V1.4.0 (#1047)

Author: thisismayuresh

apps/api/src/app/template/commands/update-destination.command.ts

@@ -49,12 +49,13 @@ export class BubbleIoDestinationObject {
   @ValidateIf((obj) => obj.destination === DestinationsEnum.BUBBLEIO)
   apiPrivateKey: string;
 
-  @IsString()
-  @IsDefined()
-  @ValidateIf((obj) => obj.destination === DestinationsEnum.BUBBLEIO)
-  datatype: string;
-
   /*
+   *@IsString()
+   *@IsDefined()
+   *@ValidateIf((obj) => obj.destination === DestinationsEnum.BUBBLEIO)
+   *datatype: string;
+   *
+   * /*
    * @IsEnum(BubbleDestinationEnvironmentEnum)
    * @IsDefined()
    * @ValidateIf((obj) => obj.destination === DestinationsEnum.BUBBLEIO)

apps/api/src/app/template/dtos/destination-response.dto.ts

@@ -12,6 +12,5 @@ export class DestinationResponseDto {
   bubbleio?: {
     bubbleAppUrl: string;
     apiPrivateKey: string;
-    datatype: string;
   };
 }

apps/api/src/app/template/dtos/update-destination-request.dto.ts

@@ -48,12 +48,13 @@ class BubbleIoDestinationObject {
   @ValidateIf((obj) => obj.destination === DestinationsEnum.BUBBLEIO)
   apiPrivateKey: string;
 
-  @IsString()
-  @IsDefined()
-  @ValidateIf((obj) => obj.destination === DestinationsEnum.BUBBLEIO)
-  datatype: string;
-
   /*
+   *@IsString()
+   *@IsDefined()
+   *@ValidateIf((obj) => obj.destination === DestinationsEnum.BUBBLEIO)
+   *datatype: string;
+   *
+   * /*
    * @IsEnum(BubbleDestinationEnvironmentEnum)
    * @IsDefined()
    * @ValidateIf((obj) => obj.destination === DestinationsEnum.BUBBLEIO)

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

@@ -76,7 +76,7 @@ export class SendBubbleDataConsumer extends BaseConsumer {
 
       await this.makeResponseEntry(
         response,
-        { bubbleAppUrl: cachedData.bubbleAppUrl, datatype: cachedData.datatype },
+        { bubbleAppUrl: cachedData.bubbleAppUrl },
         cachedData.name,
         cachedData.email
       );
@@ -173,7 +173,6 @@ export class SendBubbleDataConsumer extends BaseConsumer {
       bubbleAppUrl,
       chunkSize: 500,
       email: userEmail,
-      datatype: bubbleDestination.datatype,
       name: templateData.name,
       _templateId: uploadata._templateId,
       recordFormat: uploadata.customRecordFormat,
@@ -185,7 +184,7 @@ export class SendBubbleDataConsumer extends BaseConsumer {
 
   private async makeResponseEntry(
     data: Partial<WebhookLogEntity>,
-    bubbleData: { datatype: string; bubbleAppUrl: string },
+    bubbleData: { bubbleAppUrl: string },
     importName: string,
     userEmail: string
   ) {
@@ -196,7 +195,6 @@ export class SendBubbleDataConsumer extends BaseConsumer {
           error: JSON.stringify(data.error, null, 2).replace(/\\+"/g, '"'),
           importName,
           time: data.callDate.toString(),
-          datatype: bubbleData.datatype,
           bubbleAppUrl: bubbleData.bubbleAppUrl,
           importId: data._uploadId,
         },

apps/web/components/imports/destination/Destination.tsx

@@ -164,13 +164,6 @@ export function Destination({ template }: DestinationProps) {
               {...register('bubbleIo.apiPrivateKey')}
               error={errors?.bubbleIo?.apiPrivateKey?.message}
             />
-            <Input
-              required
-              label="Datatype Name"
-              placeholder="Datatype"
-              {...register('bubbleIo.datatype')}
-              error={errors?.bubbleIo?.datatype?.message}
-            />
             <Group>
               <Button loading={isUpdateImportLoading} type="submit">
                 Test and Save

libs/dal/src/repositories/bubble-destination/bubble-destination.entity.ts

@@ -5,7 +5,5 @@ export class BubbleDestinationEntity {
 
   apiPrivateKey: string;
 
-  datatype: string;
-
   _templateId: string;
 }

libs/dal/src/repositories/bubble-destination/bubble-destination.schema.ts

@@ -15,9 +15,6 @@ const bubbleDestinationSchema = new Schema(
     apiPrivateKey: {
       type: Schema.Types.String,
     },
-    datatype: {
-      type: Schema.Types.String,
-    },
   },
   { ...schemaOptions }
 );

libs/services/src/email/email.service.ts

@@ -9,7 +9,6 @@ interface IWebhookAlertEmailOptions {
   importId: string;
 }
 interface IBubbleAlertEmailOptions {
-  datatype: string;
   bubbleAppUrl: string;
   error: string;
   importName: string;
@@ -238,14 +237,7 @@ const EMAIL_CONTENTS = {
 </body>
 </html>
   `,
-  ERROR_SENDING_BUBBLE_DATA: ({
-    datatype,
-    bubbleAppUrl,
-    error,
-    importName,
-    time,
-    importId,
-  }: IBubbleAlertEmailOptions) => `
+  ERROR_SENDING_BUBBLE_DATA: ({ bubbleAppUrl, error, importName, time, importId }: IBubbleAlertEmailOptions) => `
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -315,7 +307,6 @@ const EMAIL_CONTENTS = {
       <ul>
         <li><strong>Import Name:</strong> ${importName}</li>
         <li><strong>URL:</strong> ${bubbleAppUrl}</li>
-        <li><strong>Data Type:</strong> ${datatype}</li>
         <li><strong>Import Id:</strong> ${importId}</li>
         <li><strong>Time of Error:</strong> ${time}</li>
       </ul>

libs/shared/src/types/destination/destination.types.ts

@@ -20,7 +20,6 @@ export interface IWebhookData {
 export interface IBubbleData {
   bubbleAppUrl: string;
   apiPrivateKey: string;
-  datatype: string;
 }
 
 export interface IDestinationData {

libs/shared/src/types/upload/upload.types.ts

@@ -82,7 +82,6 @@ export type SendBubbleCachedData = {
   name: string;
   page: number;
   email: string;
-  datatype: string;
   chunkSize: number;
   bubbleAppUrl: string;
   apiPrivateKey: string;