Merging Next Into --> Main (#1065)

Author: thisismayuresh

apps/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@impler/api",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "author": "implerhq",
   "license": "MIT",
   "private": true,

apps/api/src/app/column/dtos/column-request.dto.ts

@@ -15,6 +15,7 @@ import { Type } from 'class-transformer';
 
 import { ValidationTypesEnum } from '@impler/client';
 import { IsValidRegex } from '@shared/framework/is-valid-regex.validator';
+import { IsValidDigitsConstraint } from '@shared/framework/is-valid-digits.validator';
 import { IsNumberOrString } from '@shared/framework/number-or-string.validator';
 import { ColumnDelimiterEnum, ColumnTypesEnum, Defaults } from '@impler/shared';
 
@@ -36,17 +37,25 @@ export class ValidationDto {
   errorMessage?: string;
 
   @ApiPropertyOptional({
-    description: 'Minimum value',
+    description: 'Minimum value for digit validation',
   })
   @IsNumber()
   @IsOptional()
+  @ValidateIf((object) => object.validate === ValidationTypesEnum.DIGITS)
+  @Validate(IsValidDigitsConstraint, {
+    message: 'Invalid number of digits',
+  })
   min?: number;
 
   @ApiPropertyOptional({
-    description: 'Maximum value',
+    description: 'Maximum value for digit validation',
   })
   @IsNumber()
   @IsOptional()
+  @ValidateIf((object) => object.validate === ValidationTypesEnum.DIGITS)
+  @Validate(IsValidDigitsConstraint, {
+    message: 'Invalid number of digits',
+  })
   max?: number;
 
   @ApiPropertyOptional({

apps/api/src/app/review/usecases/do-review/base-review.usecase.ts

@@ -1,3 +1,4 @@
+/* eslint-disable multiline-comment-style */
 import * as fs from 'fs';
 import * as dayjs from 'dayjs';
 import * as Papa from 'papaparse';
@@ -10,7 +11,7 @@ import Ajv, { AnySchemaObject, ErrorObject, ValidateFunction } from 'ajv';
 import { ValidationErrorMessages } from '@shared/types/review.types';
 import { ColumnTypesEnum, Defaults, ITemplateSchemaItem } from '@impler/shared';
 import { SManager, BATCH_LIMIT, MAIN_CODE, ExecuteIsolateResult } from '@shared/services/sandbox';
-import { ValidationTypesEnum, LengthValidationType, RangeValidationType } from '@impler/client';
+import { ValidationTypesEnum, LengthValidationType, RangeValidationType, DigitsValidationType } from '@impler/client';
 
 dayjs.extend(customParseFormat);
 
@@ -112,6 +113,9 @@ export class BaseReview {
     const lengthValidation = column.validations?.find(
       (validation) => validation.validate === ValidationTypesEnum.LENGTH
     ) as LengthValidationType;
+    const digitsValidation = column.validations?.find(
+      (validation) => validation.validate === ValidationTypesEnum.DIGITS
+    ) as DigitsValidationType;
 
     switch (column.type) {
       case ColumnTypesEnum.STRING:
@@ -122,15 +126,31 @@ export class BaseReview {
         };
         break;
       case ColumnTypesEnum.NUMBER:
-      case ColumnTypesEnum.DOUBLE:
+      case ColumnTypesEnum.DOUBLE: {
+        const isInteger = column.type === ColumnTypesEnum.NUMBER;
+
         property = {
-          ...(column.type === ColumnTypesEnum.NUMBER && { multipleOf: 1 }),
           type: ['number', 'null'],
           ...(!column.isRequired && { default: null }),
+
+          // only enforce integer for NUMBER
+          //...(isInteger && { multipleOf: 1 }),
+
+          // normal range validation (applies to both)
           ...(typeof rangeValidation?.min === 'number' && { minimum: rangeValidation?.min }),
           ...(typeof rangeValidation?.max === 'number' && { maximum: rangeValidation?.max }),
+
+          // digit validation (only for NUMBER)
+          ...(isInteger &&
+            digitsValidation && {
+              digitCount: {
+                ...(typeof digitsValidation.min === 'number' && { min: digitsValidation.min }),
+                ...(typeof digitsValidation.max === 'number' && { max: digitsValidation.max }),
+              },
+            }),
         };
         break;
+      }
       case ColumnTypesEnum.SELECT:
       case ColumnTypesEnum.IMAGE:
         const selectValues =
@@ -263,6 +283,30 @@ export class BaseReview {
           validationErrorMessages?.[field]?.[ValidationTypesEnum.RANGE] ||
           `${String(data)} must be greater than or equal to ${error.params.limit}`;
         break;
+      case error.keyword === 'digitCount': {
+        const customMessage = validationErrorMessages?.[field]?.[ValidationTypesEnum.DIGITS];
+        if (customMessage) {
+          message = customMessage;
+        } else {
+          const minDigits = error.parentSchema.digitCount.min;
+          const maxDigits = error.parentSchema.digitCount.max;
+
+          if (minDigits !== undefined && maxDigits !== undefined) {
+            if (minDigits === maxDigits) {
+              message = `Must have exactly ${minDigits} digits`;
+            } else {
+              message = `Must have between ${minDigits} and ${maxDigits} digits`;
+            }
+          } else if (minDigits !== undefined) {
+            message = `Must have at least ${minDigits} digits`;
+          } else if (maxDigits !== undefined) {
+            message = `Must have at most ${maxDigits} digits`;
+          } else {
+            message = 'Invalid number of digits';
+          }
+        }
+        break;
+      }
       // empty string case
       case error.keyword === 'emptyCheck':
       case error.keyword === 'required':
@@ -548,6 +592,25 @@ export class BaseReview {
       },
     });
 
+    ajv.addKeyword({
+      keyword: 'digitCount',
+      type: 'number',
+      schemaType: 'object',
+      // schema = { min: number, max: number }
+      validate: (schema: { min?: number; max?: number }, data: number) => {
+        if (data === null || data === undefined) return true;
+
+        // Count digits (ignore sign and decimal part)
+        const digits = Math.floor(Math.log10(Math.abs(data))) + 1;
+
+        if (schema.min !== undefined && digits < schema.min) return false;
+        if (schema.max !== undefined && digits > schema.max) return false;
+
+        return true;
+      },
+      errors: true,
+    });
+
     const valuesMap = new Map();
     Object.keys(uniqueCombinations).forEach((keyword) => {
       valuesMap.set(keyword, new Set());

apps/api/src/app/shared/framework/is-valid-digits.validator.ts

@@ -0,0 +1,45 @@
+/* eslint-disable multiline-comment-style */
+import { ValidatorConstraint, ValidatorConstraintInterface, ValidationArguments } from 'class-validator';
+
+@ValidatorConstraint({ name: 'isValidDigits', async: false })
+export class IsValidDigitsConstraint implements ValidatorConstraintInterface {
+  validate(value: any, args: ValidationArguments) {
+    if (value === undefined || value === null || value === '') {
+      return true;
+    }
+
+    const strValue = String(value).replace(/[^0-9]/g, '');
+
+    if (strValue === '' || isNaN(Number(strValue))) {
+      return false;
+    }
+
+    const validation = args.object as any;
+    const numDigits = strValue.length;
+
+    // if (validation.min !== undefined && numDigits < validation.min) {
+    //   console.log(`Validation failed: Number has fewer than ${validation.min} digits`);
+    //   return false;
+    // }
+
+    if (validation.max !== undefined && numDigits > validation.max) {
+      return false;
+    }
+
+    return true;
+  }
+
+  defaultMessage(args: ValidationArguments) {
+    const validation = args.object as any;
+
+    if (validation.min !== undefined && validation.max !== undefined) {
+      return `Number must have between ${validation.min} and ${validation.max} digits`;
+    } else if (validation.min !== undefined) {
+      return `Number must have at least ${validation.min} digits`;
+    } else if (validation.max !== undefined) {
+      return `Number must have at most ${validation.max} digits`;
+    }
+
+    return 'Invalid number of digits';
+  }
+}

apps/api/src/app/template/usecases/update-template-columns/update-template-columns.usecase.ts

@@ -4,7 +4,7 @@ import { APIMessages } from '@shared/constants';
 import { PaymentAPIService } from '@impler/services';
 import { UpdateImageColumns, SaveSampleFile } from '@shared/usecases';
 import { AVAILABLE_BILLABLEMETRIC_CODE_ENUM, ColumnTypesEnum } from '@impler/shared';
-import { ColumnRepository, CustomizationRepository, TemplateRepository } from '@impler/dal';
+import { ColumnEntity, ColumnRepository, CustomizationRepository, TemplateRepository } from '@impler/dal';
 import { AddColumnCommand } from 'app/column/commands/add-column.command';
 import { UniqueColumnException } from '@shared/exceptions/unique-column.exception';
 import { UpdateCustomization } from '../update-customization/update-customization.usecase';
@@ -25,10 +25,19 @@ export class UpdateTemplateColumns {
   async execute(userColumns: AddColumnCommand[], _templateId: string, email: string) {
     await this.checkSchema(userColumns, email);
 
+    // eslint-disable-next-line prefer-const
+    let userInitialColumns: ColumnEntity[] = await this.columnRepository.find({ _templateId });
     await this.columnRepository.deleteMany({ _templateId });
     userColumns.forEach((column, index) => {
+      const existingUserColumns = userInitialColumns.find((col: ColumnEntity) => col.key === column.key);
+
       column.sequence = index;
       column.dateFormats = column.dateFormats?.map((format) => format.toUpperCase()) || [];
+      column.isRequired = existingUserColumns?.isRequired || false;
+      column.isUnique = existingUserColumns?.isUnique || false;
+      column.selectValues = existingUserColumns?.selectValues || [];
+      column.dateFormats = existingUserColumns?.dateFormats || [];
+      column.validations = existingUserColumns?.validations || [];
     });
     const columns = await this.columnRepository.createMany(userColumns);
     await this.saveSampleFile.execute(columns, _templateId);

apps/queue-manager/Dockerfile

@@ -31,4 +31,4 @@ RUN cp src/.env.production dist/.env.production
 
 EXPOSE 3000
 
-CMD [ "pm2-runtime", "/usr/src/app/apps/queue-manager/dist/index.js" ]
+CMD [ "pm2-runtime", "/usr/src/app/apps/queue-manager/dist/index.js" ]

apps/queue-manager/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@impler/queue-manager",
-  "version": "1.5.0",
+  "version": "1.6.0",
   "author": "implerhq",
   "license": "MIT",
   "private": true,

apps/web/.storybook/preview.tsx

@@ -3,14 +3,11 @@ import { themes } from '@storybook/theming';
 import { MantineProvider, ColorSchemeProvider } from '@mantine/core';
 // @ts-ignore
 import { mantineConfig } from '@config';
-import { useDarkMode } from 'storybook-dark-mode';
 
 function ThemeWrapper(props: { children: React.ReactNode }) {
-  const colorScheme = useDarkMode() ? 'dark' : 'light';
-
   return (
-    <ColorSchemeProvider colorScheme={colorScheme} toggleColorScheme={() => {}}>
-      <MantineProvider theme={{ ...mantineConfig, colorScheme }} withGlobalStyles withNormalizeCSS>
+    <ColorSchemeProvider colorScheme={'dark'} toggleColorScheme={() => {}}>
+      <MantineProvider theme={{ ...mantineConfig, colorScheme: 'dark' }} withGlobalStyles withNormalizeCSS>
         {props.children}
       </MantineProvider>
     </ColorSchemeProvider>

apps/web/assets/icons/DrawerLeftClose.icon.tsx

@@ -0,0 +1,13 @@
+import { IconType } from '@types';
+import { IconSizes } from 'config';
+
+export const DrawerLeftCloseIcon = ({ size = 'sm' }: IconType) => {
+  return (
+    <svg width={IconSizes[size]} height={IconSizes[size]} xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+      <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2">
+        <rect width="18" height="18" x="3" y="3" rx="2" />
+        <path d="M9 3v18m7-6l-3-3l3-3" />
+      </g>
+    </svg>
+  );
+};

apps/web/assets/icons/DrawerRightOpen.icon.tsx

@@ -0,0 +1,19 @@
+import { IconType } from '@types';
+import { IconSizes } from 'config';
+
+export const DrawerRightOpenIcon = ({ size = 'sm' }: IconType) => {
+  return (
+    <svg
+      width={IconSizes[size]}
+      height={IconSizes[size]}
+      viewBox="0 0 24 24"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2">
+        <rect width="18" height="18" x="3" y="3" rx="2" />
+        <path d="M15 3v18M8 9l3 3l-3 3" />
+      </g>
+    </svg>
+  );
+};