diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f443023..98bb044 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -6,22 +6,29 @@ include: stages: - build - deploy - build-app: + tags: + - frontbuild + stage: build extends: .build_template + variables: + DOCKER_BUILD_PATH: "./Dockerfile" + PRODUCTION_BRANCH: main + STAGING_BRANCH: staging deploy-to-staging: + tags: + - front + - staging rules: - if: "$CI_COMMIT_BRANCH == $STAGING_BRANCH" extends: .deploy_template - tags: - - staging - extends: .deploy_template + deploy-to-prod: + tags: + - front + - prod rules: - if: "$CI_COMMIT_BRANCH == $PRODUCTION_BRANCH" - tags: - - prod - - front extends: .deploy_template diff --git a/src/pages/dashboard/ModalUser/VerificationTab.tsx b/src/pages/dashboard/ModalUser/VerificationTab.tsx index ffe8048..7a21c72 100644 --- a/src/pages/dashboard/ModalUser/VerificationTab.tsx +++ b/src/pages/dashboard/ModalUser/VerificationTab.tsx @@ -24,6 +24,7 @@ export const VerificationTab = ({ userId }: VerificationTabProps) => { const [verificationResponse, verificationError] = await verification( userId ); + console.log(verificationResponse) setIsLoading(false); @@ -39,9 +40,15 @@ export const VerificationTab = ({ userId }: VerificationTabProps) => { }; const debouncedINNHC = useDebouncedCallback((str) => { + if (!verificationInfo) { + return; + } patchVerification({ - taxnumber: str.replace(/[^0-9]/g,""), + comment, + taxnumber: str, id: verificationInfo?._id, + status: verificationInfo?.status, + accepted: verificationInfo?.accepted, }); }, 2000); @@ -59,6 +66,7 @@ export const VerificationTab = ({ userId }: VerificationTabProps) => { accepted, comment, id: verificationInfo._id, + taxnumber: INN, status: verificationInfo.status, }); @@ -76,6 +84,7 @@ export const VerificationTab = ({ userId }: VerificationTabProps) => { await requestVefification(); }; + console.log("verificationInfo", verificationInfo) return ( { if (!verificationInfo) { return; } - setINN(event.target.value) - debouncedINNHC(event.target.value)} + setINN(event.target.value.replace(/[^0-9]/g,"")) + debouncedINNHC(event.target.value.replace(/[^0-9]/g,""))} } placeholder="ИНН" /> diff --git a/src/utils/parse-error.ts b/src/utils/parse-error.ts index 8d0df90..f626a33 100644 --- a/src/utils/parse-error.ts +++ b/src/utils/parse-error.ts @@ -19,9 +19,10 @@ const translateMessage: Record = { export const parseAxiosError = (nativeError: unknown): [string, number?] => { const error = nativeError as AxiosError; + console.log(error) if ( - error.response?.data && + error.response?.data && error.response?.data !== "Not Found" && "statusCode" in (error.response.data as ServerError) ) { const serverError = error.response.data as ServerError