ConceptProd/Portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

npm update + fix name collision

Browse Source
This commit is contained in:
Ivan 2025-02-20 18:10:34 +03:00
parent b6a888140a
commit 0694c45c08
32 changed files with 145 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
rsconcept/frontend/package-lock.json generated
View File

@ -11,13 +11,14 @@
"@dagrejs/dagre": "^1.1.4", "@dagrejs/dagre": "^1.1.4",
"@hookform/resolvers": "^4.1.0", "@hookform/resolvers": "^4.1.0",
"@lezer/lr": "^1.4.2", "@lezer/lr": "^1.4.2",
"@tanstack/react-query": "^5.66.7", "@tanstack/react-query": "^5.66.8",
"@tanstack/react-query-devtools": "^5.66.7", "@tanstack/react-query-devtools": "^5.66.8",
"@tanstack/react-table": "^8.21.2", "@tanstack/react-table": "^8.21.2",
"@uiw/codemirror-themes": "^4.23.8", "@uiw/codemirror-themes": "^4.23.8",
"@uiw/react-codemirror": "^4.23.8", "@uiw/react-codemirror": "^4.23.8",
"axios": "^1.7.9", "axios": "^1.7.9",
"clsx": "^2.1.1", "clsx": "^2.1.1",
"global": "^4.4.0",
"html-to-image": "^1.11.13", "html-to-image": "^1.11.13",
"js-file-download": "^0.4.12", "js-file-download": "^0.4.12",
"qrcode.react": "^4.2.0", "qrcode.react": "^4.2.0",
@ -25,7 +26,7 @@
"react-dom": "^19.0.0", "react-dom": "^19.0.0",
"react-error-boundary": "^5.0.0", "react-error-boundary": "^5.0.0",
"react-hook-form": "^7.54.2", "react-hook-form": "^7.54.2",
"react-icons": "^5.4.0", "react-icons": "^5.5.0",
"react-intl": "^7.1.6", "react-intl": "^7.1.6",
"react-router": "^7.2.0", "react-router": "^7.2.0",
"react-scan": "^0.1.3", "react-scan": "^0.1.3",
@ -50,21 +51,21 @@
"@typescript-eslint/parser": "^8.0.1", "@typescript-eslint/parser": "^8.0.1",
"@vitejs/plugin-react": "^4.3.4", "@vitejs/plugin-react": "^4.3.4",
"autoprefixer": "^10.4.20", "autoprefixer": "^10.4.20",
"babel-plugin-react-compiler": "^19.0.0-beta-30d8a17-20250209", "babel-plugin-react-compiler": "^19.0.0-beta-21e868a-20250216",
"eslint": "^9.20.1", "eslint": "^9.20.1",
"eslint-plugin-import": "^2.31.0", "eslint-plugin-import": "^2.31.0",
"eslint-plugin-react": "^7.37.4", "eslint-plugin-react": "^7.37.4",
"eslint-plugin-react-compiler": "^19.0.0-beta-30d8a17-20250209", "eslint-plugin-react-compiler": "^19.0.0-beta-21e868a-20250216",
"eslint-plugin-react-hooks": "^5.1.0", "eslint-plugin-react-hooks": "^5.1.0",
"eslint-plugin-simple-import-sort": "^12.1.1", "eslint-plugin-simple-import-sort": "^12.1.1",
"globals": "^15.15.0", "globals": "^16.0.0",
"jest": "^29.7.0", "jest": "^29.7.0",
"postcss": "^8.5.2", "postcss": "^8.5.3",
"tailwindcss": "^3.4.17", "tailwindcss": "^3.4.17",
"ts-jest": "^29.2.5", "ts-jest": "^29.2.5",
"typescript": "^5.7.3", "typescript": "^5.7.3",
"typescript-eslint": "^8.24.1", "typescript-eslint": "^8.24.1",
"vite": "^6.1.0" "vite": "^6.1.1"
} }
}, },
"node_modules/@alloc/quick-lru": { "node_modules/@alloc/quick-lru": {
@ -1755,9 +1756,9 @@
} }
}, },
"node_modules/@humanwhocodes/retry": { "node_modules/@humanwhocodes/retry": {
"version": "0.4.1", "version": "0.4.2",
"resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.1.tgz", "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.2.tgz",
"integrity": "sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==", "integrity": "sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ==",
"dev": true, "dev": true,
"license": "Apache-2.0", "license": "Apache-2.0",
"engines": { "engines": {
@ -3104,9 +3105,9 @@
} }
}, },
"node_modules/@tanstack/react-query": { "node_modules/@tanstack/react-query": {
"version": "5.66.7", "version": "5.66.8",
"resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.66.7.tgz", "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.66.8.tgz",
"integrity": "sha512-qd3q/tUpF2K1xItfPZddk1k/8pSXnovg41XyCqJgPoyYEirMBtB0sVEVVQ/CsAOngzgWtBPXimVf4q4kM9uO6A==", "integrity": "sha512-LqYHYArmM7ycyT1I/Txc/n6KzI8S/hBFw2SQ9Uj1GpbZ89AvZLEvetquiQEHkZ5rFEm+iVNpZ6zYjTiPmJ9N5Q==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@tanstack/query-core": "5.66.4" "@tanstack/query-core": "5.66.4"
@ -3120,9 +3121,9 @@
} }
}, },
"node_modules/@tanstack/react-query-devtools": { "node_modules/@tanstack/react-query-devtools": {
"version": "5.66.7", "version": "5.66.8",
"resolved": "https://registry.npmjs.org/@tanstack/react-query-devtools/-/react-query-devtools-5.66.7.tgz", "resolved": "https://registry.npmjs.org/@tanstack/react-query-devtools/-/react-query-devtools-5.66.8.tgz",
"integrity": "sha512-40z4PPkz06tYIF0vwLZZIZfZxKUH4OAaBOR14blCFyYm6hlU6qc+M82mkZ+D00HcEMhV7P4XeJiEuDhFq0q9Qw==", "integrity": "sha512-OOdGk4ijs1SEliluWoE5D0ghxwDQz4x2LKzO69K6++VuxtizONXEXtk/oC3QGa9Tru/2CQmsJ5HUk8pmUAi9Qg==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@tanstack/query-devtools": "5.65.0" "@tanstack/query-devtools": "5.65.0"
@ -3132,7 +3133,7 @@
"url": "https://github.com/sponsors/tannerlinsley" "url": "https://github.com/sponsors/tannerlinsley"
}, },
"peerDependencies": { "peerDependencies": {
"@tanstack/react-query": "^5.66.7", "@tanstack/react-query": "^5.66.8",
"react": "^18 || ^19" "react": "^18 || ^19"
} }
}, },
@ -4370,9 +4371,9 @@
} }
}, },
"node_modules/babel-plugin-react-compiler": { "node_modules/babel-plugin-react-compiler": {
"version": "19.0.0-beta-e552027-20250112", "version": "19.0.0-beta-21e868a-20250216",
"resolved": "https://registry.npmjs.org/babel-plugin-react-compiler/-/babel-plugin-react-compiler-19.0.0-beta-e552027-20250112.tgz", "resolved": "https://registry.npmjs.org/babel-plugin-react-compiler/-/babel-plugin-react-compiler-19.0.0-beta-21e868a-20250216.tgz",
"integrity": "sha512-pUTT0mAZ4XLewC6bvqVeX015nVRLVultcSQlkzGdC10G6YV6K2h4E7cwGlLAuLKWTj3Z08mTO9uTnPP/opUBsg==", "integrity": "sha512-WDOBsm9t9P0RADm8CSlav5OqWvs+3mZFvrBo/qf3vuNtdz78OG5TFxOy7De8ePR3rA6qg1Qmcjjae6nR1pOpCA==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
@ -5256,6 +5257,11 @@
"csstype": "^3.0.2" "csstype": "^3.0.2"
} }
}, },
"node_modules/dom-walk": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.2.tgz",
"integrity": "sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w=="
},
"node_modules/dunder-proto": { "node_modules/dunder-proto": {
"version": "1.0.1", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
@ -5781,9 +5787,9 @@
} }
}, },
"node_modules/eslint-plugin-react-compiler": { "node_modules/eslint-plugin-react-compiler": {
"version": "19.0.0-beta-e552027-20250112", "version": "19.0.0-beta-21e868a-20250216",
"resolved": "https://registry.npmjs.org/eslint-plugin-react-compiler/-/eslint-plugin-react-compiler-19.0.0-beta-e552027-20250112.tgz", "resolved": "https://registry.npmjs.org/eslint-plugin-react-compiler/-/eslint-plugin-react-compiler-19.0.0-beta-21e868a-20250216.tgz",
"integrity": "sha512-VjkIXHouCYyJHgk5HmZ1LH+fAK5CX+ULRX9iNYtwYJ+ljbivFhIT+JJyxNT/USQpCeS2Dt5ahjFeeMv0RRwTww==", "integrity": "sha512-LstAv6tKgZylMmJniWxQL9TOY9kwRddLnvBsoTbRsgUDROL5bsg0k5XHMaNJLyX8cxh4iafQ/WxAw5shNUf3GQ==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
@ -6581,10 +6587,20 @@
"node": "*" "node": "*"
} }
}, },
"node_modules/global": {
"version": "4.4.0",
"resolved": "https://registry.npmjs.org/global/-/global-4.4.0.tgz",
"integrity": "sha512-wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==",
"license": "MIT",
"dependencies": {
"min-document": "^2.19.0",
"process": "^0.11.10"
}
},
"node_modules/globals": { "node_modules/globals": {
"version": "15.15.0", "version": "16.0.0",
"resolved": "https://registry.npmjs.org/globals/-/globals-15.15.0.tgz", "resolved": "https://registry.npmjs.org/globals/-/globals-16.0.0.tgz",
"integrity": "sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==", "integrity": "sha512-iInW14XItCXET01CQFqudPOWP2jYMl7T+QRQT+UNcR/iQncN/F0UNpgd76iFkBPgNQb4+X3LV9tLJYzwh+Gl3A==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"engines": { "engines": {
@ -8385,6 +8401,14 @@
"node": ">=6" "node": ">=6"
} }
}, },
"node_modules/min-document": {
"version": "2.19.0",
"resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
"integrity": "sha512-9Wy1B3m3f66bPPmU5hdA4DR4PB2OfDU/+GS3yAB7IQozE3tqXaVv2zOjgla7MEGSRv95+ILmOuvhLkOK6wJtCQ==",
"dependencies": {
"dom-walk": "^0.1.0"
}
},
"node_modules/minimatch": { "node_modules/minimatch": {
"version": "9.0.5", "version": "9.0.5",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
@ -9024,9 +9048,9 @@
} }
}, },
"node_modules/postcss": { "node_modules/postcss": {
"version": "8.5.2", "version": "8.5.3",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.2.tgz", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
"integrity": "sha512-MjOadfU3Ys9KYoX0AdkBlFEF1Vx37uCCeN4ZHnmwm9FfpbsGWMZeBLMmmpY+6Ocqod7mkdZ0DT31OlbsFrLlkA==", "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
"dev": true, "dev": true,
"funding": [ "funding": [
{ {
@ -9221,6 +9245,15 @@
"url": "https://github.com/chalk/ansi-styles?sponsor=1" "url": "https://github.com/chalk/ansi-styles?sponsor=1"
} }
}, },
"node_modules/process": {
"version": "0.11.10",
"resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
"integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
"license": "MIT",
"engines": {
"node": ">= 0.6.0"
}
},
"node_modules/prompts": { "node_modules/prompts": {
"version": "2.4.2", "version": "2.4.2",
"resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz", "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
@ -9365,9 +9398,9 @@
} }
}, },
"node_modules/react-icons": { "node_modules/react-icons": {
"version": "5.4.0", "version": "5.5.0",
"resolved": "https://registry.npmjs.org/react-icons/-/react-icons-5.4.0.tgz", "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-5.5.0.tgz",
"integrity": "sha512-7eltJxgVt7X64oHh6wSWNwwbKTCtMfK35hcjvJS0yxEAhPM8oUKdS3+kqaW1vicIltw+kR2unHaa12S9pPALoQ==", "integrity": "sha512-MEFcXdkP3dLo8uumGI5xN3lDFNsRtrjbOEKDLD7yv76v4wpnEq2Lt2qeHaQOr34I/wPN3s3+N08WkQ+CW37Xiw==",
"license": "MIT", "license": "MIT",
"peerDependencies": { "peerDependencies": {
"react": "*" "react": "*"
@ -11434,14 +11467,14 @@
} }
}, },
"node_modules/vite": { "node_modules/vite": {
"version": "6.1.0", "version": "6.1.1",
"resolved": "https://registry.npmjs.org/vite/-/vite-6.1.0.tgz", "resolved": "https://registry.npmjs.org/vite/-/vite-6.1.1.tgz",
"integrity": "sha512-RjjMipCKVoR4hVfPY6GQTgveinjNuyLw+qruksLDvA5ktI1150VmcMBKmQaEWJhg/j6Uaf6dNCNA0AfdzUb/hQ==", "integrity": "sha512-4GgM54XrwRfrOp297aIYspIti66k56v16ZnqHvrIM7mG+HjDlAwS7p+Srr7J6fGvEdOJ5JcQ/D9T7HhtdXDTzA==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"esbuild": "^0.24.2", "esbuild": "^0.24.2",
"postcss": "^8.5.1", "postcss": "^8.5.2",
"rollup": "^4.30.1" "rollup": "^4.30.1"
}, },
"bin": { "bin": {

17
rsconcept/frontend/package.json
View File

@ -16,13 +16,14 @@
"@dagrejs/dagre": "^1.1.4", "@dagrejs/dagre": "^1.1.4",
"@hookform/resolvers": "^4.1.0", "@hookform/resolvers": "^4.1.0",
"@lezer/lr": "^1.4.2", "@lezer/lr": "^1.4.2",
"@tanstack/react-query": "^5.66.7", "@tanstack/react-query": "^5.66.8",
"@tanstack/react-query-devtools": "^5.66.7", "@tanstack/react-query-devtools": "^5.66.8",
"@tanstack/react-table": "^8.21.2", "@tanstack/react-table": "^8.21.2",
"@uiw/codemirror-themes": "^4.23.8", "@uiw/codemirror-themes": "^4.23.8",
"@uiw/react-codemirror": "^4.23.8", "@uiw/react-codemirror": "^4.23.8",
"axios": "^1.7.9", "axios": "^1.7.9",
"clsx": "^2.1.1", "clsx": "^2.1.1",
"global": "^4.4.0",
"html-to-image": "^1.11.13", "html-to-image": "^1.11.13",
"js-file-download": "^0.4.12", "js-file-download": "^0.4.12",
"qrcode.react": "^4.2.0", "qrcode.react": "^4.2.0",
@ -30,7 +31,7 @@
"react-dom": "^19.0.0", "react-dom": "^19.0.0",
"react-error-boundary": "^5.0.0", "react-error-boundary": "^5.0.0",
"react-hook-form": "^7.54.2", "react-hook-form": "^7.54.2",
"react-icons": "^5.4.0", "react-icons": "^5.5.0",
"react-intl": "^7.1.6", "react-intl": "^7.1.6",
"react-router": "^7.2.0", "react-router": "^7.2.0",
"react-scan": "^0.1.3", "react-scan": "^0.1.3",
@ -55,21 +56,21 @@
"@typescript-eslint/parser": "^8.0.1", "@typescript-eslint/parser": "^8.0.1",
"@vitejs/plugin-react": "^4.3.4", "@vitejs/plugin-react": "^4.3.4",
"autoprefixer": "^10.4.20", "autoprefixer": "^10.4.20",
"babel-plugin-react-compiler": "^19.0.0-beta-30d8a17-20250209", "babel-plugin-react-compiler": "^19.0.0-beta-21e868a-20250216",
"eslint": "^9.20.1", "eslint": "^9.20.1",
"eslint-plugin-import": "^2.31.0", "eslint-plugin-import": "^2.31.0",
"eslint-plugin-react": "^7.37.4", "eslint-plugin-react": "^7.37.4",
"eslint-plugin-react-compiler": "^19.0.0-beta-30d8a17-20250209", "eslint-plugin-react-compiler": "^19.0.0-beta-21e868a-20250216",
"eslint-plugin-react-hooks": "^5.1.0", "eslint-plugin-react-hooks": "^5.1.0",
"eslint-plugin-simple-import-sort": "^12.1.1", "eslint-plugin-simple-import-sort": "^12.1.1",
"globals": "^15.15.0", "globals": "^16.0.0",
"jest": "^29.7.0", "jest": "^29.7.0",
"postcss": "^8.5.2", "postcss": "^8.5.3",
"tailwindcss": "^3.4.17", "tailwindcss": "^3.4.17",
"ts-jest": "^29.2.5", "ts-jest": "^29.2.5",
"typescript": "^5.7.3", "typescript": "^5.7.3",
"typescript-eslint": "^8.24.1", "typescript-eslint": "^8.24.1",
"vite": "^6.1.0" "vite": "^6.1.1"
}, },
"overrides": { "overrides": {
"react": "^19.0.0" "react": "^19.0.0"

10
rsconcept/frontend/src/app/GlobalTooltips.tsx
View File

@ -5,7 +5,7 @@ import React, { Suspense } from 'react';
import { Tooltip } from '@/components/Container'; import { Tooltip } from '@/components/Container';
import { Loader } from '@/components/Loader'; import { Loader } from '@/components/Loader';
import { useTooltipsStore } from '@/stores/tooltips'; import { useTooltipsStore } from '@/stores/tooltips';
import { globals } from '@/utils/constants'; import { globalIDs } from '@/utils/constants';
const InfoConstituenta = React.lazy(() => const InfoConstituenta = React.lazy(() =>
import('@/features/rsform/components/InfoConstituenta').then(module => ({ default: module.InfoConstituenta })) import('@/features/rsform/components/InfoConstituenta').then(module => ({ default: module.InfoConstituenta }))
@ -23,20 +23,20 @@ export const GlobalTooltips = () => {
<> <>
<Tooltip <Tooltip
float float
id={globals.tooltip} id={globalIDs.tooltip}
layer='z-topmost' layer='z-topmost'
place='right-start' place='right-start'
className='mt-8 max-w-[20rem] break-words' className='mt-8 max-w-[20rem] break-words'
/> />
<Tooltip <Tooltip
float float
id={globals.value_tooltip} id={globalIDs.value_tooltip}
layer='z-topmost' layer='z-topmost'
className='max-w-[calc(min(40rem,100dvw-2rem))] text-justify' className='max-w-[calc(min(40rem,100dvw-2rem))] text-justify'
/> />
<Tooltip <Tooltip
clickable clickable
id={globals.constituenta_tooltip} id={globalIDs.constituenta_tooltip}
layer='z-modalTooltip' layer='z-modalTooltip'
className='max-w-[30rem]' className='max-w-[30rem]'
hidden={!hoverCst} hidden={!hoverCst}
@ -46,7 +46,7 @@ export const GlobalTooltips = () => {
</Suspense> </Suspense>
</Tooltip> </Tooltip>
<Tooltip <Tooltip
id={globals.operation_tooltip} id={globalIDs.operation_tooltip}
layer='z-modalTooltip' layer='z-modalTooltip'
className='max-w-[35rem] max-h-[40rem] dense' className='max-w-[35rem] max-h-[40rem] dense'
hidden={!hoverOperation} hidden={!hoverOperation}

4
rsconcept/frontend/src/app/Navigation/NavigationButton.tsx
View File

@ -1,7 +1,7 @@
import clsx from 'clsx'; import clsx from 'clsx';
import { CProps } from '@/components/props'; import { CProps } from '@/components/props';
import { globals } from '@/utils/constants'; import { globalIDs } from '@/utils/constants';
interface NavigationButtonProps extends CProps.Titled, CProps.Styling { interface NavigationButtonProps extends CProps.Titled, CProps.Styling {
text?: string; text?: string;
@ -23,7 +23,7 @@ export function NavigationButton({
<button <button
type='button' type='button'
tabIndex={-1} tabIndex={-1}
data-tooltip-id={!!title || !!titleHtml ? globals.tooltip : undefined} data-tooltip-id={!!title || !!titleHtml ? globalIDs.tooltip : undefined}
data-tooltip-html={titleHtml} data-tooltip-html={titleHtml}
data-tooltip-content={title} data-tooltip-content={title}
data-tooltip-hidden={hideTitle} data-tooltip-hidden={hideTitle}

6
rsconcept/frontend/src/app/Navigation/ToggleNavigation.tsx
View File

@ -3,7 +3,7 @@ import clsx from 'clsx';
import { IconDarkTheme, IconLightTheme, IconPin, IconUnpin } from '@/components/Icons'; import { IconDarkTheme, IconLightTheme, IconPin, IconUnpin } from '@/components/Icons';
import { useAppLayoutStore } from '@/stores/appLayout'; import { useAppLayoutStore } from '@/stores/appLayout';
import { usePreferencesStore } from '@/stores/preferences'; import { usePreferencesStore } from '@/stores/preferences';
import { globals, PARAMETER } from '@/utils/constants'; import { globalIDs, PARAMETER } from '@/utils/constants';
export function ToggleNavigation() { export function ToggleNavigation() {
const darkMode = usePreferencesStore(state => state.darkMode); const darkMode = usePreferencesStore(state => state.darkMode);
@ -34,7 +34,7 @@ export function ToggleNavigation() {
type='button' type='button'
className='p-1' className='p-1'
onClick={toggleDarkMode} onClick={toggleDarkMode}
data-tooltip-id={globals.tooltip} data-tooltip-id={globalIDs.tooltip}
data-tooltip-content={darkMode ? 'Тема: Темная' : 'Тема: Светлая'} data-tooltip-content={darkMode ? 'Тема: Темная' : 'Тема: Светлая'}
> >
{darkMode ? <IconDarkTheme size='0.75rem' /> : null} {darkMode ? <IconDarkTheme size='0.75rem' /> : null}
@ -46,7 +46,7 @@ export function ToggleNavigation() {
type='button' type='button'
className='p-1' className='p-1'
onClick={toggleNoNavigation} onClick={toggleNoNavigation}
data-tooltip-id={globals.tooltip} data-tooltip-id={globalIDs.tooltip}
data-tooltip-content={noNavigationAnimation ? 'Показать навигацию' : 'Скрыть навигацию'} data-tooltip-content={noNavigationAnimation ? 'Показать навигацию' : 'Скрыть навигацию'}
> >
{!noNavigationAnimation ? <IconPin size={iconSize} /> : null} {!noNavigationAnimation ? <IconPin size={iconSize} /> : null}

4
rsconcept/frontend/src/components/Control/Button.tsx
View File

@ -1,6 +1,6 @@
import clsx from 'clsx'; import clsx from 'clsx';
import { globals } from '@/utils/constants'; import { globalIDs } from '@/utils/constants';
import { CProps } from '../props'; import { CProps } from '../props';
@ -56,7 +56,7 @@ export function Button({
className, className,
colors colors
)} )}
data-tooltip-id={!!title || !!titleHtml ? globals.tooltip : undefined} data-tooltip-id={!!title || !!titleHtml ? globalIDs.tooltip : undefined}
data-tooltip-html={titleHtml} data-tooltip-html={titleHtml}
data-tooltip-content={title} data-tooltip-content={title}
data-tooltip-hidden={hideTitle} data-tooltip-hidden={hideTitle}

4
rsconcept/frontend/src/components/Control/MiniButton.tsx
View File

@ -1,6 +1,6 @@
import clsx from 'clsx'; import clsx from 'clsx';
import { globals } from '@/utils/constants'; import { globalIDs } from '@/utils/constants';
import { CProps } from '../props'; import { CProps } from '../props';
@ -48,7 +48,7 @@ export function MiniButton({
}, },
className className
)} )}
data-tooltip-id={!!title || !!titleHtml ? globals.tooltip : undefined} data-tooltip-id={!!title || !!titleHtml ? globalIDs.tooltip : undefined}
data-tooltip-html={titleHtml} data-tooltip-html={titleHtml}
data-tooltip-content={title} data-tooltip-content={title}
data-tooltip-hidden={hideTitle} data-tooltip-hidden={hideTitle}

4
rsconcept/frontend/src/components/Control/SelectorButton.tsx
View File

@ -1,6 +1,6 @@
import clsx from 'clsx'; import clsx from 'clsx';
import { globals } from '@/utils/constants'; import { globalIDs } from '@/utils/constants';
import { CProps } from '../props'; import { CProps } from '../props';
@ -49,7 +49,7 @@ export function SelectorButton({
className, className,
!transparent && colors !transparent && colors
)} )}
data-tooltip-id={!!title || !!titleHtml ? globals.tooltip : undefined} data-tooltip-id={!!title || !!titleHtml ? globalIDs.tooltip : undefined}
data-tooltip-html={titleHtml} data-tooltip-html={titleHtml}
data-tooltip-content={title} data-tooltip-content={title}
data-tooltip-hidden={hideTitle} data-tooltip-hidden={hideTitle}

4
rsconcept/frontend/src/components/Dropdown/DropdownButton.tsx
View File

@ -1,7 +1,7 @@
import clsx from 'clsx'; import clsx from 'clsx';
import { CProps } from '@/components/props'; import { CProps } from '@/components/props';
import { globals } from '@/utils/constants'; import { globalIDs } from '@/utils/constants';
interface DropdownButtonProps extends CProps.Button { interface DropdownButtonProps extends CProps.Button {
/** Icon to display first (not used if children are provided). */ /** Icon to display first (not used if children are provided). */
@ -46,7 +46,7 @@ export function DropdownButton({
}, },
className className
)} )}
data-tooltip-id={!!title || !!titleHtml ? globals.tooltip : undefined} data-tooltip-id={!!title || !!titleHtml ? globalIDs.tooltip : undefined}
data-tooltip-html={titleHtml} data-tooltip-html={titleHtml}
data-tooltip-content={title} data-tooltip-content={title}
data-tooltip-hidden={hideTitle} data-tooltip-hidden={hideTitle}

4
rsconcept/frontend/src/components/Input/Checkbox.tsx
View File

@ -1,6 +1,6 @@
import clsx from 'clsx'; import clsx from 'clsx';
import { globals } from '@/utils/constants'; import { globalIDs } from '@/utils/constants';
import { CheckboxChecked } from '../Icons'; import { CheckboxChecked } from '../Icons';
import { CProps } from '../props'; import { CProps } from '../props';
@ -56,7 +56,7 @@ export function Checkbox({
)} )}
disabled={disabled} disabled={disabled}
onClick={handleClick} onClick={handleClick}
data-tooltip-id={!!title || !!titleHtml ? globals.tooltip : undefined} data-tooltip-id={!!title || !!titleHtml ? globalIDs.tooltip : undefined}
data-tooltip-html={titleHtml} data-tooltip-html={titleHtml}
data-tooltip-content={title} data-tooltip-content={title}
data-tooltip-hidden={hideTitle} data-tooltip-hidden={hideTitle}

4
rsconcept/frontend/src/components/Input/CheckboxTristate.tsx
View File

@ -1,6 +1,6 @@
import clsx from 'clsx'; import clsx from 'clsx';
import { globals } from '@/utils/constants'; import { globalIDs } from '@/utils/constants';
import { CheckboxChecked, CheckboxNull } from '../Icons'; import { CheckboxChecked, CheckboxNull } from '../Icons';
import { CProps } from '../props'; import { CProps } from '../props';
@ -58,7 +58,7 @@ export function CheckboxTristate({
)} )}
disabled={disabled} disabled={disabled}
onClick={handleClick} onClick={handleClick}
data-tooltip-id={!!title || !!titleHtml ? globals.tooltip : undefined} data-tooltip-id={!!title || !!titleHtml ? globalIDs.tooltip : undefined}
data-tooltip-html={titleHtml} data-tooltip-html={titleHtml}
data-tooltip-content={title} data-tooltip-content={title}
data-tooltip-hidden={hideTitle} data-tooltip-hidden={hideTitle}

