From 4dcb757c1b581249ebd76a1a01cfd92efdbab367 Mon Sep 17 00:00:00 2001 From: argirok Date: Tue, 26 Sep 2023 17:32:27 +0300 Subject: [PATCH] improvements in manage Plugin Templates add manage plugins per page + create plugin based on a template --- dashboard/page/pages.component.html | 11 + dashboard/page/pages.component.ts | 8 + dashboard/plugins/plugins-routing.module.ts | 13 + dashboard/plugins/plugins.component.html | 191 +++++++++ dashboard/plugins/plugins.component.ts | 397 ++++++++++++++++++ dashboard/plugins/plugins.module.ts | 36 ++ .../templates/pluginTemplates.component.html | 2 +- .../templates/pluginTemplates.component.ts | 14 +- services/adminToolService.module.ts | 3 +- services/plugins.service.ts | 19 +- 10 files changed, 684 insertions(+), 10 deletions(-) create mode 100644 dashboard/plugins/plugins-routing.module.ts create mode 100644 dashboard/plugins/plugins.component.html create mode 100644 dashboard/plugins/plugins.component.ts create mode 100644 dashboard/plugins/plugins.module.ts diff --git a/dashboard/page/pages.component.html b/dashboard/page/pages.component.html index 24296b20..a8291a4d 100644 --- a/dashboard/page/pages.component.html +++ b/dashboard/page/pages.component.html @@ -88,6 +88,17 @@
+
+
+ + Manage plugins + ({{pagePluginsCount[check.page._id]}} + ) + +
+
this.handleError('System error retrieving page contents', error))); + this.subscriptions.push(this._pluginsService.countPluginPerPage( this.properties.adminToolsAPIURL, community_pid).subscribe( + countPlugins => { + this.pagePluginsCount = countPlugins; + }, + error => this.handleError('System error retrieving page contents', error))); } } diff --git a/dashboard/plugins/plugins-routing.module.ts b/dashboard/plugins/plugins-routing.module.ts new file mode 100644 index 00000000..32326af2 --- /dev/null +++ b/dashboard/plugins/plugins-routing.module.ts @@ -0,0 +1,13 @@ +import {NgModule} from '@angular/core'; +import {RouterModule} from '@angular/router'; +import {PluginsComponent} from "./plugins.component"; + + +@NgModule({ + imports: [ + RouterModule.forChild([ + { path: '', component: PluginsComponent} + ]) + ] +}) +export class PluginsRoutingModule { } diff --git a/dashboard/plugins/plugins.component.html b/dashboard/plugins/plugins.component.html new file mode 100644 index 00000000..fc362525 --- /dev/null +++ b/dashboard/plugins/plugins.component.html @@ -0,0 +1,191 @@ +
+
+
+
+
+ + + + +

{{page.name}}

