V0.30.0 (#960)

Author: chavda-bhavik

.github/workflows/test-build.yml

@@ -24,15 +24,15 @@ jobs:
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Setup kernel for react native, increase watchers
         run: echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
       - uses: actions/setup-node@v2
         with:
           node-version: '20.13.1'
 
       - name: Cache pnpm modules
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.pnpm-store
           key: ${{ runner.os }}-${{ hashFiles('**/pnpm-lock.yaml') }}

apps/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@impler/api",
-  "version": "0.29.0",
+  "version": "0.30.0",
   "author": "implerhq",
   "license": "MIT",
   "private": true,
@@ -16,6 +16,9 @@
     "lint": "eslint src",
     "lint:fix": "pnpm lint -- --fix",
     "migration": "cross-env NODE_ENV=local MIGRATION=true ts-node --require tsconfig-paths/register --transpileOnly",
+    "migration:prod": "cross-env NODE_ENV=prod MIGRATION=true ts-node --require tsconfig-paths/register --transpileOnly",
+    "migration:dev": "cross-env NODE_ENV=dev MIGRATION=true ts-node --require tsconfig-paths/register --transpileOnly",
+    "migration:test": "cross-env NODE_ENV=test MIGRATION=true ts-node --require tsconfig-paths/register --transpileOnly",
     "test": "cross-env TZ=UTC NODE_ENV=test E2E_RUNNER=true mocha --timeout 10000 --require ts-node/register --exit"
   },
   "dependencies": {

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

@@ -15,7 +15,6 @@ import { Type } from 'class-transformer';
 
 import { ValidationTypesEnum } from '@impler/client';
 import { IsValidRegex } from '@shared/framework/is-valid-regex.validator';
-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';
 
@@ -48,9 +47,6 @@ export class ValidationDto {
   })
   @IsNumber()
   @IsOptional()
