From 85a7030929faeae6150743ec261508702fd09f3e Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Tue, 12 Jul 2022 16:50:56 +0300 Subject: [PATCH] [Library & Connect Admin | new-theme]: edit-community.component.ts & portals.component.ts & pages.component.ts & page-help-content-form.component.ts & page-help-contents.component.ts & entities.component.ts & divIds.component.ts & class-help-content-form.component.ts & class-help-contents.component.ts: On save/update/delete/toggle community/page/entity/divId/helptext/divHelptext , call clearCache() to immediately get changes in the dashboards. --- dashboard/divId/divIds.component.ts | 7 ++++++- .../divhelpcontent/class-help-content-form.component.ts | 5 ++++- dashboard/divhelpcontent/class-help-contents.component.ts | 7 ++++++- dashboard/entity/entities.component.ts | 8 +++++++- dashboard/helpTexts/page-help-content-form.component.ts | 5 ++++- dashboard/helpTexts/page-help-contents.component.ts | 7 ++++++- dashboard/page/pages.component.ts | 8 +++++++- dashboard/portal/portals.component.ts | 7 ++++++- 8 files changed, 46 insertions(+), 8 deletions(-) diff --git a/dashboard/divId/divIds.component.ts b/dashboard/divId/divIds.component.ts index 38c6e8f3..75afe664 100644 --- a/dashboard/divId/divIds.component.ts +++ b/dashboard/divId/divIds.component.ts @@ -13,6 +13,7 @@ import {AlertModal} from "../../utils/modal/alert"; import {Option} from "../../sharedComponents/input/input.component"; import {SearchInputComponent} from "../../sharedComponents/search-input/search-input.component"; import {Title} from "@angular/platform-browser"; +import {ClearCacheService} from "../../services/clear-cache.service"; declare var UIkit; @@ -45,7 +46,8 @@ export class DivIdsComponent implements OnInit { constructor(private element: ElementRef, private route: ActivatedRoute, private _router: Router, private title: Title, - private _helpContentService: HelpContentService, private _fb: FormBuilder) { + private _helpContentService: HelpContentService, private _fb: FormBuilder, + private _clearCacheService: ClearCacheService) { } ngOnInit() { @@ -149,6 +151,7 @@ export class DivIdsComponent implements OnInit { pos: 'bottom-right' }); this.showLoading = false; + this._clearCacheService.clearCache("Class ids deleted"); }, error => this.handleUpdateError('System error deleting the selected classes', error) )); @@ -204,6 +207,7 @@ export class DivIdsComponent implements OnInit { timeout: 6000, pos: 'bottom-right' }); + this._clearCacheService.clearCache("Class id saved"); }, error => this.handleUpdateError("System error creating class", error) )); @@ -217,6 +221,7 @@ export class DivIdsComponent implements OnInit { timeout: 6000, pos: 'bottom-right' }); + this._clearCacheService.clearCache("Class id updated"); }, error => this.handleUpdateError("System error updating class", error) )); diff --git a/dashboard/divhelpcontent/class-help-content-form.component.ts b/dashboard/divhelpcontent/class-help-content-form.component.ts index 1fd8dd3e..52cb44d5 100644 --- a/dashboard/divhelpcontent/class-help-content-form.component.ts +++ b/dashboard/divhelpcontent/class-help-content-form.component.ts @@ -12,6 +12,7 @@ import {Subscriber, Subscription, zip} from 'rxjs'; import {HelperFunctions} from '../../utils/HelperFunctions.class'; import {DivHelpContent} from '../../utils/entities/adminTool/div-help-content'; import {NotificationHandler} from "../../utils/notification-handler"; +import {ClearCacheService} from "../../services/clear-cache.service"; declare var UIkit; @@ -33,7 +34,8 @@ export class ClassContentFormComponent implements OnInit { public pageHelpContent: DivHelpContent; public stickyPageHeader: boolean = false; - constructor(private route: ActivatedRoute, private _router: Router, private _fb: FormBuilder, private _helpContentService: HelpContentService) { + constructor(private route: ActivatedRoute, private _router: Router, private _fb: FormBuilder, + private _helpContentService: HelpContentService, private _clearCacheService: ClearCacheService) { } ngOnInit() { @@ -154,6 +156,7 @@ export class ClassContentFormComponent implements OnInit { pos: 'bottom-right' }); this.showLoading = false; + this._clearCacheService.clearCache("Class help text saved or updated"); }, err => this.handleUpdateError('System error saving page content', err) )); diff --git a/dashboard/divhelpcontent/class-help-contents.component.ts b/dashboard/divhelpcontent/class-help-contents.component.ts index 00972059..b730ccd5 100644 --- a/dashboard/divhelpcontent/class-help-contents.component.ts +++ b/dashboard/divhelpcontent/class-help-contents.component.ts @@ -14,6 +14,7 @@ import {properties} from '../../../../environments/environment'; import {DomSanitizer} from '@angular/platform-browser'; import {SearchInputComponent} from '../../sharedComponents/search-input/search-input.component'; import {CheckDivHelpContent, DivHelpContent} from '../../utils/entities/adminTool/div-help-content'; +import {ClearCacheService} from "../../services/clear-cache.service"; declare var UIkit; @@ -44,7 +45,9 @@ export class ClassHelpContentsComponent implements OnInit { private subscriptions: any[] = []; public stickyPageHeader: boolean = false; - constructor(private element: ElementRef, private route: ActivatedRoute, private router: Router, private _helpService: HelpContentService, private _fb: FormBuilder, private sanitizer: DomSanitizer) { + constructor(private element: ElementRef, private route: ActivatedRoute, private router: Router, + private _helpService: HelpContentService, private _fb: FormBuilder, private sanitizer: DomSanitizer, + private _clearCacheService: ClearCacheService) { } ngOnInit() { @@ -159,6 +162,7 @@ export class ClassHelpContentsComponent implements OnInit { pos: 'bottom-right' }); this.showLoading = false; + this._clearCacheService.clearCache("Class text texts deleted"); }, error => this.handleUpdateError('System error deleting the selected page content(s)', error) )); @@ -205,6 +209,7 @@ export class ClassHelpContentsComponent implements OnInit { timeout: 6000, pos: 'bottom-right' }); + this._clearCacheService.clearCache("class help text's status changed"); }, error => this.handleUpdateError('System error changing the status of the selected page content(s)', error) )); diff --git a/dashboard/entity/entities.component.ts b/dashboard/entity/entities.component.ts index 451f64df..77649727 100644 --- a/dashboard/entity/entities.component.ts +++ b/dashboard/entity/entities.component.ts @@ -18,6 +18,7 @@ import {CommunitiesService} from "../../connect/communities/communities.service" import {CommunityService} from "../../connect/community/community.service"; import {CommunityInfo} from "../../connect/community/communityInfo"; import {Stakeholder, StakeholderInfo} from "../../monitor/entities/stakeholder"; +import {ClearCacheService} from "../../services/clear-cache.service"; declare var UIkit; @@ -63,7 +64,8 @@ export class EntitiesComponent implements OnInit { private _helpContentService: HelpContentService, private userManagementService: UserManagementService, private _fb: FormBuilder, private communityService: CommunityService, - private stakeholderService: StakeholderService) { + private stakeholderService: StakeholderService, + private _clearCacheService: ClearCacheService) { } ngOnInit() { @@ -206,6 +208,7 @@ export class EntitiesComponent implements OnInit { pos: 'bottom-right' }); this.showLoading = false; + this._clearCacheService.clearCache("entities deleted"); }, error => this.handleUpdateError('System error deleting the selected entities', error) ); @@ -250,6 +253,7 @@ export class EntitiesComponent implements OnInit { timeout: 6000, pos: 'bottom-right' }); + this._clearCacheService.clearCache("entity updated"); }, error => this.handleUpdateError('System error updating entity', error) ); @@ -262,6 +266,7 @@ export class EntitiesComponent implements OnInit { timeout: 6000, pos: 'bottom-right' }); + this._clearCacheService.clearCache("entity saved"); }, error => this.handleUpdateError('System error creating entity', error) ); @@ -357,6 +362,7 @@ export class EntitiesComponent implements OnInit { this.checkboxes[i].entity.isEnabled = this.toggleStatus; } this.applyCheck(false); + this._clearCacheService.clearCache("entity's status changed"); }, error => this.handleUpdateError('System error changing the status of the selected entity(-ies)', error) ); diff --git a/dashboard/helpTexts/page-help-content-form.component.ts b/dashboard/helpTexts/page-help-content-form.component.ts index d28ac68d..2a74d1b0 100644 --- a/dashboard/helpTexts/page-help-content-form.component.ts +++ b/dashboard/helpTexts/page-help-content-form.component.ts @@ -8,6 +8,7 @@ import {properties} from '../../../../environments/environment'; import {Subscriber, Subscription, zip} from 'rxjs'; import {HelperFunctions} from '../../utils/HelperFunctions.class'; import {PageHelpContent} from '../../utils/entities/adminTool/page-help-content'; +import {ClearCacheService} from "../../services/clear-cache.service"; declare var UIkit; @@ -30,7 +31,8 @@ export class PageContentFormComponent implements OnInit { public pageHelpContent: PageHelpContent; public stickyPageHeader: boolean = false; - constructor(private route: ActivatedRoute, private _router: Router, private _fb: FormBuilder, private _helpContentService: HelpContentService) { + constructor(private route: ActivatedRoute, private _router: Router, private _fb: FormBuilder, + private _helpContentService: HelpContentService, private _clearCacheService: ClearCacheService) { } ngOnInit() { @@ -228,6 +230,7 @@ export class PageContentFormComponent implements OnInit { }); this._router.navigate(['../'], {queryParams: {"pageId": this.pageId}, relativeTo: this.route}); this.showLoading = false; + this._clearCacheService.clearCache("page help content saved"); }, err => this.handleUpdateError('System error saving page content', err) )); diff --git a/dashboard/helpTexts/page-help-contents.component.ts b/dashboard/helpTexts/page-help-contents.component.ts index 2a1a785b..dcf7c11c 100644 --- a/dashboard/helpTexts/page-help-contents.component.ts +++ b/dashboard/helpTexts/page-help-contents.component.ts @@ -17,6 +17,7 @@ import {Subscriber} from 'rxjs'; import {properties} from '../../../../environments/environment'; import {DomSanitizer} from '@angular/platform-browser'; import {SearchInputComponent} from '../../sharedComponents/search-input/search-input.component'; +import {ClearCacheService} from "../../services/clear-cache.service"; declare var UIkit; @@ -48,7 +49,9 @@ export class PageHelpContentsComponent implements OnInit { public stickyPageHeader: boolean = false; @ViewChild('searchInputComponent') searchInputComponent: SearchInputComponent; - constructor(private element: ElementRef, private route: ActivatedRoute, private router: Router, private _helpService: HelpContentService, private _fb: FormBuilder, private sanitizer: DomSanitizer) { + constructor(private element: ElementRef, private route: ActivatedRoute, private router: Router, + private _helpService: HelpContentService, private _fb: FormBuilder, private sanitizer: DomSanitizer, + private _clearCacheService: ClearCacheService) { } ngOnInit() { @@ -170,6 +173,7 @@ export class PageHelpContentsComponent implements OnInit { pos: 'bottom-right' }); this.showLoading = false; + this._clearCacheService.clearCache("Help texts deleted"); }, error => this.handleUpdateError('System error deleting the selected page content(s)', error) )); @@ -218,6 +222,7 @@ export class PageHelpContentsComponent implements OnInit { }); this.countPageHelpContents(); this.applyCheck(false); + this._clearCacheService.clearCache("Help text's status changed"); }, error => this.handleUpdateError('System error changing the status of the selected page content(s)', error) )); diff --git a/dashboard/page/pages.component.ts b/dashboard/page/pages.component.ts index 9a1f62d6..c7170f4b 100644 --- a/dashboard/page/pages.component.ts +++ b/dashboard/page/pages.component.ts @@ -20,6 +20,7 @@ import {StakeholderService} from '../../monitor/services/stakeholder.service'; import {CommunityInfo} from "../../connect/community/communityInfo"; import {Stakeholder} from "../../monitor/entities/stakeholder"; import {CommunityService} from "../../connect/community/community.service"; +import {ClearCacheService} from "../../services/clear-cache.service"; declare var UIkit; @@ -76,7 +77,8 @@ export class PagesComponent implements OnInit { private _router: Router, private _helpContentService: HelpContentService, private userManagementService: UserManagementService, private _fb: FormBuilder, private communityService: CommunityService, - private stakeholderService: StakeholderService) { + private stakeholderService: StakeholderService, + private _clearCacheService: ClearCacheService) { } ngOnInit() { @@ -253,6 +255,7 @@ export class PagesComponent implements OnInit { pos: 'bottom-right' }); this.showLoading = false; + this._clearCacheService.clearCache("Pages deleted"); }, error => this.handleUpdateError('System error deleting the selected pages', error) )); @@ -323,6 +326,7 @@ export class PagesComponent implements OnInit { timeout: 6000, pos: 'bottom-right' }); + this._clearCacheService.clearCache("Page saved"); }, error => this.handleUpdateError('System error creating page', error) )); @@ -336,6 +340,7 @@ export class PagesComponent implements OnInit { timeout: 6000, pos: 'bottom-right' }); + this._clearCacheService.clearCache("Page updated"); }, error => this.handleUpdateError('System error updating page', error) )); @@ -425,6 +430,7 @@ export class PagesComponent implements OnInit { this.checkboxes[i].page.isEnabled = status; } this.applyCheck(false); + this._clearCacheService.clearCache("Page's status changed"); }, error => this.handleUpdateError('System error changing the status of the selected page(s)', error) )); diff --git a/dashboard/portal/portals.component.ts b/dashboard/portal/portals.component.ts index acd1dd09..b24d46eb 100644 --- a/dashboard/portal/portals.component.ts +++ b/dashboard/portal/portals.component.ts @@ -14,6 +14,7 @@ import {properties} from "../../../../environments/environment"; import {AlertModal} from "../../utils/modal/alert"; import {SearchInputComponent} from "../../sharedComponents/search-input/search-input.component"; import {Title} from "@angular/platform-browser"; +import {ClearCacheService} from "../../services/clear-cache.service"; declare var UIkit; @@ -47,7 +48,8 @@ export class PortalsComponent implements OnInit { constructor(private element: ElementRef, private route: ActivatedRoute, private title: Title, - private _router: Router, private _helpContentService: HelpContentService, private _fb: FormBuilder) { + private _router: Router, private _helpContentService: HelpContentService, private _fb: FormBuilder, + private _clearCacheService: ClearCacheService) { } ngOnInit() { @@ -145,6 +147,7 @@ export class PortalsComponent implements OnInit { pos: 'bottom-right' }); this.showLoading = false; + this._clearCacheService.clearCache("Portals deleted"); }, error => this.handleUpdateError('System error deleting the selected communities', error) )); @@ -200,6 +203,7 @@ export class PortalsComponent implements OnInit { timeout: 6000, pos: 'bottom-right' }); + this._clearCacheService.clearCache("Portal updated"); }, error => this.handleUpdateError('System error updating portal', error) )); @@ -213,6 +217,7 @@ export class PortalsComponent implements OnInit { timeout: 6000, pos: 'bottom-right' }); + this._clearCacheService.clearCache("Portal saved"); }, error => this.handleUpdateError('System error creating portal', error) ));