[ACS-6630] Moved ExtensionComposition and ExtensionCompositionEntry components from js-api to core.

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;
-    };
+    } = {};
 }

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;

lib/core/src/lib/models/extension-composition.ts

@@ -15,13 +15,11 @@
  * limitations under the License.
  */
 
-import { AppConfigPluginRef } from './appConfigPluginRef';
+import { AppConfigPluginRef } from './app-config-plugin-ref';
-import { RuleRef } from './ruleRef';
+import { RouteRef, RuleRef, ActionRef } from '@alfresco/adf-extensions';
-import { RouteRef } from './routeRef';
-import { ActionRef } from './actionRef';
 
 export class ExtensionComposition {
-    appConfig: AppConfigPluginRef;
+    appConfig: AppConfigPluginRef = new AppConfigPluginRef();
     rules?: Array<RuleRef> = [];
     routes?: Array<RouteRef> = [];
     actions?: Array<ActionRef> = [];

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;

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'

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),

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<ExtensionCompositionEntry> {
+    getSavedExtensionState(instanceId: string): Promise<any> {
         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<void> {
+    publishExtensionConfig(instanceId: string, extensionConfig: any): Promise<void> {
         throwIfNotDefined(instanceId, 'instanceId');
         throwIfNotDefined(extensionConfig, 'extensionConfig');
 

lib/js-api/src/api/content-rest-api/model/extensionConfigEntry.ts

@@ -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;
-}

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';