inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2025-07-24 17:31:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ACS-5279] improved plugin handling (#3332)

Browse Source
This commit is contained in:
Denys Vuika
2023-07-12 08:27:28 +01:00
committed by GitHub
parent 1532d65a5b
commit 1963747590
11 changed files with 46 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
projects/aca-content/src/lib/extensions/core.extensions.module.ts
View File

@@ -27,7 +27,6 @@ import { CommonModule } from '@angular/common';
import { APP_INITIALIZER, ModuleWithProviders, NgModule } from '@angular/core';
import { ExtensionsModule } from '@alfresco/adf-extensions';
import { AppExtensionService } from '@alfresco/aca-shared';
import { ContentServiceExtensionService } from '../services/content-service-extension.service';
export function setupExtensions(service: AppExtensionService): () => void {
return () => service.load();
@@ -44,7 +43,7 @@ export class CoreExtensionsModule {
{
provide: APP_INITIALIZER,
useFactory: setupExtensions,
deps: [AppExtensionService, ContentServiceExtensionService],
deps: [AppExtensionService],
multi: true
}
]

71
projects/aca-content/src/lib/services/content-service-extension.service.spec.ts
View File

@@ -1,71 +0,0 @@
/*!
* Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
*
* Alfresco Example Content Application
*
* This file is part of the Alfresco Example Content Application.
* If the software was purchased under a paid Alfresco license, the terms of
* the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms:
*
* The Alfresco Example Content Application is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* The Alfresco Example Content Application is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
*/
import { ContentServiceExtensionService } from './content-service-extension.service';
import { AppConfigService, AppConfigServiceMock } from '@alfresco/adf-core';
import { TestBed } from '@angular/core/testing';
import { of } from 'rxjs';
import { HttpClientModule } from '@angular/common/http';
describe('ContentServiceExtensionService', () => {
let service: ContentServiceExtensionService;
let appConfig: AppConfigService;
beforeEach(() => {
TestBed.configureTestingModule({
imports: [HttpClientModule],
providers: [{ provide: AppConfigService, useClass: AppConfigServiceMock }]
});
service = TestBed.inject(ContentServiceExtensionService);
appConfig = TestBed.inject(AppConfigService);
appConfig.config = Object.assign(appConfig.config, {
plugins: {
contentService: true
}
});
appConfig.load();
appConfig.onLoad = of(appConfig.config);
});
it('should set the content service to true when it is false in local storage and enabled in the app config', () => {
localStorage.setItem('contentService', 'false');
service.updateContentServiceAvailability();
expect(localStorage.getItem('contentService')).toEqual('true');
});
it('should set the content service to false in local storage when it is false in the app config', () => {
appConfig.config.plugins.contentService = false;
appConfig.load();
appConfig.onLoad = of(appConfig.config);
service.updateContentServiceAvailability();
expect(localStorage.getItem('contentService')).toEqual('false');
});
afterEach(() => {
localStorage.clear();
});
});

58
projects/aca-content/src/lib/services/content-service-extension.service.ts
View File

@@ -1,58 +0,0 @@
/*!
* Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved.
*
* Alfresco Example Content Application
*
* This file is part of the Alfresco Example Content Application.
* If the software was purchased under a paid Alfresco license, the terms of
* the paid license agreement will prevail. Otherwise, the software is
* provided under the following open source license terms:
*
* The Alfresco Example Content Application is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* The Alfresco Example Content Application is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
*/
import { Injectable } from '@angular/core';
import { AppConfigService } from '@alfresco/adf-core';
import { take } from 'rxjs/operators';
@Injectable({
providedIn: 'root'
})
export class ContentServiceExtensionService {
constructor(private appConfigService: AppConfigService) {
this.updateContentServiceAvailability();
}
updateContentServiceAvailability() {
this.appConfigService.onLoad.pipe(take(1)).subscribe((config) => {
if (config.plugins && config.plugins.contentService === false) {
this.disableContentServices();
} else {
this.enableContentServices();
}
});
}
private disableContentServices() {
if (localStorage) {
localStorage.setItem('contentService', 'false');
}
}
private enableContentServices() {
if (localStorage && localStorage.getItem('contentService') === 'false') {
localStorage.setItem('contentService', 'true');
}
}
}

2
projects/aca-content/src/lib/services/node-template.service.ts
View File

@@ -45,7 +45,7 @@ export class NodeTemplateService {
private currentTemplateConfig: TemplateDialogConfig = null;
private rootNode: ResultNode;
_searchApi: SearchApi;
private _searchApi: SearchApi;
get searchApi(): SearchApi {
this._searchApi = this._searchApi ?? new SearchApi(this.alfrescoApiService.getInstance());
return this._searchApi;