Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions apps/queue-manager/src/consumers/send-bubble-data.consumer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -164,13 +164,17 @@ export class SendBubbleDataConsumer extends BaseConsumer {
Object.keys(extra).forEach((extraObjKey) => {
defaultValueObj[`extra.${extraObjKey}`] = extra[extraObjKey];
});
if (uploadata.customRecordFormat && uploadata.customRecordFormat.includes('{{extra.uploadId}}')) {
defaultValueObj['extra.uploadId'] = _uploadId;
}

if (uploadata.customRecordFormat && uploadata.customRecordFormat.includes('{{extra.userId}}')) {
defaultValueObj['extra.userId'] = await this.uploadRepository.getUserIdFromUploadId(_uploadId);
}
/*
* if (uploadata.customRecordFormat && uploadata.customRecordFormat.includes('{{extra.uploadId}}')) {
* defaultValueObj['extra.uploadId'] = _uploadId;
* }
*/

/*
* if (uploadata.customRecordFormat && uploadata.customRecordFormat.includes('{{extra.userId}}')) {
* defaultValueObj['extra.userId'] = await this.uploadRepository.getUserIdFromUploadId(_uploadId);
* }
*/
} catch (error) {}
}

Expand Down
6 changes: 2 additions & 4 deletions apps/widget/src/hooks/Phase1/usePhase1.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,7 @@ export function usePhase1({ goNext, texts, onManuallyEnterData }: IUsePhase1Prop
resetField('file');
setError('file', {
type: 'file',
message: maxRecords
? `${texts.PHASE3.MAX_RECORD_LIMIT_ERROR} ${maxRecords}`
: texts.PHASE3.MAX_RECORD_LIMIT_ERROR ?? error.message,
message: error.message,
});
},
}
Expand All @@ -91,7 +89,7 @@ export function usePhase1({ goNext, texts, onManuallyEnterData }: IUsePhase1Prop
IErrorObject,
{ file: File }
// eslint-disable-next-line prettier/prettier
>(['getExcelSheetNames'], (excelSheetFile) => api.getExcelSheetNames(excelSheetFile), {
>(['getExcelSheetNames'], (excelSheetFile) => api.getExcelSheetNames(excelSheetFile), {
onSuccess(sheetNames) {
if (sheetNames.length <= 1) {
setValue('selectedSheetName', sheetNames[0]);
Expand Down
Loading