dashboard/page/pages.component.html

@@ -88,7 +88,7 @@
               <div class="uk-card-footer uk-padding-remove-vertical">
                 <div class="uk-grid uk-grid-small uk-flex-nowrap uk-grid-divider uk-flex-right" uk-grid>
                   <ng-container *ngIf="!isPortalAdministrator">
-                    <div >
+                    <div *ngIf="pagePluginTemplatesCount[check.page._id]>0" >
                       <div class="uk-padding-small uk-padding-remove-horizontal">
                         <a class="uk-button uk-button-link uk-text-truncate"
                            [queryParams]="{pageId: check.page._id}"

dashboard/page/pages.component.ts

@@ -70,7 +70,7 @@ export class PagesComponent implements OnInit {
   pageHelpContentsCount = {};
   pageClassContentsCount = {};
   pagePluginsCount = {};
-  
+  pagePluginTemplatesCount = {};
   constructor(private element: ElementRef, private route: ActivatedRoute,
               private title: Title,
               private _router: Router, private _helpContentService: HelpContentService,
@@ -445,5 +445,10 @@ export class PagesComponent implements OnInit {
         this.pagePluginsCount = countPlugins;
       },
       error => this.handleError('System error retrieving page contents', error)));
+    this.subscriptions.push(this._pluginsService.countPluginTemplatePerPage( this.properties.adminToolsAPIURL, community_pid).subscribe(
+      countPlugins => {
+        this.pagePluginTemplatesCount = countPlugins;
+      },
+      error => this.handleError('System error retrieving page contents', error)));
   }
 }

dashboard/plugins/plugins.component.html

@@ -2,6 +2,28 @@
   <div header>
     <div class="uk-section-xsmall uk-margin-top">
       <div class="uk-flex-middle uk-grid" uk-grid>
+        <ng-container  *ngIf="editView ">
+          <div class="uk-width-expand">
+            <a (click)="editView = false; selectedTemplate = null; selectedPlugin = null;" class="uk-flex uk-flex-middle uk-h5 uk-link-reset">
+              <span class="uk-margin-right">
+                <icon name="west" ratio="1.7" [flex]="true"></icon>
+              </span>
+              <h1 *ngIf="page" class="uk-h5 uk-margin-remove">{{page.name}} - {{selectedPlugin ? 'Update ' : 'Add new '}} plugin
+                <span *ngIf=" templateForm && templateForm.dirty" class="uk-text-large"> (unsaved changes)</span>
+              </h1>
+            </a>
+          </div>
+          <div *ngIf="templateForm" class="uk-width-auto">
+            <button class="uk-button uk-button-default uk-margin-right"
+                    (click)="reset()" [class.uk-disabled]="!templateForm.dirty"
+                    [disabled]="!templateForm.dirty || showLoading">Reset
+            </button>
+            <button class="uk-button uk-button-primary" [class.uk-disabled]="templateForm.invalid || !templateForm.dirty || templateForm.disabled"
+                    (click)="saveConfirmed()" [disabled]="templateForm.invalid ||!templateForm.dirty || templateForm.disabled || showLoading">Save
+            </button>
+          </div>
+        </ng-container>
+        <ng-container  *ngIf="!editView">
         <div class="uk-width-expand">
           <a routerLink="../pages" class="uk-flex uk-flex-middle uk-h5 uk-link-reset">
             <span class="uk-margin-right">
@@ -10,24 +32,26 @@
             <h1 *ngIf="page" class="uk-h5 uk-margin-remove">{{page.name}}</h1>
           </a>
         </div>
-        <div search-input [disabled]="showLoading" [expandable]="true" [searchControl]="filterForm" searchInputClass="outer" placeholder="Search plugins" class="uk-width-1-3@xl uk-width-2-5@l uk-width-1-2@m uk-width-1-1">
+        <div search-input [disabled]="showLoading" [expandable]="true" [searchControl]="filterForm.get('keyword')" searchInputClass="outer" placeholder="Search plugins" class="uk-width-1-3@xl uk-width-2-5@l uk-width-1-2@m uk-width-1-1">
         </div>
         <div>
