Merge branch 'plugins-functionality' of code-repo.d4science.org:MaDgIK/openaire-library into plugins-functionality

dashboard/plugins/plugins-form/pluginsForm.component.ts

@@ -169,6 +169,7 @@ export class PluginsFormComponent implements OnInit {
   public savePlugin(plugin, update){
     this.subscriptions.push(this._pluginsService.savePlugin(plugin, this.properties.adminToolsAPIURL,this.selectedCommunityPid ).subscribe(
       saved => {
+        this._clearCacheService.purgeBrowserCache(null, this.selectedCommunityPid)
         this.edit(saved, this.selectedTemplate)
 
       },

dashboard/plugins/plugins.component.ts

@@ -199,95 +199,10 @@ export class PluginsComponent implements OnInit {
       error => this.handleError('System error retrieving templates', error)));
   }
 
-  /*
-
-    public edit(plugin:Plugin, template:PluginTemplate, placement, index) {
-      this.editView = true;
-      this.selectedPlugin = JSON.parse(JSON.stringify(plugin)); // deep copy object with nested objects
-      this.selectedTemplate = template;
-      this.index = index;
-      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),
-        templateCode: this._fb.control(plugin.templateCode, Validators.required),
-        templateId: this._fb.control(plugin.templateId, Validators.required),
-        placement: this._fb.control(plugin.placement),
-        order: this._fb.control(plugin.order),
-        active: this._fb.control(plugin.active),
-        values: this._fb.array([]),
-      });
-
-      if (template.settings) {
-        for (let attrKey of Object.keys(template.settings)) {
-          (this.templateForm.get("values") as FormArray).push(this._fb.group({
-              'key': this._fb.control(attrKey),
-              'value': this._fb.control(plugin.settingsValues[attrKey]?plugin.settingsValues[attrKey]:template.settings[attrKey].value)
-            }
-          ));
-        }
-      }
-    }
-  */
-  /*
-    public newPluginSelectTemplate() {
-      this.selectedPlugin = null;
-      this.editView = true;
-      if(!this.templateView) {
-        this.selectedTemplate = null;
-        this.selectTemplateView = true;
-      }else{
-        this.newPlugin( Object.assign({}, this.template));
-      }
-    }*/
-
-  /*
-
-    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.placement),
-        order: this._fb.control(""),
-        active: this._fb.control(false),
-        isPriorTo: this._fb.control(false),
-        values: this._fb.array([]),
-        object: this._fb.control({})
-      });
-      for (let attrKey of Object.keys(this.selectedTemplate.settings)) {
-        (this.templateForm.get("values") as FormArray).push(this._fb.group({
-          key: this._fb.control(attrKey),
-          value: this._fb.control(this.selectedTemplate.settings[attrKey].value ? this.selectedTemplate.settings[attrKey].value : ""),
-        }));
-
-      }
-      this.selectTemplateView = false;
-
-    }
-
-  */
-  /*public saveConfirmed(index) {
-    this.showLoading = true;
-    let plugin: Plugin = <Plugin>this.templateForm.getRawValue();
-    plugin.object = this.selectedPlugin.object;
-    plugin.settingsValues = new Map<string, string>();
-    for (let fields of this.templateForm.getRawValue().values) {
-      plugin.settingsValues[fields.key] = fields.value;
-    }
-    let update = (plugin._id) ? true : false;
-    this.savePlugin(plugin, update, this.index)
-  }*/
-
   public savePlugin(plugin, update, index) {
     this.subscriptions.push(this._pluginsService.savePlugin(plugin, this.properties.adminToolsAPIURL, this.selectedCommunityPid).subscribe(
       saved => {
         this.savedSuccessfully(saved, update, index);
-        // this.editView = false;
-        // this.selectTemplateView = false;
         this.selectedTemplate = null;
         this.selectedPlugin = null;
         this.clearCache();
@@ -357,12 +272,6 @@ export class PluginsComponent implements OnInit {
     ));
   }
 
-/*  get attrFormArray() {
-
-    return this.templateForm.get("values") as FormArray;
-
-  }*/
-
   attributeTypeChanged(form) {
     let type = form.get("value").get("type");
     form.get("value").setValue("");
@@ -371,41 +280,11 @@ export class PluginsComponent implements OnInit {
     }
   }
 
-  public getPagesAsString(pageIds): string {
-
-    let pages = [];
-    for (let id of pageIds) {
-      pages.push(this.allPages.filter(option => option.value._id == id).map((option => option.value.name)));
-
-    }
-    return pages.join(", ");
-  }
-
-  public getPageById(pageId) {
-    for (let option of this.allPages) {
-      if (option.value._id == pageId) {
-        return option.value;
-      }
-    }
-    return pageId;
-  }
 
   getKeys(obj) {
     return obj ? Object.keys(obj) : [];
   }
 
-  /*
-
-    reset() {
-      if (this.selectedPlugin) {
-
-        this.edit(this.pluginsByPlacement.get(this.selectedTemplate.placement)[this.index].plugin, this.selectedTemplate, this.selectedTemplate.placement, this.index)
-      } else {
-        this.newPlugin(this.selectedTemplate)
-      }
-    }
-  */
-
 
   public togglePlugin(status: boolean, id: string, i, placement) {
     this.index = i;
@@ -426,20 +305,6 @@ export class PluginsComponent implements OnInit {
     }
   }
 
-  /*pluginFieldChanged($event:PluginEditEvent){
-    if($event.type == "open-submenu"){
-      this.editSubmenuOpen = true;
-      return;
-    }
-    if($event.type == "close-submenu"){
-
-      this.editSubmenuOpen = false;
-      return;
-    }
-    this.selectedPlugin.object[$event.field]=$event.value;
-    this.templateForm.markAsDirty();
-  }
-*/
   public swap(pluginToMoveUp, pluginToMoveDown, placement) {
     this.showLoading = true;
     let moveUpGroup = this.pluginsByPlacement.get(placement)[pluginToMoveUp];
@@ -470,7 +335,7 @@ export class PluginsComponent implements OnInit {
   }
 
   clearCache() {
-    this._clearCacheService.clearCacheInRoute(null, this.selectedCommunityPid, this.getPageById(this.selectedPageId).route)
+    // this._clearCacheService.clearCacheInRoute(null, this.selectedCommunityPid, this.getPageById(this.selectedPageId).route)
     this._clearCacheService.purgeBrowserCache(null, this.selectedCommunityPid)
   }