@acorex/platform-generator 20.3.0-next.8 → 20.4.0

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@acorex/platform-generator",
-  "version": "20.3.0-next.8",
+  "version": "20.4.0",
   "peerDependencies": {
-    "@acorex/modules": ">=20.0.0"
+    "@acorex/modules": "20.4.0"
   },
   "type": "commonjs",
   "main": "./src/index.js",

package/src/bin/interactive-entity-creator.js

@@ -27,18 +27,18 @@ function validateName(name) {
   if (!name || name.trim() === '') {
     return 'Name cannot be empty.';
   }
-  
+
   // Ensure name is not just a number
   if (/^\d+$/.test(name)) {
     return 'Name cannot be just a number. Please include at least one letter.';
   }
-  
+
   // Less restrictive validation that allows non-Latin characters
   // Just check for spaces, special characters, and make sure it starts with a letter or non-Latin character
   if (/^[^a-zA-Z\p{L}]|\s|[^\w\p{L}]/u.test(name)) {
     return 'Name must start with a letter and cannot contain spaces or special characters.';
   }
-  
+
   return null; // No error
 }
 
@@ -48,15 +48,13 @@ const isDryRun = process.argv.includes('--dryRun');
 // Create an interface for readline
 const rl = readline.createInterface({
   input: process.stdin,
-  output: process.stdout
+  output: process.stdout,
 });
 
 // Define widget catalog - copied from widget-catalog.ts
 const widgetCatalog = {
   text: 'text-editor',
-  email: 'email-editor',
   password: 'password-editor',
-  phone: 'phone-editor',
   largeText: 'large-text-editor',
   richText: 'rich-text-editor',
   number: 'number-editor',
@@ -66,7 +64,6 @@ const widgetCatalog = {
   toggle: 'toggle-editor',
   dateTime: 'date-time-editor',
   color: 'color-editor',
-  link: 'link-editor',
   contact: 'contact-editor',
   tagable: 'tagable-editor',
   file: 'file',
@@ -78,15 +75,13 @@ const widgetCatalog = {
   table: 'table-editor',
   qrcode: 'qrcode',
   singleFileBox: 'single-file-box-editor',
-  metaData: 'meta-data-editor'
+  metaData: 'meta-data-editor',
 };
 
 // Define widget to data type mapping
 const widgetToDataType = {
   'text-editor': 'string',
-  'email-editor': 'string',
   'password-editor': 'string',
-  'phone-editor': 'string',
   'large-text-editor': 'string',
   'rich-text-editor': 'string',
   'number-editor': 'number',
@@ -96,35 +91,32 @@ const widgetToDataType = {
   'toggle-editor': 'boolean',
   'date-time-editor': 'date',
   'color-editor': 'string',
-  'link-editor': 'string',
   'contact-editor': 'object',
   'tagable-editor': 'string',
-  'file': 'object',
-  'gallery': 'object',
-  'signature': 'string',
-  'map': 'object',
+  file: 'object',
+  gallery: 'object',
+  signature: 'string',
+  map: 'object',
   'lookup-editor': 'object',
   'selection-list-editor': 'array',
   'table-editor': 'array',
-  'qrcode': 'string',
+  qrcode: 'string',
   'single-file-box-editor': 'object',
-  'meta-data-editor': 'object'
+  'meta-data-editor': 'object',
 };
 
 // Widget groups for better display
 const widgetGroups = {
-  'Basic': ['text-editor', 'large-text-editor', 'rich-text-editor', 'number-editor', 'checkbox-editor', 'toggle-editor'],
-  'Input': ['email-editor', 'password-editor', 'phone-editor', 'date-time-editor', 'color-editor'],
-  'Complex': ['select-editor', 'lookup-editor', 'selection-list-editor', 'table-editor'],
-  'Media': ['file', 'gallery', 'signature', 'map', 'qrcode']
+  Basic: ['text-editor', 'large-text-editor', 'rich-text-editor', 'number-editor', 'checkbox-editor', 'toggle-editor'],
+  Input: ['password-editor', 'date-time-editor', 'color-editor'],
+  Complex: ['select-editor', 'lookup-editor', 'selection-list-editor', 'table-editor'],
+  Media: ['file', 'gallery', 'signature', 'map', 'qrcode'],
 };
 
 // Define default colSpan based on widget type
 const widgetToColSpan = {
   'text-editor': 6,
-  'email-editor': 6,
   'password-editor': 6,
-  'phone-editor': 6,
   'large-text-editor': 12,
   'rich-text-editor': 12,
   'number-editor': 4,
@@ -134,19 +126,18 @@ const widgetToColSpan = {
   'toggle-editor': 4,
   'date-time-editor': 6,
   'color-editor': 4,
-  'link-editor': 6,
   'contact-editor': 8,
   'tagable-editor': 8,
-  'file': 6,
-  'gallery': 12,
-  'signature': 8,
-  'map': 12,
+  file: 6,
+  gallery: 12,
+  signature: 8,
+  map: 12,
   'lookup-editor': 6,
   'selection-list-editor': 8,
   'table-editor': 12,
-  'qrcode': 6,
+  qrcode: 6,
   'single-file-box-editor': 6,
-  'meta-data-editor': 8
+  'meta-data-editor': 8,
 };
 
 // Create data object to store all user input
@@ -163,13 +154,13 @@ const data = {
   enableSorts: [],
   enableFilters: [],
   enableInlineFilters: [],
-  inColumn: [] // اضافه کردن آرایه جدید برای ذخیره وضعیت نمایش در ستون
+  inColumn: [], // اضافه کردن آرایه جدید برای ذخیره وضعیت نمایش در ستون
 };
 
 // Run the prompts in sequence
 async function runPrompts() {
   console.log('\n=== AcoreX Platform Interactive Entity Generator ===\n');
-  
+
   // Get module name with validation
   while (true) {
     data.moduleName = await askQuestion('Module name: ');
@@ -180,7 +171,7 @@ async function runPrompts() {
       break;
     }
   }
-  
+
   // Get entity name with validation
   while (true) {
     data.name = await askQuestion('Entity name: ');
@@ -191,7 +182,7 @@ async function runPrompts() {
       break;
     }
   }
-  
+
   // Get properties
   console.log('\nEnter properties (type "done" when finished):');
   let propCount = 1;
@@ -201,50 +192,53 @@ async function runPrompts() {
       break;
     }
     data.properties.push(prop);
-    
+
     // Get widget for this property
     const widget = await selectWidget(`Select widget for "${prop}": `);
     data.widgets.push(widget);
-    
+
     // Automatically determine data type based on widget
     const dataType = widgetToDataType[widget] || 'string';
     data.dataTypes.push(dataType);
-    
+
     // Ask if this property is required
     const isRequired = await askQuestion(`Is "${prop}" required? (y/n): `, 'n');
     if (isRequired.toLowerCase() === 'y') {
       data.required.push(prop);
     }
-    
+
     // Ask if this property should be displayed in columns
     const showInColumn = await askQuestion(`Show "${prop}" in table columns? (y/n): `, 'y');
     data.inColumn.push(showInColumn.toLowerCase() === 'y' ? 'true' : 'false');
-    
+
     // Get colSpan for this property (1-12)
     const defaultColSpan = widgetToColSpan[widget] || 6;
     const colSpan = await askQuestion(`Column span for "${prop}" (1-12): `, defaultColSpan.toString());
     data.colSpans.push(parseInt(colSpan));
-    
+
     // Get order for this property
     const defaultOrder = propCount; // Default order is sequential
-    const order = await askQuestion(`Display order for "${prop}" (default: ${defaultOrder}): `, defaultOrder.toString());
+    const order = await askQuestion(
+      `Display order for "${prop}" (default: ${defaultOrder}): `,
+      defaultOrder.toString(),
+    );
     data.orders.push(parseInt(order));
-    
+
     // Ask about sort
     const enableSort = await askQuestion(`Enable sorting for "${prop}"? (y/n): `, 'y');
     data.enableSorts.push(enableSort.toLowerCase() === 'y' ? 'true' : 'false');
-    
+
     // Ask about filter
     const enableFilter = await askQuestion(`Enable filtering for "${prop}"? (y/n): `, 'y');
     data.enableFilters.push(enableFilter.toLowerCase() === 'y' ? 'true' : 'false');
-    
+
     // Ask about inline filter
     const enableInlineFilter = await askQuestion(`Enable inline filtering for "${prop}"? (y/n): `, 'n');
     data.enableInlineFilters.push(enableInlineFilter.toLowerCase() === 'y' ? 'true' : 'false');
-    
+
     propCount++;
   }
-  
+
   // Get icon
   console.log('\nSelect an icon:');
   console.log('1. Default icon (fa-light fa-default)');
@@ -253,28 +247,28 @@ async function runPrompts() {
   console.log('4. Shopping cart (fa-solid fa-shopping-cart)');
   console.log('5. File (fa-solid fa-file)');
   console.log('6. Custom icon');
-  
+
   const iconChoice = await askQuestion('Select option (1-6): ', '1');
   const iconOptions = [
     'fa-light fa-default',
     'fa-solid fa-box',
     'fa-solid fa-user',
     'fa-solid fa-shopping-cart',
-    'fa-solid fa-file'
+    'fa-solid fa-file',
   ];
-  
+
   if (iconChoice >= 1 && iconChoice <= 5) {
     data.icon = iconOptions[iconChoice - 1];
   } else if (iconChoice == 6) {
     data.icon = await askQuestion('Enter custom icon (format: fa-solid fa-xyz): ', 'fa-solid fa-star');
   }
-  
+
   // Show summary
   console.log('\n=== Summary ===');
   console.log(`Module: ${data.moduleName}`);
   console.log(`Entity: ${data.name}`);
   console.log('Properties:');
-  
+
   // Sort properties by order for display
   const propSummary = data.properties.map((prop, i) => ({
     name: prop,
@@ -286,18 +280,20 @@ async function runPrompts() {
     enableSort: data.enableSorts[i],
     enableFilter: data.enableFilters[i],
     enableInlineFilter: data.enableInlineFilters[i],
-    inColumn: data.inColumn[i]
+    inColumn: data.inColumn[i],
   }));
-  
+
   // Sort by order
   propSummary.sort((a, b) => a.order - b.order);
-  
-  propSummary.forEach(prop => {
-    console.log(`  - ${prop.name} (Widget: ${prop.widget}, Type: ${prop.dataType}${prop.required ? ', Required' : ''}, ColSpan: ${prop.colSpan}, Order: ${prop.order}, Sort: ${prop.enableSort ? 'Enabled' : 'Disabled'}, Filter: ${prop.enableFilter ? 'Enabled' : 'Disabled'}, Inline Filter: ${prop.enableInlineFilter ? 'Enabled' : 'Disabled'}, In Column: ${prop.inColumn === 'true' ? 'Yes' : 'No'})`);
+
+  propSummary.forEach((prop) => {
+    console.log(
+      `  - ${prop.name} (Widget: ${prop.widget}, Type: ${prop.dataType}${prop.required ? ', Required' : ''}, ColSpan: ${prop.colSpan}, Order: ${prop.order}, Sort: ${prop.enableSort ? 'Enabled' : 'Disabled'}, Filter: ${prop.enableFilter ? 'Enabled' : 'Disabled'}, Inline Filter: ${prop.enableInlineFilter ? 'Enabled' : 'Disabled'}, In Column: ${prop.inColumn === 'true' ? 'Yes' : 'No'})`,
+    );
   });
-  
+
   console.log(`Icon: ${data.icon}`);
-  
+
   const confirm = await askQuestion('\nGenerate entity with these settings? (y/n): ', 'y');
   if (confirm.toLowerCase() === 'y') {
     runNxGenerator();
@@ -309,9 +305,9 @@ async function runPrompts() {
 
 // Helper function to ask questions and get answers
 function askQuestion(question, defaultAnswer) {
-  return new Promise(resolve => {
+  return new Promise((resolve) => {
     const prompt = defaultAnswer ? `${question} [${defaultAnswer}] ` : question;
-    
+
     rl.question(prompt, (answer) => {
       // If answer is empty and there's a default, use the default
       const result = answer.trim() === '' && defaultAnswer ? defaultAnswer : answer.trim();
@@ -324,7 +320,7 @@ function askQuestion(question, defaultAnswer) {
 async function selectWidget(prompt) {
   console.log(`\n${prompt}`);
   console.log('Available widgets (you can type to filter):');
-  
+
   // Display widgets by groups
   for (const [groupName, groupWidgets] of Object.entries(widgetGroups)) {
     console.log(`\n${groupName} widgets:`);
@@ -333,17 +329,17 @@ async function selectWidget(prompt) {
       console.log(`  ${(index + 1).toString().padStart(2)}: ${widget} (${widgetKey})`);
     });
   }
-  
+
   // Handling widget selection with filtering
   let selectedWidget = '';
   while (!selectedWidget) {
     const input = await askQuestion('\nEnter widget name or number (or part of name to filter): ');
-    
+
     // Check if input is a number
     if (!isNaN(input) && input > 0 && input <= Object.values(widgetCatalog).length) {
       const allWidgets = Object.values(widgetCatalog);
       selectedWidget = allWidgets[parseInt(input) - 1];
-    } 
+    }
     // Check if input exactly matches a widget name
     else if (Object.values(widgetCatalog).includes(input)) {
       selectedWidget = input;
@@ -354,55 +350,53 @@ async function selectWidget(prompt) {
     }
     // Filter widgets by input
     else {
-      const filteredWidgets = Object.entries(widgetCatalog)
-        .filter(([key, value]) => 
-          key.toLowerCase().includes(input.toLowerCase()) || 
-          value.toLowerCase().includes(input.toLowerCase())
-        );
-      
+      const filteredWidgets = Object.entries(widgetCatalog).filter(
+        ([key, value]) =>
+          key.toLowerCase().includes(input.toLowerCase()) || value.toLowerCase().includes(input.toLowerCase()),
+      );
+
       if (filteredWidgets.length === 1) {
         selectedWidget = filteredWidgets[0][1]; // Pick the only match
-      } 
-      else if (filteredWidgets.length > 1) {
+      } else if (filteredWidgets.length > 1) {
         console.log('\nFiltered widgets:');
         filteredWidgets.forEach(([key, value], index) => {
           console.log(`  ${(index + 1).toString().padStart(2)}: ${value} (${key})`);
         });
-        
+
         const selection = await askQuestion('Select number or continue typing to filter more: ');
         if (!isNaN(selection) && selection > 0 && selection <= filteredWidgets.length) {
           selectedWidget = filteredWidgets[parseInt(selection) - 1][1];
         }
-      } 
-      else {
+      } else {
         console.log('No matches found. Try again.');
       }
     }
   }
-  
+
   return selectedWidget;
 }
 
 // Run the NX generator with collected data
 function runNxGenerator() {
   // Handle special cases and ensure proper formatting
-  
+
   // For empty required array, use "_none_"
-  const requiredValue = data.required.length === 0 ? "_none_" : data.required.join(',');
-  
+  const requiredValue = data.required.length === 0 ? '_none_' : data.required.join(',');
+
   // Ensure single values for colSpans and orders have trailing commas
   let colSpansStr = data.colSpans.join(',');
   if (data.colSpans.length === 1) {
     colSpansStr = colSpansStr + ',';
   }
-  
+
   let ordersStr = data.orders.join(',');
   if (data.orders.length === 1) {
     ordersStr = ordersStr + ',';
   }
-  
+
   // Prepare arguments properly
-  const command = `cd "${projectRoot}" && npx nx g @acorex-platform/generator:create-module-entity` +
+  const command =
+    `cd "${projectRoot}" && npx nx g @acorex-platform/generator:create-module-entity` +
     ` --moduleName=${data.moduleName}` +
     ` --name=${data.name}` +
     ` --properties=${data.properties.join(',')}` +
@@ -416,22 +410,22 @@ function runNxGenerator() {
     ` --enableInlineFilters=${data.enableInlineFilters.join(',')}` +
     ` --inColumn=${data.inColumn.join(',')}` +
     (isDryRun ? ' --dryRun' : '');
-  
+
   console.log(`\nRunning: ${command}`);
-  
+
   try {
     // Execute the command as a shell command to ensure proper environment
     const { execSync } = require('child_process');
-    const options = { 
+    const options = {
       stdio: 'inherit',
-      shell: true 
+      shell: true,
     };
-    
+
     execSync(command, options);
     console.log(`\nGenerator completed successfully`);
   } catch (error) {
     console.error(`\nGenerator failed with error: ${error.message}`);
-    
+
     // Show more detailed error information
     if (error.stderr) {
       console.error(`Error details: ${error.stderr.toString()}`);
@@ -442,7 +436,7 @@ function runNxGenerator() {
 }
 
 // Start the prompts
-runPrompts().catch(err => {
+runPrompts().catch((err) => {
   console.error('An error occurred:', err);
   rl.close();
-}); 
+});

package/src/generators/app-module/files/src/app/app.config.ts.template

@@ -1,5 +1,5 @@
 import { ApplicationConfig, importProvidersFrom } from '@angular/core';
-import { provideRouter, withEnabledBlockingInitialNavigation, withComponentInputBinding, withNavigationErrorHandler, NavigationError, withDebugTracing } from '@angular/router';
+import { provideRouter, withEnabledBlockingInitialNavigation, withComponentInputBinding } from '@angular/router';
 import { appRoutes } from './app.routes';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
@@ -11,19 +11,35 @@ import { AXFormatModule } from '@acorex/core/format';
 import { AXValidationModule } from '@acorex/core/validation';
 import { AXPTranslationRootModule } from './modules/common/translation-root.module';
 import { AXPLayoutRootModule } from './modules/layout/layout-root.module';
-import { AXMSettingsManagementModule } from '@acorex/modules/settings-management';
-import { <%= className %>AuthRootModule } from './modules/auth/auth-root.module';
-import { AXMPlatformManagementModule } from '@acorex/modules/platform-management';
+import { AXCMockModule, AXCUserPassStrategyMock } from '@acorex/connectivity/mock';
+import { AXPAuthModule } from '@acorex/platform/auth';
 import { AXMNotificationManagementModule } from '@acorex/modules/notification-management';
+import { AXMSettingsManagementModule } from '@acorex/modules/settings-management';
+import { AXMHelpDeskModule } from '@acorex/modules/help-desk';
+import { AXMDashboardManagementModule } from '@acorex/modules/dashboard-management';
+import { AXMHumanCapitalManagementModule } from '@acorex/modules/human-capital-management';
 import { AXMFormTemplateManagementModule } from '@acorex/modules/form-template-management';
-import { AXMTextTemplateManagementModule } from '@acorex/modules/text-template-management';
 import { AXMSecurityManagementModule } from '@acorex/modules/security-management';
 import { AXMOrganizationManagementModule } from '@acorex/modules/organization-management';
 import { AXMLogManagementModule } from '@acorex/modules/log-management';
 import { AXMDocumentManagementModule } from '@acorex/modules/document-management';
-import { AXCMockModule } from '@acorex/connectivity/mock';
-import { AXMSampleEntityModule } from './modules/<%= name %>/sample/sample.module';
-import { <%= upperCase(name) %>RootModule } from './modules/<%= name %>/<%= name %>-root.module';
+import { AXMProjectManagementModule } from '@acorex/modules/project-management';
+import { AXMTrainingManagementModule } from '@acorex/modules/training-management';
+import { AXMWorkflowManagementModule } from '@acorex/modules/workflow-management';
+import { AXMContentManagementModule } from '@acorex/modules/content-management';
+import { AXMConversationModule } from '@acorex/modules/conversation';
+import { AXMPlatformManagementModule } from '@acorex/modules/platform-management';
+import { AXMDataManagementModule } from '@acorex/modules/data-management';
+import { AXMReportManagementModule } from '@acorex/modules/report-management';
+import { AXMCalendarManagementModule } from '@acorex/modules/calendar-management';
+import { AXMLocationManagementModule } from '@acorex/modules/location-management';
+import { AXMPartyManagementModule } from '@acorex/modules/party-management';
+import { AXMContactManagementModule } from '@acorex/modules/contact-management';
+import { AXMLocaleManagementModule } from '@acorex/modules/locale-management';
+import { AXMMeetingManagementModule } from '@acorex/modules/meeting-management';
+import { AXMTaskManagementModule } from '@acorex/modules/task-management';
+import { AXMIdentifierManagementModule } from '@acorex/modules/identifier-management';
+import { AXMApplicationManagementModule } from '@acorex/modules/application-management';
 
 import {
     AXPHomePageModule,
@@ -37,12 +53,17 @@ import {
 import { AXPImageUrlLogoConfig } from '@acorex/platform/core';
 
 import { environment } from '../environments/environment';
-import { <%= className %>AppVersionProvider } from './app-version.provider';
-import { AXMCommonModule,AXPGlobalSearchModule } from '@acorex/modules/common';
+import { <%= className %>AppVersionProvider } from './modules/common/app-version.provider';
+import { AXMCommonModule } from '@acorex/modules/common';
+import { AXPGlobalSearchModule } from '@acorex/modules/common';
+import { APP_DEFAULT_SETTINGS_PROVIDERS } from './modules/common/default-settings.providers';
+import { <%= className %>AuthRootModule } from './modules/auth/auth-root.module';
+import { <%= upperCase(name) %>RootModule } from './modules/<%= name %>/<%= name %>-root.module';
 
 
 export const appConfig: ApplicationConfig = {
     providers: [
+        APP_DEFAULT_SETTINGS_PROVIDERS,
         provideHttpClient(withInterceptorsFromDi()),
         provideRouter(appRoutes, withEnabledBlockingInitialNavigation(), withComponentInputBinding()),
         //
@@ -71,7 +92,7 @@ export const appConfig: ApplicationConfig = {
                     light: new AXPImageUrlLogoConfig('assets/images/logos/full-light.svg', 160),
                 },
                 },
-                title: 'Demo',
+                title: '<%= title %>',
                 copyright: '© 2024',
             }),
             },
@@ -90,16 +111,45 @@ export const appConfig: ApplicationConfig = {
             AXValidationModule.forRoot(),
             //
             AXPGlobalSearchModule,
-            AXMSettingsManagementModule,
             //
             AXMCommonModule,
             AXPHomePageModule,
             //
             AXPTranslationRootModule,
             AXPLayoutRootModule,
+            // Management Modules (Mock)
+            AXMSettingsManagementModule,
+            AXMHelpDeskModule,
+            AXMDashboardManagementModule,
+            AXMNotificationManagementModule,
+            AXMFormTemplateManagementModule,
+            AXMSecurityManagementModule,
+            AXMOrganizationManagementModule,
+            AXMHumanCapitalManagementModule,
+            AXMLogManagementModule,
+            AXMDocumentManagementModule,
+            AXMProjectManagementModule,
+            AXMTrainingManagementModule,
+            AXMWorkflowManagementModule,
+            AXMContentManagementModule,
+            AXMConversationModule,
+            AXMPlatformManagementModule,
+            AXMDataManagementModule,
+            AXMReportManagementModule,
+            AXMCalendarManagementModule,
+            AXMLocationManagementModule,
+            AXMPartyManagementModule,
+            AXMContactManagementModule,
+            AXMLocaleManagementModule,
+            AXMMeetingManagementModule,
+            AXMTaskManagementModule,
+            AXMIdentifierManagementModule,
+            AXMApplicationManagementModule,
             //
-            AXMSampleEntityModule,
             AXCMockModule,
+            AXPAuthModule.forRoot({
+                strategies: [AXCUserPassStrategyMock],
+            }),
             //
             <%= upperCase(name) %>RootModule,
             <%= className %>AuthRootModule,

package/src/generators/app-module/files/src/app/basic-interceptor.interceptor.ts.template

@@ -11,21 +11,21 @@ export class BasicInterceptor implements HttpInterceptor {
   private isRefreshing = false;
 
   session = inject(AXPSessionService);
-  token = this.session.getToken();
   router = inject(Router);
 
   intercept(request: HttpRequest<any>, next: HttpHandler): Observable<any> {
+    const token = this.session.getToken();
     let modifiedReq = request.clone();
     if (!(request.body instanceof FormData) && !request.headers.has('Content-Type')) {
       modifiedReq = modifiedReq.clone({ setHeaders: { 'Content-Type': 'application/json' } });
     }
-    if (this.token) {
-      modifiedReq = modifiedReq.clone({ setHeaders: { Authorization: `Bearer ${this.token}` } });
+    if (token) {
+      modifiedReq = modifiedReq.clone({ setHeaders: { Authorization: `Bearer ${token}` } });
     }
 
     return next.handle(modifiedReq).pipe(
       catchError((error: HttpErrorResponse) => {
-        if (error.status === 401 && !this.isRefreshing && this.token) {
+        if (error.status === 401 && !this.isRefreshing && token) {
           return this.handle401Error(modifiedReq, next);
         } else {
           return throwError(() => error);