From 4cd7d90bcdf5b9b0316b0e08ba14b1e3ceab9ca9 Mon Sep 17 00:00:00 2001 From: Aman Chaturvedi Date: Tue, 15 Oct 2024 17:46:18 +0530 Subject: [PATCH] NTP-5975 | Pin case V2 --- android/app/build.gradle | 4 ++-- package.json | 4 ++-- src/action/dataActions.ts | 39 ++++++++++++++++++++++--------- src/common/Constants.ts | 2 ++ src/components/utlis/apiHelper.ts | 2 ++ 5 files changed, 36 insertions(+), 15 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 44a33a3f..9effb6ca 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -134,8 +134,8 @@ def reactNativeArchitectures() { return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"] } -def VERSION_CODE = 202 -def VERSION_NAME = "2.14.2" +def VERSION_CODE = 203 +def VERSION_NAME = "2.14.3" android { ndkVersion rootProject.ext.ndkVersion diff --git a/package.json b/package.json index 2c669b83..5ad95340 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "AV_APP", - "version": "2.14.2", - "buildNumber": "202", + "version": "2.14.3", + "buildNumber": "203", "private": true, "scripts": { "android:dev": "yarn move:dev && react-native run-android", diff --git a/src/action/dataActions.ts b/src/action/dataActions.ts index 962b737e..55bbca61 100644 --- a/src/action/dataActions.ts +++ b/src/action/dataActions.ts @@ -34,7 +34,7 @@ const SUBMIT_FEEDBACK_API_VERSION = 5; export const postPinnedList = (pinnedCases: IPinnedCasesPayload[], updatedCaseList: ICaseItem[], type: string) => - (dispatch: AppDispatch) => { + async (dispatch: AppDispatch) => { dispatch(setVisitPlansUpdating(true)); let pinRankCount = 1; const payload: IPinnedCasesPayload[] = pinnedCases.reduce((acc, pinnedCase) => { @@ -44,7 +44,12 @@ export const postPinnedList = }); return acc; }, [] as IPinnedCasesPayload[]); - const url = getApiUrl(ApiKeys.PINNED_CASES); + const enableCaseCollectionManager = + (await getAsyncStorageItem(LocalStorageKeys.COSMOS_CASE_COLLECTION_MANAGER_ENABLE, true)) ?? + false; + const url = getApiUrl( + enableCaseCollectionManager ? ApiKeys.PINNED_CASES_V2 : ApiKeys.PINNED_CASES + ); axiosInstance .post(url, payload) .then((response) => { @@ -148,22 +153,34 @@ export type ISignedRequest = ISignedRequestItem[]; export const getSignedApi = async ( signedRequestPayload: ISignedRequest, shouldBatch = false, - skipFirebaseUpdate = false, + skipFirebaseUpdate = false ): Promise<{ imageUrl: string }> => { return new Promise((res) => { if (shouldBatch) { - batchSignedApiRequest(signedRequestPayload, (results: any) => { + batchSignedApiRequest( + signedRequestPayload, + (results: any) => { res({ imageUrl: results?.[signedRequestPayload[0].documentReferenceId] || '' }); - }, skipFirebaseUpdate); + }, + skipFirebaseUpdate + ); } else { - makeBulkSignedApiRequest(signedRequestPayload, (results: any) => { + makeBulkSignedApiRequest( + signedRequestPayload, + (results: any) => { res({ imageUrl: results?.[signedRequestPayload[0].documentReferenceId] || '' }); - }, skipFirebaseUpdate); + }, + skipFirebaseUpdate + ); } }); }; -async function batchSignedApiRequest(payload: ISignedRequestItem[], callback: GenericFunctionArgs, skipFirebaseUpdate = false) { +async function batchSignedApiRequest( + payload: ISignedRequestItem[], + callback: GenericFunctionArgs, + skipFirebaseUpdate = false +) { payload.forEach((item) => { _signedApiCallBucket.push({ req: item, added_At: Date.now(), callback }); }); @@ -171,7 +188,7 @@ async function batchSignedApiRequest(payload: ISignedRequestItem[], callback: Ge await makeBulkSignedApiRequest( _signedApiCallBucket.map((a) => a.req), _signedApiCallBucket.map((a) => a.callback), - skipFirebaseUpdate, + skipFirebaseUpdate ); return; } else if (!_signedApiCallBucketTimer) { @@ -179,7 +196,7 @@ async function batchSignedApiRequest(payload: ISignedRequestItem[], callback: Ge await makeBulkSignedApiRequest( _signedApiCallBucket.map((a) => a.req), _signedApiCallBucket.map((a) => a.callback), - skipFirebaseUpdate, + skipFirebaseUpdate ); }, SIGNED_API_BUCKET_TIMEOUT); } @@ -188,7 +205,7 @@ async function batchSignedApiRequest(payload: ISignedRequestItem[], callback: Ge async function makeBulkSignedApiRequest( payload: ISignedRequestItem[], callback: GenericFunctionArgs | GenericFunctionArgs[], - skipFirebaseUpdate = false, + skipFirebaseUpdate = false ) { const enableCaseCollectionManager = (await getAsyncStorageItem(LocalStorageKeys.COSMOS_CASE_COLLECTION_MANAGER_ENABLE, true)) ?? diff --git a/src/common/Constants.ts b/src/common/Constants.ts index 759a84da..f78b2ac7 100644 --- a/src/common/Constants.ts +++ b/src/common/Constants.ts @@ -1476,8 +1476,10 @@ export const BUTTON_PRESS_COUNT_FOR_IMPERSONATION = 5; export const REQUEST_TYPE_TO_BLOCK_FOR_IMPERSONATION = ['post', 'put', 'patch', 'delete']; export const REQUEST_TO_UNBLOCK_FOR_IMPERSONATION = [ + getApiUrl(ApiKeys.GET_SIGNED_URL_V2), getApiUrl(ApiKeys.GET_SIGNED_URL), getApiUrl(ApiKeys.GET_SIGNED_URL_FOR_REPORTEE), + getApiUrl(ApiKeys.GET_SIGNED_URL_FOR_REPORTEE_V2), getApiUrl(ApiKeys.LOGOUT), getApiUrl(ApiKeys.PAST_FEEDBACK), getApiUrl(ApiKeys.GET_CSA_TICKETS), diff --git a/src/components/utlis/apiHelper.ts b/src/components/utlis/apiHelper.ts index bb1ea85f..042a5eee 100644 --- a/src/components/utlis/apiHelper.ts +++ b/src/components/utlis/apiHelper.ts @@ -26,6 +26,7 @@ export enum ApiKeys { ALL_CASES = 'ALL_CASES', CASE_DETAIL = 'CASE_DETAIL', PINNED_CASES = 'PINNED_CASES', + PINNED_CASES_V2 = 'PINNED_CASES_V2', LOGOUT = 'LOGOUT', FEEDBACK = 'FEEDBACK', FILTERS = 'FILTERS', @@ -110,6 +111,7 @@ API_URLS[ApiKeys.VERIFY_OTP] = '/auth/otp/verify'; API_URLS[ApiKeys.ALL_CASES] = '/cases/all-cases'; API_URLS[ApiKeys.CASE_DETAIL] = '/cases/get-cases'; API_URLS[ApiKeys.PINNED_CASES] = '/cases/pin'; +API_URLS[ApiKeys.PINNED_CASES_V2] = '/cases/v2/pin'; API_URLS[ApiKeys.LOGOUT] = '/auth/logout'; API_URLS[ApiKeys.FEEDBACK] = '/cases/feedback'; API_URLS[ApiKeys.FILTERS] = '/cases/filters';