-          <button (click)="newPlugin()" [disabled]="showLoading" [class.uk-disabled]="showLoading || this.pluginTemplates.length ==0"
+          <button (click)="newPluginSelectTemplate()" [disabled]="showLoading" [class.uk-disabled]="showLoading || this.pluginTemplates.length ==0"
                   class="uk-flex uk-flex-middle uk-button uk-button-default" >
             <icon [flex]="true" name="add"></icon>
             <span class="uk-margin-small-left">Add new plugin</span>
           </button>
         </div>
+        </ng-container>
       </div>
     </div>
   </div>
   <div inner>
     <div class="uk-section uk-section-small uk-position-relative" style="min-height: 60vh">
+
       <div *ngIf="showLoading" class="uk-position-center">
         <loading></loading>
       </div>
-      <ng-container *ngIf="!showLoading">
+      <ng-container *ngIf="!showLoading && !editView">
         <div *ngIf="checkboxes.length == 0"
              class="uk-card uk-card-default uk-padding-large uk-text-center uk-margin-bottom uk-text-bold">
           <div>No plugins found</div>
@@ -36,10 +60,6 @@
           <div *ngFor="let check of checkboxes; let i=index">
             <div class="uk-card uk-card-default">
               <div class="uk-card-body uk-flex">
-                <!--<div *ngIf="!portal" class="uk-margin-right">
-                  <input [id]="check.template._id" class="uk-checkbox" type="checkbox"
-                         name="pagescb[]" value="{{check.page._id}}" [(ngModel)]="check.checked">
-                </div>-->
                 <div class="uk-width-expand uk-text-small">
                   <ng-container *ngIf="check.template">
                     <h6>{{check.template.name}}</h6>
@@ -77,7 +97,7 @@
                     <div>
                       <div class="uk-padding-small uk-padding-remove-horizontal">
                         <button
-                                class="uk-button uk-button-link uk-flex uk-flex-middle" (click)="edit(i)" [class.uk-disabled]="!check.template">
+                                class="uk-button uk-button-link uk-flex uk-flex-middle" (click)="edit(check.plugin, check.template)" [class.uk-disabled]="!check.template">
                           <icon name="edit" [flex]="true"></icon>
                           <span class="uk-margin-xsmall-left"> Edit</span>
                         </button>
@@ -92,19 +112,26 @@
                         </button>
                       </div>
                     </div>
+                  <div>
+                    <div class="uk-padding-small uk-padding-remove-horizontal">
+                      <mat-slide-toggle [checked]="check.plugin.active"
+                                        (change)="($event.source.checked = check.plugin.active);togglePlugin(!check.plugin.active,check.plugin._id)"
+                                        >
+                        <span class="uk-text-small">Enable</span>
+                      </mat-slide-toggle>
                     </div>
                   </div>
                 </div>
+
+              </div>
+            </div>
           </div>
         </div>
       </ng-container>
-    </div>
+      <ng-container *ngIf="editView">
-  </div>
+
-</div>
+        <div *ngIf="selectTemplateView">
-<modal-alert #editModal (alertOutput)="saveConfirmed($event)" [large]="true"
+          <div> Select a Template for your plugin. </div>
-             [okDisabled]="templateForm && (templateForm.invalid || !templateForm.dirty)" classTitle="uk-background-primary uk-light">
-  {{selectedPlugin}} {{selectedTemplate}} {{pluginTemplates.length}}
-  <div *ngIf="!selectedPlugin && !selectedTemplate">
           <div *ngIf="pluginTemplates.length > 0" class="uk-grid uk-child-width-1-1" uk-height-match=".uk-card-body" uk-grid>
             <div *ngFor="let template of pluginTemplates; let i=index">
               <div class="uk-card uk-card-default">
@@ -140,30 +167,19 @@
           </div>
 
         </div>
-  <form *ngIf="templateForm" [formGroup]="templateForm" class="uk-grid" uk-grid>
+        <form *ngIf="!selectTemplateView" [formGroup]="templateForm" class="uk-grid" uk-grid>
 
 
           <ng-container *ngIf="selectedTemplate || selectedPlugin">
             <div class="uk-text-large ">{{selectedTemplate.name}}</div>
             <div class="uk-text-meta uk-width-1-1">{{selectedTemplate.description}}</div>
             <div input [formInput]="templateForm.get('placement')" placeholder="Placements" [options]="placementsOptions" type="select" class="uk-width-1-2"></div>
