@redneckz/wildless-cms-uni-blocks 0.14.1048 → 0.14.1050

package/src/components/ApplicationForm/renderSections.tsx

@@ -10,16 +10,19 @@ import type { additionalParamsType, FieldDef } from './ApplicationFormContent';
 type renderSectionsType = {
   typeForm: FormTypeFieldDef;
   additionalParams?: additionalParamsType;
+  disabled?: boolean;
 };
 
 export const renderSections = (
   sections: SectionsProps[],
   field: FormFieldRegisterer<Record<string, any>>,
-  { typeForm, additionalParams }: renderSectionsType,
+  { typeForm, additionalParams, disabled }: renderSectionsType,
 ) =>
   sections.map((_, i) => (
     <div key={`section-${i}`} className={style(inputColumnStyles(_.columns), 'grid')}>
       {renderTitle(_.title)}
-      {(_?.inputs || [])?.map(getField<FieldDef>(field, { typeForm, ...additionalParams }))}
+      {(_?.inputs || [])?.map(
+        getField<FieldDef>(field, { typeForm, disabled, ...additionalParams }),
+      )}
     </div>
   ));

package/src/hooks/useAspects/aspects/forwardQuery.ts

@@ -4,11 +4,17 @@ import { type PreventableEventWithTarget } from '../../../ui-kit/PreventableEven
 import { adjustSessionQuery } from '../../../utils/adjustSessionQuery';
 import { isURL } from '../../../utils/url';
 
+const URLS_WITHOUT_QUERY = ['https://private-banking.rshb.ru/'];
+
 export const forwardQuery = async (ev: PreventableEventWithTarget) => {
   const anchor = (ev.target as Element | null)?.closest('a');
   const navigator = locationNavigator();
 
-  if (isURL(anchor?.href) && !anchor?.href?.startsWith(navigator.origin)) {
+  if (
+    isURL(anchor?.href) &&
+    !anchor?.href?.startsWith(navigator.origin) &&
+    !URLS_WITHOUT_QUERY.includes(anchor?.href ?? '')
+  ) {
     ev.preventDefault();
     ev.stopPropagation();
 

package/src/retail/api/getCardTypes.ts

@@ -1,4 +1,5 @@
 import type { DescriptionProps } from '../../model/HeadlineType';
+import { checkNewMicroservice } from '../utils/checkNewMicroservice';
 import { fetchRetailJSON } from './doRequest';
 
 export type CardTypeData = DescriptionProps & {
@@ -9,10 +10,23 @@ export type CardTypeData = DescriptionProps & {
 };
 
 export const getCardTypes = async (paymentSystemTypeCd: string, creditProgramId: string) => {
-  const data = await fetchRetailJSON<CardTypeData[]>('/dictionaryFiltered', 'POST', {
-    type: 'CARD_TYPE',
-    presets: { paymentSystemTypeCd, creditProgramId },
-  });
+  const isNewMicroservice = checkNewMicroservice();
+
+  const endpoint = isNewMicroservice
+    ? '/external/public-data/dictionaryFiltered'
+    : '/dictionaryFiltered';
+
+  const requestBody = isNewMicroservice
+    ? {
+        paymentSystemTypeCd,
+        dictionaryType: 'CARD_TYPE',
+      }
+    : {
+        type: 'CARD_TYPE',
+        presets: { paymentSystemTypeCd, creditProgramId },
+      };
+
+  const data = await fetchRetailJSON<CardTypeData[]>(endpoint, 'POST', requestBody);
 
   return Array.isArray(data) ? data : [];
 };

package/src/retail/api/getPaymentSystems.ts

@@ -1,4 +1,5 @@
 import { type Option } from '../../ui-kit/Select/Option';
+import { checkNewMicroservice } from '../utils/checkNewMicroservice';
 import { fetchRetailJSON } from './doRequest';
 
 type PaymentSystem = {
@@ -11,13 +12,15 @@ type PaymentSystemResponse = {
 };
 
 export const getPaymentSystems = async (creditProgramId: string) => {
-  const data = await fetchRetailJSON<PaymentSystemResponse>(
-    '/public-data/creditProgramConditions',
-    'POST',
-    {
-      creditProgramId,
-    },
-  );
+  const isNewMicroservice = checkNewMicroservice();
+
+  const endpoint = isNewMicroservice
+    ? '/external/user-data/getPaymentSystem'
+    : '/public-data/creditProgramConditions';
+
+  const data = await fetchRetailJSON<PaymentSystemResponse>(endpoint, 'POST', {
+    creditProgramId,
+  });
 
   return formatData(data?.paymentSystems || []);
 };

package/src/ui-kit/FormField/Fields/DadataPartySelectField.tsx

@@ -106,8 +106,8 @@ export const DadataPartySelectField = JSX<CustomFieldProps>(({ field, input = {}
 
   return (
     <SelectControl
-      {...input}
       {...FIELD_CONFIG[fieldName]}
+      {...input}
       options={getOptions}
       {...field(input.name ?? '')}
       isSearch

package/src/ui-kit/FormField/getField.tsx

@@ -21,7 +21,7 @@ export const getField =
 
     return shouldRenderField({ input, field }) && Component ? (
       <RefWrapper onFieldRef={field(input.name ?? '').setFieldRef} key={String(i)}>
-        <Component field={field} input={input} params={params} />
+        <Component field={field} input={{ ...input, disabled: params?.disabled }} params={params} />
       </RefWrapper>
     ) : null;
   };