@contentstack/cli-cm-import 1.12.0 → 1.12.2

package/lib/import/modules/marketplace-apps.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const map_1 = tslib_1.__importDefault(require("lodash/map"));
-const find_1 = tslib_1.__importDefault(require("lodash/find"));
 const omit_1 = tslib_1.__importDefault(require("lodash/omit"));
+const find_1 = tslib_1.__importDefault(require("lodash/find"));
 const pick_1 = tslib_1.__importDefault(require("lodash/pick"));
 const first_1 = tslib_1.__importDefault(require("lodash/first"));
 const split_1 = tslib_1.__importDefault(require("lodash/split"));
@@ -13,18 +13,16 @@ const filter_1 = tslib_1.__importDefault(require("lodash/filter"));
 const isEmpty_1 = tslib_1.__importDefault(require("lodash/isEmpty"));
 const toLower_1 = tslib_1.__importDefault(require("lodash/toLower"));
 const cli_utilities_1 = require("@contentstack/cli-utilities");
-const base_class_1 = tslib_1.__importDefault(require("./base-class"));
 const log_1 = require("../../utils/log");
 const interactive_1 = require("../../utils/interactive");
 const utils_1 = require("../../utils");
-class ImportMarketplaceApps extends base_class_1.default {
-    constructor({ importConfig, stackAPIClient }) {
-        super({ importConfig, stackAPIClient });
+class ImportMarketplaceApps {
+    constructor({ importConfig }) {
+        this.importConfig = importConfig;
         this.marketPlaceAppConfig = importConfig.modules.marketplace_apps;
         this.mapperDirPath = (0, node_path_1.join)(this.importConfig.backupDir, 'mapper', 'marketplace_apps');
         this.marketPlaceFolderPath = (0, node_path_1.join)(this.importConfig.backupDir, this.marketPlaceAppConfig.dirName);
         this.marketPlaceUidMapperPath = (0, node_path_1.join)(this.mapperDirPath, 'uid-mapping.json');
-        this.httpClient = new cli_utilities_1.HttpClient();
         this.appNameMapping = {};
         this.appUidMapping = {};
         this.appOriginalName = undefined;
@@ -32,8 +30,8 @@ class ImportMarketplaceApps extends base_class_1.default {
         this.installationUidMapping = {};
     }
     /**
-     * @method start
-     * @returns {Promise<void>} Promise<void>
+     * This function starts the process of importing marketplace apps.
+     * @returns The function `start()` returns a `Promise<void>`.
      */
     async start() {
         (0, utils_1.log)(this.importConfig, 'Migrating marketplace apps', 'info');
@@ -53,37 +51,23 @@ class ImportMarketplaceApps extends base_class_1.default {
         }
         await utils_1.fsUtil.makeDirectory(this.mapperDirPath);
         this.developerHubBaseUrl = this.importConfig.developerHubBaseUrl || (await (0, utils_1.getDeveloperHubUrl)(this.importConfig));
-        this.sdkClient = await (0, cli_utilities_1.managementSDKClient)({ endpoint: this.developerHubBaseUrl });
-        this.appSdkAxiosInstance = await (0, cli_utilities_1.managementSDKClient)({
-            host: this.developerHubBaseUrl.split('://').pop(),
-        });
+        this.importConfig.developerHubBaseUrl = this.developerHubBaseUrl;
+        // NOTE init marketplace app sdk
+        const host = this.developerHubBaseUrl.split('://').pop();
+        this.appSdk = await (0, cli_utilities_1.marketplaceSDKClient)({ host });
         this.importConfig.org_uid = await (0, utils_1.getOrgUid)(this.importConfig);
-        await this.setHttpClient();
-        await this.startInstallation();
+        // NOTE start the marketplace import process
+        await this.importMarketplaceApps();
         (0, utils_1.log)(this.importConfig, 'Marketplace apps have been imported successfully!', 'success');
     }
-    async setHttpClient() {
-        if (!this.importConfig.auth_token) {
-            this.httpClient = new cli_utilities_1.OauthDecorator(this.httpClient);
-            const headers = await this.httpClient.preHeadersCheck(this.importConfig);
-            this.httpClient = this.httpClient.headers(headers);
-        }
-        else {
-            this.httpClient = new cli_utilities_1.HttpClientDecorator(this.httpClient);
-            this.httpClient.headers(this.importConfig);
-        }
-    }
     /**
-     * @method startInstallation
-     * @returns {Promise<void>}
+     * The function `importMarketplaceApps` installs marketplace apps, handles private app creation,
+     * validates app installation, and generates a UID mapper.
      */
-    async startInstallation() {
-        const cryptoArgs = { encryptionKey: '' };
-        if (this.importConfig.marketplaceAppEncryptionKey) {
-            cryptoArgs['encryptionKey'] = this.importConfig.marketplaceAppEncryptionKey;
-        }
+    async importMarketplaceApps() {
+        // NOTE set default encryptionKey
+        const cryptoArgs = { encryptionKey: this.importConfig.marketplaceAppEncryptionKey };
         if (this.importConfig.forceStopMarketplaceAppsPrompt) {
-            cryptoArgs['encryptionKey'] = this.importConfig.marketplaceAppEncryptionKey;
             this.nodeCrypto = new cli_utilities_1.NodeCrypto(cryptoArgs);
         }
         else {
@@ -91,7 +75,8 @@ class ImportMarketplaceApps extends base_class_1.default {
         }
         // NOTE install all private apps which is not available for stack.
         await this.handleAllPrivateAppsCreationProcess();
-        this.installedApps = await (0, utils_1.getAllStackSpecificApps)(this.developerHubBaseUrl, this.httpClient, this.importConfig);
+        // NOTE getting all apps to validate if it's already installed in the stack to manage conflict
+        this.installedApps = await (0, utils_1.getAllStackSpecificApps)(this.importConfig);
         (0, utils_1.log)(this.importConfig, 'Starting marketplace app installation', 'success');
         for (let app of this.marketplaceApps) {
             await this.installApps(app);
@@ -103,29 +88,46 @@ class ImportMarketplaceApps extends base_class_1.default {
             installation_uid: this.installationUidMapping,
         });
     }
+    /**
+     * The function `generateUidMapper` generates a mapping of extension UIDs from old metadata to new
+     * metadata based on the installed and marketplace apps.
+     * @returns The function `generateUidMapper` returns a Promise that resolves to a `Record<string,
+     * unknown>`.
+     */
     async generateUidMapper() {
         var _a, _b;
         const listOfNewMeta = [];
         const listOfOldMeta = [];
         const extensionUidMap = {};
-        this.installedApps =
-            (await (0, utils_1.getAllStackSpecificApps)(this.developerHubBaseUrl, this.httpClient, this.importConfig)) || [];
+        // NOTE After installation getting all apps to create mapper.
+        this.installedApps = (await (0, utils_1.getAllStackSpecificApps)(this.importConfig)) || [];
         for (const app of this.marketplaceApps) {
             listOfOldMeta.push(...(0, map_1.default)((_a = app === null || app === void 0 ? void 0 : app.ui_location) === null || _a === void 0 ? void 0 : _a.locations, 'meta').flat());
         }
         for (const app of this.installedApps) {
             listOfNewMeta.push(...(0, map_1.default)((_b = app === null || app === void 0 ? void 0 : app.ui_location) === null || _b === void 0 ? void 0 : _b.locations, 'meta').flat());
         }
-        for (const { extension_uid, name, path, uid, data_type } of (0, filter_1.default)(listOfOldMeta, 'name')) {
-            const meta = (0, find_1.default)(listOfNewMeta, { name, path }) ||
-                (0, find_1.default)(listOfNewMeta, { name: this.appNameMapping[name], path }) ||
-                (0, find_1.default)(listOfNewMeta, { name, uid, data_type });
+        for (const { extension_uid, uid } of (0, filter_1.default)(listOfOldMeta, 'name')) {
+            const meta = (0, find_1.default)(listOfNewMeta, { uid });
             if (meta) {
                 extensionUidMap[extension_uid] = meta.extension_uid;
             }
         }
         return extensionUidMap;
     }
+    /**
+     * The function `getAndValidateEncryptionKey` retrieves and validates an encryption key, with the
+     * option to retry a specified number of times.
+     * @param {string} defaultValue - The defaultValue parameter is a string that represents the default
+     * encryption key value to use if no valid encryption key is found in the marketplaceApps
+     * configuration.
+     * @param [retry=1] - The `retry` parameter is an optional parameter that specifies the number of
+     * times the function should retry getting and validating the encryption key if it fails. The default
+     * value is 1, meaning that if the function fails to get and validate the encryption key on the first
+     * attempt, it will not retry.
+     * @returns The function `getAndValidateEncryptionKey` returns a Promise that resolves to the
+     * encryption key.
+     */
     async getAndValidateEncryptionKey(defaultValue, retry = 1) {
         let appConfig = (0, find_1.default)(this.marketplaceApps, ({ configuration, server_configuration }) => !(0, isEmpty_1.default)(configuration) || !(0, isEmpty_1.default)(server_configuration));
         if (!appConfig) {
@@ -151,8 +153,10 @@ class ImportMarketplaceApps extends base_class_1.default {
         return encryptionKey;
     }
     /**
-     * @method handleAllPrivateAppsCreationProcess
-     * @returns {Promise<void>}
+     * The function `handleAllPrivateAppsCreationProcess` handles the creation process for all private
+     * apps in a developer hub, including checking for existing apps, getting confirmation from the user,
+     * and creating the apps if necessary.
+     * @returns a Promise that resolves to void.
      */
     async handleAllPrivateAppsCreationProcess() {
         const privateApps = (0, filter_1.default)(this.marketplaceApps, { manifest: { visibility: 'private' } });
@@ -162,66 +166,137 @@ class ImportMarketplaceApps extends base_class_1.default {
         await (0, utils_1.getConfirmationToCreateApps)(privateApps, this.importConfig);
         (0, utils_1.log)(this.importConfig, 'Starting developer hub private apps re-creation', 'success');
         for (let app of privateApps) {
+            if (this.importConfig.skipPrivateAppRecreationIfExist && (await this.isPrivateAppExistInDeveloperHub(app))) {
+                // NOTE Found app already exist in the same org
+                this.appUidMapping[app.uid] = app.uid;
+                cli_utilities_1.cliux.print(`App '${app.manifest.name}' already exist. skipping app recreation.!`, { color: 'yellow' });
+                continue;
+            }
             // NOTE keys can be passed to install new app in the developer hub
-            app.manifest = (0, pick_1.default)(app.manifest, ['uid', 'name', 'description', 'icon', 'target_type', 'webhook', 'oauth']);
-            this.appOriginalName = app.manifest.name;
-            const obj = {
-                oauth: app.oauth,
-                webhook: app.webhook,
-                ui_location: app.ui_location,
-            };
-            await this.createPrivateApps(Object.assign(Object.assign({}, obj), app.manifest));
+            const validKeys = [
+                'uid',
+                'name',
+                'icon',
+                'oauth',
+                'webhook',
+                'visibility',
+                'target_type',
+                'description',
+                'ui_location',
+                'framework_version',
+            ];
+            const manifest = (0, pick_1.default)(app.manifest, validKeys);
+            this.appOriginalName = manifest.name;
+            await this.createPrivateApp(manifest);
         }
         this.appOriginalName = undefined;
     }
-    async createPrivateApps(app, uidCleaned = false, appSuffix = 1) {
-        var _a;
-        let locations = (_a = app === null || app === void 0 ? void 0 : app.ui_location) === null || _a === void 0 ? void 0 : _a.locations;
-        if (!uidCleaned && !(0, isEmpty_1.default)(locations)) {
-            app.ui_location.locations = await this.updateManifestUILocations(locations, 'uid');
-        }
-        else if (uidCleaned && !(0, isEmpty_1.default)(locations)) {
-            app.ui_location.locations = await this.updateManifestUILocations(locations, 'name', appSuffix);
+    /**
+     * The function checks if a private app exists in the developer hub.
+     * @param {App} app - The `app` parameter is an object representing an application. It likely has
+     * properties such as `uid` which is a unique identifier for the app.
+     * @returns a boolean value. It returns true if the installation object is not empty, and false if
+     * the installation object is empty.
+     */
+    async isPrivateAppExistInDeveloperHub(app) {
+        const installation = await this.appSdk
+            .marketplace(this.importConfig.org_uid)
+            .installation(app.uid)
+            .fetch()
+            .catch(() => { }); // NOTE Keeping this to avoid Unhandled exception
+        return !(0, isEmpty_1.default)(installation);
+    }
+    /**
+     * The function creates a private app in a marketplace, with an optional suffix for the app name and
+     * an option to update the UI location.
+     * @param {Manifest} app - The `app` parameter is an object that represents the manifest of the app
+     * being created. It contains various properties such as `name`, `ui_location`, and `uid`.
+     * @param [appSuffix=1] - The appSuffix parameter is an optional parameter that specifies a suffix to
+     * be added to the app's UI location. It is used when updating the UI location of the app.
+     * @param [updateUiLocation=false] - A boolean value indicating whether to update the UI location of
+     * the app.
+     * @returns the result of the `appCreationCallback` function, which takes in the `app`, `response`,
+     * and `appSuffix` as arguments.
+     */
+    async createPrivateApp(app, appSuffix = 1, updateUiLocation = false) {
+        var _a, _b;
+        if (updateUiLocation && !(0, isEmpty_1.default)((_a = app === null || app === void 0 ? void 0 : app.ui_location) === null || _a === void 0 ? void 0 : _a.locations)) {
+            app.ui_location.locations = this.updateManifestUILocations((_b = app === null || app === void 0 ? void 0 : app.ui_location) === null || _b === void 0 ? void 0 : _b.locations, appSuffix);
         }
-        if (app.name > 20) {
+        if (app.name.length > 20) {
             app.name = app.name.slice(0, 20);
         }
-        const response = await (0, utils_1.createPrivateApp)(this.sdkClient, this.importConfig, app);
+        const response = await this.appSdk
+            .marketplace(this.importConfig.org_uid)
+            .app()
+            .create((0, omit_1.default)(app, ['uid']))
+            .catch((error) => error);
         return this.appCreationCallback(app, response, appSuffix);
     }
-    async updateManifestUILocations(locations, type = 'uid', appSuffix = 1) {
-        switch (type) {
-            case 'uid':
-                return (0, map_1.default)(locations, (location) => {
-                    if (location.meta) {
-                        location.meta = (0, map_1.default)(location.meta, (meta) => (0, omit_1.default)(meta, ['uid']));
+    /**
+     * The function installs an app from a marketplace onto a target stack.
+     * @param {ImportConfig} config - The `config` parameter is an object that contains the configuration
+     * for the installation. It likely includes information such as the target stack UID and other
+     * relevant details.
+     * @param {string} [appManifestUid] - The `appManifestUid` parameter is the unique identifier of the
+     * app manifest. It is used to specify which app to install from the marketplace.
+     * @returns a Promise that resolves to an object.
+     */
+    async installApp(config, appManifestUid) {
+        return await this.appSdk
+            .marketplace(this.importConfig.org_uid)
+            .app(appManifestUid)
+            .install({ targetUid: config.target_stack, targetType: 'stack' })
+            .catch((error) => error);
+    }
+    /**
+     * The function updates the names of locations in a manifest UI based on a given app suffix.
+     * @param {any} locations - An array of objects representing different locations in a manifest file.
+     * Each object has a "meta" property which is an array of objects representing metadata for that
+     * location.
+     * @param [appSuffix=1] - The `appSuffix` parameter is an optional parameter that specifies a suffix
+     * to be added to the app name. It is set to 1 by default.
+     * @returns The function `updateManifestUILocations` returns an updated array of `locations`.
+     */
+    updateManifestUILocations(locations, appSuffix = 1) {
+        return (0, map_1.default)(locations, (location, index) => {
+            if (location.meta) {
+                location.meta = (0, map_1.default)(location.meta, (meta) => {
+                    if (meta.name && this.appOriginalName == meta.name) {
+                        const name = (0, interactive_1.getAppName)((0, first_1.default)((0, split_1.default)(meta.name, '◈')), appSuffix);
+                        if (!this.appNameMapping[this.appOriginalName]) {
+                            this.appNameMapping[this.appOriginalName] = name;
+                        }
+                        meta.name = name;
                     }
-                    return location;
-                });
-            case 'name':
-                return (0, map_1.default)(locations, (location) => {
-                    if (location.meta) {
-                        location.meta = (0, map_1.default)(location.meta, (meta) => {
-                            if (meta.name) {
-                                const name = `${(0, first_1.default)((0, split_1.default)(meta.name, '◈'))}◈${appSuffix}`;
-                                if (!this.appNameMapping[this.appOriginalName]) {
-                                    this.appNameMapping[this.appOriginalName] = name;
-                                }
-                                meta.name = name;
-                            }
-                            return meta;
-                        });
+                    else if (meta.name) {
+                        meta.name = (0, interactive_1.getAppName)((0, first_1.default)((0, split_1.default)(meta.name, '◈')), appSuffix + (+index + 1));
                     }
-                    return location;
+                    return meta;
                 });
-        }
+            }
+            return location;
+        });
     }
+    /**
+     * The function `appCreationCallback` handles the creation of a new app and handles any conflicts or
+     * errors that may occur during the process.
+     * @param {any} app - The `app` parameter is an object representing the app that is being created. It
+     * contains various properties such as `uid` (unique identifier), `name`, and other app-specific
+     * details.
+     * @param {any} response - The `response` parameter is an object that contains the response received
+     * from an API call. It may have properties such as `statusText` and `message`.
+     * @param {number} appSuffix - The `appSuffix` parameter is a number that is used to generate a
+     * unique suffix for the app name in case of a name conflict. It is incremented each time a name
+     * conflict occurs to ensure that the new app name is unique.
+     * @returns a Promise.
+     */
     async appCreationCallback(app, response, appSuffix) {
         const { statusText, message } = response || {};
         if (message) {
             if ((0, toLower_1.default)(statusText) === 'conflict') {
                 const updatedApp = await (0, utils_1.handleNameConflict)(app, appSuffix, this.importConfig);
-                return this.createPrivateApps(updatedApp, true, appSuffix + 1);
+                return this.createPrivateApp(updatedApp, appSuffix + 1, true);
             }
             else {
                 (0, log_1.trace)(response, 'error', true);
@@ -251,19 +326,19 @@ class ImportMarketplaceApps extends base_class_1.default {
      * @returns {Promise<void>}
      */
     async installApps(app) {
-        var _a, _b, _c, _d;
+        var _a, _b;
         let updateParam;
         const { configuration, server_configuration } = app;
         const currentStackApp = (0, find_1.default)(this.installedApps, { manifest: { uid: (_a = app === null || app === void 0 ? void 0 : app.manifest) === null || _a === void 0 ? void 0 : _a.uid } });
         if (!currentStackApp) {
             // NOTE install new app
-            const mappedUid = this.appUidMapping[(_b = app === null || app === void 0 ? void 0 : app.manifest) === null || _b === void 0 ? void 0 : _b.uid];
-            const installation = await (0, utils_1.installApp)(this.sdkClient, this.importConfig, (_c = app === null || app === void 0 ? void 0 : app.manifest) === null || _c === void 0 ? void 0 : _c.uid, mappedUid);
+            const installation = await this.installApp(this.importConfig, 
+            // NOTE if it's private app it should get uid from mapper else will use manifest uid
+            this.appUidMapping[app.manifest.uid] || app.manifest.uid);
             if (installation.installation_uid) {
-                const appManifestName = (_d = app === null || app === void 0 ? void 0 : app.manifest) === null || _d === void 0 ? void 0 : _d.name;
-                const appName = this.appNameMapping[appManifestName] ? this.appNameMapping[appManifestName] : appManifestName;
+                const appName = (_b = this.appNameMapping[app.manifest.name]) !== null && _b !== void 0 ? _b : app.manifest.name;
                 (0, utils_1.log)(this.importConfig, `${appName} app installed successfully.!`, 'success');
-                await (0, utils_1.makeRedirectUrlCall)(installation, appManifestName, this.importConfig);
+                await (0, utils_1.makeRedirectUrlCall)(installation, appName, this.importConfig);
                 this.installationUidMapping[app.uid] = installation.installation_uid;
                 updateParam = Object.assign(Object.assign({ manifest: app.manifest }, installation), { configuration, server_configuration });
             }
@@ -285,42 +360,51 @@ class ImportMarketplaceApps extends base_class_1.default {
         }
     }
     /**
-     * @method updateAppsConfig
-     * @returns {Promise<void>}
+     * The `updateAppsConfig` function updates the configuration and server configuration of an app in a
+     * marketplace.
+     * @param {Installation} app - The `app` parameter is an object that represents an installation of an
+     * app. It contains the following properties:
      */
     async updateAppsConfig(app) {
-        const payload = { configuration: {}, server_configuration: {} };
-        const { uid, configuration, server_configuration } = app;
+        const { installation_uid, configuration, server_configuration } = app;
         if (!(0, isEmpty_1.default)(configuration)) {
-            payload['configuration'] = this.nodeCrypto.decrypt(configuration);
+            await this.appSdk
+                .marketplace(this.importConfig.org_uid)
+                .installation(installation_uid)
+                .setConfiguration(this.nodeCrypto.decrypt(configuration))
+                .then(({ data }) => {
+                if (data === null || data === void 0 ? void 0 : data.message) {
+                    (0, log_1.trace)(data, 'error', true);
+                    (0, utils_1.log)(this.importConfig, (0, utils_1.formatError)(data.message), 'success');
+                }
+                else {
+                    (0, utils_1.log)(this.importConfig, `${app.manifest.name} app config updated successfully.!`, 'success');
+                }
+            })
+                .catch((error) => {
+                (0, log_1.trace)(error, 'error', true);
+                (0, utils_1.log)(this.importConfig, (0, utils_1.formatError)(error), 'error');
+            });
         }
         if (!(0, isEmpty_1.default)(server_configuration)) {
-            payload['server_configuration'] = this.nodeCrypto.decrypt(server_configuration);
-        }
-        if ((0, isEmpty_1.default)(app) || (0, isEmpty_1.default)(payload) || !uid) {
-            return Promise.resolve();
+            await this.appSdk
+                .marketplace(this.importConfig.org_uid)
+                .installation(installation_uid)
+                .setServerConfig(this.nodeCrypto.decrypt(server_configuration))
+                .then(({ data }) => {
+                if (data === null || data === void 0 ? void 0 : data.message) {
+                    (0, log_1.trace)(data, 'error', true);
+                    (0, utils_1.log)(this.importConfig, (0, utils_1.formatError)(data.message), 'error');
+                }
+                else {
+                    (0, utils_1.log)(this.importConfig, `${app.manifest.name} app server config updated successfully.!`, 'info');
+                }
+            })
+                .catch((error) => {
+                (0, log_1.trace)(error, 'error', true);
+                (0, utils_1.log)(this.importConfig, (0, utils_1.formatError)(error), 'error');
+            });
         }
-        // TODO migrate this HTTP API call into SDK
-        // NOTE Use updateAppConfig(this.sdkClient, this.importConfig, app, payload) utility when migrating to SDK call;
-        return this.appSdkAxiosInstance.axiosInstance
-            .put(`${this.developerHubBaseUrl}/installations/${uid}`, payload, {
-            headers: {
-                organization_uid: this.importConfig.org_uid,
-            },
-        })
-            .then(({ data }) => {
-            if (data === null || data === void 0 ? void 0 : data.message) {
-                (0, log_1.trace)(data, 'error', true);
-                (0, utils_1.log)(this.importConfig, (0, utils_1.formatError)(data.message), 'success');
-            }
-            else {
-                (0, utils_1.log)(this.importConfig, `${app.manifest.name} app config updated successfully.!`, 'success');
-            }
-        })
-            .catch((error) => {
-            (0, log_1.trace)(error, 'error', true);
-            (0, utils_1.log)(this.importConfig, (0, utils_1.formatError)(error), 'error');
-        });
     }
 }
 exports.default = ImportMarketplaceApps;

package/lib/import/modules/workflows.js

@@ -147,6 +147,7 @@ class ImportWorkflows extends base_class_1.default {
             name: workflow.name,
             branches: workflow.branches,
             workflow_stages: newWorkflowStages,
+            content_types: workflow.content_types
         });
         return updateWorkflow.update();
     }

package/lib/import/modules-js/marketplace-apps.js

@@ -38,6 +38,7 @@ module.exports = class ImportMarketplaceApps {
             return Promise.resolve();
         }
         this.developerHubBaseUrl = this.config.developerHubBaseUrl || (await getDeveloperHubUrl(this.config));
+        this.config.developerHubBaseUrl = this.developerHubBaseUrl;
         this.client = await managementSDKClient({ endpoint: this.developerHubBaseUrl });
         this.appSdkAxiosInstance = await managementSDKClient({
             host: this.developerHubBaseUrl.split('://').pop()
@@ -122,7 +123,7 @@ module.exports = class ImportMarketplaceApps {
         }
         // NOTE install all private apps which is not available for stack.
         await this.handleAllPrivateAppsCreationProcess();
-        const installedApps = await getAllStackSpecificApps(this.developerHubBaseUrl, this.httpClient, this.config);
+        const installedApps = await getAllStackSpecificApps(this.config);
         log(this.config, 'Starting marketplace app installation', 'success');
         for (let app of this.marketplaceApps) {
             await this.installApps(app, installedApps);
@@ -139,7 +140,7 @@ module.exports = class ImportMarketplaceApps {
         const listOfNewMeta = [];
         const listOfOldMeta = [];
         const extensionUidMap = {};
-        const allInstalledApps = (await getAllStackSpecificApps(this.developerHubBaseUrl, this.httpClient, this.config)) || [];
+        const allInstalledApps = (await getAllStackSpecificApps(this.config)) || [];
         for (const app of this.marketplaceApps) {
             listOfOldMeta.push(..._.map((_a = app === null || app === void 0 ? void 0 : app.ui_location) === null || _a === void 0 ? void 0 : _a.locations, 'meta').flat());
         }

package/lib/import/modules-js/workflows.js

@@ -163,6 +163,7 @@ module.exports = class importWorkflows {
             name: workflow.name,
             branches: workflow.branches,
             workflow_stages: newWorkflowStages,
+            content_types: workflow.content_types
         });
         return updateWorkflow.update();
     }

package/lib/types/entries.d.ts

@@ -0,0 +1,11 @@
+type EntryJsonRTEFieldDataType = {
+    uid?: string;
+    type?: string;
+    text?: string;
+    attrs?: {
+        'entry-uid'?: string;
+        type?: string;
+    } & Record<string, any>;
+    children?: EntryJsonRTEFieldDataType[];
+};
+export { EntryJsonRTEFieldDataType };

package/lib/types/entries.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/types/import-config.d.ts

@@ -14,6 +14,7 @@ export default interface ImportConfig extends DefaultConfig, ExternalConfig {
     management_token?: string;
     apiKey: string;
     forceStopMarketplaceAppsPrompt: boolean;
+    skipPrivateAppRecreationIfExist: boolean;
     auth_token?: string;
     branchName?: string;
     securedAssets?: boolean;

package/lib/types/index.d.ts

@@ -72,3 +72,5 @@ export interface TermsConfig {
 }
 export { default as DefaultConfig } from './default-config';
 export { default as ImportConfig } from './import-config';
+export * from './entries';
+export * from './marketplace-app';

package/lib/types/index.js

@@ -1,2 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./entries"), exports);
+tslib_1.__exportStar(require("./marketplace-app"), exports);

package/lib/types/marketplace-app.d.ts

@@ -0,0 +1,54 @@
+type AppLocation = 'cs.cm.stack.config' | 'cs.cm.stack.dashboard' | 'cs.cm.stack.sidebar' | 'cs.cm.stack.custom_field' | 'cs.cm.stack.rte' | 'cs.cm.stack.asset_sidebar' | 'cs.org.config';
+interface ExtensionMeta {
+    uid?: string;
+    name?: string;
+    description?: string;
+    path?: string;
+    signed: boolean;
+    extension_uid?: string;
+    data_type?: string;
+    enabled?: boolean;
+    width?: number;
+    blur?: boolean;
+    default_width?: 'full' | 'half';
+}
+interface Extension {
+    type: AppLocation;
+    meta: ExtensionMeta[];
+}
+interface LocationConfiguration {
+    signed: boolean;
+    base_url: string;
+    locations: Extension[];
+}
+interface AnyProperty {
+    [propName: string]: any;
+}
+type Manifest = {
+    uid: string;
+    name: string;
+    icon?: string;
+    hosting?: any;
+    version?: number;
+    description: string;
+    organization_uid: string;
+    framework_version?: string;
+    oauth?: any;
+    webhook?: any;
+    ui_location: LocationConfiguration;
+    target_type: 'stack' | 'organization';
+    visibility: 'private' | 'public' | 'public_unlisted';
+} & AnyProperty;
+type Installation = {
+    uid: string;
+    status: string;
+    manifest: Manifest;
+    configuration: any;
+    server_configuration: any;
+    target: {
+        type: string;
+        uid: string;
+    };
+    ui_location: LocationConfiguration;
+} & AnyProperty;
+export { Installation, Manifest };

package/lib/types/marketplace-app.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/utils/asset-helper.js

@@ -234,7 +234,8 @@ const lookupAssets = function (data, mappedAssetUids, mappedAssetUrls, assetUidM
     assetUrls.forEach(function (assetUrl) {
         let mappedAssetUrl = mappedAssetUrls[assetUrl];
         if (typeof mappedAssetUrl !== 'undefined') {
-            entry = entry.replace(new RegExp(assetUrl, 'img'), mappedAssetUrl);
+            const escapedAssetUrl = assetUrl.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+            entry = entry.replace(new RegExp(escapedAssetUrl, 'img'), mappedAssetUrl);
             matchedUrls.push(mappedAssetUrl);
         }
         else {
@@ -244,7 +245,8 @@ const lookupAssets = function (data, mappedAssetUids, mappedAssetUrls, assetUidM
     assetUids.forEach(function (assetUid) {
         let uid = mappedAssetUids[assetUid];
         if (typeof uid !== 'undefined') {
-            entry = entry.replace(new RegExp(assetUid, 'img'), uid);
+            const escapedAssetUid = assetUid.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+            entry = entry.replace(new RegExp(escapedAssetUid, 'img'), uid);
             matchedUids.push(assetUid);
         }
         else {

package/lib/utils/entries-helper.d.ts

@@ -7,4 +7,4 @@ export declare const lookupEntries: (data: {
 }, mappedUids: Record<string, any>, uidMapperPath: string) => any;
 export declare const removeUidsFromJsonRteFields: (entry: Record<string, any>, ctSchema?: Record<string, any>[]) => Record<string, any>;
 export declare const removeEntryRefsFromJSONRTE: (entry: Record<string, any>, ctSchema?: Record<string, any>[]) => Record<string, any>;
-export declare const restoreJsonRteEntryRefs: (entry: Record<string, any>, sourceStackEntry: any, ctSchema: any, { mappedAssetUids, mappedAssetUrls }: any) => Record<string, any>;
+export declare const restoreJsonRteEntryRefs: (entry: Record<string, any>, sourceStackEntry: any, ctSchema: any, { uidMapper, mappedAssetUids, mappedAssetUrls }: any) => Record<string, any>;