@sap-ux/repo-app-import-sub-generator 1.1.43 → 1.2.0

package/generators/app/index.js

@@ -216,7 +216,9 @@ export default class extends Generator {
             generatorName: generatorName,
             generatorVersion: this.rootGeneratorVersion(),
             ui5Version: config.ui5?.version ?? '',
-            template: getFloorplanLabel(config.template.type, config.service.version),
+            template: config.template.type
+                ? getFloorplanLabel(config.template.type, config.service.version)
+                : 'unknown',
             serviceUrl: config.service.url,
             launchText: t('readMe.launchText')
         };

package/generators/app/types.d.ts

@@ -1,6 +1,6 @@
 import type Generator from 'yeoman-generator';
 import type { AppWizard } from '@sap-devx/yeoman-ui-types';
-import type { VSCodeInstance, TelemetryData, LogWrapper } from '@sap-ux/fiori-generator-shared';
+import type { VSCodeInstance, TelemetryData, LogWrapper, Floorplan } from '@sap-ux/fiori-generator-shared';
 import type { AppIndex, AbapServiceProvider } from '@sap-ux/axios-extension';
 import type { OdataServiceAnswers, OdataVersion } from '@sap-ux/odata-service-inquirer';
 import type { YUIQuestion } from '@sap-ux/inquirer-common';
@@ -23,7 +23,7 @@ export interface AbapRepoAppConfig {
         version: string;
     };
     template: {
-        type: string;
+        type: Floorplan | undefined;
     };
 }
 /**

package/generators/prompts/prompts.js

@@ -80,7 +80,9 @@ export async function getPrompts(appRootPath, quickDeployedAppConfig, appWizard,
             serviceSelection: { hide: true, useAutoComplete: isCli },
             systemSelection: {
                 defaultChoice: quickDeployedAppConfig?.serviceProviderInfo?.name,
-                hideNewSystem: true
+                hideNewSystem: true,
+                destinationFilters: { odata_abap: true },
+                backendSystemFilter: { connectionType: ['abap_catalog'] }
             }
         }, !isCli);
         let appList = [];

package/generators/utils/file-helpers.d.ts

@@ -1,6 +1,7 @@
 import type { Editor } from 'mem-fs-editor';
 import type { QfaJsonConfig, AbapRepoAppConfig } from '../app/types.js';
 import { type Manifest } from '@sap-ux/project-access';
+import type { Floorplan } from '@sap-ux/fiori-generator-shared';
 /**
  *
  * @param filePath - Path to the JSON file
@@ -34,12 +35,12 @@ export declare function cleanupArtifacts(extractedProjectPath: string, fs: Edito
  */
 export declare function addPackageJsonIfNotFound(projectPath: string, appConfig: AbapRepoAppConfig, fs: Editor): void;
 /**
- * Derives the template type string from a manifest's sourceTemplate id.
+ * Derives the template type from a manifest's sourceTemplate id.
  * Returns the suffix after `@sap/generator-fiori:` (e.g. `lrop`, `fpm`),
- * or `'unknown'` if the id is absent or is not a fiori generated app.
+ * or `undefined` if the id is absent or not a recognised fiori template.
  *
  * @param {Manifest} manifest - The parsed manifest object.
- * @returns {string} The template type string.
+ * @returns {Floorplan | undefined} The template type, or `undefined` if unrecognised.
  */
-export declare function getTemplateTypeFromManifest(manifest: Manifest): string;
+export declare function getTemplateTypeFromManifest(manifest: Manifest): Floorplan | undefined;
 //# sourceMappingURL=file-helpers.d.ts.map

package/generators/utils/file-helpers.js

@@ -99,25 +99,24 @@ export function addPackageJsonIfNotFound(projectPath, appConfig, fs) {
     }
 }
 /**
- * Derives the template type string from a manifest's sourceTemplate id.
+ * Derives the template type from a manifest's sourceTemplate id.
  * Returns the suffix after `@sap/generator-fiori:` (e.g. `lrop`, `fpm`),
- * or `'unknown'` if the id is absent or is not a fiori generated app.
+ * or `undefined` if the id is absent or not a recognised fiori template.
  *
  * @param {Manifest} manifest - The parsed manifest object.
- * @returns {string} The template type string.
+ * @returns {Floorplan | undefined} The template type, or `undefined` if unrecognised.
  */
 export function getTemplateTypeFromManifest(manifest) {
     const sourceTemplateId = manifest?.['sap.app']?.sourceTemplate?.id ?? '';
     const fioriGeneratorPrefix = '@sap/generator-fiori:';
-    // set of all known @sap/generator-fiori template suffixes for validating sourceTemplate.id in manifest.json.
     const knownTemplates = new Set([
         ...Object.values(FioriElementsTemplateType),
         ...Object.values(FioriFreestyleTemplateType)
     ]);
     if (!sourceTemplateId.startsWith(fioriGeneratorPrefix)) {
-        return 'unknown';
+        return undefined;
     }
     const suffix = sourceTemplateId.slice(fioriGeneratorPrefix.length);
-    return knownTemplates.has(suffix) ? suffix : 'unknown';
+    return knownTemplates.has(suffix) ? suffix : undefined;
 }
 //# sourceMappingURL=file-helpers.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/repo-app-import-sub-generator",
   "description": "Generator to download LROP Fiori applications deployed from an ABAP repository.",
-  "version": "1.1.43",
+  "version": "1.2.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -26,12 +26,12 @@
     "inquirer": "8.2.7",
     "yeoman-generator": "5.10.0",
     "@sap-ux/feature-toggle": "1.0.5",
-    "@sap-ux/fiori-generator-shared": "1.1.0",
-    "@sap-ux/inquirer-common": "1.0.22",
+    "@sap-ux/fiori-generator-shared": "1.2.0",
+    "@sap-ux/inquirer-common": "1.0.23",
     "@sap-ux/project-access": "2.1.6",
-    "@sap-ux/odata-service-inquirer": "3.0.25",
-    "@sap-ux/fiori-elements-writer": "3.0.58",
-    "@sap-ux/fiori-freestyle-writer": "3.0.51",
+    "@sap-ux/odata-service-inquirer": "3.1.0",
+    "@sap-ux/fiori-elements-writer": "3.0.60",
+    "@sap-ux/fiori-freestyle-writer": "3.0.53",
     "@sap-ux/logger": "1.0.3",
     "@sap-ux/project-input-validator": "1.0.10",
     "@sap-ux/launch-config": "1.0.12",