4
rsconcept/frontend/src/components/Input/SelectTree.tsx
View File

@ -1,7 +1,7 @@
import { useEffect, useState } from 'react'; import { useEffect, useState } from 'react';
import clsx from 'clsx'; import clsx from 'clsx';
import { globals, PARAMETER } from '@/utils/constants'; import { globalIDs, PARAMETER } from '@/utils/constants';
import { Overlay } from '../Container'; import { Overlay } from '../Container';
import { MiniButton } from '../Control'; import { MiniButton } from '../Control';
@ -93,7 +93,7 @@ export function SelectTree<ItemType>({
value === item && 'clr-selected', value === item && 'clr-selected',
!isActive && 'pointer-events-none' !isActive && 'pointer-events-none'
)} )}
data-tooltip-id={globals.tooltip} data-tooltip-id={globalIDs.tooltip}
data-tooltip-html={getDescription(item)} data-tooltip-html={getDescription(item)}
onClick={event => handleSetValue(event, item)} onClick={event => handleSetValue(event, item)}
style={{ style={{

4
rsconcept/frontend/src/components/Tabs/TabLabel.tsx
View File

@ -2,7 +2,7 @@ import type { TabProps as TabPropsImpl } from 'react-tabs';
import { Tab as TabImpl } from 'react-tabs'; import { Tab as TabImpl } from 'react-tabs';
import clsx from 'clsx'; import clsx from 'clsx';
import { globals } from '@/utils/constants'; import { globalIDs } from '@/utils/constants';
import { CProps } from '../props'; import { CProps } from '../props';
@ -27,7 +27,7 @@ export function TabLabel({ label, title, titleHtml, hideTitle, className, ...oth
className className
)} )}
tabIndex='-1' tabIndex='-1'
data-tooltip-id={!!title || !!titleHtml ? globals.tooltip : undefined} data-tooltip-id={!!title || !!titleHtml ? globalIDs.tooltip : undefined}
data-tooltip-html={titleHtml} data-tooltip-html={titleHtml}
data-tooltip-content={title} data-tooltip-content={title}
data-tooltip-hidden={hideTitle} data-tooltip-hidden={hideTitle}

4
rsconcept/frontend/src/components/View/Indicator.tsx
View File

@ -1,7 +1,7 @@
import clsx from 'clsx'; import clsx from 'clsx';
import { CProps } from '@/components/props'; import { CProps } from '@/components/props';
import { globals } from '@/utils/constants'; import { globalIDs } from '@/utils/constants';
interface IndicatorProps extends CProps.Titled, CProps.Styling { interface IndicatorProps extends CProps.Titled, CProps.Styling {
/** Icon to display. */ /** Icon to display. */
@ -25,7 +25,7 @@ export function Indicator({ icon, title, titleHtml, hideTitle, noPadding, classN
}, },
className className
)} )}
data-tooltip-id={!!title || !!titleHtml ? globals.tooltip : undefined} data-tooltip-id={!!title || !!titleHtml ? globalIDs.tooltip : undefined}
data-tooltip-html={titleHtml} data-tooltip-html={titleHtml}
data-tooltip-content={title} data-tooltip-content={title}
data-tooltip-hidden={hideTitle} data-tooltip-hidden={hideTitle}

