diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 06c468cb..333b3a35 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1072,6 +1072,12 @@ importers: v6y-libs/shared-ui: dependencies: + '@refinedev/core': + specifier: '=4.57.5' + version: 4.57.5(@tanstack/react-query@5.64.1(react@19.0.0))(@types/react-dom@19.0.3(@types/react@19.0.7))(@types/react@19.0.7)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + antd: + specifier: '=5.22.6' + version: 5.22.6(date-fns@4.1.0)(luxon@3.5.0)(moment@2.30.1)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) react: specifier: '=19.0.0' version: 19.0.0 @@ -1085,6 +1091,15 @@ importers: '@eslint/js': specifier: '=9.18.0' version: 9.18.0 + '@testing-library/dom': + specifier: '=10.4.0' + version: 10.4.0 + '@testing-library/jest-dom': + specifier: '=6.6.3' + version: 6.6.3 + '@testing-library/react': + specifier: '=16.1.0' + version: 16.1.0(@testing-library/dom@10.4.0)(@types/react-dom@19.0.3(@types/react@19.0.7))(@types/react@19.0.7)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) '@trivago/prettier-plugin-sort-imports': specifier: '=5.2.1' version: 5.2.1(@vue/compiler-sfc@3.5.13)(prettier@3.4.2) @@ -1094,6 +1109,15 @@ importers: '@types/node': specifier: '=22.10.6' version: 22.10.6 + '@types/react': + specifier: '=19.0.7' + version: 19.0.7 + '@types/react-dom': + specifier: '=19.0.3' + version: 19.0.3(@types/react@19.0.7) + '@vitejs/plugin-react': + specifier: '=4.3.4' + version: 4.3.4(vite@6.0.7(@types/node@22.10.6)(yaml@2.7.0)) '@vitejs/plugin-react-swc': specifier: '=3.7.2' version: 3.7.2(@swc/helpers@0.5.15)(vite@6.0.7(@types/node@22.10.6)(yaml@2.7.0)) @@ -3954,6 +3978,12 @@ packages: resolution: {integrity: sha512-PcDrVe15ldexeZMsVLBAzBwF2KhZgaU0R+CHxH+x5kqn/pO+UWVBZJ+NEXMPpEOLUFeNsnNdoWYc2gwO+MVkDg==} engines: {node: '>=16'} + antd@5.22.6: + resolution: {integrity: sha512-ZYURSV3FR8qQgbfpa554thlO07L6PeHwhAM0wmxnobOBogND/HqSnTU+UZTqT2b2y9MxSfAIu5Xn1uEM9UpceQ==} + peerDependencies: + react: '>=16.9.0' + react-dom: '>=16.9.0' + antd@5.23.1: resolution: {integrity: sha512-rg5xd5LotHw0IRyo/nsiUN/EEV3e+xU4V4UmIb/62hMN9+3APyz1Ohjf17a+fN13jC8sNY1hP1K252SU2Th0xA==} peerDependencies: @@ -7656,12 +7686,24 @@ packages: resolution: {integrity: sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==} engines: {node: '>= 0.8'} + rc-cascader@3.30.0: + resolution: {integrity: sha512-rrzSbk1Bdqbu+pDwiLCLHu72+lwX9BZ28+JKzoi0DWZ4N29QYFeip8Gctl33QVd2Xg3Rf14D3yAOG76ElJw16w==} + peerDependencies: + react: '>=16.9.0' + react-dom: '>=16.9.0' + rc-cascader@3.33.0: resolution: {integrity: sha512-JvZrMbKBXIbEDmpIORxqvedY/bck6hGbs3hxdWT8eS9wSQ1P7//lGxbyKjOSyQiVBbgzNWriSe6HoMcZO/+0rQ==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' + rc-checkbox@3.3.0: + resolution: {integrity: sha512-Ih3ZaAcoAiFKJjifzwsGiT/f/quIkxJoklW4yKGho14Olulwn8gN7hOBve0/WGDg5o/l/5mL0w7ff7/YGvefVw==} + peerDependencies: + react: '>=16.9.0' + react-dom: '>=16.9.0' + rc-checkbox@3.5.0: resolution: {integrity: sha512-aOAQc3E98HteIIsSqm6Xk2FPKIER6+5vyEFMZfo73TqM+VVAIqOkHoPjgKLqSNtVLWScoaM7vY2ZrGEheI79yg==} peerDependencies: @@ -7705,18 +7747,36 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' + rc-input-number@9.3.0: + resolution: {integrity: sha512-JQ363ywqRyxwgVxpg2z2kja3CehTpYdqR7emJ/6yJjRdbvo+RvfE83fcpBCIJRq3zLp8SakmEXq60qzWyZ7Usw==} + peerDependencies: + react: '>=16.9.0' + react-dom: '>=16.9.0' + rc-input-number@9.4.0: resolution: {integrity: sha512-Tiy4DcXcFXAf9wDhN8aUAyMeCLHJUHA/VA/t7Hj8ZEx5ETvxG7MArDOSE6psbiSCo+vJPm4E3fGN710ITVn6GA==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' + rc-input@1.6.4: + resolution: {integrity: sha512-lBZhfRD4NSAUW0zOKLUeI6GJuXkxeZYi0hr8VcJgJpyTNOvHw1ysrKWAHcEOAAHj7guxgmWYSi6xWrEdfrSAsA==} + peerDependencies: + react: '>=16.0.0' + react-dom: '>=16.0.0' + rc-input@1.7.2: resolution: {integrity: sha512-g3nYONnl4edWj2FfVoxsU3Ec4XTE+Hb39Kfh2MFxMZjp/0gGyPUgy/v7ZhS27ZxUFNkuIDYXm9PJsLyJbtg86A==} peerDependencies: react: '>=16.0.0' react-dom: '>=16.0.0' + rc-mentions@2.17.0: + resolution: {integrity: sha512-sfHy+qLvc+p8jx8GUsujZWXDOIlIimp6YQz7N5ONQ6bHsa2kyG+BLa5k2wuxgebBbH97is33wxiyq5UkiXRpHA==} + peerDependencies: + react: '>=16.9.0' + react-dom: '>=16.9.0' + rc-mentions@2.19.1: resolution: {integrity: sha512-KK3bAc/bPFI993J3necmaMXD2reZTzytZdlTvkeBbp50IGH1BDPDvxLdHDUrpQx2b2TGaVJsn+86BvYa03kGqA==} peerDependencies: @@ -7754,6 +7814,26 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' + rc-picker@4.8.3: + resolution: {integrity: sha512-hJ45qoEs4mfxXPAJdp1n3sKwADul874Cd0/HwnsEOE60H+tgiJUGgbOD62As3EG/rFVNS5AWRfBCDJJfmRqOVQ==} + engines: {node: '>=8.x'} + peerDependencies: + date-fns: '>= 2.x' + dayjs: '>= 1.x' + luxon: '>= 3.x' + moment: '>= 2.x' + react: '>=16.9.0' + react-dom: '>=16.9.0' + peerDependenciesMeta: + date-fns: + optional: true + dayjs: + optional: true + luxon: + optional: true + moment: + optional: true + rc-picker@4.9.2: resolution: {integrity: sha512-SLW4PRudODOomipKI0dvykxW4P8LOqtMr17MOaLU6NQJhkh9SZeh44a/8BMxwv5T6e3kiIeYc9k5jFg2Mv35Pg==} engines: {node: '>=8.x'} @@ -7793,6 +7873,12 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' + rc-segmented@2.5.0: + resolution: {integrity: sha512-B28Fe3J9iUFOhFJET3RoXAPFJ2u47QvLSYcZWC4tFYNGPEjug5LAxEasZlA/PpAxhdOPqGWsGbSj7ftneukJnw==} + peerDependencies: + react: '>=16.0.0' + react-dom: '>=16.0.0' + rc-segmented@2.7.0: resolution: {integrity: sha512-liijAjXz+KnTRVnxxXG2sYDGd6iLL7VpGGdR8gwoxAXy2KglviKCxLWZdjKYJzYzGSUwKDSTdYk8brj54Bn5BA==} peerDependencies: @@ -7826,6 +7912,13 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' + rc-table@7.49.0: + resolution: {integrity: sha512-/FoPLX94muAQOxVpi1jhnpKjOIqUbT81eELQPAzSXOke4ky4oCWYUXOcVpL31ZCO90xScwVSXRd7coqtgtB1Ng==} + engines: {node: '>=8.x'} + peerDependencies: + react: '>=16.9.0' + react-dom: '>=16.9.0' + rc-table@7.50.2: resolution: {integrity: sha512-+nJbzxzstBriLb5sr9U7Vjs7+4dO8cWlouQbMwBVYghk2vr508bBdkHJeP/z9HVjAIKmAgMQKxmtbgDd3gc5wA==} engines: {node: '>=8.x'} @@ -7833,6 +7926,13 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' + rc-tabs@15.4.0: + resolution: {integrity: sha512-llKuyiAVqmXm2z7OrmhX5cNb2ueZaL8ZyA2P4R+6/72NYYcbEgOXibwHiQCFY2RiN3swXl53SIABi2CumUS02g==} + engines: {node: '>=8.x'} + peerDependencies: + react: '>=16.9.0' + react-dom: '>=16.9.0' + rc-tabs@15.5.0: resolution: {integrity: sha512-NrDcTaUJLh9UuDdMBkjKTn97U9iXG44s9D03V5NHkhEDWO5/nC6PwC3RhkCWFMKB9hh+ryqgZ+TIr1b9Jd/hnQ==} engines: {node: '>=8.x'} @@ -7840,24 +7940,49 @@ packages: react: '>=16.9.0' react-dom: '>=16.9.0' + rc-textarea@1.8.2: + resolution: {integrity: sha512-UFAezAqltyR00a8Lf0IPAyTd29Jj9ee8wt8DqXyDMal7r/Cg/nDt3e1OOv3Th4W6mKaZijjgwuPXhAfVNTN8sw==} + peerDependencies: + react: '>=16.9.0' + react-dom: '>=16.9.0' + rc-textarea@1.9.0: resolution: {integrity: sha512-dQW/Bc/MriPBTugj2Kx9PMS5eXCCGn2cxoIaichjbNvOiARlaHdI99j4DTxLl/V8+PIfW06uFy7kjfUIDDKyxQ==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' + rc-tooltip@6.2.1: + resolution: {integrity: sha512-rws0duD/3sHHsD905Nex7FvoUGy2UBQRhTkKxeEvr2FB+r21HsOxcDJI0TzyO8NHhnAA8ILr8pfbSBg5Jj5KBg==} + peerDependencies: + react: '>=16.9.0' + react-dom: '>=16.9.0' + rc-tooltip@6.3.2: resolution: {integrity: sha512-oA4HZIiZJbUQ5ojigM0y4XtWxaH/aQlJSzknjICRWNpqyemy1sL3X3iEQV2eSPBWEq+bqU3+aSs81z+28j9luA==} peerDependencies: react: '>=16.9.0' react-dom: '>=16.9.0' + rc-tree-select@5.24.5: + resolution: {integrity: sha512-PnyR8LZJWaiEFw0SHRqo4MNQWyyZsyMs8eNmo68uXZWjxc7QqeWcjPPoONN0rc90c3HZqGF9z+Roz+GLzY5GXA==} + peerDependencies: + react: '*' + react-dom: '*' + rc-tree-select@5.27.0: resolution: {integrity: sha512-2qTBTzwIT7LRI1o7zLyrCzmo5tQanmyGbSaGTIf7sYimCklAToVVfpMC6OAldSKolcnjorBYPNSKQqJmN3TCww==} peerDependencies: react: '*' react-dom: '*' + rc-tree@5.10.1: + resolution: {integrity: sha512-FPXb3tT/u39mgjr6JNlHaUTYfHkVGW56XaGDahDpEFLGsnPxGcVLNTjcqoQb/GNbSCycl7tD7EvIymwOTP0+Yw==} + engines: {node: '>=10.x'} + peerDependencies: + react: '*' + react-dom: '*' + rc-tree@5.13.0: resolution: {integrity: sha512-2+lFvoVRnvHQ1trlpXMOWtF8BUgF+3TiipG72uOfhpL5CUdXCk931kvDdUkTL/IZVtNEDQKwEEmJbAYJSA5NnA==} engines: {node: '>=10.x'} @@ -12751,6 +12876,64 @@ snapshots: ansis@3.9.0: {} + antd@5.22.6(date-fns@4.1.0)(luxon@3.5.0)(moment@2.30.1)(react-dom@19.0.0(react@19.0.0))(react@19.0.0): + dependencies: + '@ant-design/colors': 7.2.0 + '@ant-design/cssinjs': 1.22.1(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + '@ant-design/cssinjs-utils': 1.1.3(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + '@ant-design/icons': 5.5.2(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + '@ant-design/react-slick': 1.1.2(react@19.0.0) + '@babel/runtime': 7.26.0 + '@ctrl/tinycolor': 3.6.1 + '@rc-component/color-picker': 2.0.1(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + '@rc-component/mutate-observer': 1.1.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + '@rc-component/qrcode': 1.0.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + '@rc-component/tour': 1.15.1(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + '@rc-component/trigger': 2.2.6(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + classnames: 2.5.1 + copy-to-clipboard: 3.3.3 + dayjs: 1.11.13 + rc-cascader: 3.30.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-checkbox: 3.3.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-collapse: 3.9.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-dialog: 9.6.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-drawer: 7.2.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-dropdown: 4.2.1(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-field-form: 2.7.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-image: 7.11.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-input: 1.6.4(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-input-number: 9.3.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-mentions: 2.17.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-menu: 9.16.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-motion: 2.9.5(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-notification: 5.6.2(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-pagination: 5.0.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-picker: 4.8.3(date-fns@4.1.0)(dayjs@1.11.13)(luxon@3.5.0)(moment@2.30.1)(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-progress: 4.0.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-rate: 2.13.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-resize-observer: 1.4.3(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-segmented: 2.5.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-select: 14.16.5(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-slider: 11.1.8(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-steps: 6.0.1(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-switch: 4.1.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-table: 7.49.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-tabs: 15.4.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-textarea: 1.8.2(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-tooltip: 6.2.1(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-tree: 5.10.1(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-tree-select: 5.24.5(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-upload: 4.8.1(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-util: 5.44.3(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + react: 19.0.0 + react-dom: 19.0.0(react@19.0.0) + scroll-into-view-if-needed: 3.1.0 + throttle-debounce: 5.0.2 + transitivePeerDependencies: + - date-fns + - luxon + - moment + antd@5.23.1(date-fns@4.1.0)(luxon@3.5.0)(moment@2.30.1)(react-dom@19.0.0(react@19.0.0))(react@19.0.0): dependencies: '@ant-design/colors': 7.2.0 @@ -17108,6 +17291,16 @@ snapshots: iconv-lite: 0.4.24 unpipe: 1.0.0 + rc-cascader@3.30.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0): + dependencies: + '@babel/runtime': 7.26.0 + classnames: 2.5.1 + rc-select: 14.16.5(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-tree: 5.10.1(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-util: 5.44.3(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + react: 19.0.0 + react-dom: 19.0.0(react@19.0.0) + rc-cascader@3.33.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0): dependencies: '@babel/runtime': 7.26.0 @@ -17118,6 +17311,14 @@ snapshots: react: 19.0.0 react-dom: 19.0.0(react@19.0.0) + rc-checkbox@3.3.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0): + dependencies: + '@babel/runtime': 7.26.0 + classnames: 2.5.1 + rc-util: 5.44.3(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + react: 19.0.0 + react-dom: 19.0.0(react@19.0.0) + rc-checkbox@3.5.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0): dependencies: '@babel/runtime': 7.26.0 @@ -17183,6 +17384,16 @@ snapshots: react: 19.0.0 react-dom: 19.0.0(react@19.0.0) + rc-input-number@9.3.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0): + dependencies: + '@babel/runtime': 7.26.0 + '@rc-component/mini-decimal': 1.1.0 + classnames: 2.5.1 + rc-input: 1.6.4(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-util: 5.44.3(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + react: 19.0.0 + react-dom: 19.0.0(react@19.0.0) + rc-input-number@9.4.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0): dependencies: '@babel/runtime': 7.26.0 @@ -17193,6 +17404,14 @@ snapshots: react: 19.0.0 react-dom: 19.0.0(react@19.0.0) + rc-input@1.6.4(react-dom@19.0.0(react@19.0.0))(react@19.0.0): + dependencies: + '@babel/runtime': 7.26.0 + classnames: 2.5.1 + rc-util: 5.44.3(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + react: 19.0.0 + react-dom: 19.0.0(react@19.0.0) + rc-input@1.7.2(react-dom@19.0.0(react@19.0.0))(react@19.0.0): dependencies: '@babel/runtime': 7.26.0 @@ -17201,6 +17420,18 @@ snapshots: react: 19.0.0 react-dom: 19.0.0(react@19.0.0) + rc-mentions@2.17.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0): + dependencies: + '@babel/runtime': 7.26.0 + '@rc-component/trigger': 2.2.6(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + classnames: 2.5.1 + rc-input: 1.6.4(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-menu: 9.16.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-textarea: 1.8.2(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-util: 5.44.3(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + react: 19.0.0 + react-dom: 19.0.0(react@19.0.0) + rc-mentions@2.19.1(react-dom@19.0.0(react@19.0.0))(react@19.0.0): dependencies: '@babel/runtime': 7.26.0 @@ -17258,6 +17489,22 @@ snapshots: react: 19.0.0 react-dom: 19.0.0(react@19.0.0) + rc-picker@4.8.3(date-fns@4.1.0)(dayjs@1.11.13)(luxon@3.5.0)(moment@2.30.1)(react-dom@19.0.0(react@19.0.0))(react@19.0.0): + dependencies: + '@babel/runtime': 7.26.0 + '@rc-component/trigger': 2.2.6(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + classnames: 2.5.1 + rc-overflow: 1.4.1(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-resize-observer: 1.4.3(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-util: 5.44.3(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + react: 19.0.0 + react-dom: 19.0.0(react@19.0.0) + optionalDependencies: + date-fns: 4.1.0 + dayjs: 1.11.13 + luxon: 3.5.0 + moment: 2.30.1 + rc-picker@4.9.2(date-fns@4.1.0)(dayjs@1.11.13)(luxon@3.5.0)(moment@2.30.1)(react-dom@19.0.0(react@19.0.0))(react@19.0.0): dependencies: '@babel/runtime': 7.26.0 @@ -17299,6 +17546,15 @@ snapshots: react-dom: 19.0.0(react@19.0.0) resize-observer-polyfill: 1.5.1 + rc-segmented@2.5.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0): + dependencies: + '@babel/runtime': 7.26.0 + classnames: 2.5.1 + rc-motion: 2.9.5(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-util: 5.44.3(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + react: 19.0.0 + react-dom: 19.0.0(react@19.0.0) + rc-segmented@2.7.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0): dependencies: '@babel/runtime': 7.26.0 @@ -17344,6 +17600,17 @@ snapshots: react: 19.0.0 react-dom: 19.0.0(react@19.0.0) + rc-table@7.49.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0): + dependencies: + '@babel/runtime': 7.26.0 + '@rc-component/context': 1.4.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + classnames: 2.5.1 + rc-resize-observer: 1.4.3(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-util: 5.44.3(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-virtual-list: 3.17.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + react: 19.0.0 + react-dom: 19.0.0(react@19.0.0) + rc-table@7.50.2(react-dom@19.0.0(react@19.0.0))(react@19.0.0): dependencies: '@babel/runtime': 7.26.0 @@ -17355,6 +17622,18 @@ snapshots: react: 19.0.0 react-dom: 19.0.0(react@19.0.0) + rc-tabs@15.4.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0): + dependencies: + '@babel/runtime': 7.26.0 + classnames: 2.5.1 + rc-dropdown: 4.2.1(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-menu: 9.16.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-motion: 2.9.5(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-resize-observer: 1.4.3(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-util: 5.44.3(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + react: 19.0.0 + react-dom: 19.0.0(react@19.0.0) + rc-tabs@15.5.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0): dependencies: '@babel/runtime': 7.26.0 @@ -17367,6 +17646,16 @@ snapshots: react: 19.0.0 react-dom: 19.0.0(react@19.0.0) + rc-textarea@1.8.2(react-dom@19.0.0(react@19.0.0))(react@19.0.0): + dependencies: + '@babel/runtime': 7.26.0 + classnames: 2.5.1 + rc-input: 1.6.4(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-resize-observer: 1.4.3(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-util: 5.44.3(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + react: 19.0.0 + react-dom: 19.0.0(react@19.0.0) + rc-textarea@1.9.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0): dependencies: '@babel/runtime': 7.26.0 @@ -17377,6 +17666,14 @@ snapshots: react: 19.0.0 react-dom: 19.0.0(react@19.0.0) + rc-tooltip@6.2.1(react-dom@19.0.0(react@19.0.0))(react@19.0.0): + dependencies: + '@babel/runtime': 7.26.0 + '@rc-component/trigger': 2.2.6(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + classnames: 2.5.1 + react: 19.0.0 + react-dom: 19.0.0(react@19.0.0) + rc-tooltip@6.3.2(react-dom@19.0.0(react@19.0.0))(react@19.0.0): dependencies: '@babel/runtime': 7.26.0 @@ -17385,6 +17682,16 @@ snapshots: react: 19.0.0 react-dom: 19.0.0(react@19.0.0) + rc-tree-select@5.24.5(react-dom@19.0.0(react@19.0.0))(react@19.0.0): + dependencies: + '@babel/runtime': 7.26.0 + classnames: 2.5.1 + rc-select: 14.16.5(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-tree: 5.10.1(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-util: 5.44.3(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + react: 19.0.0 + react-dom: 19.0.0(react@19.0.0) + rc-tree-select@5.27.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0): dependencies: '@babel/runtime': 7.26.0 @@ -17395,6 +17702,16 @@ snapshots: react: 19.0.0 react-dom: 19.0.0(react@19.0.0) + rc-tree@5.10.1(react-dom@19.0.0(react@19.0.0))(react@19.0.0): + dependencies: + '@babel/runtime': 7.26.0 + classnames: 2.5.1 + rc-motion: 2.9.5(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-util: 5.44.3(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + rc-virtual-list: 3.17.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0) + react: 19.0.0 + react-dom: 19.0.0(react@19.0.0) + rc-tree@5.13.0(react-dom@19.0.0(react@19.0.0))(react@19.0.0): dependencies: '@babel/runtime': 7.26.0 diff --git a/v6y-apps/front-bo/src/commons/components/VitalityBaseTable.tsx b/v6y-apps/front-bo/src/commons/components/VitalityBaseTable.tsx new file mode 100644 index 00000000..5dc50931 --- /dev/null +++ b/v6y-apps/front-bo/src/commons/components/VitalityBaseTable.tsx @@ -0,0 +1,13 @@ +import { Table } from 'antd'; +import { AnyObject } from 'antd/es/_util/type'; +import React from 'react'; + +const VitalityTable = ({ + dataSource, + columns, +}: { + dataSource: AnyObject[]; + columns: AnyObject[]; +}) => ; + +export default VitalityTable; diff --git a/v6y-apps/front-bo/src/commons/components/VitalityDetailsView.tsx b/v6y-apps/front-bo/src/commons/components/VitalityDetailsView.tsx index d950bc79..1ae6332a 100644 --- a/v6y-apps/front-bo/src/commons/components/VitalityDetailsView.tsx +++ b/v6y-apps/front-bo/src/commons/components/VitalityDetailsView.tsx @@ -1,5 +1,6 @@ import { HttpError } from '@refinedev/core'; -import { Descriptions, Typography } from 'antd'; +import { VitalityText } from '@v6y/shared-ui'; +import { Descriptions } from 'antd'; import * as React from 'react'; import { ReactNode } from 'react'; @@ -20,7 +21,7 @@ const VitalityDetailsView = ({ {Object.keys(details).map((itemKey, index) => ( - {details[itemKey]} + ))} diff --git a/v6y-apps/front-bo/src/commons/components/VitalityEmptyView.tsx b/v6y-apps/front-bo/src/commons/components/VitalityEmptyView.tsx index e6430e96..d5cc0236 100644 --- a/v6y-apps/front-bo/src/commons/components/VitalityEmptyView.tsx +++ b/v6y-apps/front-bo/src/commons/components/VitalityEmptyView.tsx @@ -1,4 +1,6 @@ -import { Empty, Typography } from 'antd'; +import { VitalityText } from '@v6y/shared-ui'; +import { Empty } from 'antd'; +import * as React from 'react'; import { useTranslation } from '../../infrastructure/adapters/translation/TranslationAdapter'; @@ -7,7 +9,7 @@ const VitalityEmptyView = ({ message }: { message?: string }) => { return ( {message || translate('pages.error.empty-data')} + } /> ); diff --git a/v6y-apps/front-bo/src/commons/components/VitalityLinks.tsx b/v6y-apps/front-bo/src/commons/components/VitalityLinks.tsx index 1728118f..3fd14a3c 100644 --- a/v6y-apps/front-bo/src/commons/components/VitalityLinks.tsx +++ b/v6y-apps/front-bo/src/commons/components/VitalityLinks.tsx @@ -1,6 +1,8 @@ import { LinkType } from '@v6y/core-logic'; -import { Col, Row, Typography } from 'antd'; +import { VitalityText } from '@v6y/shared-ui'; +import { Col, Row } from 'antd'; import Link from 'next/link'; +import * as React from 'react'; type ContentJustify = | 'end' @@ -34,7 +36,7 @@ const VitalityLinks = ({ links, align }: { links: LinkType[]; align: ContentJust rel="noopener noreferrer" style={{ textDecoration: 'underline' }} > - {link.label} + ); diff --git a/v6y-apps/front-bo/src/commons/components/VitalityTable.tsx b/v6y-apps/front-bo/src/commons/components/VitalityTable.tsx index bc4e2318..1bce6d4a 100644 --- a/v6y-apps/front-bo/src/commons/components/VitalityTable.tsx +++ b/v6y-apps/front-bo/src/commons/components/VitalityTable.tsx @@ -1,12 +1,29 @@ -import { Table } from 'antd'; -import { AnyObject } from 'antd/es/_util/type'; - -const VitalityTable = ({ - dataSource, - columns, -}: { - dataSource: AnyObject[]; - columns: AnyObject[]; -}) =>
; +import React from 'react'; + +import { buildCommonTableColumns, buildCommonTableDataSource } from '../config/VitalityTableConfig'; +import VitalityBaseTable from './VitalityBaseTable'; + +interface VitalityTableProps { + dataSource: unknown[]; + columnKeys: string[]; + columnOptions: { + enableEdit: boolean; + enableShow: boolean; + enableDelete: boolean; + deleteMetaQuery?: { + gqlMutation: string; + operation: string; + }; + }; +} + +const VitalityTable: React.FC = ({ dataSource, columnKeys, columnOptions }) => { + return ( + + ); +}; export default VitalityTable; diff --git a/v6y-apps/front-bo/src/commons/components/layout/VitalityPageHeader.tsx b/v6y-apps/front-bo/src/commons/components/layout/VitalityPageHeader.tsx index 03566340..3fb2547f 100644 --- a/v6y-apps/front-bo/src/commons/components/layout/VitalityPageHeader.tsx +++ b/v6y-apps/front-bo/src/commons/components/layout/VitalityPageHeader.tsx @@ -2,18 +2,8 @@ import { DownOutlined } from '@ant-design/icons'; import { useGetIdentity } from '@refinedev/core'; -import { - Layout as AntdLayout, - Avatar, - Button, - Dropdown, - Space, - Switch, - Typography, - theme, -} from 'antd'; -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-expect-error +import { VitalityText } from '@v6y/shared-ui'; +import { Layout as AntdLayout, Avatar, Button, Dropdown, Space, Switch, theme } from 'antd'; import Cookie from 'js-cookie'; import * as React from 'react'; import { useContext } from 'react'; @@ -77,9 +67,7 @@ export const VitalityPageHeader = () => { @@ -96,7 +84,7 @@ export const VitalityPageHeader = () => { /> {(user?.name || user?.avatar) && ( - {user?.name && {user.name}} + {user?.name && } {user?.avatar && } )} diff --git a/v6y-apps/front-bo/src/commons/components/layout/VitalityPageLayout.tsx b/v6y-apps/front-bo/src/commons/components/layout/VitalityPageLayout.tsx index c6948d58..9e6bb0ed 100644 --- a/v6y-apps/front-bo/src/commons/components/layout/VitalityPageLayout.tsx +++ b/v6y-apps/front-bo/src/commons/components/layout/VitalityPageLayout.tsx @@ -1,7 +1,7 @@ 'use client'; import { ThemedLayoutV2 } from '@refinedev/antd'; -import { Typography } from 'antd'; +import { VitalityTitle } from '@v6y/shared-ui'; import * as React from 'react'; import { ReactNode } from 'react'; @@ -12,14 +12,13 @@ const VitalityPageLayout = ({ children }: { children: ReactNode }) => { return ( ( - - V6Y - + title="V6Y" + /> )} Header={() => } Footer={() => } diff --git a/v6y-apps/front-bo/src/features/v6y-accounts/components/VitalityAccountCreateView.tsx b/v6y-apps/front-bo/src/features/v6y-accounts/components/VitalityAccountCreateView.tsx index c1dbf244..7520b2eb 100644 --- a/v6y-apps/front-bo/src/features/v6y-accounts/components/VitalityAccountCreateView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-accounts/components/VitalityAccountCreateView.tsx @@ -1,7 +1,8 @@ 'use client'; import { ApplicationType } from '@v6y/core-logic/src/types/ApplicationType'; -import { Typography } from 'antd'; +import { VitalityTitle } from '@v6y/shared-ui'; +import * as React from 'react'; import { useEffect, useState } from 'react'; import GetApplicationListByPageAndParams from '../../../commons/apis/getApplicationListByPageAndParams'; @@ -30,11 +31,7 @@ export default function VitalityAccountCreateView() { return ( - {translate('v6y-accounts.titles.create')} - - } + title={} createOptions={{ // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-expect-error diff --git a/v6y-apps/front-bo/src/features/v6y-accounts/components/VitalityAccountDetailsView.tsx b/v6y-apps/front-bo/src/features/v6y-accounts/components/VitalityAccountDetailsView.tsx index 494129a3..ee33b1af 100644 --- a/v6y-apps/front-bo/src/features/v6y-accounts/components/VitalityAccountDetailsView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-accounts/components/VitalityAccountDetailsView.tsx @@ -1,7 +1,7 @@ import { HttpError, useParsed } from '@refinedev/core'; import { AccountType } from '@v6y/core-logic'; import Matcher from '@v6y/core-logic/src/core/Matcher'; -import { Typography } from 'antd'; +import { VitalityTitle } from '@v6y/shared-ui'; import * as React from 'react'; import VitalityDetailsView from '../../../commons/components/VitalityDetailsView'; @@ -42,11 +42,7 @@ export default function VitalityAccountDetailsView() { return ( - {translate('v6y-account.titles.show')} - - } + title={} queryOptions={{ resource: 'getAccountDetailsByParams', query: GetAccountDetailsByParams, diff --git a/v6y-apps/front-bo/src/features/v6y-accounts/components/VitalityAccountEditView.tsx b/v6y-apps/front-bo/src/features/v6y-accounts/components/VitalityAccountEditView.tsx index 925c7939..9a232aa4 100644 --- a/v6y-apps/front-bo/src/features/v6y-accounts/components/VitalityAccountEditView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-accounts/components/VitalityAccountEditView.tsx @@ -2,7 +2,7 @@ import { useParsed } from '@refinedev/core'; import { ApplicationType } from '@v6y/core-logic/src/types/ApplicationType'; -import { Typography } from 'antd'; +import { VitalityTitle } from '@v6y/shared-ui'; import { useEffect, useState } from 'react'; import React from 'react'; @@ -35,11 +35,7 @@ export default function VitalityAccountEditView() { return ( - {translate('v6y-accounts.titles.edit')} - - } + title={} queryOptions={{ queryFormAdapter: accountCreateOrEditFormInAdapter, query: GetAccountDetailsByParams, diff --git a/v6y-apps/front-bo/src/features/v6y-accounts/components/VitalityAccountListView.tsx b/v6y-apps/front-bo/src/features/v6y-accounts/components/VitalityAccountListView.tsx index 936e5db2..3a121371 100644 --- a/v6y-apps/front-bo/src/features/v6y-accounts/components/VitalityAccountListView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-accounts/components/VitalityAccountListView.tsx @@ -1,8 +1,4 @@ -import VitalityTable from '../../../commons/components/VitalityTable'; -import { - buildCommonTableColumns, - buildCommonTableDataSource, -} from '../../../commons/config/VitalityTableConfig'; +import RenderVitalityTable from '../../../commons/components/VitalityTable'; import { useTranslation } from '../../../infrastructure/adapters/translation/TranslationAdapter'; import RefineTableWrapper from '../../../infrastructure/components/RefineTableWrapper'; import DeleteAccount from '../apis/deleteAccount'; @@ -26,9 +22,10 @@ export default function VitalityAccountListView() { query: GetAccountListByPageAndParams, }} renderTable={(dataSource) => ( - )} /> diff --git a/v6y-apps/front-bo/src/features/v6y-applications/components/VitalityApplicationCreateView.tsx b/v6y-apps/front-bo/src/features/v6y-applications/components/VitalityApplicationCreateView.tsx index 28b654ea..e9745735 100644 --- a/v6y-apps/front-bo/src/features/v6y-applications/components/VitalityApplicationCreateView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-applications/components/VitalityApplicationCreateView.tsx @@ -1,4 +1,4 @@ -import { Typography } from 'antd'; +import { VitalityTitle } from '@v6y/shared-ui'; import * as React from 'react'; import { @@ -13,11 +13,7 @@ export default function VitalityApplicationCreateView() { const { translate } = useTranslation(); return ( - {translate('v6y-applications.titles.create')} - - } + title={} createOptions={{ createFormAdapter: applicationCreateOrEditFormOutputAdapter, createQuery: CreateOrEditApplication, diff --git a/v6y-apps/front-bo/src/features/v6y-applications/components/VitalityApplicationDetailsView.tsx b/v6y-apps/front-bo/src/features/v6y-applications/components/VitalityApplicationDetailsView.tsx index 1751f8e2..7b800755 100644 --- a/v6y-apps/front-bo/src/features/v6y-applications/components/VitalityApplicationDetailsView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-applications/components/VitalityApplicationDetailsView.tsx @@ -1,7 +1,7 @@ import { HttpError, useParsed } from '@refinedev/core'; import { ApplicationType } from '@v6y/core-logic'; import Matcher from '@v6y/core-logic/src/core/Matcher'; -import { Typography } from 'antd'; +import { VitalityTitle } from '@v6y/shared-ui'; import * as React from 'react'; import VitalityDetailsView from '../../../commons/components/VitalityDetailsView'; @@ -42,11 +42,7 @@ export default function VitalityApplicationDetailsView() { return ( - {translate('v6y-applications.titles.show')} - - } + title={} queryOptions={{ resource: 'getApplicationDetailsInfoByParams', query: GetApplicationDetails, diff --git a/v6y-apps/front-bo/src/features/v6y-applications/components/VitalityApplicationEditView.tsx b/v6y-apps/front-bo/src/features/v6y-applications/components/VitalityApplicationEditView.tsx index 0d9aa118..a2214a4c 100644 --- a/v6y-apps/front-bo/src/features/v6y-applications/components/VitalityApplicationEditView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-applications/components/VitalityApplicationEditView.tsx @@ -1,5 +1,5 @@ import { useParsed } from '@refinedev/core'; -import { Typography } from 'antd'; +import { VitalityTitle } from '@v6y/shared-ui'; import * as React from 'react'; import { @@ -18,11 +18,7 @@ export default function VitalityApplicationEditView() { return ( - {translate('v6y-applications.titles.edit')} - - } + title={} queryOptions={{ queryFormAdapter: applicationCreateOrEditFormInAdapter as ( data: unknown, diff --git a/v6y-apps/front-bo/src/features/v6y-applications/components/VitalityApplicationListView.tsx b/v6y-apps/front-bo/src/features/v6y-applications/components/VitalityApplicationListView.tsx index ad06027f..dcabcd30 100644 --- a/v6y-apps/front-bo/src/features/v6y-applications/components/VitalityApplicationListView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-applications/components/VitalityApplicationListView.tsx @@ -1,11 +1,7 @@ import { ApplicationType } from '@v6y/core-logic'; import GetApplicationListByPageAndParams from '../../../commons/apis/getApplicationListByPageAndParams'; -import VitalityTable from '../../../commons/components/VitalityTable'; -import { - buildCommonTableColumns, - buildCommonTableDataSource, -} from '../../../commons/config/VitalityTableConfig'; +import RenderVitalityTable from '../../../commons/components/VitalityTable'; import { useTranslation } from '../../../infrastructure/adapters/translation/TranslationAdapter'; import RefineTableWrapper from '../../../infrastructure/components/RefineTableWrapper'; import DeleteApplication from '../apis/deleteApplication'; @@ -28,9 +24,10 @@ export default function VitalityApplicationListView() { query: GetApplicationListByPageAndParams, }} renderTable={(dataSource: ApplicationType[]) => ( - )} /> diff --git a/v6y-apps/front-bo/src/features/v6y-audit-help/components/VitalityAuditHelpDetailsView.tsx b/v6y-apps/front-bo/src/features/v6y-audit-help/components/VitalityAuditHelpDetailsView.tsx index 0e5fb0b9..9a861f63 100644 --- a/v6y-apps/front-bo/src/features/v6y-audit-help/components/VitalityAuditHelpDetailsView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-audit-help/components/VitalityAuditHelpDetailsView.tsx @@ -1,6 +1,6 @@ import { HttpError, useParsed } from '@refinedev/core'; import { AuditHelpType } from '@v6y/core-logic'; -import { Typography } from 'antd'; +import { VitalityTitle } from '@v6y/shared-ui'; import * as React from 'react'; import VitalityDetailsView from '../../../commons/components/VitalityDetailsView'; @@ -16,11 +16,7 @@ export default function VitalityAuditHelpDetailsView() { return ( - {translate('v6y-audit-helps.titles.show')} - - } + title={} queryOptions={{ resource: 'getAuditHelpDetailsByParams', query: GetAuditHelpDetailsByParams, diff --git a/v6y-apps/front-bo/src/features/v6y-audit-help/components/VitalityAuditHelpEditView.tsx b/v6y-apps/front-bo/src/features/v6y-audit-help/components/VitalityAuditHelpEditView.tsx index ad40c407..d6a6e20d 100644 --- a/v6y-apps/front-bo/src/features/v6y-audit-help/components/VitalityAuditHelpEditView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-audit-help/components/VitalityAuditHelpEditView.tsx @@ -1,5 +1,5 @@ import { useParsed } from '@refinedev/core'; -import { Typography } from 'antd'; +import { VitalityTitle } from '@v6y/shared-ui'; import * as React from 'react'; import { @@ -18,11 +18,7 @@ export default function VitalityAuditHelpEditView() { return ( - {translate('v6y-audit-helps.titles.edit')} - - } + title={} queryOptions={{ queryFormAdapter: auditHelpCreateOrEditFormInAdapter, query: GetAuditHelpDetailsByParams, diff --git a/v6y-apps/front-bo/src/features/v6y-audit-help/components/VitalityAuditHelpListView.tsx b/v6y-apps/front-bo/src/features/v6y-audit-help/components/VitalityAuditHelpListView.tsx index cee57f7d..06c1bc12 100644 --- a/v6y-apps/front-bo/src/features/v6y-audit-help/components/VitalityAuditHelpListView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-audit-help/components/VitalityAuditHelpListView.tsx @@ -1,8 +1,4 @@ -import VitalityTable from '../../../commons/components/VitalityTable'; -import { - buildCommonTableColumns, - buildCommonTableDataSource, -} from '../../../commons/config/VitalityTableConfig'; +import RenderVitalityTable from '../../../commons/components/VitalityTable'; import { useTranslation } from '../../../infrastructure/adapters/translation/TranslationAdapter'; import RefineTableWrapper from '../../../infrastructure/components/RefineTableWrapper'; import GetAuditHelpListByPageAndParams from '../apis/getAuditHelpListByPageAndParams'; @@ -25,13 +21,14 @@ export default function VitalityAuditHelpListView() { query: GetAuditHelpListByPageAndParams, }} renderTable={(dataSource) => ( - )} /> diff --git a/v6y-apps/front-bo/src/features/v6y-auth/VitalityAuthForgotPasswordView.tsx b/v6y-apps/front-bo/src/features/v6y-auth/VitalityAuthForgotPasswordView.tsx index 5f6d8b5c..c553e20f 100644 --- a/v6y-apps/front-bo/src/features/v6y-auth/VitalityAuthForgotPasswordView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-auth/VitalityAuthForgotPasswordView.tsx @@ -1,21 +1,14 @@ 'use client'; import { AuthPage as AuthPageBase } from '@refinedev/antd'; -import { Typography } from 'antd'; - -import { useTranslation } from '../../infrastructure/adapters/translation/TranslationAdapter'; +import { VitalityTitle } from '@v6y/shared-ui'; +import React from 'react'; export const VitalityAuthForgotPasswordView = () => { - const { translate } = useTranslation(); - return ( - {translate('v6y-authentication.title')} - - } + title={} /> ); }; diff --git a/v6y-apps/front-bo/src/features/v6y-auth/VitalityAuthUpdatePasswordView.tsx b/v6y-apps/front-bo/src/features/v6y-auth/VitalityAuthUpdatePasswordView.tsx index a1d373c1..d1b4cae3 100644 --- a/v6y-apps/front-bo/src/features/v6y-auth/VitalityAuthUpdatePasswordView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-auth/VitalityAuthUpdatePasswordView.tsx @@ -1,21 +1,14 @@ 'use client'; import { AuthPage as AuthPageBase } from '@refinedev/antd'; -import { Typography } from 'antd'; - -import { useTranslation } from '../../infrastructure/adapters/translation/TranslationAdapter'; +import { VitalityTitle } from '@v6y/shared-ui'; +import React from 'react'; export const VitalityAuthUpdatePasswordView = () => { - const { translate } = useTranslation(); - return ( - {translate('v6y-authentication.title')} - - } + title={} /> ); }; diff --git a/v6y-apps/front-bo/src/features/v6y-auth/components/VitalityAuthLoginView.tsx b/v6y-apps/front-bo/src/features/v6y-auth/components/VitalityAuthLoginView.tsx index 1071de76..cda44fe8 100644 --- a/v6y-apps/front-bo/src/features/v6y-auth/components/VitalityAuthLoginView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-auth/components/VitalityAuthLoginView.tsx @@ -1,21 +1,15 @@ 'use client'; import { AuthPage as AuthPageBase } from '@refinedev/antd'; -import { Checkbox, Form, Typography } from 'antd'; - -import { useTranslation } from '../../../infrastructure/adapters/translation/TranslationAdapter'; +import { VitalityTitle } from '@v6y/shared-ui'; +import { Checkbox, Form } from 'antd'; +import React from 'react'; export const VitalityAuthLoginView = () => { - const { translate } = useTranslation(); - return ( - {translate('v6y-authentication.title')} - - } + title={} rememberMe={
- {translate('v6y-dependency-status-helps.titles.show')} - - } + title={} queryOptions={{ resource: 'getDependencyStatusHelpDetailsByParams', query: GetDependencyStatusHelpDetailsByParams, diff --git a/v6y-apps/front-bo/src/features/v6y-dependency-status-helps/components/VitalityDependencyStatusHelpEditView.tsx b/v6y-apps/front-bo/src/features/v6y-dependency-status-helps/components/VitalityDependencyStatusHelpEditView.tsx index c32239e0..2f301d5b 100644 --- a/v6y-apps/front-bo/src/features/v6y-dependency-status-helps/components/VitalityDependencyStatusHelpEditView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-dependency-status-helps/components/VitalityDependencyStatusHelpEditView.tsx @@ -1,5 +1,5 @@ import { useParsed } from '@refinedev/core'; -import { Typography } from 'antd'; +import { VitalityTitle } from '@v6y/shared-ui'; import * as React from 'react'; import { @@ -18,11 +18,7 @@ export default function VitalityDependencyStatusHelpEditView() { return ( - {translate('v6y-evolution-helps.titles.edit')} - - } + title={} queryOptions={{ queryFormAdapter: dependencyStatusHelpCreateOrEditFormInAdapter, query: GetDependencyStatusHelpDetailsByParams, diff --git a/v6y-apps/front-bo/src/features/v6y-dependency-status-helps/components/VitalityDependencyStatusHelpListView.tsx b/v6y-apps/front-bo/src/features/v6y-dependency-status-helps/components/VitalityDependencyStatusHelpListView.tsx index 0cf3c504..e5e0086b 100644 --- a/v6y-apps/front-bo/src/features/v6y-dependency-status-helps/components/VitalityDependencyStatusHelpListView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-dependency-status-helps/components/VitalityDependencyStatusHelpListView.tsx @@ -1,8 +1,4 @@ -import VitalityTable from '../../../commons/components/VitalityTable'; -import { - buildCommonTableColumns, - buildCommonTableDataSource, -} from '../../../commons/config/VitalityTableConfig'; +import RenderVitalityTable from '../../../commons/components/VitalityTable'; import { useTranslation } from '../../../infrastructure/adapters/translation/TranslationAdapter'; import RefineTableWrapper from '../../../infrastructure/components/RefineTableWrapper'; import GetDependencyStatusHelpListByPageAndParams from '../apis/getDependencyStatusHelpListByPageAndParams'; @@ -25,13 +21,14 @@ export default function VitalityDependencyStatusHelpListView() { query: GetDependencyStatusHelpListByPageAndParams, }} renderTable={(dataSource) => ( - )} /> diff --git a/v6y-apps/front-bo/src/features/v6y-deprecated-dependencies/components/VitalityDeprecatedDependencyCreateView.tsx b/v6y-apps/front-bo/src/features/v6y-deprecated-dependencies/components/VitalityDeprecatedDependencyCreateView.tsx index 3e211f59..9f926f2d 100644 --- a/v6y-apps/front-bo/src/features/v6y-deprecated-dependencies/components/VitalityDeprecatedDependencyCreateView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-deprecated-dependencies/components/VitalityDeprecatedDependencyCreateView.tsx @@ -1,4 +1,4 @@ -import { Typography } from 'antd'; +import { VitalityTitle } from '@v6y/shared-ui'; import * as React from 'react'; import { @@ -14,11 +14,7 @@ export default function VitalityDeprecatedDependencyCreateView() { return ( - {translate('v6y-deprecated-dependencies.titles.create')} - - } + title={} createOptions={{ createFormAdapter: deprecatedDependencyCreateOrEditFormOutputAdapter, createQuery: CreateOrEditDeprecatedDependency, diff --git a/v6y-apps/front-bo/src/features/v6y-deprecated-dependencies/components/VitalityDeprecatedDependencyDetailsView.tsx b/v6y-apps/front-bo/src/features/v6y-deprecated-dependencies/components/VitalityDeprecatedDependencyDetailsView.tsx index 51c177e0..e5a3c8dd 100644 --- a/v6y-apps/front-bo/src/features/v6y-deprecated-dependencies/components/VitalityDeprecatedDependencyDetailsView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-deprecated-dependencies/components/VitalityDeprecatedDependencyDetailsView.tsx @@ -1,6 +1,6 @@ import { useParsed } from '@refinedev/core'; import { DeprecatedDependencyType } from '@v6y/core-logic/src'; -import { Typography } from 'antd'; +import { VitalityTitle } from '@v6y/shared-ui'; import * as React from 'react'; import VitalityDetailsView from '../../../commons/components/VitalityDetailsView'; @@ -16,11 +16,7 @@ export default function VitalityDeprecatedDependencyDetailsView() { return ( - {translate('v6y-audit-helps.titles.show')} - - } + title={} queryOptions={{ resource: 'getDeprecatedDependencyDetailsByParams', query: GetDeprecatedDependencyDetailsByParams, diff --git a/v6y-apps/front-bo/src/features/v6y-deprecated-dependencies/components/VitalityDeprecatedDependencyEditView.tsx b/v6y-apps/front-bo/src/features/v6y-deprecated-dependencies/components/VitalityDeprecatedDependencyEditView.tsx index 008c145a..76c25b6e 100644 --- a/v6y-apps/front-bo/src/features/v6y-deprecated-dependencies/components/VitalityDeprecatedDependencyEditView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-deprecated-dependencies/components/VitalityDeprecatedDependencyEditView.tsx @@ -1,5 +1,5 @@ import { useParsed } from '@refinedev/core'; -import { Typography } from 'antd'; +import { VitalityTitle } from '@v6y/shared-ui'; import * as React from 'react'; import { @@ -18,11 +18,7 @@ export default function VitalityDeprecatedDependencyEditView() { return ( - {translate('v6y-deprecated-dependencies.titles.edit')} - - } + title={} queryOptions={{ queryFormAdapter: deprecatedDependencyCreateOrEditFormInAdapter, query: GetDeprecatedDependencyDetailsByParams, diff --git a/v6y-apps/front-bo/src/features/v6y-deprecated-dependencies/components/VitalityDeprecatedDependencyListView.tsx b/v6y-apps/front-bo/src/features/v6y-deprecated-dependencies/components/VitalityDeprecatedDependencyListView.tsx index fe6d486c..73a3fbca 100644 --- a/v6y-apps/front-bo/src/features/v6y-deprecated-dependencies/components/VitalityDeprecatedDependencyListView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-deprecated-dependencies/components/VitalityDeprecatedDependencyListView.tsx @@ -1,8 +1,4 @@ -import VitalityTable from '../../../commons/components/VitalityTable'; -import { - buildCommonTableColumns, - buildCommonTableDataSource, -} from '../../../commons/config/VitalityTableConfig'; +import RenderVitalityTable from '../../../commons/components/VitalityTable'; import { useTranslation } from '../../../infrastructure/adapters/translation/TranslationAdapter'; import RefineTableWrapper from '../../../infrastructure/components/RefineTableWrapper'; import DeleteDeprecatedDependency from '../apis/deleteDeprecatedDependency'; @@ -26,9 +22,10 @@ export default function VitalityDeprecatedDependencyListView() { query: GetDeprecatedDependencyListByPageAndParams, }} renderTable={(dataSource) => ( - )} /> diff --git a/v6y-apps/front-bo/src/features/v6y-evolution-helps/components/VitalityEvolutionHelpDetailsView.tsx b/v6y-apps/front-bo/src/features/v6y-evolution-helps/components/VitalityEvolutionHelpDetailsView.tsx index b7036948..04340c35 100644 --- a/v6y-apps/front-bo/src/features/v6y-evolution-helps/components/VitalityEvolutionHelpDetailsView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-evolution-helps/components/VitalityEvolutionHelpDetailsView.tsx @@ -1,6 +1,6 @@ import { useParsed } from '@refinedev/core'; import { EvolutionHelpType } from '@v6y/core-logic'; -import { Typography } from 'antd'; +import { VitalityTitle } from '@v6y/shared-ui'; import * as React from 'react'; import VitalityDetailsView from '../../../commons/components/VitalityDetailsView'; @@ -16,11 +16,7 @@ export default function VitalityEvolutionHelpDetailsView() { return ( - {translate('v6y-evolution-helps.titles.show')} - - } + title={} queryOptions={{ resource: 'getEvolutionHelpDetailsByParams', query: GetEvolutionHelpDetailsByParams, diff --git a/v6y-apps/front-bo/src/features/v6y-evolution-helps/components/VitalityEvolutionHelpEditView.tsx b/v6y-apps/front-bo/src/features/v6y-evolution-helps/components/VitalityEvolutionHelpEditView.tsx index 0890c45a..05638a0e 100644 --- a/v6y-apps/front-bo/src/features/v6y-evolution-helps/components/VitalityEvolutionHelpEditView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-evolution-helps/components/VitalityEvolutionHelpEditView.tsx @@ -1,6 +1,6 @@ import { useParsed } from '@refinedev/core'; import { EvolutionHelpType } from '@v6y/core-logic'; -import { Typography } from 'antd'; +import { VitalityTitle } from '@v6y/shared-ui'; import * as React from 'react'; import { @@ -20,11 +20,7 @@ export default function VitalityEvolutionHelpEditView() { return ( - {translate('v6y-evolution-helps.titles.edit')} - - } + title={} queryOptions={{ queryFormAdapter: evolutionHelpCreateOrEditFormInAdapter, query: GetEvolutionHelpDetailsByParams, diff --git a/v6y-apps/front-bo/src/features/v6y-evolution-helps/components/VitalityEvolutionHelpListView.tsx b/v6y-apps/front-bo/src/features/v6y-evolution-helps/components/VitalityEvolutionHelpListView.tsx index 55dbcdb9..d223bd2f 100644 --- a/v6y-apps/front-bo/src/features/v6y-evolution-helps/components/VitalityEvolutionHelpListView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-evolution-helps/components/VitalityEvolutionHelpListView.tsx @@ -1,8 +1,4 @@ -import VitalityTable from '../../../commons/components/VitalityTable'; -import { - buildCommonTableColumns, - buildCommonTableDataSource, -} from '../../../commons/config/VitalityTableConfig'; +import RenderVitalityTable from '../../../commons/components/VitalityTable'; import { useTranslation } from '../../../infrastructure/adapters/translation/TranslationAdapter'; import RefineTableWrapper from '../../../infrastructure/components/RefineTableWrapper'; import GetEvolutionHelpListByPageAndParams from '../apis/getEvolutionHelpListByPageAndParams'; @@ -25,13 +21,14 @@ export default function VitalityEvolutionHelpListView() { query: GetEvolutionHelpListByPageAndParams, }} renderTable={(dataSource) => ( - )} /> diff --git a/v6y-apps/front-bo/src/features/v6y-faqs/components/VitalityFaqCreateView.tsx b/v6y-apps/front-bo/src/features/v6y-faqs/components/VitalityFaqCreateView.tsx index 2f519d17..84fecac1 100644 --- a/v6y-apps/front-bo/src/features/v6y-faqs/components/VitalityFaqCreateView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-faqs/components/VitalityFaqCreateView.tsx @@ -1,4 +1,4 @@ -import { Typography } from 'antd'; +import { VitalityTitle } from '@v6y/shared-ui'; import * as React from 'react'; import { @@ -14,9 +14,7 @@ export default function VitalityFaqCreateView() { return ( {translate('v6y-faqs.titles.create')} - } + title={} createOptions={{ createFormAdapter: faqCreateOrEditFormOutputAdapter, createQuery: CreateOrEditFaq, diff --git a/v6y-apps/front-bo/src/features/v6y-faqs/components/VitalityFaqDetailsView.tsx b/v6y-apps/front-bo/src/features/v6y-faqs/components/VitalityFaqDetailsView.tsx index 60e84f3e..d504bc4c 100644 --- a/v6y-apps/front-bo/src/features/v6y-faqs/components/VitalityFaqDetailsView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-faqs/components/VitalityFaqDetailsView.tsx @@ -1,6 +1,6 @@ import { useParsed } from '@refinedev/core'; import { FaqType } from '@v6y/core-logic'; -import { Typography } from 'antd'; +import { VitalityTitle } from '@v6y/shared-ui'; import * as React from 'react'; import VitalityDetailsView from '../../../commons/components/VitalityDetailsView'; @@ -16,9 +16,7 @@ export default function VitalityFaqDetailsView() { return ( {translate('v6y-faqs.titles.show')} - } + title={} queryOptions={{ resource: 'getFaqDetailsByParams', query: GetFaqDetailsByParams, diff --git a/v6y-apps/front-bo/src/features/v6y-faqs/components/VitalityFaqEditView.tsx b/v6y-apps/front-bo/src/features/v6y-faqs/components/VitalityFaqEditView.tsx index ef08ef3f..05ca0907 100644 --- a/v6y-apps/front-bo/src/features/v6y-faqs/components/VitalityFaqEditView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-faqs/components/VitalityFaqEditView.tsx @@ -1,5 +1,5 @@ import { useParsed } from '@refinedev/core'; -import { Typography } from 'antd'; +import { VitalityTitle } from '@v6y/shared-ui'; import * as React from 'react'; import { @@ -18,9 +18,7 @@ export default function VitalityFaqEditView() { return ( {translate('v6y-faqs.titles.edit')} - } + title={} queryOptions={{ queryFormAdapter: faqCreateOrEditFormInAdapter, query: GetFaqDetailsByParams, diff --git a/v6y-apps/front-bo/src/features/v6y-faqs/components/VitalityFaqListView.tsx b/v6y-apps/front-bo/src/features/v6y-faqs/components/VitalityFaqListView.tsx index dc46bd02..c22c0307 100644 --- a/v6y-apps/front-bo/src/features/v6y-faqs/components/VitalityFaqListView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-faqs/components/VitalityFaqListView.tsx @@ -1,8 +1,4 @@ -import VitalityTable from '../../../commons/components/VitalityTable'; -import { - buildCommonTableColumns, - buildCommonTableDataSource, -} from '../../../commons/config/VitalityTableConfig'; +import RenderVitalityTable from '../../../commons/components/VitalityTable'; import { useTranslation } from '../../../infrastructure/adapters/translation/TranslationAdapter'; import RefineTableWrapper from '../../../infrastructure/components/RefineTableWrapper'; import DeleteFaq from '../apis/deleteFaq'; @@ -26,9 +22,10 @@ export default function VitalityFaqListView() { query: GetFaqListByPageAndParams, }} renderTable={(dataSource) => ( - )} /> diff --git a/v6y-apps/front-bo/src/features/v6y-notifications/components/VitalityNotificationCreateView.tsx b/v6y-apps/front-bo/src/features/v6y-notifications/components/VitalityNotificationCreateView.tsx index e9454b61..58d3752e 100644 --- a/v6y-apps/front-bo/src/features/v6y-notifications/components/VitalityNotificationCreateView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-notifications/components/VitalityNotificationCreateView.tsx @@ -1,4 +1,4 @@ -import { Typography } from 'antd'; +import { VitalityTitle } from '@v6y/shared-ui'; import * as React from 'react'; import { @@ -14,11 +14,7 @@ export default function VitalityNotificationCreateView() { return ( - {translate('v6y-notifications.titles.create')} - - } + title={} createOptions={{ createFormAdapter: notificationCreateOrEditFormOutputAdapter as ( data: unknown, diff --git a/v6y-apps/front-bo/src/features/v6y-notifications/components/VitalityNotificationDetailsView.tsx b/v6y-apps/front-bo/src/features/v6y-notifications/components/VitalityNotificationDetailsView.tsx index b69fd5d0..a539094c 100644 --- a/v6y-apps/front-bo/src/features/v6y-notifications/components/VitalityNotificationDetailsView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-notifications/components/VitalityNotificationDetailsView.tsx @@ -1,6 +1,6 @@ import { useParsed } from '@refinedev/core'; import { NotificationType } from '@v6y/core-logic/src'; -import { Typography } from 'antd'; +import { VitalityTitle } from '@v6y/shared-ui'; import * as React from 'react'; import VitalityDetailsView from '../../../commons/components/VitalityDetailsView'; @@ -16,11 +16,7 @@ export default function VitalityNotificationDetailsView() { return ( - {translate('v6y-notifications.titles.show')} - - } + title={} queryOptions={{ resource: 'getNotificationDetailsByParams', query: GetNotificationDetailsByParams, diff --git a/v6y-apps/front-bo/src/features/v6y-notifications/components/VitalityNotificationEditView.tsx b/v6y-apps/front-bo/src/features/v6y-notifications/components/VitalityNotificationEditView.tsx index 2aeebf87..d6cd3e85 100644 --- a/v6y-apps/front-bo/src/features/v6y-notifications/components/VitalityNotificationEditView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-notifications/components/VitalityNotificationEditView.tsx @@ -1,5 +1,5 @@ import { useParsed } from '@refinedev/core'; -import { Typography } from 'antd'; +import { VitalityTitle } from '@v6y/shared-ui'; import * as React from 'react'; import { @@ -18,11 +18,7 @@ export default function VitalityNotificationEditView() { return ( - {translate('v6y-notifications.titles.edit')} - - } + title={} queryOptions={{ queryFormAdapter: notificationCreateOrEditFormInAdapter as ( data: unknown, diff --git a/v6y-apps/front-bo/src/features/v6y-notifications/components/VitalityNotificationListView.tsx b/v6y-apps/front-bo/src/features/v6y-notifications/components/VitalityNotificationListView.tsx index 4334c3e8..1fa54dc2 100644 --- a/v6y-apps/front-bo/src/features/v6y-notifications/components/VitalityNotificationListView.tsx +++ b/v6y-apps/front-bo/src/features/v6y-notifications/components/VitalityNotificationListView.tsx @@ -1,8 +1,4 @@ -import VitalityTable from '../../../commons/components/VitalityTable'; -import { - buildCommonTableColumns, - buildCommonTableDataSource, -} from '../../../commons/config/VitalityTableConfig'; +import RenderVitalityTable from '../../../commons/components/VitalityTable'; import { useTranslation } from '../../../infrastructure/adapters/translation/TranslationAdapter'; import RefineTableWrapper from '../../../infrastructure/components/RefineTableWrapper'; import DeleteNotification from '../apis/deleteNotification'; @@ -26,9 +22,10 @@ export default function VitalityNotificationListView() { query: GetNotificationListByPageAndParams, }} renderTable={(dataSource) => ( - )} /> diff --git a/v6y-apps/front-bo/src/infrastructure/components/RefineTableWrapper.tsx b/v6y-apps/front-bo/src/infrastructure/components/RefineTableWrapper.tsx index e0a3b9db..74d2c7c6 100644 --- a/v6y-apps/front-bo/src/infrastructure/components/RefineTableWrapper.tsx +++ b/v6y-apps/front-bo/src/infrastructure/components/RefineTableWrapper.tsx @@ -1,5 +1,5 @@ import { List, RefreshButton, useTable } from '@refinedev/antd'; -import { Typography } from 'antd'; +import { VitalityTitle } from '@v6y/shared-ui'; import { ReactNode } from 'react'; import VitalityLoader from '../../commons/components/VitalityLoader'; @@ -32,7 +32,7 @@ export default function RefineTableWrapper({ return (
- {title} + ( diff --git a/v6y-apps/front/src/commons/components/VitalityEmptyView.tsx b/v6y-apps/front/src/commons/components/VitalityEmptyView.tsx index f0110a64..e92b8ea7 100644 --- a/v6y-apps/front/src/commons/components/VitalityEmptyView.tsx +++ b/v6y-apps/front/src/commons/components/VitalityEmptyView.tsx @@ -1,14 +1,12 @@ -import { Empty, Typography } from 'antd'; +import { VitalityText } from '@v6y/shared-ui'; +import { Empty } from 'antd'; +import * as React from 'react'; import VitalityTerms from '../config/VitalityTerms'; const VitalityEmptyView = ({ message }: { message?: string }) => ( - {message || VitalityTerms.VITALITY_EMPTY_DATA_MESSAGE} - - } + description={} /> ); diff --git a/v6y-apps/front/src/commons/components/VitalityLinks.tsx b/v6y-apps/front/src/commons/components/VitalityLinks.tsx index 674a0e33..f910a8b3 100644 --- a/v6y-apps/front/src/commons/components/VitalityLinks.tsx +++ b/v6y-apps/front/src/commons/components/VitalityLinks.tsx @@ -1,6 +1,8 @@ import { LinkType } from '@v6y/core-logic'; -import { Col, Row, Typography } from 'antd'; +import { VitalityText } from '@v6y/shared-ui'; +import { Col, Row } from 'antd'; import Link from 'next/link'; +import * as React from 'react'; import { VitalityLinksProps } from '../types/VitalityLinksProps'; @@ -32,7 +34,7 @@ const VitalityLinks = ({ links, align }: VitalityLinksProps) => { rel="noopener noreferrer" style={{ textDecoration: 'underline' }} > - {link.label} + )} diff --git a/v6y-apps/front/src/commons/components/VitalityPaginatedList.tsx b/v6y-apps/front/src/commons/components/VitalityPaginatedList.tsx index 5bda65aa..b5bbb5fc 100644 --- a/v6y-apps/front/src/commons/components/VitalityPaginatedList.tsx +++ b/v6y-apps/front/src/commons/components/VitalityPaginatedList.tsx @@ -1,4 +1,6 @@ -import { List, Typography } from 'antd'; +import { VitalityText } from '@v6y/shared-ui'; +import { List } from 'antd'; +import * as React from 'react'; import { VitalityListProps } from '../types/VitalityListProps'; @@ -26,9 +28,7 @@ const VitalityPaginatedList = ({ renderItem={renderItem} header={header} footer={ - showFooter ? ( - {`Total: ${dataSource?.length || 0}`} - ) : null + showFooter ? : null } style={{ ...(style || {}), diff --git a/v6y-apps/front/src/commons/components/VitalitySearchBar.tsx b/v6y-apps/front/src/commons/components/VitalitySearchBar.tsx index 18129969..6fc54a10 100644 --- a/v6y-apps/front/src/commons/components/VitalitySearchBar.tsx +++ b/v6y-apps/front/src/commons/components/VitalitySearchBar.tsx @@ -1,6 +1,7 @@ 'use client'; -import { Col, Form, Input, Row, Typography } from 'antd'; +import { VitalityText } from '@v6y/shared-ui'; +import { Col, Form, Input, Row } from 'antd'; import * as React from 'react'; import useNavigationAdapter from '../../infrastructure/adapters/navigation/useNavigationAdapter'; @@ -36,8 +37,8 @@ const VitalitySearchBar = ({ helper, label, status, placeholder }: VitalitySearc
{label}} - help={{helper}} + label={} + help={} initialValue={searchText} > )} - {title || ''} + } > diff --git a/v6y-apps/front/src/commons/components/VitalitySelectGrouperView.tsx b/v6y-apps/front/src/commons/components/VitalitySelectGrouperView.tsx index 1c90388d..ec466bdc 100644 --- a/v6y-apps/front/src/commons/components/VitalitySelectGrouperView.tsx +++ b/v6y-apps/front/src/commons/components/VitalitySelectGrouperView.tsx @@ -1,4 +1,5 @@ -import { Col, Form, Row, Select, Typography } from 'antd'; +import { VitalityText } from '@v6y/shared-ui'; +import { Col, Form, Row, Select } from 'antd'; import * as React from 'react'; import { useEffect } from 'react'; @@ -62,8 +63,8 @@ const VitalitySelectGrouperView = ({ > {label}} - help={{helper}} + label={} + help={} >