fix(demo): in-memory driver never gets loaded (#3051)

graycoreio · Sep 17, 2024 · d4df739 · d4df739
1 parent cb114f1
commit d4df739
Show file tree

Hide file tree

Showing 8 changed files with 37 additions and 42 deletions.
diff --git a/angular.json b/angular.json
@@ -78,6 +78,10 @@
                 {
                   "replace": "apps/demo/src/environments/environment.ts",
                   "with": "apps/demo/src/environments/environment.prod.ts"
+                },
+                {
+                  "replace": "apps/demo/src/app/drivers/driver.module.ts",
+                  "with": "apps/demo/src/app/drivers/in-memory.module.ts"
                 }
               ]
             },
@@ -86,6 +90,10 @@
                 {
                   "replace": "apps/demo/src/environments/environment.ts",
                   "with": "apps/demo/src/environments/environment.magento.ts"
+                },
+                {
+                  "replace": "apps/demo/src/app/drivers/driver.module.ts",
+                  "with": "apps/demo/src/app/drivers/magento.module.ts"
                 }
               ]
             },
@@ -94,6 +102,10 @@
                 {
                   "replace": "apps/demo/src/environments/environment.ts",
                   "with": "apps/demo/src/environments/environment.venia.ts"
+                },
+                {
+                  "replace": "apps/demo/src/app/drivers/driver.module.ts",
+                  "with": "apps/demo/src/app/drivers/magento.module.ts"
                 }
               ]
             }

diff --git a/apps/demo/src/app/app.module.ts b/apps/demo/src/app/app.module.ts
@@ -20,7 +20,7 @@ import { DemoCartRootModule } from './cart/cart-root.module';
 import { CategoryModule } from './category/category.module';
 import { DemoCheckoutStepActionTypes } from './checkout/actions/checkout-step.actions';
 import { TemplateModule } from './core/template/template/template.module';
-import { DemoDriverMap } from './drivers/map';
+import { DemoDriverModule } from './drivers/driver.module';
 import { NotFoundModule } from './misc/not-found/not-found.module';
 import { ProductModule } from './product/product.module';
 import { DemoRoutingComponentModule } from './routing/routing-component.module';
@@ -36,7 +36,7 @@ import { environment } from '../environments/environment';
 
     HttpClientModule,
 
-    DemoDriverMap[environment.driver.variant],
+    DemoDriverModule,
 
     StoreModule.forRoot({}),
     EffectsModule.forRoot([]),

diff --git a/apps/demo/src/app/drivers/driver.module.ts b/apps/demo/src/app/drivers/driver.module.ts
@@ -0,0 +1,4 @@
+import { NgModule } from '@angular/core';
+
+@NgModule()
+export class DemoDriverModule {}
diff --git a/...app/drivers/in-memory/in-memory.module.ts → .../demo/src/app/drivers/in-memory.module.ts b/...app/drivers/in-memory/in-memory.module.ts → .../demo/src/app/drivers/in-memory.module.ts
@@ -5,6 +5,7 @@ import {
 import { HttpClientInMemoryWebApiModule } from 'angular-in-memory-web-api';
 
 import { DaffAuthInMemoryDriverModule } from '@daffodil/auth/driver/in-memory';
+import { DaffAuthorizeNetInMemoryDriverModule } from '@daffodil/authorizenet/driver/in-memory';
 import { DaffCartInMemoryDriverModule } from '@daffodil/cart/driver/in-memory';
 import { DaffCategoryInMemoryDriverModule } from '@daffodil/category/driver/in-memory';
 import { DaffInMemoryBackendCategoryService } from '@daffodil/category/driver/in-memory';
@@ -19,13 +20,13 @@ import { DaffProductInMemoryDriverModule } from '@daffodil/product/driver/in-mem
 import { DaffCompositeProductInMemoryDriverModule } from '@daffodil/product-composite/driver/in-memory';
 import { DaffConfigurableProductInMemoryDriverModule } from '@daffodil/product-configurable/driver/in-memory';
 
-import { DemoInMemoryBackendService } from './backend/backend.service';
-import { DEMO_EXTERNAL_ROUTER_DRIVER_IN_MEMORY_CONFIG } from './external-router.config.token';
-
+import { DemoInMemoryBackendService } from './in-memory/backend/backend.service';
+import { DEMO_EXTERNAL_ROUTER_DRIVER_IN_MEMORY_CONFIG } from './in-memory/external-router.config.token';
 
 @NgModule({
   imports: [
     HttpClientInMemoryWebApiModule.forRoot(DemoInMemoryBackendService),
+    DaffAuthorizeNetInMemoryDriverModule.forRoot(),
     DaffAuthInMemoryDriverModule.forRoot(),
     DaffProductInMemoryDriverModule.forRoot(),
     DaffCompositeProductInMemoryDriverModule.forRoot(),
@@ -47,4 +48,4 @@ import { DEMO_EXTERNAL_ROUTER_DRIVER_IN_MEMORY_CONFIG } from './external-router.
     },
   ],
 })
