@sap-ux/generator-adp 0.9.55 → 0.9.57

package/generators/add-new-model/index.d.ts

@@ -12,6 +12,10 @@ declare class AddNewModelGenerator extends SubGeneratorBase {
      * The variant.
      */
     private variant;
+    /**
+     * The CF configuration, set when running in a CF environment.
+     */
+    private cfConfig;
     /**
      * The project path.
      */
@@ -24,15 +28,14 @@ declare class AddNewModelGenerator extends SubGeneratorBase {
      */
     constructor(args: string | string[], opts: GeneratorOpts);
     initializing(): Promise<void>;
+    /**
+     * Checks whether the project's CF target (org/space stored in ui5.yaml) matches the
+     * currently logged-in CF target.
+     */
+    private _checkCfTargetMismatch;
     prompting(): Promise<void>;
     writing(): Promise<void>;
     end(): void;
-    /**
-     * Creates the new model data.
-     *
-     * @returns {NewModelData} The new model data.
-     */
-    private _createNewModelData;
 }
 export = AddNewModelGenerator;
 //# sourceMappingURL=index.d.ts.map

package/generators/add-new-model/index.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 const yeoman_ui_types_1 = require("@sap-devx/yeoman-ui-types");
 const adp_tooling_1 = require("@sap-ux/adp-tooling");
+const fiori_generator_shared_1 = require("@sap-ux/fiori-generator-shared");
 const types_1 = require("../types");
 const i18n_1 = require("../utils/i18n");
 const sub_gen_base_1 = __importDefault(require("../base/sub-gen-base"));
@@ -19,6 +20,10 @@ class AddNewModelGenerator extends sub_gen_base_1.default {
      * The variant.
      */
     variant;
+    /**
+     * The CF configuration, set when running in a CF environment.
+     */
+    cfConfig;
     /**
      * The project path.
      */
@@ -37,7 +42,16 @@ class AddNewModelGenerator extends sub_gen_base_1.default {
     }
     async initializing() {
         await (0, i18n_1.initI18n)();
+        (0, fiori_generator_shared_1.setYeomanEnvConflicterForce)(this.env, true);
         try {
+            if (await (0, adp_tooling_1.isCFEnvironment)(this.projectPath)) {
+                this.cfConfig = (0, adp_tooling_1.loadCfConfig)(this.logger);
+                const loggedIn = await (0, adp_tooling_1.isLoggedInCf)(this.cfConfig, this.logger);
+                if (!loggedIn) {
+                    throw new Error((0, i18n_1.t)('error.cfNotLoggedIn'));
+                }
+                await this._checkCfTargetMismatch();
+            }
             this._registerPrompts(new yeoman_ui_types_1.Prompts([
                 { name: (0, i18n_1.t)('yuiNavSteps.addNewModelName'), description: (0, i18n_1.t)('yuiNavSteps.addNewModelDescr') }
             ]));
@@ -49,46 +63,41 @@ class AddNewModelGenerator extends sub_gen_base_1.default {
             this.logger.error(e);
         }
     }
+    /**
+     * Checks whether the project's CF target (org/space stored in ui5.yaml) matches the
+     * currently logged-in CF target.
+     */
+    async _checkCfTargetMismatch() {
+        let buildTask;
+        try {
+            const ui5Config = await (0, adp_tooling_1.readUi5Config)(this.projectPath, 'ui5.yaml');
+            buildTask = (0, adp_tooling_1.extractCfBuildTask)(ui5Config);
+        }
+        catch (e) {
+            this.logger.error(e.message);
+            throw new Error('CF target mismatch check failed. Check the logs for details.');
+        }
+        const orgMismatch = this.cfConfig?.org.GUID !== buildTask.org;
+        const spaceMismatch = this.cfConfig?.space.GUID !== buildTask.space;
+        if (orgMismatch || spaceMismatch) {
+            throw new Error((0, i18n_1.t)('error.cfTargetMismatch'));
+        }
+    }
     async prompting() {
         if (this.validationError) {
             await this.handleRuntimeCrash(this.validationError.message);
             return;
         }
-        this.answers = await this.prompt(await (0, adp_tooling_1.getPromptsForNewModel)(this.projectPath, this.variant.layer));
+        this.answers = await this.prompt(await (0, adp_tooling_1.getPromptsForNewModel)(this.projectPath, this.variant.layer, this.logger));
         this.logger.log(`Current answers\n${JSON.stringify(this.answers, null, 2)}`);
     }
     async writing() {
-        await (0, adp_tooling_1.generateChange)(this.projectPath, "appdescr_ui5_addNewModel" /* ChangeType.ADD_NEW_MODEL */, this._createNewModelData(), this.fs);
+        await (0, adp_tooling_1.generateChange)(this.projectPath, "appdescr_ui5_addNewModel" /* ChangeType.ADD_NEW_MODEL */, await (0, adp_tooling_1.createNewModelData)(this.projectPath, this.variant, this.answers, this.logger), this.fs);
         this.logger.log('Change written to changes folder');
     }
     end() {
         this.logger.log('Successfully created change!');
     }
-    /**
-     * Creates the new model data.
-     *
-     * @returns {NewModelData} The new model data.
-     */
-    _createNewModelData() {
-        const { name, uri, modelName, version, modelSettings, addAnnotationMode } = this.answers;
-        return {
-            variant: this.variant,
-            service: {
-                name,
-                uri,
-                modelName,
-                version,
-                modelSettings
-            },
-            ...(addAnnotationMode && {
-                annotation: {
-                    dataSourceName: this.answers.dataSourceName,
-                    dataSourceURI: this.answers.dataSourceURI,
-                    settings: this.answers.annotationSettings
-                }
-            })
-        };
-    }
 }
 module.exports = AddNewModelGenerator;
 //# sourceMappingURL=index.js.map

package/generators/translations/generator-adp.i18n.json

@@ -13,8 +13,8 @@
         "deployConfigDescr": "Configure deployment settings.",
         "addComponentUsagesName": "Add SAPUI5 Component Usages",
         "addComponentUsagesDescr": "Select SAPUI5 component usages.",
-        "addNewModelName": "Add OData Service and SAPUI5 Model",
-        "addNewModelDescr": "Select an OData service and SAPUI5 model.",
+        "addNewModelName": "Add Datasource and SAPUI5 Model",
+        "addNewModelDescr": "Select a Datasource and SAPUI5 model.",
         "addLocalAnnotationFileName": "Add Local Annotation File",
         "addLocalAnnotationFileDescr": "Select an OData service and annotation XML file.",
         "replaceODataServiceName": "Replace OData Service",
@@ -111,6 +111,7 @@
         "cfNotInstalled": "Cloud Foundry is not installed in your space. Please install it to continue.",
         "cfNotLoggedIn": "You are not logged in to Cloud Foundry. Please login to continue.",
         "cfOrgSpaceMissing": "You are logged in to the Cloud Foundry API endpoint but no organization and space are targeted. Target an organization and space to continue.",
+        "cfTargetMismatch": "The active Cloud Foundry session doesn't match the expected organization and space of the project.",
         "baseAppHasToBeSelected": "Base application has to be selected. Please select a base application.",
         "businessServiceHasToBeSelected": "Business service has to be selected. Please select a business service.",
         "businessServiceDoesNotExist": "The service chosen does not exist in cockpit or the user is not member of the needed space.",

package/generators/types.d.ts

@@ -1,7 +1,7 @@
 export declare enum GeneratorTypes {
     ADD_ANNOTATIONS_TO_DATA = "Add Local Annotation File",
     ADD_COMPONENT_USAGES = "Add SAPUI5 Component Usages",
-    ADD_NEW_MODEL = "Add OData Service And SAPUI5 Model",
+    ADD_NEW_MODEL = "Add Datasource and SAPUI5 Model",
     CHANGE_DATA_SOURCE = "Replace OData Service"
 }
 export interface Credentials {

package/generators/types.js

@@ -5,7 +5,7 @@ var GeneratorTypes;
 (function (GeneratorTypes) {
     GeneratorTypes["ADD_ANNOTATIONS_TO_DATA"] = "Add Local Annotation File";
     GeneratorTypes["ADD_COMPONENT_USAGES"] = "Add SAPUI5 Component Usages";
-    GeneratorTypes["ADD_NEW_MODEL"] = "Add OData Service And SAPUI5 Model";
+    GeneratorTypes["ADD_NEW_MODEL"] = "Add Datasource and SAPUI5 Model";
     GeneratorTypes["CHANGE_DATA_SOURCE"] = "Replace OData Service";
 })(GeneratorTypes || (exports.GeneratorTypes = GeneratorTypes = {}));
 //# sourceMappingURL=types.js.map

package/package.json

@@ -3,7 +3,7 @@
   "displayName": "SAPUI5 Adaptation Project",
   "homepage": "https://help.sap.com/viewer/584e0bcbfd4a4aff91c815cefa0bce2d/Cloud/en-US/ada9567b767941aba8d49fdb4fdedea7.html",
   "description": "Adaptation project allows you to create an app variant for an existing SAP Fiori elements-based or SAPUI5 freestyle application, without changing the original application.",
-  "version": "0.9.55",
+  "version": "0.9.57",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -30,19 +30,19 @@
     "i18next": "25.10.10",
     "yeoman-generator": "5.10.0",
     "uuid": "11.1.0",
-    "@sap-ux/adp-tooling": "0.18.116",
+    "@sap-ux/adp-tooling": "0.18.118",
     "@sap-ux/axios-extension": "1.25.31",
     "@sap-ux/btp-utils": "1.1.14",
     "@sap-ux/feature-toggle": "0.3.8",
-    "@sap-ux/inquirer-common": "0.11.36",
+    "@sap-ux/inquirer-common": "0.11.37",
     "@sap-ux/logger": "0.8.5",
     "@sap-ux/project-access": "1.35.20",
     "@sap-ux/store": "1.5.13",
     "@sap-ux/system-access": "0.7.7",
     "@sap-ux/project-input-validator": "0.6.76",
-    "@sap-ux/fiori-generator-shared": "0.13.98",
+    "@sap-ux/fiori-generator-shared": "0.13.99",
     "@sap-ux/odata-service-writer": "0.31.7",
-    "@sap-ux/telemetry": "0.6.98"
+    "@sap-ux/telemetry": "0.6.99"
   },
   "devDependencies": {
     "@jest/types": "30.3.0",
@@ -57,7 +57,7 @@
     "fs-extra": "11.3.4",
     "rimraf": "6.1.3",
     "yeoman-test": "6.3.0",
-    "@sap-ux/deploy-config-sub-generator": "0.5.141"
+    "@sap-ux/deploy-config-sub-generator": "0.5.143"
   },
   "engines": {
     "node": ">=20.x"