From d8e562e6b2e45e96a5133ef604dd3126dedf7a09 Mon Sep 17 00:00:00 2001 From: "swapnil.verma" Date: Mon, 6 May 2024 11:38:15 +0530 Subject: [PATCH] [ACS-6630] Moved ExtensionComposition and ExtensionCompositionEntry components from js-api to core. --- .../src/lib/models/app-config-plugin-ref.ts} | 4 ++-- .../models/extension-composition-entry.ts} | 2 +- .../src/lib/models/extension-composition.ts} | 8 +++---- .../src/lib/models/extension-info.model.ts | 2 +- .../lib/services/extension-manager.service.ts | 5 ++++- .../src/lib/services/extension.service.ts | 3 +-- .../api/content-rest-api/api/settings.api.ts | 7 +++--- .../model/extensionConfigEntry.ts | 22 ------------------- .../src/api/content-rest-api/model/index.ts | 2 -- 9 files changed, 15 insertions(+), 40 deletions(-) rename lib/{js-api/src/api/content-rest-api/model/appConfigPluginRef.ts => core/src/lib/models/app-config-plugin-ref.ts} (93%) rename lib/{js-api/src/api/content-rest-api/model/extensionCompositionEntry.ts => core/src/lib/models/extension-composition-entry.ts} (92%) rename lib/{js-api/src/api/content-rest-api/model/extensionComposition.ts => core/src/lib/models/extension-composition.ts} (80%) delete mode 100644 lib/js-api/src/api/content-rest-api/model/extensionConfigEntry.ts diff --git a/lib/js-api/src/api/content-rest-api/model/appConfigPluginRef.ts b/lib/core/src/lib/models/app-config-plugin-ref.ts similarity index 93% rename from lib/js-api/src/api/content-rest-api/model/appConfigPluginRef.ts rename to lib/core/src/lib/models/app-config-plugin-ref.ts index e08d12938a..f169844bac 100644 --- a/lib/js-api/src/api/content-rest-api/model/appConfigPluginRef.ts +++ b/lib/core/src/lib/models/app-config-plugin-ref.ts @@ -15,8 +15,8 @@ * limitations under the License. */ -export interface AppConfigPluginRef { +export class AppConfigPluginRef { plugins: { [key: string]: boolean; - }; + } = {}; } diff --git a/lib/js-api/src/api/content-rest-api/model/extensionCompositionEntry.ts b/lib/core/src/lib/models/extension-composition-entry.ts similarity index 92% rename from lib/js-api/src/api/content-rest-api/model/extensionCompositionEntry.ts rename to lib/core/src/lib/models/extension-composition-entry.ts index 89b9170e53..90464e4326 100644 --- a/lib/js-api/src/api/content-rest-api/model/extensionCompositionEntry.ts +++ b/lib/core/src/lib/models/extension-composition-entry.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ExtensionComposition } from './extensionComposition'; +import { ExtensionComposition } from './extension-composition'; export class ExtensionCompositionEntry { entry: ExtensionComposition; diff --git a/lib/js-api/src/api/content-rest-api/model/extensionComposition.ts b/lib/core/src/lib/models/extension-composition.ts similarity index 80% rename from lib/js-api/src/api/content-rest-api/model/extensionComposition.ts rename to lib/core/src/lib/models/extension-composition.ts index ff07d41b08..3ed5524835 100644 --- a/lib/js-api/src/api/content-rest-api/model/extensionComposition.ts +++ b/lib/core/src/lib/models/extension-composition.ts @@ -15,13 +15,11 @@ * limitations under the License. */ -import { AppConfigPluginRef } from './appConfigPluginRef'; -import { RuleRef } from './ruleRef'; -import { RouteRef } from './routeRef'; -import { ActionRef } from './actionRef'; +import { AppConfigPluginRef } from './app-config-plugin-ref'; +import { RouteRef, RuleRef, ActionRef } from '@alfresco/adf-extensions'; export class ExtensionComposition { - appConfig: AppConfigPluginRef; + appConfig: AppConfigPluginRef = new AppConfigPluginRef(); rules?: Array = []; routes?: Array = []; actions?: Array = []; diff --git a/lib/core/src/lib/models/extension-info.model.ts b/lib/core/src/lib/models/extension-info.model.ts index c847e5e562..b74e575e21 100644 --- a/lib/core/src/lib/models/extension-info.model.ts +++ b/lib/core/src/lib/models/extension-info.model.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { ActionRef, RouteRef, RuleRef } from '@alfresco/js-api'; +import { ActionRef, RouteRef, RuleRef } from '@alfresco/adf-extensions'; export class ExtensionInfoModel { $id: string; diff --git a/lib/core/src/lib/services/extension-manager.service.ts b/lib/core/src/lib/services/extension-manager.service.ts index 213af6044e..81536e24de 100644 --- a/lib/core/src/lib/services/extension-manager.service.ts +++ b/lib/core/src/lib/services/extension-manager.service.ts @@ -18,9 +18,12 @@ import { Injectable } from '@angular/core'; import { AlfrescoApiService } from './alfresco-api.service'; import { from, Observable } from 'rxjs'; -import { AppConfigPluginRef, SettingsApi, ExtensionCompositionEntry, ExtensionComposition } from '@alfresco/js-api'; +import { SettingsApi } from '@alfresco/js-api'; import { HttpClient } from '@angular/common/http'; import { ExtensionInfoModel } from '../models'; +import { ExtensionCompositionEntry } from '../models/extension-composition-entry'; +import { AppConfigPluginRef } from '../models/app-config-plugin-ref'; +import { ExtensionComposition } from '../models/extension-composition'; @Injectable({ providedIn: 'root' diff --git a/lib/extensions/src/lib/services/extension.service.ts b/lib/extensions/src/lib/services/extension.service.ts index 3a0ff363bd..a19a0b04e3 100644 --- a/lib/extensions/src/lib/services/extension.service.ts +++ b/lib/extensions/src/lib/services/extension.service.ts @@ -27,7 +27,6 @@ import { RuleService } from './rule.service'; import { ExtensionElement } from '../config/extension-element'; import { BehaviorSubject, Observable } from 'rxjs'; import { mergeArrays, mergeObjects } from '../config/extension-utils'; -import { ExtensionComposition } from '@alfresco/js-api'; /** * The default extensions factory @@ -111,7 +110,7 @@ export class ExtensionService { return config; } - appendConfig(partialConfig: ExtensionComposition) { + appendConfig(partialConfig: any) { this.setup({ ...this.config, rules: mergeArrays(this.config.rules, partialConfig.rules), diff --git a/lib/js-api/src/api/content-rest-api/api/settings.api.ts b/lib/js-api/src/api/content-rest-api/api/settings.api.ts index 5db8ef0849..bc06df2056 100644 --- a/lib/js-api/src/api/content-rest-api/api/settings.api.ts +++ b/lib/js-api/src/api/content-rest-api/api/settings.api.ts @@ -17,8 +17,7 @@ import { BaseApi } from './base.api'; import { throwIfNotDefined } from '../../../assert'; -import { ExtensionComposition } from '../model/extensionComposition'; -import { ExtensionCompositionEntry } from '../model/extensionCompositionEntry'; + export class SettingsApi extends BaseApi { /** * Gets the published extension configuration from @@ -27,7 +26,7 @@ export class SettingsApi extends BaseApi { * @param instanceId Unique ID for a running instance of ADW * for which configuration is to be fetched */ - getSavedExtensionState(instanceId: string): Promise { + getSavedExtensionState(instanceId: string): Promise { throwIfNotDefined(instanceId, 'instanceId'); const pathParams = { @@ -49,7 +48,7 @@ export class SettingsApi extends BaseApi { * @param extensionConfig Extension configuration that is to * be saved */ - publishExtensionConfig(instanceId: string, extensionConfig: ExtensionComposition): Promise { + publishExtensionConfig(instanceId: string, extensionConfig: any): Promise { throwIfNotDefined(instanceId, 'instanceId'); throwIfNotDefined(extensionConfig, 'extensionConfig'); diff --git a/lib/js-api/src/api/content-rest-api/model/extensionConfigEntry.ts b/lib/js-api/src/api/content-rest-api/model/extensionConfigEntry.ts deleted file mode 100644 index 95ede4c782..0000000000 --- a/lib/js-api/src/api/content-rest-api/model/extensionConfigEntry.ts +++ /dev/null @@ -1,22 +0,0 @@ -/*! - * @license - * Copyright © 2005-2023 Hyland Software, Inc. and its affiliates. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { ExtensionConfig } from './extensionConfig'; - -export class ExtensionConfigEntry { - entry: ExtensionConfig; -} diff --git a/lib/js-api/src/api/content-rest-api/model/index.ts b/lib/js-api/src/api/content-rest-api/model/index.ts index 184f3d9c49..adee78c5ac 100644 --- a/lib/js-api/src/api/content-rest-api/model/index.ts +++ b/lib/js-api/src/api/content-rest-api/model/index.ts @@ -80,8 +80,6 @@ export * from './download-status'; export * from './downloadBodyCreate'; export * from './downloadEntry'; export * from './errorError'; -export * from './extensionComposition'; -export * from './extensionCompositionEntry'; export * from './favorite'; export * from './favoriteBodyCreate'; export * from './favoriteEntry';