-export class DemoInMemoryDriverModule { }
+export class DemoDriverModule { }
diff --git a/...src/app/drivers/magento/magento.module.ts → apps/demo/src/app/drivers/magento.module.ts b/...src/app/drivers/magento/magento.module.ts → apps/demo/src/app/drivers/magento.module.ts
@@ -16,9 +16,9 @@ import { DaffNavigationMagentoDriverModule } from '@daffodil/navigation/driver/m
 import { DaffNewsletterInMemoryDriverModule } from '@daffodil/newsletter/driver/in-memory';
 import { DaffProductMagentoDriverModule } from '@daffodil/product/driver/magento';
 
-import { demoMagentoApolloOptions } from './apollo-options.factory';
-import { environment } from '../../../environments/environment';
-import { MagentoEnvironmentDriverConfiguration } from '../../../environments/environment.interface';
+import { demoMagentoApolloOptions } from './magento/apollo-options.factory';
+import { environment } from '../../environments/environment';
+import { MagentoEnvironmentDriverConfiguration } from '../../environments/environment.interface';
 
 @NgModule({
   imports: [
@@ -47,4 +47,4 @@ import { MagentoEnvironmentDriverConfiguration } from '../../../environments/env
     },
   ],
 })
-export class DemoMagentoDriverModule {}
+export class DemoDriverModule {}
diff --git a/apps/demo/src/app/drivers/map.ts b/apps/demo/src/app/drivers/map.ts
diff --git a/...src/app/drivers/shopify/shopify.module.ts → apps/demo/src/app/drivers/shopify.module.ts b/...src/app/drivers/shopify/shopify.module.ts → apps/demo/src/app/drivers/shopify.module.ts
@@ -12,8 +12,8 @@ import { DaffCartInMemoryDriverModule } from '@daffodil/cart/driver/in-memory';
 import { DaffNewsletterInMemoryDriverModule } from '@daffodil/newsletter/driver/in-memory';
 import { DaffProductShopifyDriverModule } from '@daffodil/product/driver/shopify';
 
-import { environment } from '../../../environments/environment';
-import { ShopifyEnviromentDriverConfiguration } from '../../../environments/environment.interface';
+import { environment } from '../../environments/environment';
+import { ShopifyEnviromentDriverConfiguration } from '../../environments/environment.interface';
 
 const cache = new InMemoryCache();
 
@@ -25,7 +25,7 @@ const cache = new InMemoryCache();
     DaffNewsletterInMemoryDriverModule.forRoot(),
   ],
 })
-export class DemoShopifyDriverModule {
+export class DemoDriverModule {
   driver: ShopifyEnviromentDriverConfiguration = (<ShopifyEnviromentDriverConfiguration>environment.driver);
 
   // Shopify

diff --git a/apps/demo/src/environments/environment.interface.ts b/apps/demo/src/environments/environment.interface.ts
@@ -4,24 +4,24 @@
 
 import { DaffAuthorizeNetConfig } from '@daffodil/authorizenet/driver';
 
-export const DemoDriverVariantEnum = {
-  IN_MEMORY: 0,
-  MAGENTO: 1,
-  SHOPIFY: 2,
+export enum DemoDriverVariantEnum {
+  IN_MEMORY = 'IN_MEMORY',
+  MAGENTO = 'MAGENTO',
+  SHOPIFY = 'SHOPIFY',
 };
 
 export interface InMemoryEnviromentDriverConfiguration {
-  variant: typeof DemoDriverVariantEnum.IN_MEMORY;
+  variant: DemoDriverVariantEnum.IN_MEMORY;
 }
 
 export interface MagentoEnvironmentDriverConfiguration {
-  variant: typeof DemoDriverVariantEnum.MAGENTO;
+  variant: DemoDriverVariantEnum.MAGENTO;
   domain: string;
   anetConfig: DaffAuthorizeNetConfig;
 }
 
 export interface ShopifyEnviromentDriverConfiguration {
-  variant: typeof DemoDriverVariantEnum.SHOPIFY;
+  variant: DemoDriverVariantEnum.SHOPIFY;
   domain: string;
   publicAccessToken: string;
 }