@redneckz/wildless-cms-uni-blocks 0.14.1067 → 0.14.1069

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (51) hide show
  1. package/bundle/bundle.umd.js +44 -7
  2. package/bundle/bundle.umd.min.js +1 -1
  3. package/bundle/components/CreditForm/StepsNavigationButtons.d.ts +2 -0
  4. package/bundle/components/CreditForm/getYandexAspects.d.ts +10 -0
  5. package/dist/components/CreditForm/CreditFormStep.js +1 -1
  6. package/dist/components/CreditForm/CreditFormStep.js.map +1 -1
  7. package/dist/components/CreditForm/StepsNavigationButtons.d.ts +2 -0
  8. package/dist/components/CreditForm/StepsNavigationButtons.js +9 -5
  9. package/dist/components/CreditForm/StepsNavigationButtons.js.map +1 -1
  10. package/dist/components/CreditForm/getYandexAspects.d.ts +10 -0
  11. package/dist/components/CreditForm/getYandexAspects.js +38 -0
  12. package/dist/components/CreditForm/getYandexAspects.js.map +1 -0
  13. package/lib/components/CreditForm/CreditFormStep.js +1 -1
  14. package/lib/components/CreditForm/CreditFormStep.js.map +1 -1
  15. package/lib/components/CreditForm/StepsNavigationButtons.d.ts +2 -0
  16. package/lib/components/CreditForm/StepsNavigationButtons.js +9 -5
  17. package/lib/components/CreditForm/StepsNavigationButtons.js.map +1 -1
  18. package/lib/components/CreditForm/getYandexAspects.d.ts +10 -0
  19. package/lib/components/CreditForm/getYandexAspects.js +35 -0
  20. package/lib/components/CreditForm/getYandexAspects.js.map +1 -0
  21. package/mobile/bundle/bundle.umd.js +44 -7
  22. package/mobile/bundle/bundle.umd.min.js +1 -1
  23. package/mobile/bundle/components/CreditForm/StepsNavigationButtons.d.ts +2 -0
  24. package/mobile/bundle/components/CreditForm/getYandexAspects.d.ts +10 -0
  25. package/mobile/dist/components/CreditForm/CreditFormStep.js +1 -1
  26. package/mobile/dist/components/CreditForm/CreditFormStep.js.map +1 -1
  27. package/mobile/dist/components/CreditForm/StepsNavigationButtons.d.ts +2 -0
  28. package/mobile/dist/components/CreditForm/StepsNavigationButtons.js +9 -5
  29. package/mobile/dist/components/CreditForm/StepsNavigationButtons.js.map +1 -1
  30. package/mobile/dist/components/CreditForm/getYandexAspects.d.ts +10 -0
  31. package/mobile/dist/components/CreditForm/getYandexAspects.js +38 -0
  32. package/mobile/dist/components/CreditForm/getYandexAspects.js.map +1 -0
  33. package/mobile/lib/components/CreditForm/CreditFormStep.js +1 -1
  34. package/mobile/lib/components/CreditForm/CreditFormStep.js.map +1 -1
  35. package/mobile/lib/components/CreditForm/StepsNavigationButtons.d.ts +2 -0
  36. package/mobile/lib/components/CreditForm/StepsNavigationButtons.js +9 -5
  37. package/mobile/lib/components/CreditForm/StepsNavigationButtons.js.map +1 -1
  38. package/mobile/lib/components/CreditForm/getYandexAspects.d.ts +10 -0
  39. package/mobile/lib/components/CreditForm/getYandexAspects.js +35 -0
  40. package/mobile/lib/components/CreditForm/getYandexAspects.js.map +1 -0
  41. package/mobile/src/components/ApplicationForm/ApplicationForm.example.json +2 -15
  42. package/mobile/src/components/CreditForm/CreditFormStep.tsx +7 -1
  43. package/mobile/src/components/CreditForm/StepsNavigationButtons.tsx +12 -7
  44. package/mobile/src/components/CreditForm/getYandexAspects.ts +58 -0
  45. package/package.json +1 -1
  46. package/src/components/ApplicationForm/ApplicationForm.example.json +2 -15
  47. package/src/components/ApplicationForm/ApplicationForm.fixture.mobile.tsx +3 -16
  48. package/src/components/ApplicationForm/ApplicationForm.fixture.tsx +1 -14
  49. package/src/components/CreditForm/CreditFormStep.tsx +7 -1
  50. package/src/components/CreditForm/StepsNavigationButtons.tsx +12 -7
  51. package/src/components/CreditForm/getYandexAspects.ts +58 -0
package/mobile/bundle/components/CreditForm/StepsNavigationButtons.d.ts CHANGED
@@ -2,5 +2,7 @@ export interface StepsNavigationButtonsProps {
2
2
  step: number;
3
3
  isSending: boolean;
4
4
  onPrevStep?: () => void;
5
+ programId?: string | null;
6
+ productType?: string;
5
7
  }
6
8
  export declare const StepsNavigationButtons: import("@redneckz/uni-jsx").UNIComponent<StepsNavigationButtonsProps, any, any>;
package/mobile/bundle/components/CreditForm/getYandexAspects.d.ts ADDED
@@ -0,0 +1,10 @@
1
+ import { type AspectsDef } from '../../model/AspectsProps';
2
+ interface YandexAspectsParams {
3
+ step: number;
4
+ programId?: string | null;
5
+ productType?: string;
6
+ paymentSystem?: string;
7
+ aspectsData: AspectsDef[][];
8
+ }
9
+ export declare const getYandexAspects: ({ step, programId, productType, paymentSystem, aspectsData, }: YandexAspectsParams) => AspectsDef[];
10
+ export {};
package/mobile/dist/components/CreditForm/CreditFormStep.js CHANGED
@@ -30,6 +30,6 @@ exports.CreditFormStep = (0, uni_jsx_1.JSX)(({ step, sections, programsSource, o
30
30
  formValidator,
31
31
  onSubmit,
32
32
  });
33
- return ((0, jsx_runtime_1.jsxs)("form", { onSubmit: handleSubmit, className: "space-y-m", children: [(0, renderStep_1.renderStep)({ sections, field, params: { calcData } }), (0, jsx_runtime_1.jsx)(StepsNavigationButtons_1.StepsNavigationButtons, { step: step, isSending: isSending, onPrevStep: onPrevStep })] }));
33
+ return ((0, jsx_runtime_1.jsxs)("form", { onSubmit: handleSubmit, className: "space-y-m", children: [(0, renderStep_1.renderStep)({ sections, field, params: { calcData } }), (0, jsx_runtime_1.jsx)(StepsNavigationButtons_1.StepsNavigationButtons, { step: step, isSending: isSending, onPrevStep: onPrevStep, programId: programId, productType: PRODUCT_TYPE })] }));
34
34
  });