4
rsconcept/frontend/src/components/View/TextContent.tsx
View File

@ -1,7 +1,7 @@
import clsx from 'clsx'; import clsx from 'clsx';
import { CProps } from '@/components/props'; import { CProps } from '@/components/props';
import { globals } from '@/utils/constants'; import { globalIDs } from '@/utils/constants';
import { truncateToLastWord } from '@/utils/utils'; import { truncateToLastWord } from '@/utils/utils';
export interface TextContentProps extends CProps.Styling { export interface TextContentProps extends CProps.Styling {
@ -24,7 +24,7 @@ export function TextContent({ className, text, maxLength, noTooltip, ...restProp
return ( return (
<div <div
className={clsx('text-xs text-pretty', className)} className={clsx('text-xs text-pretty', className)}
data-tooltip-id={isTruncated && !noTooltip ? globals.value_tooltip : undefined} data-tooltip-id={isTruncated && !noTooltip ? globalIDs.value_tooltip : undefined}
data-tooltip-html={isTruncated && !noTooltip ? text : undefined} data-tooltip-html={isTruncated && !noTooltip ? text : undefined}
{...restProps} {...restProps}
> >

4
rsconcept/frontend/src/components/View/ValueIcon.tsx
View File

@ -1,7 +1,7 @@
import clsx from 'clsx'; import clsx from 'clsx';
import { CProps } from '@/components/props'; import { CProps } from '@/components/props';
import { globals } from '@/utils/constants'; import { globalIDs } from '@/utils/constants';
import { MiniButton } from '../Control'; import { MiniButton } from '../Control';
@ -61,7 +61,7 @@ export function ValueIcon({
className className
)} )}
{...restProps} {...restProps}
data-tooltip-id={!!title || !!titleHtml ? globals.tooltip : undefined} data-tooltip-id={!!title || !!titleHtml ? globalIDs.tooltip : undefined}
data-tooltip-html={titleHtml} data-tooltip-html={titleHtml}
data-tooltip-content={title} data-tooltip-content={title}
data-tooltip-hidden={hideTitle} data-tooltip-hidden={hideTitle}

4
rsconcept/frontend/src/features/library/components/BadgeLocation.tsx
View File

@ -1,5 +1,5 @@
import { LocationIcon } from '@/components/DomainIcons'; import { LocationIcon } from '@/components/DomainIcons';
import { globals } from '@/utils/constants'; import { globalIDs } from '@/utils/constants';
interface BadgeLocationProps { interface BadgeLocationProps {
/** Location to display. */ /** Location to display. */
@ -11,7 +11,7 @@ interface BadgeLocationProps {
*/ */
export function BadgeLocation({ location }: BadgeLocationProps) { export function BadgeLocation({ location }: BadgeLocationProps) {
return ( return (
<div className='pl-2' data-tooltip-id={globals.tooltip} data-tooltip-content={location}> <div className='pl-2' data-tooltip-id={globalIDs.tooltip} data-tooltip-content={location}>
<LocationIcon value={location} size='1.25rem' /> <LocationIcon value={location} size='1.25rem' />
</div> </div>
); );

4
rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssCard/EditorOssCard.tsx
View File

@ -7,7 +7,7 @@ import { ToolbarRSFormCard } from '@/features/rsform';
import { FlexColumn } from '@/components/Container'; import { FlexColumn } from '@/components/Container';
import { useModificationStore } from '@/stores/modification'; import { useModificationStore } from '@/stores/modification';
import { globals } from '@/utils/constants'; import { globalIDs } from '@/utils/constants';
import { useOssEdit } from '../OssEditContext'; import { useOssEdit } from '../OssEditContext';
@ -19,7 +19,7 @@ export function EditorOssCard() {
const { isModified } = useModificationStore(); const { isModified } = useModificationStore();
function initiateSubmit() { function initiateSubmit() {
const element = document.getElementById(globals.library_item_editor) as HTMLFormElement; const element = document.getElementById(globalIDs.library_item_editor) as HTMLFormElement;
if (element) { if (element) {
element.requestSubmit(); element.requestSubmit();
} }

4
rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssCard/FormOSS.tsx
View File

@ -13,7 +13,7 @@ import { SubmitButton } from '@/components/Control';
import { IconSave } from '@/components/Icons'; import { IconSave } from '@/components/Icons';
import { TextArea, TextInput } from '@/components/Input'; import { TextArea, TextInput } from '@/components/Input';
import { useModificationStore } from '@/stores/modification'; import { useModificationStore } from '@/stores/modification';
import { globals } from '@/utils/constants'; import { globalIDs } from '@/utils/constants';
import { useMutatingOss } from '../../../backend/useMutatingOss'; import { useMutatingOss } from '../../../backend/useMutatingOss';
import { useOssEdit } from '../OssEditContext'; import { useOssEdit } from '../OssEditContext';
@ -56,7 +56,7 @@ export function FormOSS() {
return ( return (
<form <form
id={globals.library_item_editor} id={globalIDs.library_item_editor}
className={clsx('mt-1 min-w-[22rem] sm:w-[30rem]', 'flex flex-col pt-1')} className={clsx('mt-1 min-w-[22rem] sm:w-[30rem]', 'flex flex-col pt-1')}
onSubmit={event => void handleSubmit(onSubmit)(event)} onSubmit={event => void handleSubmit(onSubmit)(event)}
> >

4
rsconcept/frontend/src/features/oss/pages/OssPage/EditorOssGraph/graph/NodeCore.tsx
View File

@ -4,7 +4,7 @@ import { Overlay } from '@/components/Container';
import { IconConsolidation, IconRSForm } from '@/components/Icons'; import { IconConsolidation, IconRSForm } from '@/components/Icons';
import { Indicator } from '@/components/View'; import { Indicator } from '@/components/View';
import { useTooltipsStore } from '@/stores/tooltips'; import { useTooltipsStore } from '@/stores/tooltips';
import { globals, PARAMETER } from '@/utils/constants'; import { globalIDs, PARAMETER } from '@/utils/constants';
import { truncateToLastWord } from '@/utils/utils'; import { truncateToLastWord } from '@/utils/utils';
import { OperationType } from '../../../../backend/types'; import { OperationType } from '../../../../backend/types';
@ -52,7 +52,7 @@ export function NodeCore({ node }: NodeCoreProps) {
<div <div
className='h-[34px] w-[144px] flex items-center justify-center' className='h-[34px] w-[144px] flex items-center justify-center'
data-tooltip-id={globals.operation_tooltip} data-tooltip-id={globalIDs.operation_tooltip}
onMouseEnter={() => setHover(node.data.operation)} onMouseEnter={() => setHover(node.data.operation)}
> >
<div <div

4
rsconcept/frontend/src/features/rsform/components/BadgeConstituenta.tsx
View File

@ -3,7 +3,7 @@ import clsx from 'clsx';
import { CProps } from '@/components/props'; import { CProps } from '@/components/props';
import { useTooltipsStore } from '@/stores/tooltips'; import { useTooltipsStore } from '@/stores/tooltips';
import { APP_COLORS } from '@/styling/colors'; import { APP_COLORS } from '@/styling/colors';
import { globals } from '@/utils/constants'; import { globalIDs } from '@/utils/constants';
import { colorFgCstStatus } from '../colors'; import { colorFgCstStatus } from '../colors';
import { CstClass, IConstituenta } from '../models/rsform'; import { CstClass, IConstituenta } from '../models/rsform';
@ -39,7 +39,7 @@ export function BadgeConstituenta({ value, prefixID, className, style }: BadgeCo
backgroundColor: value.cst_class === CstClass.BASIC ? APP_COLORS.bgGreen25 : APP_COLORS.bgInput, backgroundColor: value.cst_class === CstClass.BASIC ? APP_COLORS.bgGreen25 : APP_COLORS.bgInput,
...style ...style
}} }}
data-tooltip-id={globals.constituenta_tooltip} data-tooltip-id={globalIDs.constituenta_tooltip}
onMouseEnter={() => setActiveCst(value)} onMouseEnter={() => setActiveCst(value)}
> >
{value.alias} {value.alias}

4
rsconcept/frontend/src/features/rsform/dialogs/DlgShowTypeGraph/graph/MGraphNode.tsx
View File

@ -3,7 +3,7 @@
import { Handle, Position } from 'reactflow'; import { Handle, Position } from 'reactflow';
import { APP_COLORS } from '@/styling/colors'; import { APP_COLORS } from '@/styling/colors';
import { globals } from '@/utils/constants'; import { globalIDs } from '@/utils/constants';
import { colorBgTMGraphNode } from '../../../colors'; import { colorBgTMGraphNode } from '../../../colors';
import { TMGraphNode } from '../../../models/TMGraph'; import { TMGraphNode } from '../../../models/TMGraph';
@ -29,7 +29,7 @@ export function MGraphNode(node: MGraphNodeInternal) {
<Handle type='source' position={Position.Top} style={{ opacity: 0 }} /> <Handle type='source' position={Position.Top} style={{ opacity: 0 }} />
<div <div
className='w-full h-full cursor-default flex items-center justify-center rounded-full' className='w-full h-full cursor-default flex items-center justify-center rounded-full'
data-tooltip-id={globals.tooltip} data-tooltip-id={globalIDs.tooltip}
data-tooltip-html={tooltipText} data-tooltip-html={tooltipText}
style={{ style={{
backgroundColor: colorBgTMGraphNode(node.data), backgroundColor: colorBgTMGraphNode(node.data),

6
rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorConstituenta/EditorConstituenta.tsx
View File

@ -8,7 +8,7 @@ import { useMainHeight } from '@/stores/appLayout';
import { useDialogsStore } from '@/stores/dialogs'; import { useDialogsStore } from '@/stores/dialogs';
import { useModificationStore } from '@/stores/modification'; import { useModificationStore } from '@/stores/modification';
import { usePreferencesStore } from '@/stores/preferences'; import { usePreferencesStore } from '@/stores/preferences';
import { globals } from '@/utils/constants'; import { globalIDs } from '@/utils/constants';
import { promptUnsaved } from '@/utils/utils'; import { promptUnsaved } from '@/utils/utils';
import { useMutatingRSForm } from '../../../backend/useMutatingRSForm'; import { useMutatingRSForm } from '../../../backend/useMutatingRSForm';
@ -68,7 +68,7 @@ export function EditorConstituenta() {
} }
function initiateSubmit() { function initiateSubmit() {
const element = document.getElementById(globals.constituenta_editor) as HTMLFormElement; const element = document.getElementById(globalIDs.constituenta_editor) as HTMLFormElement;
if (element) { if (element) {
element.requestSubmit(); element.requestSubmit();
} }
@ -114,7 +114,7 @@ export function EditorConstituenta() {
) : null} ) : null}
{activeCst ? ( {activeCst ? (
<FormConstituenta <FormConstituenta
id={globals.constituenta_editor} // id={globalIDs.constituenta_editor} //
disabled={disabled} disabled={disabled}
toggleReset={toggleReset} toggleReset={toggleReset}
activeCst={activeCst} activeCst={activeCst}

4
rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSExpression/RSLocalButton.tsx
View File

@ -1,7 +1,7 @@
import clsx from 'clsx'; import clsx from 'clsx';
import { CProps } from '@/components/props'; import { CProps } from '@/components/props';
import { globals } from '@/utils/constants'; import { globalIDs } from '@/utils/constants';
import { TokenID } from '../../../backend/types'; import { TokenID } from '../../../backend/types';
@ -26,7 +26,7 @@ export function RSLocalButton({
type='button' type='button'
tabIndex={-1} tabIndex={-1}
disabled={disabled} disabled={disabled}
data-tooltip-id={!!title || !!titleHtml ? globals.tooltip : undefined} data-tooltip-id={!!title || !!titleHtml ? globalIDs.tooltip : undefined}
data-tooltip-html={titleHtml} data-tooltip-html={titleHtml}
data-tooltip-content={title} data-tooltip-content={title}
data-tooltip-hidden={hideTitle} data-tooltip-hidden={hideTitle}

4
rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSExpression/RSTokenButton.tsx
View File

@ -1,6 +1,6 @@
import clsx from 'clsx'; import clsx from 'clsx';
import { globals } from '@/utils/constants'; import { globalIDs } from '@/utils/constants';
import { TokenID } from '../../../backend/types'; import { TokenID } from '../../../backend/types';
import { describeToken, labelToken } from '../../../labels'; import { describeToken, labelToken } from '../../../labels';
@ -31,7 +31,7 @@ export function RSTokenButton({ token, disabled, onInsert }: RSTokenButtonProps)
'w-[1.85rem] md:w-[2.25rem]': label.length <= 3 'w-[1.85rem] md:w-[2.25rem]': label.length <= 3
} }
)} )}
data-tooltip-id={globals.tooltip} data-tooltip-id={globalIDs.tooltip}
data-tooltip-html={describeToken(token)} data-tooltip-html={describeToken(token)}
> >
{label ? <span className='whitespace-nowrap'>{label}</span> : null} {label ? <span className='whitespace-nowrap'>{label}</span> : null}

4
rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSExpression/StatusBar.tsx
View File

@ -5,7 +5,7 @@ import clsx from 'clsx';
import { StatusIcon } from '@/components/DomainIcons'; import { StatusIcon } from '@/components/DomainIcons';
import { Loader } from '@/components/Loader'; import { Loader } from '@/components/Loader';
import { APP_COLORS } from '@/styling/colors'; import { APP_COLORS } from '@/styling/colors';
import { globals } from '@/utils/constants'; import { globalIDs } from '@/utils/constants';
import { prepareTooltip } from '@/utils/utils'; import { prepareTooltip } from '@/utils/utils';
import { IExpressionParseDTO, ParsingStatus } from '../../../backend/types'; import { IExpressionParseDTO, ParsingStatus } from '../../../backend/types';
@ -47,7 +47,7 @@ export function StatusBar({ isModified, processing, activeCst, parseData, onAnal
'transition-colors duration-500' 'transition-colors duration-500'
)} )}
style={{ backgroundColor: processing ? APP_COLORS.bgDefault : colorStatusBar(status) }} style={{ backgroundColor: processing ? APP_COLORS.bgDefault : colorStatusBar(status) }}
data-tooltip-id={globals.tooltip} data-tooltip-id={globalIDs.tooltip}
data-tooltip-html={prepareTooltip('Проверить определение', 'Ctrl + Q')} data-tooltip-html={prepareTooltip('Проверить определение', 'Ctrl + Q')}
onClick={onAnalyze} onClick={onAnalyze}
> >

4
rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/EditorRSFormCard.tsx
View File

@ -6,7 +6,7 @@ import { EditorLibraryItem } from '@/features/library';
import { FlexColumn } from '@/components/Container'; import { FlexColumn } from '@/components/Container';
import { useModificationStore } from '@/stores/modification'; import { useModificationStore } from '@/stores/modification';
import { globals } from '@/utils/constants'; import { globalIDs } from '@/utils/constants';
import { ToolbarRSFormCard } from '../../../components/ToolbarRSFormCard'; import { ToolbarRSFormCard } from '../../../components/ToolbarRSFormCard';
import { useRSEdit } from '../RSEditContext'; import { useRSEdit } from '../RSEditContext';
@ -19,7 +19,7 @@ export function EditorRSFormCard() {
const { isModified } = useModificationStore(); const { isModified } = useModificationStore();
function initiateSubmit() { function initiateSubmit() {
const element = document.getElementById(globals.library_item_editor) as HTMLFormElement; const element = document.getElementById(globalIDs.library_item_editor) as HTMLFormElement;
if (element) { if (element) {
element.requestSubmit(); element.requestSubmit();
} }

4
rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorRSFormCard/FormRSForm.tsx
View File

@ -15,7 +15,7 @@ import { SubmitButton } from '@/components/Control';
import { IconSave } from '@/components/Icons'; import { IconSave } from '@/components/Icons';
import { Label, TextArea, TextInput } from '@/components/Input'; import { Label, TextArea, TextInput } from '@/components/Input';
import { useModificationStore } from '@/stores/modification'; import { useModificationStore } from '@/stores/modification';
import { globals } from '@/utils/constants'; import { globalIDs } from '@/utils/constants';
import { useMutatingRSForm } from '../../../backend/useMutatingRSForm'; import { useMutatingRSForm } from '../../../backend/useMutatingRSForm';
import { useRSEdit } from '../RSEditContext'; import { useRSEdit } from '../RSEditContext';
@ -65,7 +65,7 @@ export function FormRSForm() {
return ( return (
<form <form
id={globals.library_item_editor} id={globalIDs.library_item_editor}
className={clsx('mt-1 min-w-[22rem] sm:w-[30rem]', 'flex flex-col pt-1')} className={clsx('mt-1 min-w-[22rem] sm:w-[30rem]', 'flex flex-col pt-1')}
onSubmit={event => void handleSubmit(onSubmit)(event)} onSubmit={event => void handleSubmit(onSubmit)(event)}
> >

6
rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/SchemasGuide.tsx
View File

@ -2,7 +2,7 @@ import { useLibrary } from '@/features/library';
import { Tooltip } from '@/components/Container'; import { Tooltip } from '@/components/Container';
import { IconHelp } from '@/components/Icons'; import { IconHelp } from '@/components/Icons';
import { globals, prefixes } from '@/utils/constants'; import { globalIDs, prefixes } from '@/utils/constants';
import { colorBgSchemas } from '../../../colors'; import { colorBgSchemas } from '../../../colors';
import { IRSForm } from '../../../models/rsform'; import { IRSForm } from '../../../models/rsform';
@ -39,10 +39,10 @@ export function SchemasGuide({ schema }: SchemasGuideProps) {
})(); })();
return ( return (
<div tabIndex={-1} id={globals.graph_schemas} className='p-1'> <div tabIndex={-1} id={globalIDs.graph_schemas} className='p-1'>
<IconHelp size='1.25rem' className='icon-primary' /> <IconHelp size='1.25rem' className='icon-primary' />
<Tooltip <Tooltip
anchorSelect={`#${globals.graph_schemas}`} anchorSelect={`#${globalIDs.graph_schemas}`}
layer='z-modalTooltip' layer='z-modalTooltip'
place='right' place='right'
className='max-w-[25rem] break-words text-base' className='max-w-[25rem] break-words text-base'

4
rsconcept/frontend/src/features/rsform/pages/RSFormPage/EditorTermGraph/ViewHidden.tsx
View File

@ -10,7 +10,7 @@ import { useWindowSize } from '@/hooks/useWindowSize';
import { useFitHeight } from '@/stores/appLayout'; import { useFitHeight } from '@/stores/appLayout';
import { useTooltipsStore } from '@/stores/tooltips'; import { useTooltipsStore } from '@/stores/tooltips';
import { APP_COLORS } from '@/styling/colors'; import { APP_COLORS } from '@/styling/colors';
import { globals, PARAMETER, prefixes } from '@/utils/constants'; import { globalIDs, PARAMETER, prefixes } from '@/utils/constants';
import { colorBgGraphNode } from '../../../colors'; import { colorBgGraphNode } from '../../../colors';
import { IRSForm } from '../../../models/rsform'; import { IRSForm } from '../../../models/rsform';
@ -111,7 +111,7 @@ export function ViewHidden({ items, selected, toggleSelection, setFocus, schema,
}} }}
onClick={event => handleClick(cstID, event)} onClick={event => handleClick(cstID, event)}
onDoubleClick={() => navigateCst(cstID)} onDoubleClick={() => navigateCst(cstID)}
data-tooltip-id={globals.constituenta_tooltip} data-tooltip-id={globalIDs.constituenta_tooltip}
onMouseEnter={() => setActiveCst(cst)} onMouseEnter={() => setActiveCst(cst)}
> >
{cst.alias} {cst.alias}

6
rsconcept/frontend/src/features/users/pages/RegisterPage/FormSignup.tsx
View File

@ -15,7 +15,7 @@ import { IconHelp } from '@/components/Icons';
import { ErrorData } from '@/components/InfoError'; import { ErrorData } from '@/components/InfoError';
import { Checkbox, TextInput } from '@/components/Input'; import { Checkbox, TextInput } from '@/components/Input';
import { PrettyJson } from '@/components/View'; import { PrettyJson } from '@/components/View';
import { globals, patterns } from '@/utils/constants'; import { globalIDs, patterns } from '@/utils/constants';
import { IUserSignupDTO, schemaUserSignup } from '../../backend/types'; import { IUserSignupDTO, schemaUserSignup } from '../../backend/types';
import { useSignup } from '../../backend/useSignup'; import { useSignup } from '../../backend/useSignup';
@ -62,10 +62,10 @@ export function FormSignup() {
> >
<h1> <h1>
<span>Новый пользователь</span> <span>Новый пользователь</span>
<Overlay id={globals.email_tooltip} position='top-[0.5rem] right-[1.75rem]'> <Overlay id={globalIDs.email_tooltip} position='top-[0.5rem] right-[1.75rem]'>
<IconHelp size='1.25rem' className='icon-primary' /> <IconHelp size='1.25rem' className='icon-primary' />
</Overlay> </Overlay>
<Tooltip anchorSelect={`#${globals.email_tooltip}`} offset={6}> <Tooltip anchorSelect={`#${globalIDs.email_tooltip}`} offset={6}>
электронная почта используется для восстановления пароля электронная почта используется для восстановления пароля
</Tooltip> </Tooltip>
</h1> </h1>

2
rsconcept/frontend/src/utils/constants.ts
View File

@ -107,7 +107,7 @@ export const external_urls = {
/** /**
* Global element ID. * Global element ID.
*/ */
export const globals = { export const globalIDs = {
tooltip: 'global_tooltip', tooltip: 'global_tooltip',
value_tooltip: 'value_tooltip', value_tooltip: 'value_tooltip',
constituenta_tooltip: 'cst_tooltip', constituenta_tooltip: 'cst_tooltip',