chore: add opf sub-libs to schematics (#19387)

CXSPA-8629 Opf 6 libs are added with schematics.
SAP · Oct 18, 2024 · 7e0070c · 7e0070c
1 parent 5f1b9a7
commit 7e0070c
Show file tree

Hide file tree

Showing 13 changed files with 263 additions and 83 deletions.
diff --git a/integration-libs/opf/base/core/services/opf-endpoints.service.spec.ts b/integration-libs/opf/base/core/services/opf-endpoints.service.spec.ts
@@ -19,7 +19,7 @@ describe('OpfEndpointsService', () => {
   beforeEach(() => {
     opfConfigMock = {
       opf: {
-        baseUrl: 'https://elec-spa.com/opf',
+        opfBaseUrl: 'https://elec-spa.com/opf',
       },
     };
     opfApiConfigMock = {
@@ -70,7 +70,7 @@ describe('OpfEndpointsService', () => {
     });
 
     it('should return an empty string when baseUrl is empty', () => {
-      service['opfConfig'] = { opf: { baseUrl: '' } };
+      service['opfConfig'] = { opf: { opfBaseUrl: '' } };
       const result = service['getBaseEndpoint']();
       expect(result).toEqual('');
     });

diff --git a/integration-libs/opf/base/core/services/opf-endpoints.service.ts b/integration-libs/opf/base/core/services/opf-endpoints.service.ts
@@ -59,8 +59,8 @@ export class OpfEndpointsService {
   }
 
   private getBaseEndpoint(): string {
-    if (this.opfConfig && this.opfConfig.opf && this.opfConfig.opf.baseUrl) {
-      return this.opfConfig.opf.baseUrl;
+    if (this.opfConfig && this.opfConfig.opf && this.opfConfig.opf.opfBaseUrl) {
+      return this.opfConfig.opf.opfBaseUrl;
     }
 
     return '';

diff --git a/integration-libs/opf/base/root/config/default-opf-config.ts b/integration-libs/opf/base/root/config/default-opf-config.ts
@@ -8,6 +8,6 @@ import { OpfConfig } from './opf-config';
 
 export const defaultOpfConfig: OpfConfig = {
   opf: {
-    baseUrl: '',
+    opfBaseUrl: '',
   },
 };
diff --git a/integration-libs/opf/base/root/config/opf-config.ts b/integration-libs/opf/base/root/config/opf-config.ts
@@ -13,7 +13,7 @@ import { Config } from '@spartacus/core';
 })
 export abstract class OpfConfig {
   opf?: {
-    baseUrl?: string;
+    opfBaseUrl?: string;
     commerceCloudPublicKey?: string;
   };
 }

diff --git a/integration-libs/opf/schematics/add-opf/__snapshots__/index_spec.ts.snap b/integration-libs/opf/schematics/add-opf/__snapshots__/index_spec.ts.snap
@@ -2,73 +2,45 @@
 
 exports[`Spartacus SAP OPF integration schematics: ng-add SAP OPF feature general setup should add the feature using the lazy loading syntax 1`] = `
 "import { NgModule } from '@angular/core';
-import { CmsConfig, I18nConfig, provideConfig } from "@spartacus/core";
-import { opfBaseTranslationChunksConfig, opfBaseTranslations } from "@spartacus/opf/base/assets";
-import { OPF_BASE_FEATURE, OpfBaseRootModule, OpfConfig } from "@spartacus/opf/base/root";
+import { CmsConfig, provideConfig } from "@spartacus/core";
+import { OPF_QUICK_BUY_FEATURE, OpfQuickBuyRootModule } from "@spartacus/opf/quick-buy/root";
 
 @NgModule({
   declarations: [],
   imports: [
-    OpfBaseRootModule
+    OpfQuickBuyRootModule
   ],
   providers: [provideConfig(<CmsConfig>{
     featureModules: {
-      [OPF_BASE_FEATURE]: {
+      [OPF_QUICK_BUY_FEATURE]: {
         module: () =>
-          import('@spartacus/opf/base').then((m) => m.OpfBaseModule),
+          import('@spartacus/opf/quick-buy').then((m) => m.OpfQuickBuyModule),
       },
     }
-  }),
-  provideConfig(<I18nConfig>{
-    i18n: {
-      resources: opfBaseTranslations,
-      chunks: opfBaseTranslationChunksConfig,
-    },
-  }),
-  provideConfig(<OpfConfig>{
-    opf: {
-      baseUrl: "PLACEHOLDER_OPF_BASE_URL",
-      commerceCloudPublicKey: "PLACEHOLDER_COMMERCE_CLOUD_PUBLIC_KEY",
-    },
-  })
-  ]
+  })]
 })
 export class OpfFeatureModule { }
 "
 `;
 
 exports[`Spartacus SAP OPF integration schematics: ng-add SAP OPF feature general setup should add the feature using the lazy loading syntax 2`] = `
 "import { NgModule } from '@angular/core';
-import { CmsConfig, I18nConfig, provideConfig } from "@spartacus/core";
-import { opfBaseTranslationChunksConfig, opfBaseTranslations } from "@spartacus/opf/base/assets";
-import { OPF_BASE_FEATURE, OpfBaseRootModule, OpfConfig } from "@spartacus/opf/base/root";
+import { CmsConfig, provideConfig } from "@spartacus/core";
+import { OPF_QUICK_BUY_FEATURE, OpfQuickBuyRootModule } from "@spartacus/opf/quick-buy/root";
 
 @NgModule({
   declarations: [],
   imports: [
-    OpfBaseRootModule
+    OpfQuickBuyRootModule
   ],
   providers: [provideConfig(<CmsConfig>{
     featureModules: {
-      [OPF_BASE_FEATURE]: {
+      [OPF_QUICK_BUY_FEATURE]: {
         module: () =>
-          import('@spartacus/opf/base').then((m) => m.OpfBaseModule),
+          import('@spartacus/opf/quick-buy').then((m) => m.OpfQuickBuyModule),
       },
     }
-  }),
-  provideConfig(<I18nConfig>{
-    i18n: {
-      resources: opfBaseTranslations,
-      chunks: opfBaseTranslationChunksConfig,
-    },
-  }),
-  provideConfig(<OpfConfig>{
-    opf: {
-      baseUrl: "PLACEHOLDER_OPF_BASE_URL",
-      commerceCloudPublicKey: "PLACEHOLDER_COMMERCE_CLOUD_PUBLIC_KEY",
-    },
-  })
-  ]
+  })]
 })
 export class OpfFeatureModule { }
 "

diff --git a/integration-libs/opf/schematics/add-opf/index_spec.ts b/integration-libs/opf/schematics/add-opf/index_spec.ts
@@ -13,6 +13,10 @@ import { Schema as WorkspaceOptions } from '@schematics/angular/workspace/schema
 import {
   OPF_BASE_FEATURE_NAME,
   OPF_CHECKOUT_FEATURE_NAME,
+  OPF_CTA_FEATURE_NAME,
+  OPF_GLOBAL_FUNCTIONS_FEATURE_NAME,
+  OPF_PAYMENT_FEATURE_NAME,
+  OPF_QUICK_BUY_FEATURE_NAME,
   SPARTACUS_CHECKOUT,
   SPARTACUS_OPF,
   SPARTACUS_SCHEMATICS,
@@ -72,6 +76,25 @@ describe('Spartacus SAP OPF integration schematics: ng-add', () => {
     features: [OPF_BASE_FEATURE_NAME],
   };
 
+  const opfPaymentFeatureOptions: SpartacusOpfOptions = {
+    ...libraryNoFeaturesOptions,
+    features: [OPF_PAYMENT_FEATURE_NAME],
+  };
+
+  const opfCtaFeatureOptions: SpartacusOpfOptions = {
+    ...libraryNoFeaturesOptions,
+    features: [OPF_CTA_FEATURE_NAME],
+  };
+  const opfGlobalFunctionsFeatureOptions: SpartacusOpfOptions = {
+    ...libraryNoFeaturesOptions,
+    features: [OPF_GLOBAL_FUNCTIONS_FEATURE_NAME],
+  };
+
+  const opfQuickBuyFeatureOptions: SpartacusOpfOptions = {
+    ...libraryNoFeaturesOptions,
+    features: [OPF_QUICK_BUY_FEATURE_NAME],
+  };
+
   beforeEach(async () => {
     schematicRunner.registerCollection(
       SPARTACUS_SCHEMATICS,
@@ -129,7 +152,14 @@ describe('Spartacus SAP OPF integration schematics: ng-add', () => {
       beforeEach(async () => {
         appTree = await schematicRunner.runSchematic(
           'ng-add',
-          { ...checkoutFeatureOptions, ...opfFeatureOptions },
+          {
+            ...checkoutFeatureOptions,
+            ...opfFeatureOptions,
+            ...opfPaymentFeatureOptions,
+            ...opfCtaFeatureOptions,
+            ...opfGlobalFunctionsFeatureOptions,
+            ...opfQuickBuyFeatureOptions,
+          },
           appTree
         );
       });

diff --git a/integration-libs/opf/schematics/add-opf/schema.json b/integration-libs/opf/schematics/add-opf/schema.json
@@ -25,12 +25,26 @@
       "type": "array",
       "uniqueItems": true,
       "items": {
-        "enum": ["OPF-Checkout", "OPF-Base"],
+        "enum": [
+          "OPF-Checkout",
+          "OPF-Base",
+          "OPF-Payment",
+          "OPF-Cta",
+          "OPF-Global-Functions",
+          "OPF-Quick-Buy"
+        ],
         "type": "string"
       },
-      "default": ["OPF-Checkout", "OPF-Base"]
+      "default": [
+        "OPF-Checkout",
+        "OPF-Base",
+        "OPF-Payment",
+        "OPF-Cta",
+        "OPF-Global-Functions",
+        "OPF-Quick-Buy"
+      ]
     },
-    "baseUrl": {
+    "opfBaseUrl": {
       "type": "string",
       "description": "The base url of Cloud Commerce Adapter for Open Payment Framework integration",
       "x-prompt": "[OPF] What is the base URL (origin) of your OPF Cloud Commerce Adapter?"