-
-    <div *ngFor="let attrForm of attrFormArray.controls; let i=index" class="uk-width-1-1 uk-grid uk-child-width-1-2 uk-margin-top" uk-grid>
-
-
             <div class="uk-heading-divider  uk-text-small uk-width-1-1 uk-margin-bottom uk-text-meta">
               <div class="uk-grid">
-          <div>Field #{{i +1}}</div>
+                <div>Plugin Fields</div>
-          <!--<div  *ngIf="attrFormArray.length > 1" class=" uk-width-expand uk-text-right ">
-            <a  class="   " (click)="removeAttr(i)">Remove</a>
-          </div>-->
-
               </div>
             </div>
-     <!-- <div input [formInput]="attrForm.get('value')" [placeholder]="attrForm.get"></div>
+            <div *ngFor="let attrForm of attrFormArray.controls; let i=index" class="uk-width-1-1 uk-grid uk-child-width-1-2 uk-margin-top" uk-grid>
-      <div input [formInput]="attrForm.get('name')" placeholder="Name"></div>
-      <div input [formInput]="attrForm.get('type')" placeholder="Type" [options]="attrTypeOptions" type="select" (valueChange)="attributeTypeChanged(attrForm)"></div>
--->
               <div  *ngIf="this.selectedTemplate.attributes[attrForm.get('key').value].type == 'text'" input [formInput]="attrForm.get('value')" [placeholder]="selectedTemplate.attributes[attrForm.get('key').value].name" type="text"  ></div>
               <div  *ngIf="this.selectedTemplate.attributes[attrForm.get('key').value].type == 'URL'" input [formInput]="attrForm.get('value')" [placeholder]="selectedTemplate.attributes[attrForm.get('key').value].name"  type="URL" [validators]="urlValidator"></div>
               <div  *ngIf="this.selectedTemplate.attributes[attrForm.get('key').value].type == 'boolean'" input [formInput]="attrForm.get('value')" [placeholder]="selectedTemplate.attributes[attrForm.get('key').value].name"  type="select"
@@ -187,5 +203,9 @@
 
           </ng-container>
         </form>
-</modal-alert>
+      </ng-container>
+    </div>
+  </div>
+</div>
+
 <modal-alert #deleteModal  (alertOutput)="confirmedDelete()" classTitle="uk-background-primary uk-light"></modal-alert>

dashboard/plugins/plugins.component.ts

@@ -9,7 +9,7 @@ import {
   ValidatorFn,
   Validators
 } from "@angular/forms";
-import {Page} from "../../utils/entities/adminTool/page";
+import {CheckPage, Page} from "../../utils/entities/adminTool/page";
 import {EnvProperties} from '../../utils/properties/env-properties';
 import {HelperFunctions} from "../../utils/HelperFunctions.class";
 import {Subscriber} from "rxjs";
