fix: Update schematics

Closes: CXSPA-4396
SAP · Nov 7, 2023 · c41fbd4 · c41fbd4
1 parent 44c1008
commit c41fbd4
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 12 deletions.
diff --git a/integration-libs/opf/package.json b/integration-libs/opf/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@spartacus/opf",
-  "version": "6.3.0-1",
+  "version": "6.6.0-1",
   "description": "SAP Open Payment Framework integration library for Spartacus",
   "keywords": [
     "spartacus",

diff --git a/projects/schematics/src/add-spartacus/schema.json b/projects/schematics/src/add-spartacus/schema.json
@@ -32,7 +32,6 @@
           "Digital-Payments",
           "EPD-Visualization",
           "OPF-Checkout",
-          "OPF-Base",
           "Customer-Ticketing",
           "Administration",
           "Order-Approval",
@@ -146,11 +145,7 @@
           },
           {
             "value": "OPF-Checkout",
-            "label": "OPF - Checkout Integration"
-          },
-          {
-            "value": "OPF-Base",
-            "label": "OPF - Base Integration"
+            "label": "Open Payment Framework Checkout Integration"
           },
           {
             "value": "Administration",

diff --git a/projects/schematics/src/shared/lib-configs/integration-libs/opf-schematics-config.ts b/projects/schematics/src/shared/lib-configs/integration-libs/opf-schematics-config.ts
@@ -70,7 +70,7 @@ export const OPF_CHECKOUT_SCHEMATICS_CONFIG: SchematicConfig = {
     scssFileName: OPF_SCSS_FILE_NAME,
     importStyle: SPARTACUS_OPF,
   },
-  dependencyFeatures: [CHECKOUT_BASE_FEATURE_NAME],
+  dependencyFeatures: [CHECKOUT_BASE_FEATURE_NAME, OPF_BASE_FEATURE_NAME],
   importAfter: [
     {
       markerModuleName: CHECKOUT_BASE_MODULE,

diff --git a/projects/schematics/src/shared/schematics-config-mappings.ts b/projects/schematics/src/shared/schematics-config-mappings.ts
@@ -6,8 +6,8 @@
 
 import { SchematicsException } from '@angular-devkit/schematics';
 import {
-  ASM_SCHEMATICS_CONFIG,
   ASM_CUSTOMER_360_SCHEMATICS_CONFIG,
+  ASM_SCHEMATICS_CONFIG,
 } from './lib-configs/asm-schematics-config';
 import {
   CART_BASE_SCHEMATICS_CONFIG,
@@ -136,8 +136,8 @@ export const SCHEMATICS_CONFIGS: SchematicConfig[] = [
 
   S4OM_SCHEMATICS_CONFIG,
 
-  OPF_CHECKOUT_SCHEMATICS_CONFIG,
   OPF_BASE_SCHEMATICS_CONFIG,
+  OPF_CHECKOUT_SCHEMATICS_CONFIG,
 
   SEGMENT_REFS_SCHEMATICS_CONFIG,
 ];

diff --git a/projects/schematics/src/shared/utils/graph-utils_spec.ts b/projects/schematics/src/shared/utils/graph-utils_spec.ts
@@ -173,6 +173,8 @@ describe('Graph utils', () => {
           "Personalization",
           "TMS-AEPL",
           "TMS-GTM",
+          "OPF-Base",
+          "OPF-Checkout",
           "PDF-Invoices",
           "Requested-Delivery-Date",
           "Organization-User-Registration",
@@ -187,8 +189,6 @@ describe('Graph utils', () => {
           "ASM",
           "ASM-Customer-360",
           "Segment-Refs",
-          "OPF-Base",
-          "OPF-Checkout",
           "S4HANA-Order-Management",
           "EPD-Visualization",
           "Digital-Payments",