From 1e0c40a5a0826b4f5c636aaa9068e0fc2bd628df Mon Sep 17 00:00:00 2001 From: vchikalkin Date: Thu, 23 Feb 2023 11:43:12 +0300 Subject: [PATCH] process/gibdd: make label for selectRegistration filter --- apps/web/process/gibdd/reactions.ts | 51 +++++++++++++------------- apps/web/process/init/get-main-data.js | 14 +++---- 2 files changed, 33 insertions(+), 32 deletions(-) diff --git a/apps/web/process/gibdd/reactions.ts b/apps/web/process/gibdd/reactions.ts index cab8a50..eb0c254 100644 --- a/apps/web/process/gibdd/reactions.ts +++ b/apps/web/process/gibdd/reactions.ts @@ -288,33 +288,34 @@ export function common({ store, apolloClient, queryClient }: ProcessContext) { variables: { currentDate }, }); - $calculation - .element('selectRegistration') - .setOptions( - normalizeOptions( - evo_addproduct_types?.filter( - (x) => - x?.evo_leasingobject_types?.find( - (evo_leasingobject_type) => - evo_leasingobject_type?.evo_leasingobject_typeid === leaseObjectType - ) && - x.evo_whom_register === objectRegistration && - Boolean( - leaseObjectCategory === 100_000_001 - ? x.evo_towtruck === true || x.evo_towtruck === false - : x.evo_towtruck === false - ) && - x.evo_gibdd_region === (objectRegionRegistrationId === regionRegistrationId) && - Boolean(typePTS && x.evo_pts_type?.includes(typePTS)) && - Boolean( - x.evo_accountid && - evo_region?.accounts?.some( - (evo_region_account) => evo_region_account?.accountid === x.evo_accountid - ) + const options = evo_addproduct_types + ?.filter( + (x) => + x?.evo_leasingobject_types?.find( + (evo_leasingobject_type) => + evo_leasingobject_type?.evo_leasingobject_typeid === leaseObjectType + ) && + x.evo_whom_register === objectRegistration && + Boolean( + leaseObjectCategory === 100_000_001 + ? x.evo_towtruck === true || x.evo_towtruck === false + : x.evo_towtruck === false + ) && + x.evo_gibdd_region === (objectRegionRegistrationId === regionRegistrationId) && + Boolean(typePTS && x.evo_pts_type?.includes(typePTS)) && + Boolean( + x.evo_accountid && + evo_region?.accounts?.some( + (evo_region_account) => evo_region_account?.accountid === x.evo_accountid ) ) - ) - ); + ) + .map((x) => ({ + ...x, + label: `${x?.label} (${x?.evo_graph_price} руб.)`, + })); + + $calculation.element('selectRegistration').setOptions(normalizeOptions(options)); } ); } diff --git a/apps/web/process/init/get-main-data.js b/apps/web/process/init/get-main-data.js index 407b847..dcfc861 100644 --- a/apps/web/process/init/get-main-data.js +++ b/apps/web/process/init/get-main-data.js @@ -103,12 +103,12 @@ function getMainData({ query }, onCompleted) { currentDate, }, }).then(({ data }) => { - const selectRegistration = data.evo_addproduct_types - ?.filter((x) => x?.evo_product_type === 100_000_001) - .map((x) => ({ - ...x, - label: `${x?.label} (${x?.evo_graph_price} руб.)`, - })); + // const selectRegistration = data.evo_addproduct_types + // ?.filter((x) => x?.evo_product_type === 100_000_001) + // .map((x) => ({ + // ...x, + // label: `${x?.label} (${x?.evo_graph_price} руб.)`, + // })); const selectTechnicalCard = data.evo_addproduct_types ?.filter((x) => x?.evo_product_type === 100_000_000) @@ -140,7 +140,7 @@ function getMainData({ query }, onCompleted) { ); onCompleted({ - selectRegistration, + // selectRegistration, selectTechnicalCard, selectTelematic, selectTracker,