-  @IsGreaterThan('min', {
-    message: 'max must be greater than min',
-  })
   max?: number;
 
   @ApiPropertyOptional({

apps/api/src/migrations/resend-webhook-data/resend-webhook-data.migration.ts

@@ -0,0 +1,61 @@
+/**
+ * Migration Script:
+ * - Finds uploads stuck in 'PROCESSING' status
+ * - Republishes them to the END_IMPORT queue to restart processing
+ */
+
+import '../../config';
+import { AppModule } from '../../app.module';
+import { NestFactory } from '@nestjs/core';
+import { UploadStatusEnum, QueuesEnum } from '@impler/shared';
+import { UploadRepository, TemplateRepository } from '@impler/dal';
+import { QueueService } from '@shared/services/queue.service';
+
+async function run() {
+  console.log('Starting migration: reprocessing uploads in PROCESSING state');
+
+  const app = await NestFactory.create(AppModule, { logger: false });
+
+  try {
+    const uploadRepository = app.get(UploadRepository);
+    const templateRepository = app.get(TemplateRepository);
+    const queueService = app.get(QueueService);
+
+    const processingUploads = await uploadRepository.find({
+      status: UploadStatusEnum.PROCESSING,
+    });
+
+    if (!processingUploads.length) {
+      console.log('No uploads found in PROCESSING state.');
+
+      return;
+    }
+
+    console.log(`Found ${processingUploads.length} uploads. Republishing to queue.`);
+
+    for (const upload of processingUploads) {
+      const template = await templateRepository.findOne({ _id: upload._templateId });
+
+      if (template?.destination) {
+        queueService.publishToQueue(QueuesEnum.END_IMPORT, {
+          uploadId: upload._id,
+          uploadedFileId: upload._uploadedFileId,
+          destination: template.destination,
+        });
+
+        console.log(`Send upload ${upload._id} to destination ${template.destination}`);
+      } else {
+        console.warn(`No destination found for upload ${upload._id}`);
+      }
+    }
+
+    console.log('Migration completed.');
+  } catch (error) {
+    console.error('Migration failed:', error);
+  } finally {
+    await app.close();
+    process.exit(0);
+  }
+}
+
+run();

apps/queue-manager/package.json

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

apps/queue-manager/src/consumers/base.consumer.ts

@@ -60,6 +60,7 @@ export abstract class BaseConsumer {
       return baseResponse;
     } catch (error) {
       baseResponse.status = StatusEnum.FAILED;
+      console.log(error);
       if (axios.isAxiosError(error)) {
         if (error.response) {
           const formattedError = error.toJSON() as any;

apps/queue-manager/src/consumers/send-import-job-data.consumer.ts

@@ -173,6 +173,7 @@ export class SendImportJobDataConsumer extends BaseConsumer {
       multiSelectHeadings,
       extra: userJob.extra,
       name: templateData.name,
+      projectId: templateData._projectId,
       _templateId: userJob._templateId,
       authHeaderValue: userJob.authHeaderValue,
       callbackUrl: webhookDestination?.callbackUrl,

apps/queue-manager/src/consumers/send-webhook-data.consumer.ts

@@ -20,6 +20,7 @@ import {
   WebhookLogRepository,
   WebhookDestinationRepository,
   FailedWebhookRetryRequestsRepository,
+  EnvironmentRepository,
 } from '@impler/dal';
 
 import { BaseConsumer } from './base.consumer';
@@ -40,6 +41,7 @@ export class SendWebhookDataConsumer extends BaseConsumer {
   private emailService: EmailService = getEmailServiceClass();
   private failedWebhookRetryRequestsRepository: FailedWebhookRetryRequestsRepository =
     new FailedWebhookRetryRequestsRepository();
+  private environmentRepository: EnvironmentRepository = new EnvironmentRepository();
 
   async message(message: { content: string }) {
     const data = JSON.parse(message.content) as SendWebhookData;
@@ -91,9 +93,9 @@ export class SendWebhookDataConsumer extends BaseConsumer {
 
       await this.makeResponseEntry({
         data: response,
+        projectId: cachedData.projectId,
         importName: cachedData.name,
         url: cachedData.callbackUrl,
-        userEmail: cachedData.email,
         retryInterval: cachedData.retryInterval,
         retryCount: cachedData.retryCount,
         allData,
@@ -207,6 +209,7 @@ export class SendWebhookDataConsumer extends BaseConsumer {
 
     return {
       _templateId: uploadata._templateId,
+      projectId: templateData._projectId,
       callbackUrl: webhookDestination?.callbackUrl,
       chunkSize: webhookDestination?.chunkSize,
       name: templateData.name,
@@ -230,22 +233,26 @@ export class SendWebhookDataConsumer extends BaseConsumer {
   private async makeResponseEntry({
     data,
     importName,
+    projectId,
     url,
     allData,
-    userEmail,
     retryInterval,
     retryCount,
   }: {
     data: Partial<WebhookLogEntity>;
     importName: string;
+    projectId: string;
     url: string;
-    userEmail: string;
     retryCount?: number;
     retryInterval?: number;
     allData: Record<string, any>;
   }) {
     const webhookLog = await this.webhookLogRepository.create(data);
     if (data.status === StatusEnum.FAILED) {
+      const environment = await this.environmentRepository.getProjectTeamMembers(projectId);
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      const teamMemberEmails = environment.map((teamMember) => teamMember._userId.email);
       const emailContents = this.emailService.getEmailContent({
         type: 'ERROR_SENDING_WEBHOOK_DATA',
         data: {
@@ -256,13 +263,14 @@ export class SendWebhookDataConsumer extends BaseConsumer {
           importId: data._uploadId,
         },
       });
-
-      await this.emailService.sendEmail({
-        to: userEmail,
-        subject: `${EMAIL_SUBJECT.ERROR_SENDING_WEBHOOK_DATA} ${importName}`,
-        html: emailContents,
-        from: process.env.ALERT_EMAIL_FROM,
-        senderName: process.env.EMAIL_FROM_NAME,
+      teamMemberEmails.forEach(async (email) => {
+        await this.emailService.sendEmail({
+          to: email,
+          subject: `${EMAIL_SUBJECT.ERROR_SENDING_WEBHOOK_DATA} ${importName}`,
+          html: emailContents,
+          from: process.env.ALERT_EMAIL_FROM,
+          senderName: process.env.EMAIL_FROM_NAME,
+        });
       });
 
       if (retryCount && retryInterval) {

apps/web/components/ConfirmationModal/ConfirmationModal.tsx

@@ -1,17 +1,19 @@
 import React from 'react';
-import Lottie from 'lottie-react';
+import dynamic from 'next/dynamic';
 import { modals } from '@mantine/modals';
 import { colors, CONSTANTS } from '@config';
 import { Stack, Text } from '@mantine/core';
 
+import { Button } from '@ui/button';
 import FailedAnimationData from './failed-animation-data.json';
 import SuccessAnimationData from './success-animation-data.json';
-import { Button } from '@ui/button';
 
 interface ConfirmationModalProps {
   status: string;
 }
 
+const Lottie = dynamic(() => import('lottie-react'), { ssr: false });
+
 export const ConfirmationModal = ({ status }: ConfirmationModalProps) => {
   const title =
     status === CONSTANTS.PAYMENT_SUCCCESS_CODE

apps/web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@impler/web",
-  "version": "0.29.0",
+  "version": "0.30.0",
   "author": "implerhq",
   "license": "MIT",
   "private": true,