+ +
+
+
+
+ +
+
+
+
+
+
+
+ +
+ +
+
No plugins found
+
+
+
+
+
+ +
+ +
{{check.template.name}}
+
+ {{check.template.description}} +
+ + +
{{check.plugin.code}}
+
+ Plugin is not supported anymore! +
+ +
+ Placement: {{check.plugin.placement}} +
+
+
+ {{check.template.attributes[key]['name']}}: +
+
+
+ {{check.template.attributes[key]['name']}}: +
{{check.plugin.values[key]}}
+
+
+ + +
+
+
+
+ + +
+
+ +
+
+
+
+ +
+
+
+
+
+
+
+ +
+
+
+ + {{selectedPlugin}} {{selectedTemplate}} {{pluginTemplates.length}} +
+
+
+
+
+
+
{{template.name}}
+
+ Placements: {{template.placements.join(", ")}} +
+
+ {{template.description}} +
+ +
+
+
+
+ + +
+
+ +
+
+
+
+
+
+
+ +
+
+ + + +
{{selectedTemplate.name}}
+
{{selectedTemplate.description}}
+
+ +
+ + +
+
+
Field #{{i +1}}
+ + +
+
+ +
+
+
+
+ + + +
+
+ + +
+ + diff --git a/dashboard/plugins/plugins.component.ts b/dashboard/plugins/plugins.component.ts new file mode 100644 index 00000000..192c0c28 --- /dev/null +++ b/dashboard/plugins/plugins.component.ts @@ -0,0 +1,397 @@ +import {Component, ElementRef, OnInit, ViewChild} from '@angular/core'; +import {ActivatedRoute, Router} from "@angular/router"; +import {HelpContentService} from "../../services/help-content.service"; +import { + FormArray, + UntypedFormArray, + UntypedFormBuilder, + UntypedFormGroup, + ValidatorFn, + Validators +} from "@angular/forms"; +import {Page} from "../../utils/entities/adminTool/page"; +import {EnvProperties} from '../../utils/properties/env-properties'; +import {HelperFunctions} from "../../utils/HelperFunctions.class"; +import {Subscriber} from "rxjs"; +import {properties} from "../../../../environments/environment"; +import {PortalUtils} from "../portal/portalHelper"; +import {AlertModal} from "../../utils/modal/alert"; +import {Option} from "../../sharedComponents/input/input.component"; +import {Title} from "@angular/platform-browser"; +import {ClearCacheService} from "../../services/clear-cache.service"; +import {NotificationHandler} from "../../utils/notification-handler"; +import {PluginsService} from "../../services/plugins.service"; +import {Plugin} from "../../utils/entities/adminTool/plugin"; +import {StringUtils} from "../../utils/string-utils.class"; +import {Portal} from "../../utils/entities/adminTool/portal"; +import {PluginTemplate} from "../../utils/entities/adminTool/pluginTemplate"; + +@Component({ + selector: 'plugins', + templateUrl: './plugins.component.html', +}) +export class PluginsComponent implements OnInit { + @ViewChild('editModal') editModal: AlertModal; + @ViewChild('deleteModal') deleteModal: AlertModal; + private selectedId: string; + public checkboxes: { + plugin: Plugin; + checked: boolean; + template:PluginTemplate + }[] = []; + public plugins: Plugin[] = []; + public pluginTemplates: PluginTemplate[] = []; + public selectedTemplate: PluginTemplate = null; + public selectedPlugin: Plugin = null; + public templateForm: UntypedFormGroup; + public pagesCtrl: UntypedFormArray; + urlValidator: ValidatorFn = StringUtils.urlValidator; + private searchText: RegExp = new RegExp(''); + public keyword: string = ""; + public properties: EnvProperties = properties; + public formPages: Page[] = []; + public showLoading: boolean = true; + public filterForm: UntypedFormGroup; + private subscriptions: any[] = []; + public allPages: Option[] = []; + public attrTypeOptions: Option[] = [ + {label:"Text", value:"text"}, + {label:"HTML", value:"HTML"}, + {label:"Boolean", value:"boolean"}, + {label:"URL", value:"URL"}, + ]; + public placementsOptions: Option[] = [ + {label:"Top", value:"top"}, + {label:"Bottom", value:"bottom"}, + {label:"Top Right", value:"top-right"}, + {label:"Center", value:"center"}, + {label:"Right", value:"right"}, + {label:"Left", value:"left"}, + ]; + selectedCommunityPid = null; + public portalUtils: PortalUtils = new PortalUtils(); + private index: number; + public portal: string; + public selectedPageId: string; + public community: Portal; + public page: Page; + + constructor(private element: ElementRef, private route: ActivatedRoute, private _router: Router, + private title: Title,private _helpContentService: HelpContentService, + private _pluginsService: PluginsService, private _fb: UntypedFormBuilder, + private _clearCacheService: ClearCacheService) { + } + + ngOnInit() { + this.title.setTitle('Administrator Dashboard | Classes'); + this.filterForm = this._fb.group({ + keyword: [''], + type: ['all', Validators.required] + }); + this.subscriptions.push(this.filterForm.get('keyword').valueChanges.subscribe(value => { + this.searchText = new RegExp(value, 'i'); + this.applyFilters(); + })); + 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]; + this.selectedCommunityPid = params.community; + + this.subscriptions.push(this.route.queryParams.subscribe(params => { + HelperFunctions.scroll(); + console.log(params) + // this.selectedCommunityPid = params['communityId']; + this.selectedPageId = params['pageId']; + if (this.portal && this.selectedPageId) { + this.getPage(this.selectedPageId); + } + if (!this.selectedPageId) { + this._router.navigate(['../pages'], {relativeTo: this.route}); + } + })); + })); + + + } + + ngOnDestroy(): void { + this.subscriptions.forEach(value => { + if (value instanceof Subscriber) { + value.unsubscribe(); + } else if (value instanceof Function) { + value(); + } + }); + } + getTemplateByCode(code){ + for(let template of this.pluginTemplates){ + if(template.code == code){ + return template; + } + } + return null; + } + getPage(pageId: string) { + this.showLoading = true; + this.subscriptions.push(this._helpContentService.getPageByPortal(pageId, this.properties.adminToolsAPIURL, this.portal).subscribe( + page => { + if (this.properties.adminToolsPortalType != page.portalType) { + this._router.navigate(['./pageContents']); + } else { + this.page = page; + this.getPlugins(); + } + }, + 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( + templates => { + this.pluginTemplates = templates; + + this.subscriptions.push(this._pluginsService.getPluginsByPage( this.properties.adminToolsAPIURL, this.selectedCommunityPid, this.selectedPageId).subscribe( + plugins => { + this.plugins = plugins; + this.checkboxes = []; + + let self = this; + this.plugins.forEach(_ => { + self.checkboxes.push( {plugin: _, checked: false, template:this.getTemplateByCode(_.code)}); + }); + + this.showLoading = false; + }, + error => this.handleError('System error retrieving plugins', error))); + + }, + error => this.handleError('System error retrieving templates', error))); + } + + // public showModal():void { + // this.modal.showModal(); + // } + + public toggleCheckBoxes(event) { + this.checkboxes.forEach(_ => _.checked = event.target.checked); + } + + public applyCheck(flag: boolean) { + this.checkboxes.forEach(_ => _.checked = flag); + } + + private deleteFromArray(id: string): void { + + let i = this.plugins.findIndex(_ => _._id == id); + this.plugins.splice(i, 1); + + this.applyFilters(); + } + + public confirmDelete(id: string) { + this.selectedId = id; + this.confirmModalOpen(); + } + + + private confirmModalOpen() { + this.deleteModal.alertTitle = "Delete Confirmation"; + this.deleteModal.message = "Are you sure you want to delete the selected template(s)?"; + this.deleteModal.okButtonText = "Yes"; + this.deleteModal.open(); + } + + public confirmedDelete() { + this.showLoading = true; + this.subscriptions.push(this._pluginsService.deletePluginTemplate(this.selectedId, this.properties.adminToolsAPIURL).subscribe( + _ => { + this.deleteFromArray(this.selectedId); + NotificationHandler.rise('Template have been successfully deleted'); + this.showLoading = false; + this._clearCacheService.clearCache("Template id deleted"); + }, + error => this.handleUpdateError('System error deleting the selected Template', error) + )); + } + + + public edit(i: number) { + let plugin:Plugin = this.checkboxes[i].plugin; + this.selectedPlugin = plugin; + this.selectedTemplate = this.checkboxes[i].template; + this.index = this.plugins.findIndex(value => value._id === plugin._id); + // this.formPages = plugin.pages; + this.pagesCtrl = this._fb.array([], Validators.required); + this.templateForm = this._fb.group({ + _id: this._fb.control(plugin._id), + 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), + isPriorTo: this._fb.control(plugin.isPriorTo), + values:this._fb.array([]) + }); + if(plugin.values) { + 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])} + )); + } + } + this.modalOpen("Edit Plugin", "Save Changes"); + } + + public newPlugin(template=null) { + this.selectedPlugin = null; + this.selectedTemplate = template; + if(this.selectedTemplate) { + if (this.templateForm) { + this.templateForm.get('portalType').enable(); + } + this.templateForm = this._fb.group({ + _id: this._fb.control(null), + 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), + 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), + value: this._fb.control(this.selectedTemplate.attributes[attrKey].value?this.selectedTemplate.attributes[attrKey].value:""), + })); + + } + // } + }else { + // this.addNewAttr(); + this.modalOpen("Create plugin", "Create"); + } + } + + private modalOpen(title: string, yesBtn: string) { + 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 = this.templateForm.getRawValue(); + // template.pages = this.pagesCtrl.getRawValue().map(page => page._id?page._id:page); + plugin.values = new Map(); + for (let fields of this.templateForm.getRawValue().values) { + plugin.values[fields.key]= fields.value; + } + let update = plugin._id?true:false; + this.subscriptions.push(this._pluginsService.savePlugin(plugin, this.properties.adminToolsAPIURL).subscribe( + saved => { + this.savedSuccessfully(saved, update ); + NotificationHandler.rise('Plugin ' + this.selectedTemplate.name + ' has been successfully' + (update?' updated ':' created ') + ''); + this._clearCacheService.clearCache("Plugin id saved"); + }, + error => this.handleUpdateError("System error creating template", error) + )); + } + + public savedSuccessfully(template: Plugin, update:boolean) { + if(update){ + this.plugins[this.index] = template; + }else{ + this.plugins.push(template); + } + this.applyFilters(); + this.applyCheck(false); + this.showLoading = false; + } + + + public applyFilters() { + /* this.checkboxes = []; + this.plugins.filter(item => this.filterByType(item)).forEach( + item => this.checkboxes.push({plugin: item, checked: false}) + ); + this.checkboxes = this.checkboxes.filter(item => this.filter(item.plugin));*/ + } + + + + handleUpdateError(message: string, error = null) { + if (error) { + console.log('Server responded: ' + error); + } + NotificationHandler.rise(message,'danger'); + this.showLoading = false; + } + + handleError(message: string, error = null) { + if (error) { + console.log('Server responded: ' + error); + } + NotificationHandler.rise(message,'danger'); + this.showLoading = false; + } + + getPages() { + this.showLoading = true; + this.subscriptions.push(this._helpContentService.getAllPages(this.properties.adminToolsAPIURL).subscribe( + pages => { + this.allPages = []; + pages.forEach(page => { + this.allPages.push({ + label: page.name + " [" + page.portalType + "]", + value: page + }); + }); + this.showLoading = false; + }, + error => this.handleError('System error retrieving pages', error) + )); + } + + get attrFormArray(){ + + return this.templateForm.get("values") as FormArray; + + } + + attributeTypeChanged(form){ + let type = form.get("value").get("type"); + form.get("value").setValue(""); + if(type == "boolean"){ + form.get("value").setValue(false); + } + } + 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 Object.keys(obj); + } + +} diff --git a/dashboard/plugins/plugins.module.ts b/dashboard/plugins/plugins.module.ts new file mode 100644 index 00000000..ba119656 --- /dev/null +++ b/dashboard/plugins/plugins.module.ts @@ -0,0 +1,36 @@ +import {NgModule} from '@angular/core'; +import {RouterModule} from '@angular/router'; +import {CommonModule} from '@angular/common'; +import {FormsModule, ReactiveFormsModule} from '@angular/forms'; +import {AlertModalModule} from '../../utils/modal/alertModal.module'; +import {PluginsComponent} from './plugins.component'; +import {AdminToolServiceModule} from "../../services/adminToolService.module"; +import {InputModule} from "../../sharedComponents/input/input.module"; + + +import {MatAutocompleteModule} from '@angular/material/autocomplete'; +import { MatCheckboxModule } from "@angular/material/checkbox"; +import { MatFormFieldModule } from "@angular/material/form-field"; + + +import {MatChipsModule} from '@angular/material/chips'; +import {AdminTabsModule} from "../sharedComponents/admin-tabs/admin-tabs.module"; +import {PageContentModule} from "../sharedComponents/page-content/page-content.module"; +import {PluginsRoutingModule} from "./plugins-routing.module"; +import {SearchInputModule} from "../../sharedComponents/search-input/search-input.module"; +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"; + +@NgModule({ + imports: [ + CommonModule, RouterModule, FormsModule, + AlertModalModule, ReactiveFormsModule, AdminToolServiceModule, InputModule, MatAutocompleteModule, MatFormFieldModule, MatChipsModule, + MatCheckboxModule, AdminTabsModule, PageContentModule, PluginsRoutingModule, SearchInputModule, IconsModule, LoadingModule, CKEditorModule + ], + providers:[PluginsService], + declarations: [PluginsComponent], + exports: [PluginsComponent] +}) +export class PluginsModule {} diff --git a/dashboard/plugins/templates/pluginTemplates.component.html b/dashboard/plugins/templates/pluginTemplates.component.html index 8a656da1..bee1e117 100644 --- a/dashboard/plugins/templates/pluginTemplates.component.html +++ b/dashboard/plugins/templates/pluginTemplates.component.html @@ -99,7 +99,7 @@
-
+
diff --git a/dashboard/plugins/templates/pluginTemplates.component.ts b/dashboard/plugins/templates/pluginTemplates.component.ts index b9c8965b..f4014013 100644 --- a/dashboard/plugins/templates/pluginTemplates.component.ts +++ b/dashboard/plugins/templates/pluginTemplates.component.ts @@ -55,6 +55,14 @@ export class PluginTemplatesComponent implements OnInit { {label:"Boolean", value:"boolean"}, {label:"URL", value:"URL"}, ]; + public placementsOptions: Option[] = [ + {label:"Top", value:"top"}, + {label:"Bottom", value:"bottom"}, + {label:"Top Right", value:"top-right"}, + {label:"Center", value:"center"}, + {label:"Right", value:"right"}, + {label:"Left", value:"left"}, + ]; selectedCommunityPid = null; public portalUtils: PortalUtils = new PortalUtils(); private index: number; @@ -200,9 +208,9 @@ export class PluginTemplatesComponent implements OnInit { } this.templateForm = this._fb.group({ _id: this._fb.control(null), - name: this._fb.control('aa', Validators.required), - code: this._fb.control('aa', Validators.required), - description: this._fb.control('aa'), + name: this._fb.control('', Validators.required), + code: this._fb.control('', Validators.required), + description: this._fb.control(''), pages: this.pagesCtrl, portalType: this._fb.control('community', Validators.required), placements: this._fb.array([]), diff --git a/services/adminToolService.module.ts b/services/adminToolService.module.ts index 1aafe365..737d6b86 100644 --- a/services/adminToolService.module.ts +++ b/services/adminToolService.module.ts @@ -1,6 +1,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import {HelpContentService} from "./help-content.service"; +import {PluginsService} from "./plugins.service"; @NgModule({ @@ -8,7 +9,7 @@ import {HelpContentService} from "./help-content.service"; CommonModule, ], declarations:[ ], - providers: [HelpContentService], + providers: [HelpContentService, PluginsService], }) diff --git a/services/plugins.service.ts b/services/plugins.service.ts index 9f756967..0e5caaf6 100644 --- a/services/plugins.service.ts +++ b/services/plugins.service.ts @@ -1,9 +1,9 @@ import {Injectable} from '@angular/core'; import {HttpClient} from "@angular/common/http"; -import {DivId} from "../utils/entities/adminTool/divId"; -import {catchError} from "rxjs/operators"; 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"; @Injectable() export class PluginsService { @@ -16,7 +16,7 @@ export class PluginsService { } getAllPlugins(api:string) { - return this.http.get>(api + 'plugins') + return this.http.get>(api + 'plugins') } @@ -25,12 +25,21 @@ export class PluginsService { return this.http.post(api + 'pluginTemplate/save', pluginTemplate, CustomOptions.getAuthOptionsWithBody()); } savePlugin(plugin, api:string) { - return this.http.post(api + 'plugin/save', JSON.stringify(plugin), CustomOptions.getAuthOptionsWithBody()); + return this.http.post(api + 'plugin/save', JSON.stringify(plugin), CustomOptions.getAuthOptionsWithBody()); } deletePlugin(id, api:string) { - return this.http.delete(api + 'plugin/'+id, CustomOptions.getAuthOptionsWithBody()); + return this.http.delete(api + 'plugin/'+id, CustomOptions.getAuthOptionsWithBody()); } deletePluginTemplate(id, api:string) { return this.http.delete(api + 'pluginTemplate/'+id, CustomOptions.getAuthOptionsWithBody()); } + countPluginPerPage( api:string, pid:string){ + return this.http.get(api + properties.adminToolsPortalType + '/' +pid+'/plugin/page/count'); + } + getPluginsByPage(api:string, pid:string, pageId:string){ + return this.http.get>(api + properties.adminToolsPortalType + '/' +pid+'/plugins/page/' + pageId); + } + getPluginTemplatesByPage(api:string, pid:string, pageId:string){ + return this.http.get>(api + properties.adminToolsPortalType + '/' +pid+'/pluginTemplates/page/' + pageId); + } }