35
35
  //# sourceMappingURL=CreditFormStep.js.map
package/mobile/dist/components/CreditForm/CreditFormStep.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"CreditFormStep.js","sourceRoot":"","sources":["../../../src/components/CreditForm/CreditFormStep.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,uDAAmE;AACnE,yDAAsD;AACtD,oEAAiE;AACjE,8EAA2E;AAG3E,8DAA2D;AAC3D,0FAAuF;AAEvF,qEAAkE;AAClE,yDAAsD;AAWtD,MAAM,YAAY,GAAG,QAAQ,CAAC;AAEjB,QAAA,cAAc,GAAG,IAAA,aAAG,EAC/B,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,cAAc,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,EAAE;IACvE,MAAM,EAAE,SAAS,EAAE,GAAG,IAAA,uCAAkB,GAAE,CAAC;IAC3C,IAAA,6BAAa,GAAE,CAAC;IAChB,MAAM,QAAQ,GAAG,cAAc,EAAE,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,CAAC,sDAAsD;IAE1G,MAAM,MAAM,GAAG,IAAA,eAAO,EACpB,GAAG,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAsB,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,IAAI,EAAE,CAAC,EACpE,CAAC,QAAQ,CAAC,CACX,CAAC;IAEF,MAAM,aAAa,GAAG,IAAA,mBAAW,EAC/B,CAAC,SAAwB,EAAE,EAAE,CAC3B,IAAA,+CAAsB,EAAC;QACrB,SAAS;QACT,MAAM;QACN,WAAW,EAAE,YAAY;KAC1B,CAAC,EACJ,CAAC,MAAM,CAAC,CACT,CAAC;IAEF,MAAM,CAAC,YAAY,EAAE,QAAQ,EAAE,SAAS,CAAC,GAAG,IAAA,mCAAgB,EAAC;QAC3D,IAAI;QACJ,UAAU;QACV,QAAQ;KACT,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,GAAG,IAAA,iBAAO,EAAC,YAAY,EAAE;QAClE,aAAa;QACb,QAAQ;KACT,CAAC,CAAC;IAEH,OAAO,CACL,kCAAM,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAC,WAAW,aAChD,IAAA,uBAAU,EAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,EAAE,CAAC,EACtD,uBAAC,+CAAsB,IAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,GAAI,IAC/E,CACR,CAAC;AACJ,CAAC,CACF,CAAC"}
1
+ {"version":3,"file":"CreditFormStep.js","sourceRoot":"","sources":["../../../src/components/CreditForm/CreditFormStep.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AACxC,uDAAmE;AACnE,yDAAsD;AACtD,oEAAiE;AACjE,8EAA2E;AAG3E,8DAA2D;AAC3D,0FAAuF;AAEvF,qEAAkE;AAClE,yDAAsD;AAWtD,MAAM,YAAY,GAAG,QAAQ,CAAC;AAEjB,QAAA,cAAc,GAAG,IAAA,aAAG,EAC/B,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,cAAc,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,EAAE;IACvE,MAAM,EAAE,SAAS,EAAE,GAAG,IAAA,uCAAkB,GAAE,CAAC;IAC3C,IAAA,6BAAa,GAAE,CAAC;IAChB,MAAM,QAAQ,GAAG,cAAc,EAAE,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,CAAC,sDAAsD;IAE1G,MAAM,MAAM,GAAG,IAAA,eAAO,EACpB,GAAG,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAsB,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,IAAI,EAAE,CAAC,EACpE,CAAC,QAAQ,CAAC,CACX,CAAC;IAEF,MAAM,aAAa,GAAG,IAAA,mBAAW,EAC/B,CAAC,SAAwB,EAAE,EAAE,CAC3B,IAAA,+CAAsB,EAAC;QACrB,SAAS;QACT,MAAM;QACN,WAAW,EAAE,YAAY;KAC1B,CAAC,EACJ,CAAC,MAAM,CAAC,CACT,CAAC;IAEF,MAAM,CAAC,YAAY,EAAE,QAAQ,EAAE,SAAS,CAAC,GAAG,IAAA,mCAAgB,EAAC;QAC3D,IAAI;QACJ,UAAU;QACV,QAAQ;KACT,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,GAAG,IAAA,iBAAO,EAAC,YAAY,EAAE;QAClE,aAAa;QACb,QAAQ;KACT,CAAC,CAAC;IAEH,OAAO,CACL,kCAAM,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAC,WAAW,aAChD,IAAA,uBAAU,EAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,EAAE,CAAC,EACtD,uBAAC,+CAAsB,IACrB,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,YAAY,GACzB,IACG,CACR,CAAC;AACJ,CAAC,CACF,CAAC"}
package/mobile/dist/components/CreditForm/StepsNavigationButtons.d.ts CHANGED
@@ -2,5 +2,7 @@ export interface StepsNavigationButtonsProps {
2
2
  step: number;
3
3
  isSending: boolean;
4
4
  onPrevStep?: () => void;
5
+ programId?: string | null;
6
+ productType?: string;
5
7
  }
6
8
  export declare const StepsNavigationButtons: import("@redneckz/uni-jsx").UNIComponent<StepsNavigationButtonsProps, any, any>;
package/mobile/dist/components/CreditForm/StepsNavigationButtons.js CHANGED
@@ -5,6 +5,7 @@ const uni_jsx_1 = require("@redneckz/uni-jsx");
5
5
  const ProjectSettings_1 = require("../../ProjectSettings");
6
6
  const Button_1 = require("../../ui-kit/Button/Button");
7
7
  const SubmitButton_1 = require("../../ui-kit/Button/SubmitButton");
8
+ const getYandexAspects_1 = require("./getYandexAspects");
8
9
  const YANDEX_ID = ProjectSettings_1.projectSettings.YANDEX_METRIKA_ID || '92511315';
9
10
  const data = [
10
11
  [
@@ -93,12 +94,15 @@ const data = [
93
94
  },
94
95
  ],
95
96
  ];
96
- const getAspects = (step) => {
97
- return data[step] || [];
98
- };
99
- exports.StepsNavigationButtons = (0, uni_jsx_1.JSX)(({ step, onPrevStep, isSending }) => {
97
+ exports.StepsNavigationButtons = (0, uni_jsx_1.JSX)(({ step, onPrevStep, isSending, programId, productType = 'credit' }) => {
100
98
  const isFirstStep = step === 0;
101
99
  const isFinalStep = step === 5;
102
- return ((0, jsx_runtime_1.jsxs)("div", { className: 'flex justify-between gap-m', children: [(0, jsx_runtime_1.jsx)(Button_1.Button, { version: "secondary", disabled: isFirstStep, onClick: onPrevStep, testId: "back-button", children: "\u041D\u0430\u0437\u0430\u0434" }), (0, jsx_runtime_1.jsx)(SubmitButton_1.SubmitButton, { isLoading: isSending, testId: "next-button", data: getAspects(step), children: isFinalStep ? 'Отправить заявку' : 'Далее' })] }));
100
+ const aspects = (0, getYandexAspects_1.getYandexAspects)({
101
+ step,
102
+ programId,
103
+ productType,
104
+ aspectsData: data,
105
+ });
106
+ return ((0, jsx_runtime_1.jsxs)("div", { className: 'flex justify-between gap-m', children: [(0, jsx_runtime_1.jsx)(Button_1.Button, { version: "secondary", disabled: isFirstStep, onClick: onPrevStep, testId: "back-button", children: "\u041D\u0430\u0437\u0430\u0434" }), (0, jsx_runtime_1.jsx)(SubmitButton_1.SubmitButton, { isLoading: isSending, testId: "next-button", data: aspects, children: isFinalStep ? 'Отправить заявку' : 'Далее' })] }));
103
107
  });
104
108
  //# sourceMappingURL=StepsNavigationButtons.js.map
package/mobile/dist/components/CreditForm/StepsNavigationButtons.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"StepsNavigationButtons.js","sourceRoot":"","sources":["../../../src/components/CreditForm/StepsNavigationButtons.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AAExC,2DAAwD;AACxD,uDAAoD;AACpD,mEAAgE;AAQhE,MAAM,SAAS,GAAG,iCAAe,CAAC,iBAAiB,IAAI,UAAU,CAAC;AAElE,MAAM,IAAI,GAAmB;IAC3B;QACE;YACE,UAAU,EAAE,aAAa;YACzB,MAAM,EAAE;gBACN,QAAQ,EAAE,SAAS;gBACnB,UAAU,EAAE,mBAAmB;aAChC;SACF;QACD;YACE,UAAU,EAAE,eAAe;YAC3B,MAAM,EAAE;gBACN,WAAW,EAAE,kDAAkD;gBAC/D,aAAa,EAAE,gBAAgB;gBAC/B,cAAc,EAAE,iEAAiE;aAClF;SACF;KACF;IACD;QACE;YACE,UAAU,EAAE,aAAa;YACzB,MAAM,EAAE;gBACN,QAAQ,EAAE,SAAS;gBACnB,UAAU,EAAE,mBAAmB;aAChC;SACF;QACD;YACE,UAAU,EAAE,eAAe;YAC3B,MAAM,EAAE;gBACN,WAAW,EAAE,oDAAoD;gBACjE,aAAa,EAAE,gBAAgB;gBAC/B,cAAc,EAAE,6DAA6D;aAC9E;SACF;KACF;IACD;QACE;YACE,UAAU,EAAE,aAAa;YACzB,MAAM,EAAE;gBACN,QAAQ,EAAE,SAAS;gBACnB,UAAU,EAAE,UAAU;aACvB;SACF;QACD;YACE,UAAU,EAAE,eAAe;YAC3B,MAAM,EAAE;gBACN,WAAW,EAAE,2DAA2D;gBACxE,aAAa,EAAE,gBAAgB;gBAC/B,cAAc,EAAE,iEAAiE;aAClF;SACF;KACF;IACD;QACE;YACE,UAAU,EAAE,aAAa;YACzB,MAAM,EAAE;gBACN,QAAQ,EAAE,SAAS;gBACnB,UAAU,EAAE,YAAY;aACzB;SACF;QACD;YACE,UAAU,EAAE,eAAe;YAC3B,MAAM,EAAE;gBACN,WAAW,EAAE,wDAAwD;gBACrE,aAAa,EAAE,gBAAgB;gBAC/B,cAAc,EAAE,sEAAsE;aACvF;SACF;KACF;IACD;QACE;YACE,UAAU,EAAE,aAAa;YACzB,MAAM,EAAE;gBACN,QAAQ,EAAE,SAAS;gBACnB,UAAU,EAAE,iBAAiB;aAC9B;SACF;QACD;YACE,UAAU,EAAE,eAAe;YAC3B,MAAM,EAAE;gBACN,WAAW,EAAE,kEAAkE;gBAC/E,aAAa,EAAE,gBAAgB;gBAC/B,cAAc,EAAE,2DAA2D;aAC5E;SACF;KACF;CACF,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,IAAY,EAAgB,EAAE;IAChD,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;AAC1B,CAAC,CAAC;AAEW,QAAA,sBAAsB,GAAG,IAAA,aAAG,EACvC,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,EAAE;IAClC,MAAM,WAAW,GAAG,IAAI,KAAK,CAAC,CAAC;IAC/B,MAAM,WAAW,GAAG,IAAI,KAAK,CAAC,CAAC;IAE/B,OAAO,CACL,iCAAK,SAAS,EAAE,4BAA4B,aAC1C,uBAAC,eAAM,IACL,OAAO,EAAC,WAAW,EACnB,QAAQ,EAAE,WAAW,EACrB,OAAO,EAAE,UAAU,EACnB,MAAM,EAAC,aAAa,+CAGb,EACT,uBAAC,2BAAY,IAAC,SAAS,EAAE,SAAS,EAAE,MAAM,EAAC,aAAa,EAAC,IAAI,EAAE,UAAU,CAAC,IAAI,CAAC,YAC5E,WAAW,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,GAC9B,IACX,CACP,CAAC;AACJ,CAAC,CACF,CAAC"}
1
+ {"version":3,"file":"StepsNavigationButtons.js","sourceRoot":"","sources":["../../../src/components/CreditForm/StepsNavigationButtons.tsx"],"names":[],"mappings":";;;AAAA,+CAAwC;AAExC,2DAAwD;AACxD,uDAAoD;AACpD,mEAAgE;AAChE,yDAAsD;AAStD,MAAM,SAAS,GAAG,iCAAe,CAAC,iBAAiB,IAAI,UAAU,CAAC;AAElE,MAAM,IAAI,GAAmB;IAC3B;QACE;YACE,UAAU,EAAE,aAAa;YACzB,MAAM,EAAE;gBACN,QAAQ,EAAE,SAAS;gBACnB,UAAU,EAAE,mBAAmB;aAChC;SACF;QACD;YACE,UAAU,EAAE,eAAe;YAC3B,MAAM,EAAE;gBACN,WAAW,EAAE,kDAAkD;gBAC/D,aAAa,EAAE,gBAAgB;gBAC/B,cAAc,EAAE,iEAAiE;aAClF;SACF;KACF;IACD;QACE;YACE,UAAU,EAAE,aAAa;YACzB,MAAM,EAAE;gBACN,QAAQ,EAAE,SAAS;gBACnB,UAAU,EAAE,mBAAmB;aAChC;SACF;QACD;YACE,UAAU,EAAE,eAAe;YAC3B,MAAM,EAAE;gBACN,WAAW,EAAE,oDAAoD;gBACjE,aAAa,EAAE,gBAAgB;gBAC/B,cAAc,EAAE,6DAA6D;aAC9E;SACF;KACF;IACD;QACE;YACE,UAAU,EAAE,aAAa;YACzB,MAAM,EAAE;gBACN,QAAQ,EAAE,SAAS;gBACnB,UAAU,EAAE,UAAU;aACvB;SACF;QACD;YACE,UAAU,EAAE,eAAe;YAC3B,MAAM,EAAE;gBACN,WAAW,EAAE,2DAA2D;gBACxE,aAAa,EAAE,gBAAgB;gBAC/B,cAAc,EAAE,iEAAiE;aAClF;SACF;KACF;IACD;QACE;YACE,UAAU,EAAE,aAAa;YACzB,MAAM,EAAE;gBACN,QAAQ,EAAE,SAAS;gBACnB,UAAU,EAAE,YAAY;aACzB;SACF;QACD;YACE,UAAU,EAAE,eAAe;YAC3B,MAAM,EAAE;gBACN,WAAW,EAAE,wDAAwD;gBACrE,aAAa,EAAE,gBAAgB;gBAC/B,cAAc,EAAE,sEAAsE;aACvF;SACF;KACF;IACD;QACE;YACE,UAAU,EAAE,aAAa;YACzB,MAAM,EAAE;gBACN,QAAQ,EAAE,SAAS;gBACnB,UAAU,EAAE,iBAAiB;aAC9B;SACF;QACD;YACE,UAAU,EAAE,eAAe;YAC3B,MAAM,EAAE;gBACN,WAAW,EAAE,kEAAkE;gBAC/E,aAAa,EAAE,gBAAgB;gBAC/B,cAAc,EAAE,2DAA2D;aAC5E;SACF;KACF;CACF,CAAC;AAEW,QAAA,sBAAsB,GAAG,IAAA,aAAG,EACvC,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,GAAG,QAAQ,EAAE,EAAE,EAAE;IACrE,MAAM,WAAW,GAAG,IAAI,KAAK,CAAC,CAAC;IAC/B,MAAM,WAAW,GAAG,IAAI,KAAK,CAAC,CAAC;IAE/B,MAAM,OAAO,GAAG,IAAA,mCAAgB,EAAC;QAC/B,IAAI;QACJ,SAAS;QACT,WAAW;QACX,WAAW,EAAE,IAAI;KAClB,CAAC,CAAC;IAEH,OAAO,CACL,iCAAK,SAAS,EAAE,4BAA4B,aAC1C,uBAAC,eAAM,IACL,OAAO,EAAC,WAAW,EACnB,QAAQ,EAAE,WAAW,EACrB,OAAO,EAAE,UAAU,EACnB,MAAM,EAAC,aAAa,+CAGb,EACT,uBAAC,2BAAY,IAAC,SAAS,EAAE,SAAS,EAAE,MAAM,EAAC,aAAa,EAAC,IAAI,EAAE,OAAO,YACnE,WAAW,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,GAC9B,IACX,CACP,CAAC;AACJ,CAAC,CACF,CAAC"}
package/mobile/dist/components/CreditForm/getYandexAspects.d.ts ADDED
@@ -0,0 +1,10 @@
1
+ import { type AspectsDef } from '../../model/AspectsProps';
2
+ interface YandexAspectsParams {
3
+ step: number;
4
+ programId?: string | null;
5
+ productType?: string;
6
+ paymentSystem?: string;
7
+ aspectsData: AspectsDef[][];
8
+ }
9
+ export declare const getYandexAspects: ({ step, programId, productType, paymentSystem, aspectsData, }: YandexAspectsParams) => AspectsDef[];
10
+ export {};
package/mobile/dist/components/CreditForm/getYandexAspects.js ADDED
@@ -0,0 +1,38 @@
1
+ Object.defineProperty(exports, "__esModule", { value: true });
2
+ exports.getYandexAspects = void 0;
3
+ const getCreditInfo_1 = require("./getCreditInfo");
4
+ const getVisitParams = (programId, productType, paymentSystem) => {
5
+ const creditInfo = (0, getCreditInfo_1.getCreditInfo)(programId ?? null);
6
+ const productName = creditInfo?.name || '';
7
+ const productTypeValue = productType ?? '';
8
+ if (paymentSystem && productType !== 'credit') {
9
+ return {
10
+ [productTypeValue]: {
11
+ [productName]: paymentSystem,
12
+ },
13
+ };
14
+ }
15
+ else {
16
+ return {
17
+ [productTypeValue]: productName,
18
+ };
19
+ }
20
+ };
21
+ const getYandexAspects = ({ step, programId, productType, paymentSystem, aspectsData, }) => {
22
+ const aspects = aspectsData[step] || [];
23
+ const visitParams = getVisitParams(programId, productType, paymentSystem);
24
+ return aspects.map((aspect) => {
25
+ if (aspect.aspectName === 'ymReachGoal') {
26
+ return {
27
+ ...aspect,
28
+ params: {
29
+ ...aspect.params,
30
+ ...visitParams,
31
+ },
32
+ };
33
+ }
34
+ return aspect;
35
+ });
36
+ };
37
+ exports.getYandexAspects = getYandexAspects;
38
+ //# sourceMappingURL=getYandexAspects.js.map
package/mobile/dist/components/CreditForm/getYandexAspects.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"getYandexAspects.js","sourceRoot":"","sources":["../../../src/components/CreditForm/getYandexAspects.ts"],"names":[],"mappings":";;AAEA,mDAAgD;AAUhD,MAAM,cAAc,GAAG,CACrB,SAAyB,EACzB,WAAoB,EACpB,aAAsB,EACG,EAAE;IAC3B,MAAM,UAAU,GAAG,IAAA,6BAAa,EAAC,SAAS,IAAI,IAAI,CAAC,CAAC;IACpD,MAAM,WAAW,GAAG,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC;IAC3C,MAAM,gBAAgB,GAAG,WAAW,IAAI,EAAE,CAAC;IAE3C,IAAI,aAAa,IAAI,WAAW,KAAK,QAAQ,EAAE;QAC7C,OAAO;YACL,CAAC,gBAAgB,CAAC,EAAE;gBAClB,CAAC,WAAW,CAAC,EAAE,aAAa;aAC7B;SACF,CAAC;KACH;SAAM;QACL,OAAO;YACL,CAAC,gBAAgB,CAAC,EAAE,WAAW;SAChC,CAAC;KACH;AACH,CAAC,CAAC;AAEK,MAAM,gBAAgB,GAAG,CAAC,EAC/B,IAAI,EACJ,SAAS,EACT,WAAW,EACX,aAAa,EACb,WAAW,GACS,EAAgB,EAAE;IACtC,MAAM,OAAO,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;IACxC,MAAM,WAAW,GAAG,cAAc,CAAC,SAAS,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;IAE1E,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QAC5B,IAAI,MAAM,CAAC,UAAU,KAAK,aAAa,EAAE;YACvC,OAAO;gBACL,GAAG,MAAM;gBACT,MAAM,EAAE;oBACN,GAAG,MAAM,CAAC,MAAM;oBAChB,GAAG,WAAW;iBACD;aAChB,CAAC;SACH;QAED,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAvBW,QAAA,gBAAgB,oBAuB3B"}
package/mobile/lib/components/CreditForm/CreditFormStep.js CHANGED
@@ -28,6 +28,6 @@ export const CreditFormStep = JSX(({ step, sections, programsSource, onPrevStep,
28
28
  formValidator,
29
29
  onSubmit,
30
30
  });
31
- return (_jsxs("form", { onSubmit: handleSubmit, className: "space-y-m", children: [renderStep({ sections, field, params: { calcData } }), _jsx(StepsNavigationButtons, { step: step, isSending: isSending, onPrevStep: onPrevStep })] }));
31
+ return (_jsxs("form", { onSubmit: handleSubmit, className: "space-y-m", children: [renderStep({ sections, field, params: { calcData } }), _jsx(StepsNavigationButtons, { step: step, isSending: isSending, onPrevStep: onPrevStep, programId: programId, productType: PRODUCT_TYPE })] }));
32
32
  });
33
33
  //# sourceMappingURL=CreditFormStep.js.map
package/mobile/lib/components/CreditForm/CreditFormStep.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"CreditFormStep.js","sourceRoot":"","sources":["../../../src/components/CreditForm/CreditFormStep.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAG3E,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,+CAA+C,CAAC;AAEvF,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAWtD,MAAM,YAAY,GAAG,QAAQ,CAAC;AAE9B,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,CAC/B,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,cAAc,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,EAAE;IACvE,MAAM,EAAE,SAAS,EAAE,GAAG,kBAAkB,EAAE,CAAC;IAC3C,aAAa,EAAE,CAAC;IAChB,MAAM,QAAQ,GAAG,cAAc,EAAE,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,CAAC,sDAAsD;IAE1G,MAAM,MAAM,GAAG,OAAO,CACpB,GAAG,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAsB,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,IAAI,EAAE,CAAC,EACpE,CAAC,QAAQ,CAAC,CACX,CAAC;IAEF,MAAM,aAAa,GAAG,WAAW,CAC/B,CAAC,SAAwB,EAAE,EAAE,CAC3B,sBAAsB,CAAC;QACrB,SAAS;QACT,MAAM;QACN,WAAW,EAAE,YAAY;KAC1B,CAAC,EACJ,CAAC,MAAM,CAAC,CACT,CAAC;IAEF,MAAM,CAAC,YAAY,EAAE,QAAQ,EAAE,SAAS,CAAC,GAAG,gBAAgB,CAAC;QAC3D,IAAI;QACJ,UAAU;QACV,QAAQ;KACT,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,GAAG,OAAO,CAAC,YAAY,EAAE;QAClE,aAAa;QACb,QAAQ;KACT,CAAC,CAAC;IAEH,OAAO,CACL,gBAAM,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAC,WAAW,aAChD,UAAU,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,EAAE,CAAC,EACtD,KAAC,sBAAsB,IAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,GAAI,IAC/E,CACR,CAAC;AACJ,CAAC,CACF,CAAC"}
1
+ {"version":3,"file":"CreditFormStep.js","sourceRoot":"","sources":["../../../src/components/CreditForm/CreditFormStep.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAG3E,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,+CAA+C,CAAC;AAEvF,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAWtD,MAAM,YAAY,GAAG,QAAQ,CAAC;AAE9B,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,CAC/B,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,cAAc,EAAE,UAAU,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,EAAE;IACvE,MAAM,EAAE,SAAS,EAAE,GAAG,kBAAkB,EAAE,CAAC;IAC3C,aAAa,EAAE,CAAC;IAChB,MAAM,QAAQ,GAAG,cAAc,EAAE,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,CAAC,sDAAsD;IAE1G,MAAM,MAAM,GAAG,OAAO,CACpB,GAAG,EAAE,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAsB,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,IAAI,EAAE,CAAC,EACpE,CAAC,QAAQ,CAAC,CACX,CAAC;IAEF,MAAM,aAAa,GAAG,WAAW,CAC/B,CAAC,SAAwB,EAAE,EAAE,CAC3B,sBAAsB,CAAC;QACrB,SAAS;QACT,MAAM;QACN,WAAW,EAAE,YAAY;KAC1B,CAAC,EACJ,CAAC,MAAM,CAAC,CACT,CAAC;IAEF,MAAM,CAAC,YAAY,EAAE,QAAQ,EAAE,SAAS,CAAC,GAAG,gBAAgB,CAAC;QAC3D,IAAI;QACJ,UAAU;QACV,QAAQ;KACT,CAAC,CAAC;IAEH,MAAM,CAAC,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,GAAG,OAAO,CAAC,YAAY,EAAE;QAClE,aAAa;QACb,QAAQ;KACT,CAAC,CAAC;IAEH,OAAO,CACL,gBAAM,QAAQ,EAAE,YAAY,EAAE,SAAS,EAAC,WAAW,aAChD,UAAU,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,EAAE,CAAC,EACtD,KAAC,sBAAsB,IACrB,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,SAAS,EACpB,WAAW,EAAE,YAAY,GACzB,IACG,CACR,CAAC;AACJ,CAAC,CACF,CAAC"}
package/mobile/lib/components/CreditForm/StepsNavigationButtons.d.ts CHANGED
@@ -2,5 +2,7 @@ export interface StepsNavigationButtonsProps {
2
2
  step: number;
3
3
  isSending: boolean;
4
4
  onPrevStep?: () => void;
5
+ programId?: string | null;
6
+ productType?: string;
5
7
  }
6
8
  export declare const StepsNavigationButtons: import("@redneckz/uni-jsx").UNIComponent<StepsNavigationButtonsProps, any, any>;
package/mobile/lib/components/CreditForm/StepsNavigationButtons.js CHANGED
@@ -3,6 +3,7 @@ import { JSX } from '@redneckz/uni-jsx';
3
3
  import { projectSettings } from '../../ProjectSettings.js';
4
4
  import { Button } from '../../ui-kit/Button/Button.js';
5
5
  import { SubmitButton } from '../../ui-kit/Button/SubmitButton.js';
6
+ import { getYandexAspects } from './getYandexAspects.js';
6
7
  const YANDEX_ID = projectSettings.YANDEX_METRIKA_ID || '92511315';
7
8
  const data = [
8
9
  [
@@ -91,12 +92,15 @@ const data = [
91
92
  },
92
93
  ],
93
94
  ];
94
- const getAspects = (step) => {
95
- return data[step] || [];
96
- };
97
- export const StepsNavigationButtons = JSX(({ step, onPrevStep, isSending }) => {
95
+ export const StepsNavigationButtons = JSX(({ step, onPrevStep, isSending, programId, productType = 'credit' }) => {
98
96
  const isFirstStep = step === 0;
99
97
  const isFinalStep = step === 5;
100
- return (_jsxs("div", { className: 'flex justify-between gap-m', children: [_jsx(Button, { version: "secondary", disabled: isFirstStep, onClick: onPrevStep, testId: "back-button", children: "\u041D\u0430\u0437\u0430\u0434" }), _jsx(SubmitButton, { isLoading: isSending, testId: "next-button", data: getAspects(step), children: isFinalStep ? 'Отправить заявку' : 'Далее' })] }));
98
+ const aspects = getYandexAspects({
99
+ step,
100
+ programId,
101
+ productType,
102
+ aspectsData: data,
103
+ });
104
+ return (_jsxs("div", { className: 'flex justify-between gap-m', children: [_jsx(Button, { version: "secondary", disabled: isFirstStep, onClick: onPrevStep, testId: "back-button", children: "\u041D\u0430\u0437\u0430\u0434" }), _jsx(SubmitButton, { isLoading: isSending, testId: "next-button", data: aspects, children: isFinalStep ? 'Отправить заявку' : 'Далее' })] }));
101
105
  });
102
106
  //# sourceMappingURL=StepsNavigationButtons.js.map
package/mobile/lib/components/CreditForm/StepsNavigationButtons.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"StepsNavigationButtons.js","sourceRoot":"","sources":["../../../src/components/CreditForm/StepsNavigationButtons.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"StepsNavigationButtons.js","sourceRoot":"","sources":["../../../src/components/CreditForm/StepsNavigationButtons.tsx"],"names":[],"mappings":"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"}
package/mobile/lib/components/CreditForm/getYandexAspects.d.ts ADDED
@@ -0,0 +1,10 @@
1
+ import { type AspectsDef } from '../../model/AspectsProps';
2
+ interface YandexAspectsParams {
3
+ step: number;
4
+ programId?: string | null;
5
+ productType?: string;
6
+ paymentSystem?: string;
7
+ aspectsData: AspectsDef[][];
8
+ }
9
+ export declare const getYandexAspects: ({ step, programId, productType, paymentSystem, aspectsData, }: YandexAspectsParams) => AspectsDef[];
10
+ export {};
package/mobile/lib/components/CreditForm/getYandexAspects.js ADDED
@@ -0,0 +1,35 @@
1
+ import { getCreditInfo } from './getCreditInfo.js';
2
+ const getVisitParams = (programId, productType, paymentSystem) => {
3
+ const creditInfo = getCreditInfo(programId ?? null);
4
+ const productName = creditInfo?.name || '';
5
+ const productTypeValue = productType ?? '';
6
+ if (paymentSystem && productType !== 'credit') {
7
+ return {
8
+ [productTypeValue]: {
9
+ [productName]: paymentSystem,
10
+ },
11
+ };
12
+ }
13
+ else {
14
+ return {
15
+ [productTypeValue]: productName,
16
+ };
17
+ }
18
+ };
19
+ export const getYandexAspects = ({ step, programId, productType, paymentSystem, aspectsData, }) => {
20
+ const aspects = aspectsData[step] || [];
21
+ const visitParams = getVisitParams(programId, productType, paymentSystem);
22
+ return aspects.map((aspect) => {
23
+ if (aspect.aspectName === 'ymReachGoal') {
24
+ return {
25
+ ...aspect,
26
+ params: {
27
+ ...aspect.params,
28
+ ...visitParams,
29
+ },
30
+ };
31
+ }
32
+ return aspect;
33
+ });
34
+ };
35
+ //# sourceMappingURL=getYandexAspects.js.map
package/mobile/lib/components/CreditForm/getYandexAspects.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"getYandexAspects.js","sourceRoot":"","sources":["../../../src/components/CreditForm/getYandexAspects.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAUhD,MAAM,cAAc,GAAG,CACrB,SAAyB,EACzB,WAAoB,EACpB,aAAsB,EACG,EAAE;IAC3B,MAAM,UAAU,GAAG,aAAa,CAAC,SAAS,IAAI,IAAI,CAAC,CAAC;IACpD,MAAM,WAAW,GAAG,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC;IAC3C,MAAM,gBAAgB,GAAG,WAAW,IAAI,EAAE,CAAC;IAE3C,IAAI,aAAa,IAAI,WAAW,KAAK,QAAQ,EAAE;QAC7C,OAAO;YACL,CAAC,gBAAgB,CAAC,EAAE;gBAClB,CAAC,WAAW,CAAC,EAAE,aAAa;aAC7B;SACF,CAAC;KACH;SAAM;QACL,OAAO;YACL,CAAC,gBAAgB,CAAC,EAAE,WAAW;SAChC,CAAC;KACH;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,EAC/B,IAAI,EACJ,SAAS,EACT,WAAW,EACX,aAAa,EACb,WAAW,GACS,EAAgB,EAAE;IACtC,MAAM,OAAO,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;IACxC,MAAM,WAAW,GAAG,cAAc,CAAC,SAAS,EAAE,WAAW,EAAE,aAAa,CAAC,CAAC;IAE1E,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QAC5B,IAAI,MAAM,CAAC,UAAU,KAAK,aAAa,EAAE;YACvC,OAAO;gBACL,GAAG,MAAM;gBACT,MAAM,EAAE;oBACN,GAAG,MAAM,CAAC,MAAM;oBAChB,GAAG,WAAW;iBACD;aAChB,CAAC;SACH;QAED,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;AACL,CAAC,CAAC"}
package/mobile/src/components/ApplicationForm/ApplicationForm.example.json CHANGED
@@ -1899,22 +1899,9 @@
1899
1899
  "columns": 2,
1900
1900
  "inputs": [
1901
1901
  { "name": "dadataPartyNameSelect", "required": true },
1902
- { "name": "dadataPartyInnSelect", "required": true }
1903
- ]
1904
- },
1905
- {
1906
- "columns": 2,
1907
- "inputs": [
1902
+ { "name": "dadataPartyInnSelect", "required": true },
1903
+ { "name": "name", "required": true },
1908
1904
  { "name": "phone", "required": true },
1909
- { "name": "email", "required": true }
1910
- ]
1911
- },
1912
- {
1913
- "inputs": [{ "name": "name", "required": true }]
1914
- },
1915
- {
1916
- "columns": 2,
1917
- "inputs": [
1918
1905
  { "name": "region", "required": true },
1919
1906
  { "name": "addressBranch", "required": true }
1920
1907
  ]
package/mobile/src/components/CreditForm/CreditFormStep.tsx CHANGED
@@ -57,7 +57,13 @@ export const CreditFormStep = JSX<CreditFormStepProps>(
57
57
  return (
58
58
  <form onSubmit={handleSubmit} className="space-y-m">
59
59
  {renderStep({ sections, field, params: { calcData } })}
60
- <StepsNavigationButtons step={step} isSending={isSending} onPrevStep={onPrevStep} />
60
+ <StepsNavigationButtons
61
+ step={step}
62
+ isSending={isSending}
63
+ onPrevStep={onPrevStep}
64
+ programId={programId}
65
+ productType={PRODUCT_TYPE}
66
+ />
61
67
  </form>
62
68
  );
63
69
  },
package/mobile/src/components/CreditForm/StepsNavigationButtons.tsx CHANGED
@@ -3,11 +3,13 @@ import { type AspectsDef } from '../../model/AspectsProps';
3
3
  import { projectSettings } from '../../ProjectSettings';
4
4
  import { Button } from '../../ui-kit/Button/Button';
5
5
  import { SubmitButton } from '../../ui-kit/Button/SubmitButton';
6
-
6
+ import { getYandexAspects } from './getYandexAspects';
7
7
  export interface StepsNavigationButtonsProps {
8
8
  step: number;
9
9
  isSending: boolean;
10
10
  onPrevStep?: () => void;
11
+ programId?: string | null;
12
+ productType?: string;
11
13
  }
12
14
 
13
15
  const YANDEX_ID = projectSettings.YANDEX_METRIKA_ID || '92511315';
@@ -100,15 +102,18 @@ const data: AspectsDef[][] = [
100
102
  ],
101
103
  ];
102
104
 
103
- const getAspects = (step: number): AspectsDef[] => {
104
- return data[step] || [];
105
- };
106
-
107
105
  export const StepsNavigationButtons = JSX<StepsNavigationButtonsProps>(
108
- ({ step, onPrevStep, isSending }) => {
106
+ ({ step, onPrevStep, isSending, programId, productType = 'credit' }) => {
109
107
  const isFirstStep = step === 0;
110
108
  const isFinalStep = step === 5;
111
109
 
110
+ const aspects = getYandexAspects({
111
+ step,
112
+ programId,
113
+ productType,
114
+ aspectsData: data,
115
+ });
116
+
112
117
  return (
113
118
  <div className={'flex justify-between gap-m'}>
114
119
  <Button
@@ -119,7 +124,7 @@ export const StepsNavigationButtons = JSX<StepsNavigationButtonsProps>(
119
124
  >
120
125
  Назад
121
126
  </Button>
122
- <SubmitButton isLoading={isSending} testId="next-button" data={getAspects(step)}>
127
+ <SubmitButton isLoading={isSending} testId="next-button" data={aspects}>
123
128
  {isFinalStep ? 'Отправить заявку' : 'Далее'}
124
129
  </SubmitButton>
125
130
  </div>
package/mobile/src/components/CreditForm/getYandexAspects.ts ADDED
@@ -0,0 +1,58 @@
1
+ import { type AspectData } from '../../hooks/useAspects/useAspects';
2
+ import { type AspectsDef } from '../../model/AspectsProps';
3
+ import { getCreditInfo } from './getCreditInfo';
4
+
5
+ interface YandexAspectsParams {
6
+ step: number;
7
+ programId?: string | null;
8
+ productType?: string;
9
+ paymentSystem?: string;
10
+ aspectsData: AspectsDef[][];
11
+ }
12
+
13
+ const getVisitParams = (
14
+ programId?: string | null,
15
+ productType?: string,
16
+ paymentSystem?: string,
17
+ ): Record<string, unknown> => {
18
+ const creditInfo = getCreditInfo(programId ?? null);
19
+ const productName = creditInfo?.name || '';
20
+ const productTypeValue = productType ?? '';
21
+
22
+ if (paymentSystem && productType !== 'credit') {
23
+ return {
24
+ [productTypeValue]: {
25
+ [productName]: paymentSystem,
26
+ },
27
+ };
28
+ } else {
29
+ return {
30
+ [productTypeValue]: productName,
31
+ };
32
+ }
33
+ };
34
+
35
+ export const getYandexAspects = ({
36
+ step,
37
+ programId,
38
+ productType,
39
+ paymentSystem,
40
+ aspectsData,
41
+ }: YandexAspectsParams): AspectsDef[] => {
42
+ const aspects = aspectsData[step] || [];
43
+ const visitParams = getVisitParams(programId, productType, paymentSystem);
44
+
45
+ return aspects.map((aspect) => {
46
+ if (aspect.aspectName === 'ymReachGoal') {
47
+ return {
48
+ ...aspect,
49
+ params: {
50
+ ...aspect.params,
51
+ ...visitParams,
52
+ } as AspectData,
53
+ };
54
+ }
55
+
56
+ return aspect;
57
+ });
58
+ };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@redneckz/wildless-cms-uni-blocks",
3
- "version": "0.14.1067",
3
+ "version": "0.14.1069",
4
4
  "private": false,
5
5
  "license": "MIT",
6
6
  "author": "ЦК",
package/src/components/ApplicationForm/ApplicationForm.example.json CHANGED
@@ -1899,22 +1899,9 @@
1899
1899
  "columns": 2,
1900
1900
  "inputs": [
1901
1901
  { "name": "dadataPartyNameSelect", "required": true },
1902
- { "name": "dadataPartyInnSelect", "required": true }
1903
- ]
1904
- },
1905
- {
1906
- "columns": 2,
1907
- "inputs": [
1902
+ { "name": "dadataPartyInnSelect", "required": true },
1903
+ { "name": "name", "required": true },
1908
1904
  { "name": "phone", "required": true },
1909
- { "name": "email", "required": true }
1910
- ]
1911
- },
1912
- {
1913
- "inputs": [{ "name": "name", "required": true }]
1914
- },
1915
- {
1916
- "columns": 2,
1917
- "inputs": [
1918
1905
  { "name": "region", "required": true },
1919
1906
  { "name": "addressBranch", "required": true }
1920
1907
  ]
package/src/components/ApplicationForm/ApplicationForm.fixture.mobile.tsx CHANGED
@@ -985,23 +985,10 @@ export default {
985
985
  {
986
986
  columns: 2,
987
987
  inputs: [
988
- { name: 'dadataPartyNameSelect', required: true, label: 'Полное наименование' },
989
- { name: 'dadataPartyInnSelect', required: true, label: 'Полное наименование' },
990
- ],
991
- },
992
- {
993
- columns: 2,
994
- inputs: [
988
+ { name: 'dadataPartyNameSelect', required: true },
989
+ { name: 'dadataPartyInnSelect', required: true },
990
+ { name: 'name', required: true },
995
991
  { name: 'phone', required: true },
996
- { name: 'email', required: true },
997
- ],
998
- },
999
- {
1000
- inputs: [{ name: 'name', required: true }],
1001
- },
1002
- {
1003
- columns: 2,
1004
- inputs: [
1005
992
  { name: 'region', required: true },
1006
993
  { name: 'addressBranch', required: true },
1007
994
  ],
package/src/components/ApplicationForm/ApplicationForm.fixture.tsx CHANGED
@@ -1205,21 +1205,8 @@ export default {
1205
1205
  inputs: [
1206
1206
  { name: 'dadataPartyNameSelect', required: true },
1207
1207
  { name: 'dadataPartyInnSelect', required: true },
1208
- ],
1209
- },
1210
- {
1211
- columns: 2,
1212
- inputs: [
1208
+ { name: 'name', required: true },
1213
1209
  { name: 'phone', required: true },
1214
- { name: 'email', required: true },
1215
- ],
1216
- },
1217
- {
1218
- inputs: [{ name: 'name', required: true }],
1219
- },
1220
- {
1221
- columns: 2,
1222
- inputs: [
1223
1210
  { name: 'region', required: true },
1224
1211
  { name: 'addressBranch', required: true },
1225
1212
  ],
package/src/components/CreditForm/CreditFormStep.tsx CHANGED
@@ -57,7 +57,13 @@ export const CreditFormStep = JSX<CreditFormStepProps>(
57
57
  return (
58
58
  <form onSubmit={handleSubmit} className="space-y-m">
59
59
  {renderStep({ sections, field, params: { calcData } })}
60
- <StepsNavigationButtons step={step} isSending={isSending} onPrevStep={onPrevStep} />
60
+ <StepsNavigationButtons
61
+ step={step}
62
+ isSending={isSending}
63
+ onPrevStep={onPrevStep}
64
+ programId={programId}
65
+ productType={PRODUCT_TYPE}
66
+ />
61
67
  </form>
62
68
  );
63
69
  },
package/src/components/CreditForm/StepsNavigationButtons.tsx CHANGED
@@ -3,11 +3,13 @@ import { type AspectsDef } from '../../model/AspectsProps';
3
3
  import { projectSettings } from '../../ProjectSettings';
4
4
  import { Button } from '../../ui-kit/Button/Button';
5
5
  import { SubmitButton } from '../../ui-kit/Button/SubmitButton';
6
-
6
+ import { getYandexAspects } from './getYandexAspects';
7
7
  export interface StepsNavigationButtonsProps {
8
8
  step: number;
9
9
  isSending: boolean;
10
10
  onPrevStep?: () => void;
11
+ programId?: string | null;
12
+ productType?: string;
11
13
  }
12
14
 
13
15
  const YANDEX_ID = projectSettings.YANDEX_METRIKA_ID || '92511315';
@@ -100,15 +102,18 @@ const data: AspectsDef[][] = [
100
102
  ],
101
103
  ];
102
104
 
103
- const getAspects = (step: number): AspectsDef[] => {
104
- return data[step] || [];
105
- };
106
-
107
105
  export const StepsNavigationButtons = JSX<StepsNavigationButtonsProps>(
108
- ({ step, onPrevStep, isSending }) => {
106
+ ({ step, onPrevStep, isSending, programId, productType = 'credit' }) => {
109
107
  const isFirstStep = step === 0;
110
108
  const isFinalStep = step === 5;
111
109
 
110
+ const aspects = getYandexAspects({
111
+ step,
112
+ programId,
113
+ productType,
114
+ aspectsData: data,
115
+ });
116
+
112
117
  return (
113
118
  <div className={'flex justify-between gap-m'}>
114
119
  <Button
@@ -119,7 +124,7 @@ export const StepsNavigationButtons = JSX<StepsNavigationButtonsProps>(
119
124
  >
120
125
  Назад
121
126
  </Button>
122
- <SubmitButton isLoading={isSending} testId="next-button" data={getAspects(step)}>
127
+ <SubmitButton isLoading={isSending} testId="next-button" data={aspects}>
123
128
  {isFinalStep ? 'Отправить заявку' : 'Далее'}
124
129
  </SubmitButton>
125
130
  </div>
package/src/components/CreditForm/getYandexAspects.ts ADDED
@@ -0,0 +1,58 @@
1
+ import { type AspectData } from '../../hooks/useAspects/useAspects';
2
+ import { type AspectsDef } from '../../model/AspectsProps';
3
+ import { getCreditInfo } from './getCreditInfo';
4
+
5
+ interface YandexAspectsParams {
6
+ step: number;
7
+ programId?: string | null;
8
+ productType?: string;
9
+ paymentSystem?: string;
10
+ aspectsData: AspectsDef[][];
11
+ }
12
+
13
+ const getVisitParams = (
14
+ programId?: string | null,
15
+ productType?: string,
16
+ paymentSystem?: string,
17
+ ): Record<string, unknown> => {
18
+ const creditInfo = getCreditInfo(programId ?? null);
19
+ const productName = creditInfo?.name || '';
20
+ const productTypeValue = productType ?? '';
21
+
22
+ if (paymentSystem && productType !== 'credit') {
23
+ return {
24
+ [productTypeValue]: {
25
+ [productName]: paymentSystem,
26
+ },
27
+ };
28
+ } else {
29
+ return {
30
+ [productTypeValue]: productName,
31
+ };
32
+ }
33
+ };
34
+
35
+ export const getYandexAspects = ({
36
+ step,
37
+ programId,
38
+ productType,
39
+ paymentSystem,
40
+ aspectsData,
41
+ }: YandexAspectsParams): AspectsDef[] => {
42
+ const aspects = aspectsData[step] || [];
43
+ const visitParams = getVisitParams(programId, productType, paymentSystem);
44
+
45
+ return aspects.map((aspect) => {
46
+ if (aspect.aspectName === 'ymReachGoal') {
47
+ return {
48
+ ...aspect,
49
+ params: {
50
+ ...aspect.params,
51
+ ...visitParams,
52
+ } as AspectData,
53
+ };
54
+ }
55
+
56
+ return aspect;
57
+ });
58
+ };