@@ -31,7 +31,6 @@ import {PluginTemplate} from "../../utils/entities/adminTool/pluginTemplate";
   templateUrl: './plugins.component.html',
 })
 export class PluginsComponent implements OnInit {
-  @ViewChild('editModal') editModal: AlertModal;
   @ViewChild('deleteModal') deleteModal: AlertModal;
   private selectedId: string;
   public checkboxes: {
@@ -43,6 +42,8 @@ export class PluginsComponent implements OnInit {
   public pluginTemplates: PluginTemplate[] = [];
   public selectedTemplate: PluginTemplate = null;
   public selectedPlugin: Plugin = null;
+  public editView = false;
+  public selectTemplateView = false;
   public templateForm: UntypedFormGroup;
   public pagesCtrl: UntypedFormArray;
   urlValidator: ValidatorFn = StringUtils.urlValidator;
@@ -83,7 +84,7 @@ export class PluginsComponent implements OnInit {
   }
 
   ngOnInit() {
-    this.title.setTitle('Administrator Dashboard | Classes');
+    this.title.setTitle('Administrator Dashboard | Plugins');
     this.filterForm = this._fb.group({
       keyword: [''],
       type: ['all', Validators.required]
@@ -92,9 +93,9 @@ export class PluginsComponent implements OnInit {
       this.searchText = new RegExp(value, 'i');
       this.applyFilters();
     }));
-    this.subscriptions.push(this.filterForm.get('type').valueChanges.subscribe(value => {
+    /*this.subscriptions.push(this.filterForm.get('type').valueChanges.subscribe(value => {
       this.applyFilters();
-    }));
+    }));*/
     this.subscriptions.push(this.route.params.subscribe(params => {
       console.log(params)
       this.portal = (this.route.snapshot.data.portal) ? this.route.snapshot.data.portal : this.route.snapshot.params[this.route.snapshot.data.param];
@@ -126,6 +127,7 @@ export class PluginsComponent implements OnInit {
       }
     });
   }
+
   getTemplateByCode(code) {
     for (let template of this.pluginTemplates) {
       if (template.code == code) {
@@ -134,6 +136,7 @@ export class PluginsComponent implements OnInit {
     }
     return null;
   }
+
   getPage(pageId: string) {
     this.showLoading = true;
     this.subscriptions.push(this._helpContentService.getPageByPortal(pageId, this.properties.adminToolsAPIURL, this.portal).subscribe(
@@ -147,6 +150,7 @@ export class PluginsComponent implements OnInit {
       },
       error => this.handleError('System error retrieving page', error)));
   }
+
   getPlugins() {
     this.showLoading = true;
     this.subscriptions.push(this._pluginsService.getPluginTemplatesByPage(this.properties.adminToolsAPIURL, this.selectedCommunityPid, this.selectedPageId).subscribe(
@@ -171,10 +175,6 @@ export class PluginsComponent implements OnInit {
       error => this.handleError('System error retrieving templates', error)));
   }
 
-  // public showModal():void {
-  //     this.modal.showModal();
-  // }
-  
   public toggleCheckBoxes(event) {
     this.checkboxes.forEach(_ => _.checked = event.target.checked);
   }
@@ -218,20 +218,21 @@ export class PluginsComponent implements OnInit {
   }
 
 
-  public edit(i: number) {
+  public edit(plugin, template) {
-    let plugin:Plugin  = this.checkboxes[i].plugin;
+    this.editView = true;
     this.selectedPlugin = plugin;
-    this.selectedTemplate = this.checkboxes[i].template;
+    this.selectedTemplate = template;
     this.index = this.plugins.findIndex(value => value._id === plugin._id);
     // this.formPages = <Page[]>plugin.pages;
     this.pagesCtrl = this._fb.array([], Validators.required);
     this.templateForm = this._fb.group({
       _id: this._fb.control(plugin._id),
+      pid: this._fb.control(this.selectedCommunityPid),
       page: this._fb.control(plugin.page),
       code: this._fb.control(plugin.code, Validators.required),
       placement: this._fb.control(plugin.placement),
       order: this._fb.control(plugin.order),
-      isActive: this._fb.control(plugin.isActive),
+      active: this._fb.control(plugin.active),
       isPriorTo: this._fb.control(plugin.isPriorTo),
       values: this._fb.array([])
     });
@@ -239,31 +240,33 @@ export class PluginsComponent implements OnInit {
       for (let attrKey of Object.keys(plugin.values)) {
         (this.templateForm.get("values") as FormArray).push(this._fb.group({
             'key': this._fb.control(attrKey),
-          'value': this._fb.control(plugin.values[attrKey])}
+            'value': this._fb.control(plugin.values[attrKey])
+          }
         ));
       }
     }
-    this.modalOpen("Edit Plugin", "Save Changes");
   }
 
-  public newPlugin(template=null) {
+  public newPluginSelectTemplate() {
     this.selectedPlugin = null;
-    this.selectedTemplate = template;
+    this.selectedTemplate = null;
-    if(this.selectedTemplate) {
+    this.editView = true;
-      if (this.templateForm) {
+    this.selectTemplateView = true;
-        this.templateForm.get('portalType').enable();
   }
+
+  public newPlugin(template) {
+    this.selectedTemplate = template;
     this.templateForm = this._fb.group({
       _id: this._fb.control(null),
+      pid: this._fb.control(this.selectedCommunityPid),
       page: this._fb.control(this.selectedPageId),
       code: this._fb.control(this.selectedTemplate.code, Validators.required),
       placement: this._fb.control(this.selectedTemplate.placements[0]),
       order: this._fb.control(""),
-        isActive: this._fb.control(false),
+      active: this._fb.control(false),
       isPriorTo: this._fb.control(false),
       values: this._fb.array([])
     });
-      // if(plugin.values) {
     for (let attrKey of Object.keys(this.selectedTemplate.attributes)) {
       (this.templateForm.get("values") as FormArray).push(this._fb.group({
         key: this._fb.control(attrKey),
@@ -271,21 +274,11 @@ export class PluginsComponent implements OnInit {
       }));
 
     }
-      // }
+    this.selectTemplateView = false;
-    }else {
+
-      // this.addNewAttr();
-      this.modalOpen("Create plugin", "Create");
-    }
   }
 
-  private modalOpen(title: string, yesBtn: string) {
+  public saveConfirmed() {
-    this.editModal.okButtonLeft = false;
-    this.editModal.alertTitle = title;
-    this.editModal.okButtonText = yesBtn;
-    this.editModal.open();
-  }
-  
-  public saveConfirmed(data: any) {
     this.showLoading = true;
     let plugin: Plugin = <Plugin>this.templateForm.getRawValue();
     // template.pages = this.pagesCtrl.getRawValue().map(page => page._id?page._id:page);
@@ -293,22 +286,27 @@ export class PluginsComponent implements OnInit {
     for (let fields of this.templateForm.getRawValue().values) {
       plugin.values[fields.key] = fields.value;
     }
-    let update = plugin._id?true:false;
+    let update = (plugin._id ) ? true : false;
+    console.log("update:" + update);
     this.subscriptions.push(this._pluginsService.savePlugin(plugin, this.properties.adminToolsAPIURL).subscribe(
       saved => {
         this.savedSuccessfully(saved, update);
         NotificationHandler.rise('Plugin <b>' + this.selectedTemplate.name + '</b> has been <b>successfully' + (update ? ' updated ' : ' created ') + '</b>');
         this._clearCacheService.clearCache("Plugin id saved");
+        this.editView = false;
+        this.selectTemplateView = false;
+        this.selectedTemplate = null;
+        this.selectedPlugin = null;
       },
       error => this.handleUpdateError("System error creating template", error)
     ));
   }
 
-  public savedSuccessfully(template: Plugin, update:boolean) {
+  public savedSuccessfully(plugin: Plugin, update: boolean) {
     if (update) {
-      this.plugins[this.index] = template;
+      this.plugins[this.index] = plugin;
     } else {
-      this.plugins.push(template);
+      this.plugins.push(plugin);
     }
     this.applyFilters();
     this.applyCheck(false);
@@ -322,9 +320,28 @@ export class PluginsComponent implements OnInit {
         item => this.checkboxes.push({plugin: item, checked: false})
       );
       this.checkboxes = this.checkboxes.filter(item => this.filter(item.plugin));*/
+
+    this.checkboxes = [];
+
+   this.plugins.forEach(item => {
+     let template = this.getTemplateByCode(item.code);
+     if (this.filterPlugins(item, template)) {
+       this.checkboxes.push({plugin: item, checked: false, template: template});
+
+     }
+   });
+
   }
 
 
+  public filterPlugins(plugin: Plugin, template: PluginTemplate): boolean {
+    let values =[];
+    for(let key of this.getKeys(plugin.values)){
+      values.push(plugin.values[key]);
+    }
+    return this.searchText.toString() == '' || (plugin.code + ' ' +values.join(' ') +  template.name + ' ' + template.description).match(this.searchText) != null;
+  }
+
 
   handleUpdateError(message: string, error = null) {
     if (error) {
@@ -372,6 +389,7 @@ export class PluginsComponent implements OnInit {
       form.get("value").setValue(false);
     }
   }
+
   public getPagesAsString(pageIds): string {
 
     let pages = [];
@@ -381,6 +399,7 @@ export class PluginsComponent implements OnInit {
     }
     return pages.join(", ");
   }
+
   public getPageById(pageId) {
     for (let option of this.allPages) {
       if (option.value._id == pageId) {
@@ -394,4 +413,27 @@ export class PluginsComponent implements OnInit {
     return Object.keys(obj);
   }
 
+  reset() {
+    if (this.selectedPlugin) {
+      this.edit(this.selectedPlugin, this.selectedTemplate)
+    } else {
+      this.newPlugin(this.selectedTemplate)
+    }
+  }
+
+
+  public togglePlugin(status: boolean, id: string) {
+    this.subscriptions.push(this._pluginsService.togglePages(id, status, this.properties.adminToolsAPIURL).subscribe(
+      () => {
+
+          let i = this.checkboxes.findIndex(_ => _.plugin._id == id);
+          this.checkboxes[i].plugin.active = status;
+        this.applyCheck(false);
+        this._clearCacheService.clearCache("Plugin's status changed");
+        this._clearCacheService.purgeBrowserCache("Plugin's status changed", this.portal);
+      },
+      error => this.handleUpdateError('System error changing the status of Plugin', error)
+    ));
+  }
+
 }

dashboard/plugins/plugins.module.ts

@@ -22,12 +22,14 @@ import {IconsModule} from "../../utils/icons/icons.module";
 import {LoadingModule} from "../../utils/loading/loading.module";
 import {PluginsService} from "../../services/plugins.service";
 import {CKEditorModule} from "ng2-ckeditor";
+import {MatSlideToggleModule} from "@angular/material/slide-toggle";
 
 @NgModule({
   imports: [
     CommonModule, RouterModule, FormsModule,
     AlertModalModule, ReactiveFormsModule, AdminToolServiceModule, InputModule, MatAutocompleteModule, MatFormFieldModule, MatChipsModule,
-    MatCheckboxModule, AdminTabsModule, PageContentModule, PluginsRoutingModule, SearchInputModule, IconsModule, LoadingModule, CKEditorModule
+    MatCheckboxModule, AdminTabsModule, PageContentModule, PluginsRoutingModule, SearchInputModule, IconsModule, LoadingModule, CKEditorModule,
+    MatSlideToggleModule
   ],
   providers:[PluginsService],
     declarations: [PluginsComponent],

dashboard/plugins/templates/pluginTemplates.component.html

@@ -114,7 +114,7 @@
 
         </div>
       </div>
-      <div input [formInput]="attrForm.get('key')" placeholder="Field key"></div>
+      <div input [formInput]="attrForm.get('key')" placeholder="Key"></div>
       <div input [formInput]="attrForm.get('name')" placeholder="Name"></div>
       <div input [formInput]="attrForm.get('type')" placeholder="Type" [options]="attrTypeOptions" type="select" (valueChange)="attributeTypeChanged(attrForm)"></div>
 

dashboard/plugins/templates/pluginTemplates.component.ts

@@ -338,7 +338,7 @@ export class PluginTemplatesComponent implements OnInit {
 
     let pages = [];
     for(let id of pageIds) {
-      pages.push(this.allPages.filter(option => option.value._id == id).map((option => option.value.name)));
+      pages.push(this.allPages.filter(option => option.value._id == id).map((option => option.value.name  + " [" + option.value.portalType + "]")));
 
     }
     return pages.join(", ");

services/plugins.service.ts

@@ -4,6 +4,7 @@ import {CustomOptions} from "./servicesUtils/customOptions.class";
 import {PluginTemplate} from "../utils/entities/adminTool/pluginTemplate";
 import {Plugin} from "../utils/entities/adminTool/plugin";
 import {properties} from "../../../environments/environment";
+import {catchError} from "rxjs/operators";
 
 @Injectable()
 export class PluginsService {
@@ -36,10 +37,17 @@ export class PluginsService {
   countPluginPerPage( api:string, pid:string){
     return this.http.get(api  + properties.adminToolsPortalType + '/' +pid+'/plugin/page/count');
   }
+  countPluginTemplatePerPage( api:string, pid:string){
+    return this.http.get(api  + properties.adminToolsPortalType + '/' +pid+'/pluginTemplate/page/count');
+  }
   getPluginsByPage(api:string, pid:string, pageId:string){
     return this.http.get<Array<Plugin>>(api  + properties.adminToolsPortalType + '/' +pid+'/plugins/page/' + pageId);
   }
   getPluginTemplatesByPage(api:string, pid:string, pageId:string){
     return this.http.get<Array<PluginTemplate>>(api  + properties.adminToolsPortalType + '/' +pid+'/pluginTemplates/page/' + pageId);
   }
+
+  togglePages(id : string,status : boolean, api:string) {
+    return this.http.post(api + 'plugin/status/' + id, status, CustomOptions.getAuthOptionsWithBody());
+  }
 }

utils/entities/adminTool/plugin.ts

@@ -2,10 +2,11 @@ export class Plugin {
   _id: string;
   code: string;
   page: string;
+  pid:string;
   placement: string;
   order: string;
-  isActive:boolean;
+  active:boolean;
-  isPriorTo:boolean;
+  priorTo:boolean;
   values:Map<string,string> = new Map<string, string>();
 
 }