Merge branch 'next' into next

chavda-bhavik · web-flow · commit 8c8cc26b0b98 · 2024-09-21T17:35:21.000+05:30
diff --git a/apps/api/package.json b/apps/api/package.json
@@ -19,9 +19,10 @@
     "test": "cross-env TZ=UTC NODE_ENV=test E2E_RUNNER=true mocha --timeout 10000 --require ts-node/register --exit src/**/**/*.spec.ts"
   },
   "dependencies": {
-    "@impler/dal": "^0.24.1",
-    "@impler/services": "^0.24.1",
-    "@impler/shared": "^0.24.1",
+    "@impler/client": "workspace:^",
+    "@impler/dal": "workspace:^",
+    "@impler/services": "workspace:^",
+    "@impler/shared": "workspace:^",
     "@nestjs/common": "^9.1.2",
     "@nestjs/core": "^9.1.2",
     "@nestjs/jwt": "^10.0.1",
diff --git a/apps/api/src/app/column/commands/add-column.command.ts b/apps/api/src/app/column/commands/add-column.command.ts
@@ -1,4 +1,5 @@
-import { ColumnDelimiterEnum, ColumnTypesEnum, ValidatorTypesEnum } from '@impler/shared';
+import { ValidatorTypesEnum } from '@impler/client';
+import { ColumnDelimiterEnum, ColumnTypesEnum } from '@impler/shared';
 
 export class ValidatorCommand {
   validate: ValidatorTypesEnum;
diff --git a/apps/api/src/app/column/dtos/column-request.dto.ts b/apps/api/src/app/column/dtos/column-request.dto.ts
@@ -12,10 +12,12 @@ import {
   ValidateNested,
 } from 'class-validator';
 import { Type } from 'class-transformer';
+
+import { ValidatorTypesEnum } from '@impler/client';
 import { IsValidRegex } from '@shared/framework/is-valid-regex.validator';
-import { IsNumberOrString } from '@shared/framework/number-or-string.validator';
-import { ColumnDelimiterEnum, ColumnTypesEnum, Defaults, ValidatorTypesEnum } from '@impler/shared';
 import { IsGreaterThan } from '@shared/framework/is-greator-than.validator';
+import { IsNumberOrString } from '@shared/framework/number-or-string.validator';
+import { ColumnDelimiterEnum, ColumnTypesEnum, Defaults } from '@impler/shared';
 
 export class ValidatorDto {
   @ApiProperty({
diff --git a/apps/api/src/app/review/usecases/do-review/base-review.usecase.ts b/apps/api/src/app/review/usecases/do-review/base-review.usecase.ts
@@ -8,15 +8,9 @@ import * as customParseFormat from 'dayjs/plugin/customParseFormat';
 import Ajv, { AnySchemaObject, ErrorObject, ValidateFunction } from 'ajv';
 
 import { ValidatorErrorMessages } from '@shared/types/review.types';
+import { ColumnTypesEnum, Defaults, ITemplateSchemaItem } from '@impler/shared';
 import { SManager, BATCH_LIMIT, MAIN_CODE, ExecuteIsolateResult } from '@shared/services/sandbox';
-import {
-  ColumnTypesEnum,
-  Defaults,
-  ITemplateSchemaItem,
-  LengthValidatorType,
-  RangeValidatorType,
-  ValidatorTypesEnum,
-} from '@impler/shared';
+import { ValidatorTypesEnum, LengthValidatorType, RangeValidatorType } from '@impler/client';
 
 dayjs.extend(customParseFormat);
 
@@ -193,10 +187,6 @@ export class BaseReview {
     let field: string;
 
     return errors.reduce((obj, error) => {
-      if (error.keyword === 'required') field = error.params.missingProperty;
-      else [, field] = error.instancePath.split('/');
-
-      field = field.replace(/~1/g, '/');
       if (!!uniqueCombinations[error.keyword]) {
         uniqueCombinations[error.keyword].forEach((columnKey) => {
           obj[columnKey] = this.getMessage({
@@ -208,7 +198,11 @@ export class BaseReview {
             validatorErrorMessages,
           });
         });
-      } else
+      } else {
+        if (error.keyword === 'required') field = error.params.missingProperty;
+        else [, , field] = error.instancePath.split('/');
+
+        field = field.replace(/~1/g, '/');
         obj[field] = this.getMessage({
           error,
           data: error.data,
@@ -217,6 +211,7 @@ export class BaseReview {
           uniqueCombinations,
           validatorErrorMessages,
         });
+      }
 
       return obj;
     }, {});
diff --git a/apps/api/src/app/review/usecases/do-review/do-review.usecase.ts b/apps/api/src/app/review/usecases/do-review/do-review.usecase.ts
@@ -3,8 +3,9 @@ import { Writable } from 'stream';
 import { Injectable, BadRequestException, InternalServerErrorException } from '@nestjs/common';
 
 import { APIMessages } from '@shared/constants';
-import { EMAIL_SUBJECT, ValidatorTypesEnum } from '@impler/shared';
+import { EMAIL_SUBJECT } from '@impler/shared';
 import { BaseReview } from './base-review.usecase';
+import { ValidatorTypesEnum } from '@impler/client';
 import { BATCH_LIMIT } from '@shared/services/sandbox';
 import { StorageService, PaymentAPIService, EmailService } from '@impler/services';
 import { ColumnTypesEnum, UploadStatusEnum, ITemplateSchemaItem, ColumnDelimiterEnum } from '@impler/shared';
diff --git a/apps/api/src/app/review/usecases/do-review/re-review-data.usecase.ts b/apps/api/src/app/review/usecases/do-review/re-review-data.usecase.ts
@@ -3,14 +3,14 @@ import { Writable } from 'stream';
 import { ValidateFunction } from 'ajv';
 import { Injectable, BadRequestException, InternalServerErrorException } from '@nestjs/common';
 
+import { ValidatorTypesEnum } from '@impler/client';
 import { UploadRepository, ValidatorRepository, DalService, TemplateEntity } from '@impler/dal';
 import {
-  ColumnDelimiterEnum,
+  EMAIL_SUBJECT,
   ColumnTypesEnum,
-  ITemplateSchemaItem,
   UploadStatusEnum,
-  EMAIL_SUBJECT,
-  ValidatorTypesEnum,
+  ColumnDelimiterEnum,
+  ITemplateSchemaItem,
 } from '@impler/shared';
 
 import { APIMessages } from '@shared/constants';
@@ -69,7 +69,7 @@ export class DoReReview extends BaseReview {
     });
 
     const columns = JSON.parse(uploadInfo.customSchema) as ITemplateSchemaItem[];
-    const uniqueFieldsSet = new Set(...columns.filter((column) => column.isUnique).map((column) => column.key));
+    const uniqueFieldsSet = new Set(columns.filter((column) => column.isUnique).map((column) => column.key));
     const multiSelectColumnHeadings: Record<string, string> = {};
     const validatorErrorMessages = {};
     (columns as ITemplateSchemaItem[]).forEach((column) => {
@@ -205,6 +205,7 @@ export class DoReReview extends BaseReview {
     validator,
     dateFormats,
     uniqueCombinations,
+    validatorErrorMessages,
     multiSelectColumnHeadings,
   }: {
     uploadId: string;
@@ -231,6 +232,7 @@ export class DoReReview extends BaseReview {
         dateFormats,
         uniqueCombinations,
         index: record.index,
+        validatorErrorMessages,
         passRecord: record.record,
       });
       response.totalRecords++;
diff --git a/apps/queue-manager/package.json b/apps/queue-manager/package.json
@@ -16,9 +16,9 @@
     "lint:fix": "pnpm lint -- --fix"
   },
   "dependencies": {
-    "@impler/dal": "^0.24.1",
-    "@impler/services": "^0.24.1",
-    "@impler/shared": "^0.24.1",
+    "@impler/dal": "workspace:^",
+    "@impler/services": "workspace:^",
+    "@impler/shared": "workspace:^",
     "@sentry/node": "^7.112.2",
     "axios": "1.6.2",
     "dotenv": "^16.0.2",
diff --git a/apps/web/components/imports/forms/ColumnForm.tsx b/apps/web/components/imports/forms/ColumnForm.tsx
@@ -14,7 +14,8 @@ import {
   useMantineColorScheme,
 } from '@mantine/core';
 
-import { ColumnTypesEnum, DEFAULT_VALUES, IColumn, ValidatorTypesEnum } from '@impler/shared';
+import { ValidatorTypesEnum } from '@impler/client';
+import { ColumnTypesEnum, DEFAULT_VALUES, IColumn } from '@impler/shared';
 import { colors, DELIMITERS, MODAL_KEYS, MODAL_TITLES, DOCUMENTATION_REFERENCE_LINKS } from '@config';
 
 import { Button } from '@ui/button';
@@ -363,7 +364,7 @@ export function ColumnForm({ onSubmit, data, isLoading }: ColumnFormProps) {
                 index={fields.findIndex((field) => field.validate === ValidatorTypesEnum.UNIQUE_WITH)}
                 onCheckToggle={(status, index) => {
                   if (status) {
-                    append({ validate: ValidatorTypesEnum.UNIQUE_WITH });
+                    append({ validate: ValidatorTypesEnum.UNIQUE_WITH, uniqueKey: '' });
                   } else {
                     remove(index);
                   }
diff --git a/apps/web/components/imports/schema/ValidationsGroup.tsx b/apps/web/components/imports/schema/ValidationsGroup.tsx
@@ -1,7 +1,8 @@
-import { ColumnTypesEnum, IColumn, ValidatorTypesEnum } from '@impler/shared';
 import { Group } from '@mantine/core';
 import { Badge } from '@ui/badge';
 import { getColorForText } from '@shared/utils';
+import { ValidatorTypesEnum } from '@impler/client';
+import { ColumnTypesEnum, IColumn } from '@impler/shared';
 
 interface IValidationsGroupProps {
   item: IColumn;
@@ -54,7 +55,7 @@ export function ValidationsGroup({ item }: IValidationsGroupProps) {
       {item.validators?.map((validator) => {
         if (validator.validate === ValidatorTypesEnum.UNIQUE_WITH) {
           return (
-            <Badge variant="filled" key={ValidatorTypesEnum.UNIQUE_WITH} color={getColorForText(validator.uniqueKey!)}>
+            <Badge variant="filled" key={ValidatorTypesEnum.UNIQUE_WITH} color={getColorForText(validator.uniqueKey)}>
               Unique with: {validator.uniqueKey}
             </Badge>
           );
diff --git a/apps/web/design-system/auto-height-component/AutoHeightComponent.tsx b/apps/web/design-system/auto-height-component/AutoHeightComponent.tsx
@@ -31,7 +31,7 @@ export const AutoHeightComponent: React.FC<AutoHeightComponentProps> = ({ isVisi
   };
 
   return (
-    <Collapse in={isExpanded} onTransitionEnd={handleTransitionEnd}>
+    <Collapse in={isExpanded} onTransitionEnd={handleTransitionEnd} w="100%">
       {isRendered && children}
     </Collapse>
   );
diff --git a/apps/web/design-system/validator/Validator.stories.tsx b/apps/web/design-system/validator/Validator.stories.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Validator } from './Validator';
-import { ValidatorTypesEnum } from '@impler/shared';
+import { ValidatorTypesEnum } from '@impler/client';
 import { ComponentStory, ComponentMeta } from '@storybook/react';
 
 export default {
diff --git a/apps/web/design-system/validator/Validator.tsx b/apps/web/design-system/validator/Validator.tsx
@@ -10,9 +10,10 @@ import { AutoHeightComponent } from '@ui/auto-height-component';
 import { ROUTES } from '@config';
 import { Badge } from '@ui/badge';
 import { Button } from '@ui/button';
+import { IColumn } from '@impler/shared';
 import { LockIcon } from '@assets/icons/Lock.icon';
+import { ValidatorTypesEnum } from '@impler/client';
 import { TooltipLabel } from '@components/guide-point';
-import { IColumn, ValidatorTypesEnum } from '@impler/shared';
 
 import useStyles from './Validator.styles';
 import { MinMaxValidator } from './MinMaxValidator';
diff --git a/apps/web/package.json b/apps/web/package.json
@@ -19,6 +19,7 @@
     "@amplitude/analytics-browser": "^2.0.1",
     "@emotion/react": "^11.10.5",
     "@emotion/server": "^11.10.0",
+    "@impler/client": "workspace:^",
     "@impler/react": "workspace:^",
     "@impler/shared": "workspace:^",
     "@mantine/carousel": "6.0.21",
diff --git a/apps/web/pages/imports/[id].tsx b/apps/web/pages/imports/[id].tsx
@@ -62,7 +62,9 @@ export default function ImportDetails({}) {
       name: 'IMPORT CLICK',
       properties: {},
     });
-    showWidget({ colorScheme });
+    showWidget({
+      colorScheme,
+    });
   };
 
   return (
diff --git a/apps/widget/package.json b/apps/widget/package.json
@@ -40,8 +40,8 @@
 		"@craco/craco": "^6.4.5",
 		"@emotion/react": "^11.10.5",
 		"@handsontable/react": "^14.1.0",
-		"@impler/client": "^0.24.1",
-		"@impler/shared": "^0.24.1",
+		"@impler/client": "workspace:^",
+		"@impler/shared": "workspace:^",
 		"@mantine/core": "6.0.21",
 		"@mantine/dropzone": "6.0.21",
 		"@mantine/hooks": "6.0.21",
diff --git a/libs/dal/package.json b/libs/dal/package.json
@@ -16,7 +16,7 @@
     "lint:fix": "eslint src --fix"
   },
   "dependencies": {
-    "@impler/shared": "^0.24.1",
+    "@impler/shared": "workspace:^",
     "class-transformer": "^0.5.1",
     "date-fns": "^2.30.0",
     "mongoose": "8.0.1",
diff --git a/libs/services/package.json b/libs/services/package.json
@@ -31,7 +31,7 @@
     "@aws-sdk/client-ses": "^3.616.0",
     "@aws-sdk/lib-storage": "^3.360.0",
     "@aws-sdk/s3-request-presigner": "^3.276.0",
-    "@impler/shared": "^0.24.1",
+    "@impler/shared": "workspace:^",
     "axios": "1.6.2",
     "nodemailer": "^6.9.14",
     "uuid": "^9.0.0"
diff --git a/libs/shared/src/entities/Column/Column.interface.ts b/libs/shared/src/entities/Column/Column.interface.ts
@@ -1,30 +1,4 @@
-export enum ValidatorTypesEnum {
-  RANGE = 'range',
-  LENGTH = 'length',
-  UNIQUE_WITH = 'unique_with',
-}
-
-export type RangeValidatorType = {
-  validate: ValidatorTypesEnum.RANGE;
-  min?: number;
-  max?: number;
-  errorMessage?: string;
-};
-
-export type LengthValidatorType = {
-  validate: ValidatorTypesEnum.LENGTH;
-  min?: number;
-  max?: number;
-  errorMessage?: string;
-};
-
-export type UniqueWithValidatorType = {
-  validate: ValidatorTypesEnum.UNIQUE_WITH;
-  uniqueKey?: string;
-  errorMessage?: string;
-};
-
-export type ValidatorType = RangeValidatorType | LengthValidatorType | UniqueWithValidatorType;
+import { ValidatorType } from '@impler/client';
 
 export interface IColumn {
   _id: string;
diff --git a/libs/shared/src/types/column/column.types.ts b/libs/shared/src/types/column/column.types.ts
@@ -1,4 +1,4 @@
-import { ValidatorType } from '../../entities';
+import { ValidatorType } from '@impler/client';
 
 export enum ColumnTypesEnum {
   'STRING' = 'String',
diff --git a/packages/angular/src/index.ts b/packages/angular/src/index.ts
@@ -1,3 +1,3 @@
 export * from './services';
-export { ColumnTypes, EventTypes } from '@impler/client';
+export { ColumnTypes, EventTypes, ValidatorTypes } from '@impler/client';
 export type { CustomTexts, ISchemaItem, EventCalls } from '@impler/client';
diff --git a/packages/client/src/types.ts b/packages/client/src/types.ts
diff --git a/packages/react/src/index.ts b/packages/react/src/index.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
