feat: Added bubbleAppUrl a simple way to get the data in bubble app (#1040)

Author: thisismayuresh

apps/api/src/app/shared/services/bubble-io.service.ts

@@ -17,8 +17,7 @@ interface IThingsResponse {
 export class BubbleIoService extends BubbleBaseService {
   async getDatatypeData(data: Omit<BubbleDestinationEntity, '_id' | '_templateId'>) {
     try {
-      const url = this.createBubbleIoUrl(data);
-      const response = await axios.get<IThingsResponse>(url, {
+      const response = await axios.get<IThingsResponse>(data.bubbleAppUrl, {
         headers: {
           Authorization: `Bearer ${data.apiPrivateKey}`,
         },

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

@@ -12,7 +12,7 @@ import {
 } from 'class-validator';
 import { Type } from 'class-transformer';
 import { BaseCommand } from '@shared/commands/base.command';
-import { BubbleDestinationEnvironmentEnum, DestinationsEnum } from '@impler/shared';
+import { DestinationsEnum } from '@impler/shared';
 
 export class WebhookDestinationObject {
   @IsUrl()
@@ -42,7 +42,7 @@ export class BubbleIoDestinationObject {
   @IsString()
   @IsDefined()
   @ValidateIf((obj) => obj.destination === DestinationsEnum.BUBBLEIO)
-  appName: string;
+  bubbleAppUrl: string;
 
   @IsString()
   @IsDefined()
@@ -54,15 +54,19 @@ export class BubbleIoDestinationObject {
   @ValidateIf((obj) => obj.destination === DestinationsEnum.BUBBLEIO)
   datatype: string;
 
-  @IsEnum(BubbleDestinationEnvironmentEnum)
-  @IsDefined()
-  @ValidateIf((obj) => obj.destination === DestinationsEnum.BUBBLEIO)
-  environment: BubbleDestinationEnvironmentEnum;
+  /*
+   * @IsEnum(BubbleDestinationEnvironmentEnum)
+   * @IsDefined()
+   * @ValidateIf((obj) => obj.destination === DestinationsEnum.BUBBLEIO)
+   * environment: BubbleDestinationEnvironmentEnum;
+   */
 
-  @IsString()
-  @IsOptional()
-  @ValidateIf((obj) => obj.destination === DestinationsEnum.BUBBLEIO)
-  customDomainName?: string;
+  /*
+   * @IsString()
+   * @IsOptional()
+   * @ValidateIf((obj) => obj.destination === DestinationsEnum.BUBBLEIO)
+   * customDomainName?: string;
+   */
 }
 
 export class UpdateDestinationCommand extends BaseCommand {

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

@@ -10,10 +10,8 @@ export class DestinationResponseDto {
     retryCount?: number;
   };
   bubbleio?: {
-    appName: string;
+    bubbleAppUrl: string;
     apiPrivateKey: string;
     datatype: string;
-    environment: string;
-    customDomainName?: string;
   };
 }

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

@@ -10,7 +10,7 @@ import {
   IsNotEmptyObject,
   ValidateNested,
 } from 'class-validator';
-import { BubbleDestinationEnvironmentEnum, DestinationsEnum } from '@impler/shared';
+import { DestinationsEnum } from '@impler/shared';
 import { Type } from 'class-transformer';
 
 class WebhookDestinationObject {
@@ -41,7 +41,7 @@ class BubbleIoDestinationObject {
   @IsString()
   @IsDefined()
   @ValidateIf((obj) => obj.destination === DestinationsEnum.BUBBLEIO)
-  appName: string;
+  bubbleAppUrl: string;
 
   @IsString()
   @IsDefined()
@@ -53,15 +53,19 @@ class BubbleIoDestinationObject {
   @ValidateIf((obj) => obj.destination === DestinationsEnum.BUBBLEIO)
   datatype: string;
 
-  @IsEnum(BubbleDestinationEnvironmentEnum)
-  @IsDefined()
-  @ValidateIf((obj) => obj.destination === DestinationsEnum.BUBBLEIO)
-  environment: BubbleDestinationEnvironmentEnum;
+  /*
+   * @IsEnum(BubbleDestinationEnvironmentEnum)
+   * @IsDefined()
+   * @ValidateIf((obj) => obj.destination === DestinationsEnum.BUBBLEIO)
+   * environment: BubbleDestinationEnvironmentEnum;
+   */
 
-  @IsString()
-  @IsOptional()
-  @ValidateIf((obj) => obj.destination === DestinationsEnum.BUBBLEIO)
-  customDomainName?: string;
+  /*
+   * @IsString()
+   * @IsOptional()
+   * @ValidateIf((obj) => obj.destination === DestinationsEnum.BUBBLEIO)
+   * customDomainName?: string;
+   */
 }
 
 export class UpdateDestinationDto {

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

@@ -76,7 +76,7 @@ export class SendBubbleDataConsumer extends BaseConsumer {
 
       await this.makeResponseEntry(
         response,
-        { datatype: cachedData.datatype, environment: cachedData.environment, url: cachedData.bubbleUrl },
+        { bubbleAppUrl: cachedData.bubbleUrl, datatype: cachedData.datatype },
         cachedData.name,
         cachedData.email
       );
@@ -142,7 +142,7 @@ export class SendBubbleDataConsumer extends BaseConsumer {
     const templateData = await this.templateRepository.findById(uploadata._templateId, 'name');
 
     const bubbleDestination = await this.bubbleDestinationRepository.findOne({ _templateId: uploadata._templateId });
-    const bubbleUrl = this.bubbleBaseService.createBubbleIoUrl(bubbleDestination, 'bulk');
+    const bubbleUrl = bubbleDestination.bubbleAppUrl;
 
     const defaultValueObj = {};
     const customSchema = JSON.parse(uploadata.customSchema) as ITemplateSchemaItem;
@@ -168,7 +168,6 @@ export class SendBubbleDataConsumer extends BaseConsumer {
       email: userEmail,
       datatype: bubbleDestination.datatype,
       name: templateData.name,
-      environment: bubbleDestination.environment,
       _templateId: uploadata._templateId,
       recordFormat: uploadata.customRecordFormat,
       defaultValues: JSON.stringify(defaultValueObj),
@@ -179,7 +178,7 @@ export class SendBubbleDataConsumer extends BaseConsumer {
 
   private async makeResponseEntry(
     data: Partial<WebhookLogEntity>,
-    bubbleData: { datatype: string; environment: string; url: string },
+    bubbleData: { datatype: string; bubbleAppUrl: string },
     importName: string,
     userEmail: string
   ) {
@@ -191,8 +190,7 @@ export class SendBubbleDataConsumer extends BaseConsumer {
           importName,
           time: data.callDate.toString(),
           datatype: bubbleData.datatype,
-          environment: bubbleData.environment,
-          url: bubbleData.url,
+          bubbleAppUrl: bubbleData.bubbleAppUrl,
           importId: data._uploadId,
         },
       });

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

@@ -4,9 +4,7 @@ import { Stack, TextInput as Input, Group, Select } from '@mantine/core';
 
 import { Button } from '@ui/button';
 import { NumberInput } from '@ui/number-input';
-import { DoaminInput } from '@ui/domain-input';
 import { DOCUMENTATION_REFERENCE_LINKS, REGULAR_EXPRESSIONS } from '@config';
-import { NativeSelect } from '@ui/native-select';
 import { useDestination } from '@hooks/useDestination';
 import { DestinationItem } from './DestinationItem';
 
@@ -16,7 +14,6 @@ interface DestinationProps {
 
 export function Destination({ template }: DestinationProps) {
   const {
-    watch,
     errors,
     control,
     onSubmit,
@@ -45,7 +42,6 @@ export function Destination({ template }: DestinationProps) {
       }
     }
   };
-  const bubbleDestinationEnvironment = watch('bubbleIo.environment');
 
   return (
     <Stack>
@@ -148,48 +144,13 @@ export function Destination({ template }: DestinationProps) {
       >
         <form onSubmit={onSubmit}>
           <Stack spacing="xs">
-            <Controller
-              name="bubbleIo.appName"
-              control={control}
-              render={({ field }) => (
-                <DoaminInput
-                  value={field.value}
-                  label="Bubble App Name"
-                  onChange={field.onChange}
-                  rightSection=".bubbleapps.io"
-                  placeholder="Bubble Application Name"
-                  error={errors.bubbleIo?.appName?.message}
-                />
-              )}
-            />
-
-            <Controller
-              control={control}
-              name="bubbleIo.environment"
-              render={({ field }) => (
-                <NativeSelect
-                  register={{
-                    value: field.value,
-                    onChange: field.onChange,
-                  }}
-                  required
-                  label="Environment"
-                  data={['development', 'production']}
-                  error={errors.bubbleIo?.environment?.message}
-                />
-              )}
+            <Input
+              required
+              label="Bubble App URL"
+              placeholder="Bubble App URL"
+              {...register('bubbleIo.bubbleAppUrl')}
+              error={errors?.bubbleIo?.bubbleAppUrl?.message}
             />
-            {bubbleDestinationEnvironment === 'production' && (
-              <Input
-                label="Custom Domain Name"
-                placeholder="Custom Domain Name"
-                {...register('bubbleIo.customDomainName', {
-                  pattern: /^((?!-)[a-zA-Z0-9-]{1,63}(?<!-)\.)+[a-zA-Z]{2,63}$/,
-                })}
-                description="Required, if application is hosted on custom domain. Ex. myapp.io"
-                error={errors?.bubbleIo?.customDomainName ? 'Please enter valid domain name' : undefined}
-              />
-            )}
             <Input
               required
               label="API Private Key"

apps/web/hooks/useDestination.tsx

@@ -30,9 +30,6 @@ export function useDestination({ template }: UseDestinationProps) {
       webhook: {
         chunkSize: 100,
       },
-      bubbleIo: {
-        environment: 'development',
-      },
     },
   });
   useQuery<unknown, IErrorObject, IDestinationData, [string, string | undefined]>(
@@ -123,20 +120,25 @@ export function useDestination({ template }: UseDestinationProps) {
     });
   };
   const onSubmit = (data: IDestinationData) => {
-    if (data.destination === DestinationsEnum.BUBBLEIO && !data.bubbleIo?.appName && !data.bubbleIo?.customDomainName) {
+    console.log(data);
+    if (
+      data.destination === DestinationsEnum.BUBBLEIO &&
+      !data.bubbleIo?.bubbleAppUrl &&
+      !data.bubbleIo?.apiPrivateKey
+    ) {
       setError(
-        'bubbleIo.appName',
+        'bubbleIo.bubbleAppUrl',
         {
           type: 'manual',
-          message: 'Either App Name or Custom Domain Name is required',
+          message: 'Bubble App URL is required',
         },
         {
           shouldFocus: true,
         }
       );
-      setError('bubbleIo.customDomainName', {
+      setError('bubbleIo.apiPrivateKey', {
         type: 'manual',
-        message: 'Either App Name or Custom Domain Name is required',
+        message: 'API Private Key is required',
       });
 
       return;

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

@@ -1,13 +1,7 @@
-import { BubbleDestinationEnvironmentEnum } from '@impler/shared';
-
 export class BubbleDestinationEntity {
   _id?: string;
 
-  appName: string;
-
-  customDomainName?: string;
-
-  environment: BubbleDestinationEnvironmentEnum;
+  bubbleAppUrl: string;
 
   apiPrivateKey: string;
 

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

@@ -4,13 +4,7 @@ import { BubbleDestinationEntity } from './bubble-destination.entity';
 
 const bubbleDestinationSchema = new Schema(
   {
-    appName: {
-      type: Schema.Types.String,
-    },
-    customDomainName: {
-      type: Schema.Types.String,
-    },
-    environment: {
+    bubbleAppUrl: {
       type: Schema.Types.String,
     },
     _templateId: {

libs/services/src/bubble/bubble-base.service.ts

@@ -1,12 +1,9 @@
+/* eslint-disable multiline-comment-style */
 import { AxiosError } from 'axios';
-import { BubbleDestinationEnvironmentEnum, IBubbleData } from '@impler/shared';
 
 export class BubbleBaseService {
-  createBubbleIoUrl(data: IBubbleData, type: 'single' | 'bulk' = 'single'): string {
-    let url = data.customDomainName ? `https://${data.customDomainName}` : `https://${data.appName}.bubbleapps.io`;
-    if (data.environment === BubbleDestinationEnvironmentEnum.DEVELOPMENT) url += '/version-test';
-
-    return `${url}/api/1.1/obj/${data.datatype}${type === 'bulk' ? '/bulk' : ''}`;
+  createBubbleIoUrl(bubbleAppUrl: string): string {
+    return bubbleAppUrl;
   }
   throwRequestError(errorWithType: AxiosError) {
     if ((errorWithType as AxiosError).response) {