diff --git a/.eslintrc.js b/.eslintrc.js index 477bcc7f4b..bcd429aecb 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -24,7 +24,7 @@ module.exports = { jest: true, node: true, }, - plugins: ['prettier', 'simple-import-sort', 'react-hooks'], + plugins: ['prettier', 'simple-import-sort', 'react-hooks', 'import'], rules: { 'no-underscore-dangle': 0, 'prettier/prettier': 1, @@ -75,15 +75,10 @@ module.exports = { '^(assert|buffer|child_process|cluster|console|constants|crypto|dgram|dns|domain|events|fs|http|https|module|net|os|path|punycode|querystring|readline|repl|stream|string_decoder|sys|timers|tls|tty|url|util|vm|zlib|freelist|v8|process|async_hooks|http2|perf_hooks)(/.*|$)', '^@?\\w', ], - ['^@meta(\\/\\w)*'], - [ - '^@client\\/store(\\/\\w)*', - '^@client\\/hooks(\\/\\w)*', - '^@client\\components(\\/\\w)*', - '^@client(\\/\\w)*', - ], - ['^@server(\\/\\w)*'], - ['^@test(\\/\\w)*'], + ['^meta(\\/\\w)*'], + ['^client\\/store(\\/\\w)*', '^client\\/hooks(\\/\\w)*', '^client\\components(\\/\\w)*', '^client(\\/\\w)*'], + ['^server(\\/\\w)*'], + ['^test(\\/\\w)*'], [ '^\\.\\.(?!/?$)', '^\\.\\./?$', // Parent imports. Put `..` last. @@ -100,10 +95,19 @@ module.exports = { version: 'detect', }, 'import/resolver': { - node: {}, + node: { + extensions: ['.js', '.jsx', '.ts', '.tsx'], + }, webpack: { config: 'webpack.config.babel.js', }, + // typescript: {}, }, + // 'import/resolver': { + // node: {}, + // webpack: { + // config: 'webpack.config.babel.js', + // }, + // }, }, } diff --git a/.github/workflows/test.js.yml b/.github/workflows/test.js.yml index 8a1d8f0128..4b379fa31b 100644 --- a/.github/workflows/test.js.yml +++ b/.github/workflows/test.js.yml @@ -47,14 +47,13 @@ jobs: NODE_AUTH_TOKEN: ${{ secrets.ACCESS_TOKEN }} - name: Install Playwright Browsers run: npx playwright install --with-deps -# - run: yarn run-migrations -# env: -# PGHOST: localhost -# PGPORT: 5442 -# PGDATABASE: frap-dev -# PGUSER: frap -# PGPASSWORD: frap -# Migrations are run on yarn build + - run: yarn migrations:run + env: + PGHOST: localhost + PGPORT: 5442 + PGDATABASE: frap-dev + PGUSER: frap + PGPASSWORD: frap - run: yarn build env: PGHOST: localhost diff --git a/.prettierrc b/.prettierrc index e2ada79506..8beace3018 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,5 +1,5 @@ { - "printWidth": 120, + "printWidth": 140, "singleQuote": true, "semi": false, "trailingComma": "es5" diff --git a/.src.legacy/core/auth/user.ts b/.src.legacy/core/auth/user.ts index e880b80284..d6ae3951c5 100644 --- a/.src.legacy/core/auth/user.ts +++ b/.src.legacy/core/auth/user.ts @@ -1,4 +1,4 @@ -import { Lang } from '@meta/lang' +import { Lang } from 'meta/lang' import { AssessmentType } from '../assessment' import { Role } from './role' diff --git a/jest.config.js b/jest.config.js index 00615c3b9e..62a8b7519c 100644 --- a/jest.config.js +++ b/jest.config.js @@ -3,16 +3,23 @@ module.exports = { testEnvironment: 'node', testPathIgnorePatterns: ['/node_modules/'], roots: [''], + rootDir: 'src', verbose: true, testMatch: ['**/*.test.ts'], moduleDirectories: ['node_modules'], moduleNameMapper: { - '@i18n/(.*)': '/src/i18n/$1', - '@client/(.*)': '/src/client/$1', - '@meta/(.*)': '/src/meta/$1', - '@server/(.*)': '/src/server/$1', - '@test/(.*)': '/src/test/$1', - '@utils/(.*)': '/src/utils/$1', + 'i18n/(.*)': '/i18n/$1', + 'client/(.*)': '/client/$1', + 'meta/(.*)': '/meta/$1', + 'server/(.*)': '/server/$1', + 'test/(.*)': '/test/$1', + 'utils/objects(.*)': '/utils/objects$1', + 'utils/arrays(.*)': '/utils/arrays$1', + 'utils/dates(.*)': '/utils/dates$1', + 'utils/functions(.*)': '/utils/functions$1', + 'utils/numbers(.*)': '/utils/numbers$1', + 'utils/strings(.*)': '/utils/strings$1', + 'utils/uuids(.*)': '/utils/uuids$1', }, globals: { 'ts-jest': { diff --git a/jsconfig.json b/jsconfig.json index 8c46f11bea..6a4be98886 100644 --- a/jsconfig.json +++ b/jsconfig.json @@ -4,11 +4,12 @@ "target": "es2019", "baseUrl": "./", "paths": { - "@i18n/*": ["./src/i18n/*"], - "@client/*": ["./src/client/*"], - "@meta/*": ["./src/meta/*"], - "@server/*": ["./src/server/*"], - "@utils/*": ["./src/utils/*"] + "i18n/*": ["./src/i18n/*"], + "client/*": ["./src/client/*"], + "meta/*": ["./src/meta/*"], + "server/*": ["./src/server/*"], + "test/*": ["./src/test/*"], + "utils/*": ["./src/utils/*"] } }, "include": ["src"] diff --git a/package.json b/package.json index 63c00b1666..04b7ae142e 100644 --- a/package.json +++ b/package.json @@ -6,27 +6,25 @@ "yarn": "^1.22.19" }, "scripts": { - "migrate-panEuropean:migration": "ts-node tools/dataMigration/panEuropean.ts && yarn jest --no-cache --detectOpenHandles --setupFiles dotenv/config --config src/test/dataMigration/jest.config.panEu.js", - "build": "yarn build:client && yarn build:server && yarn build:copy && yarn run-migrations", - "build:server": "yarn tsc --project tsconfig.server.json && yarn tscpaths -v -p tsconfig.server.paths.json -s ./server -o ./dist", - "build:client": "cross-env NODE_ENV=production webpack --config webpack.config.babel.js", - "build:copy": "shx cp -Rf src/server/db/migration/* dist/server/db/migration/. && shx cp -Rf web-resources dist/ && shx cp -Rf src/server/static dist/server/", - "build:watch": "cross-env NODE_ENV=development webpack --config webpack.config.babel.js --watch", - "build:dev-server": "cross-env NODE_ENV=development webpack serve --config webpack.config.babel.js", + "migrate-panEuropean:migration": "ts-node tools/dataMigration/panEuropean.ts && ts-node src/test/dataMigration/panEuPostDataMigration.ts", + "build": "run-s build:prod:client build:prod:server build:prod:server:resources", + "build:prod:client": "cross-env NODE_ENV=production webpack --config webpack.config.babel.js", + "build:prod:server": "yarn tsc --project tsconfig.server.json && tsc-alias -p tsconfig.server.json", + "build:prod:server:resources": "shx cp -Rf src/server/db/migration/* dist/server/db/migration/. && shx cp -Rf web-resources dist/ && shx cp -Rf src/server/static dist/server/", "build:prod:report": "cross-env NODE_ENV=production BUILD_REPORT=true webpack --display-error-details -p --config webpack.config.babel.js", - "build:prod": "cross-env NODE_ENV=production webpack --display-error-details -p --config webpack.config.babel.js", "clean": "shx rm -rf dist/", - "start": "node dist/server", - "watch": "run-p build:dev-server watch:server", - "watch-debug": "run-p build:dev-server watch:server-debug", - "watch:server": "ts-node-dev src/server", - "watch:server-debug": "cross-env NODE_ENV=development nodemon -e js --inspect --watch server src/server/serverLocal.js", - "create-migration": "./src/server/db/migration/create-migration.sh", - "create-migration-step": "src/test/migrations/create-migration-step.sh", - "run-migrations": "./src/server/db/migration/run-migrations.sh", - "run-migration-steps": "yarn jest --verbose false --no-cache --detectOpenHandles --setupFiles dotenv/config --config src/test/migrations/jest.config.js", + "heroku-prebuild": "echo \"//npm.pkg.github.com/:_authToken=${NPM_GITHUB_TOKEN}\" >> .npmrc", + "migrations:create": "./src/server/db/migration/create-migration.sh", + "migrations:run": "./src/server/db/migration/run-migrations.sh", + "migration-steps:run": "ts-node src/test/migrations/", + "migration-steps:create": "src/test/migrations/create-migration-step.sh", + "run:dev": "run-p run:dev:client run:dev:server", + "run:dev:client": "cross-env NODE_ENV=development webpack serve --config webpack.config.babel.js", + "run:dev:server": "yarn migrations:run && ts-node-dev src/server/start", + "run:prod": "run-s build start", + "run:prod:server": "node dist/server/start", + "start": "run-s migrations:run run:prod:server", "generate-metacache": "yarn jest --verbose false --no-cache --detectOpenHandles --setupFiles dotenv/config --config src/test/generateMetaCache/jest.config.js", - "migrate": "run-s run-migrations run-migration-steps generate-metacache", "//test": "mochapack --webpack-config webpack.config.babel.test.js", "test": "run-s test:integration", "test:integration": "yarn jest --no-cache --detectOpenHandles --setupFiles dotenv/config", @@ -36,9 +34,7 @@ "postversion": "git push --tags && echo \"Successfully released version $npm_package_version!\"", "prepare": "husky install", "postinstall": "husky install", - "prod": "yarn build && yarn start", "pre-commit": "lint-staged && eslint --cache --fix", - "heroku-prebuild": "echo \"//npm.pkg.github.com/:_authToken=${NPM_GITHUB_TOKEN}\" >> .npmrc", "geo:forest-estimations-import": "ts-node tools/geo/forestEstimationsImport.ts", "geo:bounds-import": "ts-node tools/geo/boundsImport.ts" }, @@ -116,8 +112,9 @@ "eslint": "8.22.0", "eslint-config-airbnb": "^19.0.4", "eslint-config-prettier": "^8.5.0", + "eslint-import-resolver-typescript": "^3.5.5", "eslint-import-resolver-webpack": "^0.13.1", - "eslint-plugin-import": "^2.23.4", + "eslint-plugin-import": "^2.27.5", "eslint-plugin-jsx-a11y": "^6.4.1", "eslint-plugin-prettier": "^4.0.0", "eslint-plugin-react": "^7.29.4", @@ -151,7 +148,7 @@ "ts-migrate": "^0.1.28", "ts-node": "^10.7.0", "ts-node-dev": "^2.0.0", - "tscpaths": "^0.0.9", + "tsc-alias": "^1.8.6", "turndown": "^7.1.1", "typescript": "^4.6.3", "webpack": "^5.71.0", diff --git a/src/client/Main.tsx b/src/client/Main.tsx index 1219c99b33..2aac306047 100644 --- a/src/client/Main.tsx +++ b/src/client/Main.tsx @@ -1,6 +1,6 @@ import './i18n' -import '@client/styles/style.scss' +import 'client/styles/style.scss' import React from 'react' import { createRoot } from 'react-dom/client' import { Provider } from 'react-redux' diff --git a/src/client/components/AreaSelector/AreaSelector.tsx b/src/client/components/AreaSelector/AreaSelector.tsx index 920de3f65c..1c7220eeb7 100644 --- a/src/client/components/AreaSelector/AreaSelector.tsx +++ b/src/client/components/AreaSelector/AreaSelector.tsx @@ -5,13 +5,13 @@ import { useNavigate } from 'react-router-dom' import classNames from 'classnames' -import { ClientRoutes } from '@meta/app' -import { Areas, CountryIso, Global, RegionCode } from '@meta/area' -import { Users } from '@meta/user' +import { ClientRoutes } from 'meta/app' +import { Areas, CountryIso, Global, RegionCode } from 'meta/area' +import { Users } from 'meta/user' -import { useAssessment, useCycle } from '@client/store/assessment' -import { useUser } from '@client/store/user' -import { useIsGeoPage } from '@client/hooks' +import { useAssessment, useCycle } from 'client/store/assessment' +import { useUser } from 'client/store/user' +import { useIsGeoPage } from 'client/hooks' import Icon from '../Icon' import CountryList from './CountryList' diff --git a/src/client/components/AreaSelector/CountryList/CountryList.tsx b/src/client/components/AreaSelector/CountryList/CountryList.tsx index 2b28c9dd65..32ec2b35f5 100644 --- a/src/client/components/AreaSelector/CountryList/CountryList.tsx +++ b/src/client/components/AreaSelector/CountryList/CountryList.tsx @@ -4,12 +4,12 @@ import { useTranslation } from 'react-i18next' import { i18n } from 'i18next' -import { Areas, CountryIso, Global, Region, RegionCode } from '@meta/area' -import { UserRoles } from '@meta/user/userRoles' +import { Areas, CountryIso, Global, Region, RegionCode } from 'meta/area' +import { UserRoles } from 'meta/user/userRoles' -import { useCountries, useCycle, useRegionGroups } from '@client/store/assessment' -import { useIsPanEuropean } from '@client/hooks' -import { checkMatch } from '@client/utils' +import { useCountries, useCycle, useRegionGroups } from 'client/store/assessment' +import { useIsPanEuropean } from 'client/hooks' +import { checkMatch } from 'client/utils' import { useUserCountryISOs } from './hooks/useUserCountryISOs' import CountryListDownload from './CountryListDownload' diff --git a/src/client/components/AreaSelector/CountryList/CountryListDownload/CountryListDownload.tsx b/src/client/components/AreaSelector/CountryList/CountryListDownload/CountryListDownload.tsx index 7fc67c7642..efb2192190 100644 --- a/src/client/components/AreaSelector/CountryList/CountryListDownload/CountryListDownload.tsx +++ b/src/client/components/AreaSelector/CountryList/CountryListDownload/CountryListDownload.tsx @@ -3,13 +3,13 @@ import React from 'react' import { CSVLink } from 'react-csv' import { useTranslation } from 'react-i18next' -import { Areas } from '@meta/area' -import { Users } from '@meta/user' +import { Areas } from 'meta/area' +import { Users } from 'meta/user' -import { useCountries } from '@client/store/assessment' -import { useUser, useUserCountries } from '@client/store/user' -import Icon from '@client/components/Icon' -import { Dates } from '@client/utils' +import { useCountries } from 'client/store/assessment' +import { useUser, useUserCountries } from 'client/store/user' +import Icon from 'client/components/Icon' +import { Dates } from 'client/utils' const CountryListDownload: React.FC = () => { const user = useUser() diff --git a/src/client/components/AreaSelector/CountryList/CountryListRoleSection/CountryListRoleSection.tsx b/src/client/components/AreaSelector/CountryList/CountryListRoleSection/CountryListRoleSection.tsx index b9d3152f77..0310ae6105 100644 --- a/src/client/components/AreaSelector/CountryList/CountryListRoleSection/CountryListRoleSection.tsx +++ b/src/client/components/AreaSelector/CountryList/CountryListRoleSection/CountryListRoleSection.tsx @@ -3,13 +3,13 @@ import { useTranslation } from 'react-i18next' import { i18n } from 'i18next' -import { Areas, Country, CountryIso, Global, RegionCode } from '@meta/area' -import { Assessments } from '@meta/assessment' -import { RoleName, Users } from '@meta/user' -import { UserRoles } from '@meta/user/userRoles' +import { Areas, Country, CountryIso, Global, RegionCode } from 'meta/area' +import { Assessments } from 'meta/assessment' +import { RoleName, Users } from 'meta/user' +import { UserRoles } from 'meta/user/userRoles' -import { useAssessment, useCountries, useCycle } from '@client/store/assessment' -import { checkMatch } from '@client/utils' +import { useAssessment, useCountries, useCycle } from 'client/store/assessment' +import { checkMatch } from 'client/utils' import CountryListRow from '../CountryListRow' diff --git a/src/client/components/AreaSelector/CountryList/CountryListRow/CountryListRow.tsx b/src/client/components/AreaSelector/CountryList/CountryListRow/CountryListRow.tsx index 1506203a37..59482ef6ba 100644 --- a/src/client/components/AreaSelector/CountryList/CountryListRow/CountryListRow.tsx +++ b/src/client/components/AreaSelector/CountryList/CountryListRow/CountryListRow.tsx @@ -3,12 +3,12 @@ import { useTranslation } from 'react-i18next' import classNames from 'classnames' -import { Areas, CountryIso, Global, RegionCode } from '@meta/area' -import { UserRoles } from '@meta/user/userRoles' +import { Areas, CountryIso, Global, RegionCode } from 'meta/area' +import { UserRoles } from 'meta/user/userRoles' -import { useCountry } from '@client/store/assessment' -import { useIsCycleLanding } from '@client/hooks' -import { Dates } from '@client/utils' +import { useCountry } from 'client/store/assessment' +import { useIsCycleLanding } from 'client/hooks' +import { Dates } from 'client/utils' type Props = { country: { countryIso: CountryIso | Global | RegionCode } diff --git a/src/client/components/AreaSelector/CountryList/hooks/useUserCountryISOs.tsx b/src/client/components/AreaSelector/CountryList/hooks/useUserCountryISOs.tsx index 6e2329106f..9996f9b21a 100644 --- a/src/client/components/AreaSelector/CountryList/hooks/useUserCountryISOs.tsx +++ b/src/client/components/AreaSelector/CountryList/hooks/useUserCountryISOs.tsx @@ -1,10 +1,10 @@ -import { CountryIso } from '@meta/area' -import { CycleUuid } from '@meta/assessment' -import { RoleName, Users } from '@meta/user' -import { UserRoles } from '@meta/user/userRoles' +import { CountryIso } from 'meta/area' +import { CycleUuid } from 'meta/assessment' +import { RoleName, Users } from 'meta/user' +import { UserRoles } from 'meta/user/userRoles' -import { useCountries, useCycle } from '@client/store/assessment' -import { useUser, useUserCountries } from '@client/store/user' +import { useCountries, useCycle } from 'client/store/assessment' +import { useUser, useUserCountries } from 'client/store/user' export const useUserCountryISOs = (): Record>> => { const cycle = useCycle() diff --git a/src/client/components/AssessmentSwitch/AssessmentSwitch.tsx b/src/client/components/AssessmentSwitch/AssessmentSwitch.tsx index 78e3530310..3c744822f2 100644 --- a/src/client/components/AssessmentSwitch/AssessmentSwitch.tsx +++ b/src/client/components/AssessmentSwitch/AssessmentSwitch.tsx @@ -1,7 +1,7 @@ import React from 'react' import { useParams } from 'react-router-dom' -import { AssessmentNames } from '@meta/assessment' +import { AssessmentNames } from 'meta/assessment' type Props = { components: Record> diff --git a/src/client/components/Autocomplete/Autocomplete.tsx b/src/client/components/Autocomplete/Autocomplete.tsx index 5cccd0a0d8..81d7479433 100644 --- a/src/client/components/Autocomplete/Autocomplete.tsx +++ b/src/client/components/Autocomplete/Autocomplete.tsx @@ -2,11 +2,11 @@ import './Autocomplete.scss' import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' import classNames from 'classnames' import { useCombobox, UseComboboxStateChange } from 'downshift' -import AutocompleteInput from '@client/components/Autocomplete/AutocompleteInput' +import AutocompleteInput from 'client/components/Autocomplete/AutocompleteInput' type Option = { label: string diff --git a/src/client/components/ButtonTableClear/ButtonTableClear.tsx b/src/client/components/ButtonTableClear/ButtonTableClear.tsx index 5a89977ccf..68876af277 100644 --- a/src/client/components/ButtonTableClear/ButtonTableClear.tsx +++ b/src/client/components/ButtonTableClear/ButtonTableClear.tsx @@ -4,15 +4,15 @@ import { useTranslation } from 'react-i18next' import classNames from 'classnames' -import { Table } from '@meta/assessment' +import { Table } from 'meta/assessment' -import { useAppDispatch } from '@client/store' -import { useCycle } from '@client/store/assessment' -import { DataActions } from '@client/store/data' -import { useIsDataLocked } from '@client/store/ui/dataLock' -import { useCountryIso } from '@client/hooks' -import { useIsPrint } from '@client/hooks/useIsPath' -import Icon from '@client/components/Icon' +import { useAppDispatch } from 'client/store' +import { useCycle } from 'client/store/assessment' +import { DataActions } from 'client/store/data' +import { useIsDataLocked } from 'client/store/ui/dataLock' +import { useCountryIso } from 'client/hooks' +import { useIsPrint } from 'client/hooks/useIsPath' +import Icon from 'client/components/Icon' type Props = { disabled?: boolean diff --git a/src/client/components/ButtonTableExport/ButtonTableExport.tsx b/src/client/components/ButtonTableExport/ButtonTableExport.tsx index 725eb69f10..f4f56d7e74 100644 --- a/src/client/components/ButtonTableExport/ButtonTableExport.tsx +++ b/src/client/components/ButtonTableExport/ButtonTableExport.tsx @@ -4,9 +4,9 @@ import { CSVLink } from 'react-csv' import classNames from 'classnames' -import { useIsDataLocked } from '@client/store/ui/dataLock' -import { useIsPrint } from '@client/hooks/useIsPath' -import Icon from '@client/components/Icon' +import { useIsDataLocked } from 'client/store/ui/dataLock' +import { useIsPrint } from 'client/hooks/useIsPath' +import Icon from 'client/components/Icon' import * as Utils from './utils' diff --git a/src/client/components/Chart/Chart.tsx b/src/client/components/Chart/Chart.tsx index 65b48b7fac..bd72865106 100644 --- a/src/client/components/Chart/Chart.tsx +++ b/src/client/components/Chart/Chart.tsx @@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next' import { ChartData, ChartOptions, DefaultDataPoint, Plugin } from 'chart.js' import Chart, { ChartTypeRegistry } from 'chart.js/auto' -import { useOnUpdate } from '@client/hooks' +import { useOnUpdate } from 'client/hooks' export type ChartDataType = ChartData, unknown> diff --git a/src/client/components/CollaboratorAccessModal/CollaboratorAccessModal.tsx b/src/client/components/CollaboratorAccessModal/CollaboratorAccessModal.tsx index 129cf21593..35b5fe01aa 100644 --- a/src/client/components/CollaboratorAccessModal/CollaboratorAccessModal.tsx +++ b/src/client/components/CollaboratorAccessModal/CollaboratorAccessModal.tsx @@ -2,15 +2,15 @@ import './collaboratorAccessModal.scss' import React, { useEffect, useMemo } from 'react' import { useTranslation } from 'react-i18next' -import { SubSections } from '@meta/assessment' -import { Collaborator, CollaboratorEditPropertyType } from '@meta/user' - -import { useAppDispatch } from '@client/store' -import { useAssessment, useAssessmentSections, useCycle } from '@client/store/assessment' -import { UserManagementActions } from '@client/store/ui/userManagement' -import { useCountryIso, useOnUpdate } from '@client/hooks' -import ButtonCheckBox from '@client/components/ButtonCheckBox' -import { Modal, ModalBody, ModalClose, ModalHeader } from '@client/components/Modal' +import { SubSections } from 'meta/assessment' +import { Collaborator, CollaboratorEditPropertyType } from 'meta/user' + +import { useAppDispatch } from 'client/store' +import { useAssessment, useAssessmentSections, useCycle } from 'client/store/assessment' +import { UserManagementActions } from 'client/store/ui/userManagement' +import { useCountryIso, useOnUpdate } from 'client/hooks' +import ButtonCheckBox from 'client/components/ButtonCheckBox' +import { Modal, ModalBody, ModalClose, ModalHeader } from 'client/components/Modal' import { useActions } from './hooks/useActions' diff --git a/src/client/components/CollaboratorAccessModal/hooks/useActions.ts b/src/client/components/CollaboratorAccessModal/hooks/useActions.ts index 914dae61b1..bf7bd04f3f 100644 --- a/src/client/components/CollaboratorAccessModal/hooks/useActions.ts +++ b/src/client/components/CollaboratorAccessModal/hooks/useActions.ts @@ -1,8 +1,8 @@ import { useState } from 'react' -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Collaborator, CollaboratorEditPropertyType, CollaboratorSectionsPermission } from '@meta/user' +import { Collaborator, CollaboratorEditPropertyType, CollaboratorSectionsPermission } from 'meta/user' export const useActions = (props: { options: Record; userRole: Collaborator }) => { const { options, userRole } = props diff --git a/src/client/components/CountrySelectModal/CountrySelectModal.tsx b/src/client/components/CountrySelectModal/CountrySelectModal.tsx index ae19107534..b291cce097 100644 --- a/src/client/components/CountrySelectModal/CountrySelectModal.tsx +++ b/src/client/components/CountrySelectModal/CountrySelectModal.tsx @@ -2,12 +2,12 @@ import './countrySelectModal.scss' import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import { Objects } from '@utils/objects' -import { Strings } from '@utils/strings' +import { Objects } from 'utils/objects' +import { Strings } from 'utils/strings' -import { Areas, Country } from '@meta/area' +import { Areas, Country } from 'meta/area' -import { Modal, ModalClose, ModalFooter, ModalHeader } from '@client/components/Modal' +import { Modal, ModalClose, ModalFooter, ModalHeader } from 'client/components/Modal' import CountrySelectModalBody from './CountrySelectModalBody' diff --git a/src/client/components/CountrySelectModal/CountrySelectModalBody/CountrySelectModalBody.tsx b/src/client/components/CountrySelectModal/CountrySelectModalBody/CountrySelectModalBody.tsx index 8d3b9ad01f..4dc6f7b5e7 100644 --- a/src/client/components/CountrySelectModal/CountrySelectModalBody/CountrySelectModalBody.tsx +++ b/src/client/components/CountrySelectModal/CountrySelectModalBody/CountrySelectModalBody.tsx @@ -5,10 +5,10 @@ import MediaQuery from 'react-responsive' import classNames from 'classnames' -import { Country } from '@meta/area' +import { Country } from 'meta/area' -import { ModalBody } from '@client/components/Modal' -import { Breakpoints } from '@client/utils/breakpoints' +import { ModalBody } from 'client/components/Modal' +import { Breakpoints } from 'client/utils/breakpoints' type Props = { countries: Array diff --git a/src/client/components/DefinitionLink/DefinitionLink.tsx b/src/client/components/DefinitionLink/DefinitionLink.tsx index c703ad9f7d..0ba482a1ec 100644 --- a/src/client/components/DefinitionLink/DefinitionLink.tsx +++ b/src/client/components/DefinitionLink/DefinitionLink.tsx @@ -1,8 +1,8 @@ import './DefinitionLink.scss' import React from 'react' -import { ApiEndPoint } from '@meta/api/endpoint' -import { Lang } from '@meta/lang' +import { ApiEndPoint } from 'meta/api/endpoint' +import { Lang } from 'meta/lang' type Props = { assessmentName: string diff --git a/src/client/components/EditUserForm/CollaboratorPermissions/CollaboratorPermissions.tsx b/src/client/components/EditUserForm/CollaboratorPermissions/CollaboratorPermissions.tsx index 7153ddba6d..02798dfa05 100644 --- a/src/client/components/EditUserForm/CollaboratorPermissions/CollaboratorPermissions.tsx +++ b/src/client/components/EditUserForm/CollaboratorPermissions/CollaboratorPermissions.tsx @@ -2,13 +2,13 @@ import './CollaboratorPermissions.scss' import React, { useState } from 'react' import { useTranslation } from 'react-i18next' -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { SubSections } from '@meta/assessment' -import { Collaborator, CollaboratorPermissions as CollabPermissions } from '@meta/user' +import { SubSections } from 'meta/assessment' +import { Collaborator, CollaboratorPermissions as CollabPermissions } from 'meta/user' -import { useAssessmentSections, useCycle } from '@client/store/assessment' -import CollaboratorAccessModal from '@client/components/CollaboratorAccessModal' +import { useAssessmentSections, useCycle } from 'client/store/assessment' +import CollaboratorAccessModal from 'client/components/CollaboratorAccessModal' type Props = { userRole: Collaborator diff --git a/src/client/components/EditUserForm/ContactMethodField/ContactMethodField.tsx b/src/client/components/EditUserForm/ContactMethodField/ContactMethodField.tsx index 45e191d96e..4b1087079f 100644 --- a/src/client/components/EditUserForm/ContactMethodField/ContactMethodField.tsx +++ b/src/client/components/EditUserForm/ContactMethodField/ContactMethodField.tsx @@ -4,15 +4,15 @@ import { useTranslation } from 'react-i18next' import classNames from 'classnames' -import { User } from '@meta/user' -import { UserProps } from '@meta/user/user' +import { User } from 'meta/user' +import { UserProps } from 'meta/user/user' import { UserContactPreference, UserContactPreferenceMethod, UserContactPreferencePhoneOption, -} from '@meta/user/userRole' +} from 'meta/user/userRole' -import { useOnUpdate } from '@client/hooks' +import { useOnUpdate } from 'client/hooks' type Props = { name: string diff --git a/src/client/components/EditUserForm/CountryRoles/CountryRole/CountryRole.tsx b/src/client/components/EditUserForm/CountryRoles/CountryRole/CountryRole.tsx index 06aca0fa1a..efe75c34f9 100644 --- a/src/client/components/EditUserForm/CountryRoles/CountryRole/CountryRole.tsx +++ b/src/client/components/EditUserForm/CountryRoles/CountryRole/CountryRole.tsx @@ -2,9 +2,9 @@ import './CountryRole.scss' import React, { MouseEventHandler } from 'react' import { useTranslation } from 'react-i18next' -import { RoleName, User, UserRole, Users } from '@meta/user' +import { RoleName, User, UserRole, Users } from 'meta/user' -import { useUser } from '@client/store/user' +import { useUser } from 'client/store/user' type Props = { onClick: MouseEventHandler diff --git a/src/client/components/EditUserForm/CountryRoles/CountryRoles.tsx b/src/client/components/EditUserForm/CountryRoles/CountryRoles.tsx index ff49e5e2cf..ed780cdf9b 100644 --- a/src/client/components/EditUserForm/CountryRoles/CountryRoles.tsx +++ b/src/client/components/EditUserForm/CountryRoles/CountryRoles.tsx @@ -5,15 +5,15 @@ import { useTranslation } from 'react-i18next' import classNames from 'classnames' -import { CountryIso, Region, RegionCode } from '@meta/area' -import { RoleName, User, UserRole, Users } from '@meta/user' - -import { useAppDispatch } from '@client/store' -import { useCountries } from '@client/store/assessment' -import { useAssessment, useCycle, useSecondaryRegion } from '@client/store/assessment/hooks' -import { UserManagementActions } from '@client/store/ui/userManagement' -import { useUser } from '@client/store/user' -import CountrySelectModal from '@client/components/CountrySelectModal' +import { CountryIso, Region, RegionCode } from 'meta/area' +import { RoleName, User, UserRole, Users } from 'meta/user' + +import { useAppDispatch } from 'client/store' +import { useCountries } from 'client/store/assessment' +import { useAssessment, useCycle, useSecondaryRegion } from 'client/store/assessment/hooks' +import { UserManagementActions } from 'client/store/ui/userManagement' +import { useUser } from 'client/store/user' +import CountrySelectModal from 'client/components/CountrySelectModal' import CountryRole from './CountryRole' diff --git a/src/client/components/EditUserForm/CountrySelectField/CountrySelectField.tsx b/src/client/components/EditUserForm/CountrySelectField/CountrySelectField.tsx index f5e530c28a..6306fad276 100644 --- a/src/client/components/EditUserForm/CountrySelectField/CountrySelectField.tsx +++ b/src/client/components/EditUserForm/CountrySelectField/CountrySelectField.tsx @@ -4,11 +4,11 @@ import { useTranslation } from 'react-i18next' import classNames from 'classnames' -import { CountryIso } from '@meta/area' -import { User } from '@meta/user' -import { UserProps } from '@meta/user/user' +import { CountryIso } from 'meta/area' +import { User } from 'meta/user' +import { UserProps } from 'meta/user/user' -import AreaSelector from '@client/components/AreaSelector/AreaSelector' +import AreaSelector from 'client/components/AreaSelector/AreaSelector' type Props = { name: string diff --git a/src/client/components/EditUserForm/EditUserForm.tsx b/src/client/components/EditUserForm/EditUserForm.tsx index d153bab93e..4bbd2fefce 100644 --- a/src/client/components/EditUserForm/EditUserForm.tsx +++ b/src/client/components/EditUserForm/EditUserForm.tsx @@ -2,13 +2,13 @@ import './EditUserForm.scss' import React, { useState } from 'react' import { useTranslation } from 'react-i18next' -import { Collaborator, RoleName, User, UserRole, Users } from '@meta/user' +import { Collaborator, RoleName, User, UserRole, Users } from 'meta/user' -import { useAppDispatch } from '@client/store' -import { useAssessment, useCycle } from '@client/store/assessment' -import { UserManagementActions } from '@client/store/ui/userManagement' -import { useUser } from '@client/store/user' -import { useCountryIso, useOnUpdate } from '@client/hooks' +import { useAppDispatch } from 'client/store' +import { useAssessment, useCycle } from 'client/store/assessment' +import { UserManagementActions } from 'client/store/ui/userManagement' +import { useUser } from 'client/store/user' +import { useCountryIso, useOnUpdate } from 'client/hooks' import CollaboratorPermissions from './CollaboratorPermissions' import CountryRoles from './CountryRoles' diff --git a/src/client/components/EditUserForm/PhoneField/PhoneField.tsx b/src/client/components/EditUserForm/PhoneField/PhoneField.tsx index 4999e23972..5823124163 100644 --- a/src/client/components/EditUserForm/PhoneField/PhoneField.tsx +++ b/src/client/components/EditUserForm/PhoneField/PhoneField.tsx @@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next' import classNames from 'classnames' -import { useOnUpdate } from '@client/hooks' +import { useOnUpdate } from 'client/hooks' type Props = { name: string diff --git a/src/client/components/EditUserForm/ProfilePicture/ProfilePicture.tsx b/src/client/components/EditUserForm/ProfilePicture/ProfilePicture.tsx index 6f253173fd..81a41020fc 100644 --- a/src/client/components/EditUserForm/ProfilePicture/ProfilePicture.tsx +++ b/src/client/components/EditUserForm/ProfilePicture/ProfilePicture.tsx @@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next' import classNames from 'classnames' -import { Users } from '@meta/user' +import { Users } from 'meta/user' type Props = { onChange: (profilePictureFile: File) => void diff --git a/src/client/components/EditUserForm/SelectField/SelectField.tsx b/src/client/components/EditUserForm/SelectField/SelectField.tsx index 047152cdba..04d372c650 100644 --- a/src/client/components/EditUserForm/SelectField/SelectField.tsx +++ b/src/client/components/EditUserForm/SelectField/SelectField.tsx @@ -4,8 +4,8 @@ import { useTranslation } from 'react-i18next' import classNames from 'classnames' -import { User } from '@meta/user' -import { UserProps } from '@meta/user/user' +import { User } from 'meta/user' +import { UserProps } from 'meta/user/user' type Props = { name: string diff --git a/src/client/components/EditUserForm/UserRolePropsFields/UserRolePropsFields.tsx b/src/client/components/EditUserForm/UserRolePropsFields/UserRolePropsFields.tsx index 9bb68eb208..55023f1bbd 100644 --- a/src/client/components/EditUserForm/UserRolePropsFields/UserRolePropsFields.tsx +++ b/src/client/components/EditUserForm/UserRolePropsFields/UserRolePropsFields.tsx @@ -1,6 +1,6 @@ import React from 'react' -import { RoleName, UserContactPreference, UserRole } from '@meta/user/userRole' +import { RoleName, UserContactPreference, UserRole } from 'meta/user/userRole' import ContactMethodField from '../ContactMethodField' import CountrySelectField from '../CountrySelectField' diff --git a/src/client/components/InviteUserForm/InviteUserForm.tsx b/src/client/components/InviteUserForm/InviteUserForm.tsx index c03b7c551b..3d5fbe26af 100644 --- a/src/client/components/InviteUserForm/InviteUserForm.tsx +++ b/src/client/components/InviteUserForm/InviteUserForm.tsx @@ -2,14 +2,14 @@ import './InviteUserForm.scss' import React, { useState } from 'react' import { useTranslation } from 'react-i18next' -import { RoleName, Users } from '@meta/user' +import { RoleName, Users } from 'meta/user' -import { useAppDispatch } from '@client/store' -import { useAssessment, useCycle } from '@client/store/assessment' -import { UserManagementActions } from '@client/store/ui/userManagement' -import { useUser } from '@client/store/user' -import { useCountryIso } from '@client/hooks' -import { useToaster } from '@client/hooks/useToaster' +import { useAppDispatch } from 'client/store' +import { useAssessment, useCycle } from 'client/store/assessment' +import { UserManagementActions } from 'client/store/ui/userManagement' +import { useUser } from 'client/store/user' +import { useCountryIso } from 'client/hooks' +import { useToaster } from 'client/hooks/useToaster' const validateName = (name: string) => !!name.trim() const validateRole = (role: string) => !!role diff --git a/src/client/components/LinkGeo/LinkGeo.tsx b/src/client/components/LinkGeo/LinkGeo.tsx index 56658811e6..07c7636338 100644 --- a/src/client/components/LinkGeo/LinkGeo.tsx +++ b/src/client/components/LinkGeo/LinkGeo.tsx @@ -2,10 +2,10 @@ import './linkGeo.scss' import React from 'react' import { NavLink } from 'react-router-dom' -import { ClientRoutes } from '@meta/app' +import { ClientRoutes } from 'meta/app' -import { useAssessment, useCycle } from '@client/store/assessment' -import { useCountryIso } from '@client/hooks' +import { useAssessment, useCycle } from 'client/store/assessment' +import { useCountryIso } from 'client/hooks' const LinkGeo: React.FC = () => { const assessment = useAssessment() diff --git a/src/client/components/LinkHome/LinkHome.tsx b/src/client/components/LinkHome/LinkHome.tsx index bb692e3f10..7793c25ceb 100644 --- a/src/client/components/LinkHome/LinkHome.tsx +++ b/src/client/components/LinkHome/LinkHome.tsx @@ -2,9 +2,9 @@ import './linkHome.scss' import React from 'react' import { NavLink } from 'react-router-dom' -import { ClientRoutes } from '@meta/app' +import { ClientRoutes } from 'meta/app' -import { useAssessment, useCycle } from '@client/store/assessment' +import { useAssessment, useCycle } from 'client/store/assessment' const LinkHome: React.FC = () => { const assessment = useAssessment() diff --git a/src/client/components/Loading/Loading.tsx b/src/client/components/Loading/Loading.tsx index 6bc56f3fd3..c9002e835e 100644 --- a/src/client/components/Loading/Loading.tsx +++ b/src/client/components/Loading/Loading.tsx @@ -1,6 +1,6 @@ import React from 'react' -import { AssessmentNames } from '@meta/assessment' +import { AssessmentNames } from 'meta/assessment' const Loading = () => { // Toucan is hidden in PanEuropean pages. diff --git a/src/client/components/MessageCenter/MessageCenter.tsx b/src/client/components/MessageCenter/MessageCenter.tsx index cf99c59e17..01eafff805 100644 --- a/src/client/components/MessageCenter/MessageCenter.tsx +++ b/src/client/components/MessageCenter/MessageCenter.tsx @@ -1,9 +1,9 @@ import './MessageCenter.scss' import React from 'react' -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { useTopics } from '@client/store/ui/messageCenter' +import { useTopics } from 'client/store/ui/messageCenter' import Topic from './Topic' diff --git a/src/client/components/MessageCenter/Topic/Message/Message.tsx b/src/client/components/MessageCenter/Topic/Message/Message.tsx index ef77ed1efd..a0f05daa3d 100644 --- a/src/client/components/MessageCenter/Topic/Message/Message.tsx +++ b/src/client/components/MessageCenter/Topic/Message/Message.tsx @@ -2,14 +2,14 @@ import './Message.scss' import React, { useLayoutEffect, useRef } from 'react' import { useTranslation } from 'react-i18next' -import { getRelativeDate } from '@utils/dates' +import { getRelativeDate } from 'utils/dates' import classNames from 'classnames' -import { ApiEndPoint } from '@meta/api/endpoint' -import { Message as MessageType } from '@meta/messageCenter/message' -import { Users } from '@meta/user' +import { ApiEndPoint } from 'meta/api/endpoint' +import { Message as MessageType } from 'meta/messageCenter/message' +import { Users } from 'meta/user' -import Icon from '@client/components/Icon' +import Icon from 'client/components/Icon' type MessageProps = { message: MessageType diff --git a/src/client/components/MessageCenter/Topic/Topic.tsx b/src/client/components/MessageCenter/Topic/Topic.tsx index 0d2c4b670c..fe474fe37f 100644 --- a/src/client/components/MessageCenter/Topic/Topic.tsx +++ b/src/client/components/MessageCenter/Topic/Topic.tsx @@ -3,20 +3,20 @@ import React, { useCallback, useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' import { useParams } from 'react-router-dom' -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' import classNames from 'classnames' -import { Message as MessageType, MessageTopic, MessageTopicStatus, MessageTopicType } from '@meta/messageCenter' -import { Sockets } from '@meta/socket' -import { Users } from '@meta/user' - -import { useAppDispatch } from '@client/store' -import { useAssessment, useCycle } from '@client/store/assessment' -import { MessageCenterActions } from '@client/store/ui/messageCenter' -import { useUser } from '@client/store/user' -import { useCountryIso } from '@client/hooks' -import Icon from '@client/components/Icon' -import { SocketClient } from '@client/service/socket' +import { Message as MessageType, MessageTopic, MessageTopicStatus, MessageTopicType } from 'meta/messageCenter' +import { Sockets } from 'meta/socket' +import { Users } from 'meta/user' + +import { useAppDispatch } from 'client/store' +import { useAssessment, useCycle } from 'client/store/assessment' +import { MessageCenterActions } from 'client/store/ui/messageCenter' +import { useUser } from 'client/store/user' +import { useCountryIso } from 'client/hooks' +import Icon from 'client/components/Icon' +import { SocketClient } from 'client/service/socket' import Message from './Message' diff --git a/src/client/components/Modal/Modal.tsx b/src/client/components/Modal/Modal.tsx index e486bb3e07..c7609c227b 100644 --- a/src/client/components/Modal/Modal.tsx +++ b/src/client/components/Modal/Modal.tsx @@ -1,7 +1,7 @@ import './Modal.scss' import React from 'react' -import Icon from '@client/components/Icon' +import Icon from 'client/components/Icon' type PropsChildren = { children: React.ReactNode | React.ReactNode[] diff --git a/src/client/components/MultiSelect/MultiSelect.tsx b/src/client/components/MultiSelect/MultiSelect.tsx index d49bee4cca..d2361fa379 100644 --- a/src/client/components/MultiSelect/MultiSelect.tsx +++ b/src/client/components/MultiSelect/MultiSelect.tsx @@ -2,10 +2,10 @@ import './MultiSelect.scss' import React, { useEffect, useRef, useState } from 'react' import { useTranslation } from 'react-i18next' -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' import classNames from 'classnames' -import { Option } from '@client/components/MultiSelect/option' +import { Option } from 'client/components/MultiSelect/option' const optionClick = (currentValues: string[], onChange: (values: string[]) => void, option: string) => (evt: any) => { evt.stopPropagation() diff --git a/src/client/components/Navigation/NavAssessment/Header/Header.tsx b/src/client/components/Navigation/NavAssessment/Header/Header.tsx index 817e56f480..f971748c21 100644 --- a/src/client/components/Navigation/NavAssessment/Header/Header.tsx +++ b/src/client/components/Navigation/NavAssessment/Header/Header.tsx @@ -3,7 +3,7 @@ import React from 'react' import classNames from 'classnames' -import Icon from '@client/components/Icon' +import Icon from 'client/components/Icon' import LinkLanding from './LinkLanding' diff --git a/src/client/components/Navigation/NavAssessment/Header/LinkLanding/LinkLanding.tsx b/src/client/components/Navigation/NavAssessment/Header/LinkLanding/LinkLanding.tsx index a8988b70c0..389a95997e 100644 --- a/src/client/components/Navigation/NavAssessment/Header/LinkLanding/LinkLanding.tsx +++ b/src/client/components/Navigation/NavAssessment/Header/LinkLanding/LinkLanding.tsx @@ -5,11 +5,11 @@ import { matchPath, NavLink, useLocation } from 'react-router-dom' import classNames from 'classnames' -import { ClientRoutes } from '@meta/app' +import { ClientRoutes } from 'meta/app' -import { useAssessment, useCycle } from '@client/store/assessment' -import { useCountryIso } from '@client/hooks' -import Icon from '@client/components/Icon' +import { useAssessment, useCycle } from 'client/store/assessment' +import { useCountryIso } from 'client/hooks' +import Icon from 'client/components/Icon' const LinkLanding: React.FC = () => { const assessment = useAssessment() diff --git a/src/client/components/Navigation/NavAssessment/NavAssessment.tsx b/src/client/components/Navigation/NavAssessment/NavAssessment.tsx index 4abdc72217..a270e29d32 100644 --- a/src/client/components/Navigation/NavAssessment/NavAssessment.tsx +++ b/src/client/components/Navigation/NavAssessment/NavAssessment.tsx @@ -1,8 +1,8 @@ import React, { useState } from 'react' -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { useAssessmentSections } from '@client/store/assessment' +import { useAssessmentSections } from 'client/store/assessment' import Header from './Header' import NavigationSection from './Section' diff --git a/src/client/components/Navigation/NavAssessment/Section/NavigationSection.tsx b/src/client/components/Navigation/NavAssessment/Section/NavigationSection.tsx index f855b7be27..4d9aed0986 100644 --- a/src/client/components/Navigation/NavAssessment/Section/NavigationSection.tsx +++ b/src/client/components/Navigation/NavAssessment/Section/NavigationSection.tsx @@ -3,13 +3,13 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' import { matchPath, useLocation } from 'react-router-dom' -import { ClientRoutes } from '@meta/app' -import { Labels, Section } from '@meta/assessment' +import { ClientRoutes } from 'meta/app' +import { Labels, Section } from 'meta/assessment' -import { useAssessment, useCycle } from '@client/store/assessment' -import { useSectionReviewSummary } from '@client/store/ui/review/hooks' -import { useCountryIso, useIsDataExportView } from '@client/hooks' -import ReviewSummaryIndicator from '@client/components/ReviewSummaryIndicator' +import { useAssessment, useCycle } from 'client/store/assessment' +import { useSectionReviewSummary } from 'client/store/ui/review/hooks' +import { useCountryIso, useIsDataExportView } from 'client/hooks' +import ReviewSummaryIndicator from 'client/components/ReviewSummaryIndicator' import SectionItemLink from './SectionItemLink' diff --git a/src/client/components/Navigation/NavAssessment/Section/SectionItemLink/SectionItemLink.tsx b/src/client/components/Navigation/NavAssessment/Section/SectionItemLink/SectionItemLink.tsx index b934a8838e..ea9f209756 100644 --- a/src/client/components/Navigation/NavAssessment/Section/SectionItemLink/SectionItemLink.tsx +++ b/src/client/components/Navigation/NavAssessment/Section/SectionItemLink/SectionItemLink.tsx @@ -5,16 +5,16 @@ import { NavLink } from 'react-router-dom' import classNames from 'classnames' -import { ClientRoutes } from '@meta/app' -import { Labels, SubSection, SubSections } from '@meta/assessment' +import { ClientRoutes } from 'meta/app' +import { Labels, SubSection, SubSections } from 'meta/assessment' -import { useAppDispatch } from '@client/store' -import { useAssessment, useCycle } from '@client/store/assessment' -import { NavigationActions } from '@client/store/ui/navigation' -import { useSectionReviewSummary } from '@client/store/ui/review/hooks' -import { useCountryIso, useIsDataExportView } from '@client/hooks' -import ReviewSummaryIndicator from '@client/components/ReviewSummaryIndicator' -import { Breakpoints } from '@client/utils' +import { useAppDispatch } from 'client/store' +import { useAssessment, useCycle } from 'client/store/assessment' +import { NavigationActions } from 'client/store/ui/navigation' +import { useSectionReviewSummary } from 'client/store/ui/review/hooks' +import { useCountryIso, useIsDataExportView } from 'client/hooks' +import ReviewSummaryIndicator from 'client/components/ReviewSummaryIndicator' +import { Breakpoints } from 'client/utils' type Props = { subSection: SubSection diff --git a/src/client/components/Navigation/Navigation.tsx b/src/client/components/Navigation/Navigation.tsx index edd71c7d06..4652d22f33 100644 --- a/src/client/components/Navigation/Navigation.tsx +++ b/src/client/components/Navigation/Navigation.tsx @@ -2,11 +2,11 @@ import './Navigation.scss' import React, { useEffect } from 'react' import MediaQuery from 'react-responsive' -import { useAppDispatch } from '@client/store' -import { NavigationActions } from '@client/store/ui/navigation' -import { useCountryIso } from '@client/hooks' -import { useIsPrint } from '@client/hooks/useIsPath' -import { Breakpoints } from '@client/utils' +import { useAppDispatch } from 'client/store' +import { NavigationActions } from 'client/store/ui/navigation' +import { useCountryIso } from 'client/hooks' +import { useIsPrint } from 'client/hooks/useIsPath' +import { Breakpoints } from 'client/utils' import NavigationDesktop from './NavigationDesktop' import NavigationMobile from './NavigationMobile' diff --git a/src/client/components/Navigation/NavigationDesktop/NavigationDesktop.tsx b/src/client/components/Navigation/NavigationDesktop/NavigationDesktop.tsx index e3c6282177..8839993331 100644 --- a/src/client/components/Navigation/NavigationDesktop/NavigationDesktop.tsx +++ b/src/client/components/Navigation/NavigationDesktop/NavigationDesktop.tsx @@ -2,14 +2,14 @@ import React, { useEffect } from 'react' import { useTranslation } from 'react-i18next' import { Link } from 'react-router-dom' -import { ClientRoutes } from '@meta/app' -import { Areas } from '@meta/area' - -import { useAppDispatch } from '@client/store' -import { useAssessment, useCycle } from '@client/store/assessment' -import { NavigationActions } from '@client/store/ui/navigation' -import { useCountryIso } from '@client/hooks' -import Icon from '@client/components/Icon' +import { ClientRoutes } from 'meta/app' +import { Areas } from 'meta/area' + +import { useAppDispatch } from 'client/store' +import { useAssessment, useCycle } from 'client/store/assessment' +import { NavigationActions } from 'client/store/ui/navigation' +import { useCountryIso } from 'client/hooks' +import Icon from 'client/components/Icon' import NavAssessment from '../NavAssessment' diff --git a/src/client/components/Navigation/NavigationMobile/NavigationMobile.tsx b/src/client/components/Navigation/NavigationMobile/NavigationMobile.tsx index 15b66befd6..121e019f73 100644 --- a/src/client/components/Navigation/NavigationMobile/NavigationMobile.tsx +++ b/src/client/components/Navigation/NavigationMobile/NavigationMobile.tsx @@ -3,9 +3,9 @@ import React, { useEffect } from 'react' import classNames from 'classnames' -import { useAppDispatch } from '@client/store' -import { NavigationActions, useNavigationVisible } from '@client/store/ui/navigation' -import Icon from '@client/components/Icon' +import { useAppDispatch } from 'client/store' +import { NavigationActions, useNavigationVisible } from 'client/store/ui/navigation' +import Icon from 'client/components/Icon' import NavAssessment from '../NavAssessment' diff --git a/src/client/components/PageLayout/Footer/Footer.tsx b/src/client/components/PageLayout/Footer/Footer.tsx index 5b6faf7956..4f5522e530 100644 --- a/src/client/components/PageLayout/Footer/Footer.tsx +++ b/src/client/components/PageLayout/Footer/Footer.tsx @@ -2,10 +2,10 @@ import './Footer.scss' import React from 'react' import { useTranslation } from 'react-i18next' -import { ApiEndPoint } from '@meta/api/endpoint' +import { ApiEndPoint } from 'meta/api/endpoint' -import { useUser } from '@client/store/user' -import { useIsPrint } from '@client/hooks/useIsPath' +import { useUser } from 'client/store/user' +import { useIsPrint } from 'client/hooks/useIsPath' import SendFeedback from './SendFeedback' diff --git a/src/client/components/PageLayout/Footer/SendFeedback/SendFeedback.tsx b/src/client/components/PageLayout/Footer/SendFeedback/SendFeedback.tsx index cf1c000255..01c8fbe7cc 100644 --- a/src/client/components/PageLayout/Footer/SendFeedback/SendFeedback.tsx +++ b/src/client/components/PageLayout/Footer/SendFeedback/SendFeedback.tsx @@ -1,9 +1,9 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { Users } from '@meta/user' +import { Users } from 'meta/user' -import { useUser } from '@client/store/user' +import { useUser } from 'client/store/user' /* global __APPLICATION_VERSION__ */ const SendFeedback: React.FC = () => { diff --git a/src/client/components/PageLayout/Header/CycleSwitcher/CycleSwitcher.tsx b/src/client/components/PageLayout/Header/CycleSwitcher/CycleSwitcher.tsx index 680ae3e715..5dc2a5a4da 100644 --- a/src/client/components/PageLayout/Header/CycleSwitcher/CycleSwitcher.tsx +++ b/src/client/components/PageLayout/Header/CycleSwitcher/CycleSwitcher.tsx @@ -2,14 +2,14 @@ import './CycleSwitcher.scss' import React, { useCallback } from 'react' import { useNavigate } from 'react-router-dom' -import { ClientRoutes } from '@meta/app' -import { Cycle } from '@meta/assessment' - -import { useAssessment, useCycle } from '@client/store/assessment' -import { useUserCycles } from '@client/store/user/hooks' -import { useCountryIso, useIsAdmin, useIsDataExportView } from '@client/hooks' -import Icon from '@client/components/Icon' -import PopoverControl from '@client/components/PopoverControl' +import { ClientRoutes } from 'meta/app' +import { Cycle } from 'meta/assessment' + +import { useAssessment, useCycle } from 'client/store/assessment' +import { useUserCycles } from 'client/store/user/hooks' +import { useCountryIso, useIsAdmin, useIsDataExportView } from 'client/hooks' +import Icon from 'client/components/Icon' +import PopoverControl from 'client/components/PopoverControl' const CycleSwitcher = () => { const countryIso = useCountryIso() diff --git a/src/client/components/PageLayout/Header/FraHeader/FraHeader.tsx b/src/client/components/PageLayout/Header/FraHeader/FraHeader.tsx index 7b7b7775be..d4ccc92912 100644 --- a/src/client/components/PageLayout/Header/FraHeader/FraHeader.tsx +++ b/src/client/components/PageLayout/Header/FraHeader/FraHeader.tsx @@ -1,8 +1,8 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { useCycle } from '@client/store/assessment' -import LinkHome from '@client/components/LinkHome' +import { useCycle } from 'client/store/assessment' +import LinkHome from 'client/components/LinkHome' import CycleSwitcher from '../CycleSwitcher' import LanguageSelector, { LanguageSelectorMobile } from '../LanguageSelector' diff --git a/src/client/components/PageLayout/Header/Header.tsx b/src/client/components/PageLayout/Header/Header.tsx index c42d184284..ea7ffe6bb9 100644 --- a/src/client/components/PageLayout/Header/Header.tsx +++ b/src/client/components/PageLayout/Header/Header.tsx @@ -1,9 +1,9 @@ import './Header.scss' import React from 'react' -import { AssessmentName, AssessmentNames } from '@meta/assessment' +import { AssessmentName, AssessmentNames } from 'meta/assessment' -import AssessmentSwitch from '@client/components/AssessmentSwitch' +import AssessmentSwitch from 'client/components/AssessmentSwitch' import FraHeader from './FraHeader' import PanEuropeanHeader from './PanEuropeanHeader' diff --git a/src/client/components/PageLayout/Header/LanguageSelector/LanguageSelector.tsx b/src/client/components/PageLayout/Header/LanguageSelector/LanguageSelector.tsx index f986365377..5d68585c5c 100644 --- a/src/client/components/PageLayout/Header/LanguageSelector/LanguageSelector.tsx +++ b/src/client/components/PageLayout/Header/LanguageSelector/LanguageSelector.tsx @@ -1,10 +1,10 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { Lang, LanguageCodes } from '@meta/lang' +import { Lang, LanguageCodes } from 'meta/lang' -import Icon from '@client/components/Icon' -import PopoverControl from '@client/components/PopoverControl' +import Icon from 'client/components/Icon' +import PopoverControl from 'client/components/PopoverControl' const LanguageSelector: React.FC = () => { const { i18n } = useTranslation() diff --git a/src/client/components/PageLayout/Header/LanguageSelector/LanguageSelectorMobile.tsx b/src/client/components/PageLayout/Header/LanguageSelector/LanguageSelectorMobile.tsx index 9d880a6e9d..b7c25e7bf5 100644 --- a/src/client/components/PageLayout/Header/LanguageSelector/LanguageSelectorMobile.tsx +++ b/src/client/components/PageLayout/Header/LanguageSelector/LanguageSelectorMobile.tsx @@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next' import classNames from 'classnames' -import { Lang, LanguageCodes } from '@meta/lang' +import { Lang, LanguageCodes } from 'meta/lang' const LanguageSelectorMobile: React.FC = () => { // const dispatch = useAppDispatch() diff --git a/src/client/components/PageLayout/Header/PanEuropeanHeader/PanEuropeanHeader.tsx b/src/client/components/PageLayout/Header/PanEuropeanHeader/PanEuropeanHeader.tsx index f188258cb6..31c4b9efff 100644 --- a/src/client/components/PageLayout/Header/PanEuropeanHeader/PanEuropeanHeader.tsx +++ b/src/client/components/PageLayout/Header/PanEuropeanHeader/PanEuropeanHeader.tsx @@ -1,8 +1,8 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { useCycle } from '@client/store/assessment' -import LinkHome from '@client/components/LinkHome' +import { useCycle } from 'client/store/assessment' +import LinkHome from 'client/components/LinkHome' import CycleSwitcher from '../CycleSwitcher' import LanguageSelector, { LanguageSelectorMobile } from '../LanguageSelector' diff --git a/src/client/components/PageLayout/Header/UserLinks/LinksFRA/LinksFRA.tsx b/src/client/components/PageLayout/Header/UserLinks/LinksFRA/LinksFRA.tsx index e32851319f..e05226393e 100644 --- a/src/client/components/PageLayout/Header/UserLinks/LinksFRA/LinksFRA.tsx +++ b/src/client/components/PageLayout/Header/UserLinks/LinksFRA/LinksFRA.tsx @@ -4,19 +4,19 @@ import { Link } from 'react-router-dom' import { i18n } from 'i18next' -import { ClientRoutes } from '@meta/app' -import { CountryIso, Global } from '@meta/area' -import { Assessment, Cycle } from '@meta/assessment' -import { User, Users } from '@meta/user' -import { UserRoles } from '@meta/user/userRoles' +import { ClientRoutes } from 'meta/app' +import { CountryIso, Global } from 'meta/area' +import { Assessment, Cycle } from 'meta/assessment' +import { User, Users } from 'meta/user' +import { UserRoles } from 'meta/user/userRoles' -import { AppDispatch, useAppDispatch } from '@client/store' -import { useAssessment, useCycle } from '@client/store/assessment' -import { UserActions, useUser } from '@client/store/user' -import { useCountryIso, useIsLogin } from '@client/hooks' -import { ToasterHook, useToaster } from '@client/hooks/useToaster' -import Icon from '@client/components/Icon' -import PopoverControl, { PopoverItem } from '@client/components/PopoverControl' +import { AppDispatch, useAppDispatch } from 'client/store' +import { useAssessment, useCycle } from 'client/store/assessment' +import { UserActions, useUser } from 'client/store/user' +import { useCountryIso, useIsLogin } from 'client/hooks' +import { ToasterHook, useToaster } from 'client/hooks/useToaster' +import Icon from 'client/components/Icon' +import PopoverControl, { PopoverItem } from 'client/components/PopoverControl' const getLinks = ( i18nInstance: i18n, diff --git a/src/client/components/PageLayout/Header/UserLinks/UserLinks.tsx b/src/client/components/PageLayout/Header/UserLinks/UserLinks.tsx index f0df4f35ba..929f4f2316 100644 --- a/src/client/components/PageLayout/Header/UserLinks/UserLinks.tsx +++ b/src/client/components/PageLayout/Header/UserLinks/UserLinks.tsx @@ -1,8 +1,8 @@ import React from 'react' -import { AssessmentNames } from '@meta/assessment' +import { AssessmentNames } from 'meta/assessment' -import AssessmentSwitch from '@client/components/AssessmentSwitch' +import AssessmentSwitch from 'client/components/AssessmentSwitch' import LinksFRA from './LinksFRA' diff --git a/src/client/components/PageLayout/Toolbar/Lock/Lock.tsx b/src/client/components/PageLayout/Toolbar/Lock/Lock.tsx index 60fe890d72..40896ee361 100644 --- a/src/client/components/PageLayout/Toolbar/Lock/Lock.tsx +++ b/src/client/components/PageLayout/Toolbar/Lock/Lock.tsx @@ -2,10 +2,10 @@ import './Lock.scss' import React from 'react' import MediaQuery from 'react-responsive' -import { useAppDispatch } from '@client/store' -import { DataLockActions, useIsDataLocked } from '@client/store/ui/dataLock' -import Icon from '@client/components/Icon' -import { Breakpoints } from '@client/utils' +import { useAppDispatch } from 'client/store' +import { DataLockActions, useIsDataLocked } from 'client/store/ui/dataLock' +import Icon from 'client/components/Icon' +import { Breakpoints } from 'client/utils' const Lock: React.FC = () => { const dispatch = useAppDispatch() diff --git a/src/client/components/PageLayout/Toolbar/Status/Status.tsx b/src/client/components/PageLayout/Toolbar/Status/Status.tsx index e27378ef21..86ceaf5596 100644 --- a/src/client/components/PageLayout/Toolbar/Status/Status.tsx +++ b/src/client/components/PageLayout/Toolbar/Status/Status.tsx @@ -4,22 +4,22 @@ import { useTranslation } from 'react-i18next' import MediaQuery from 'react-responsive' import { useParams } from 'react-router-dom' -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' import classNames from 'classnames' -import { Areas } from '@meta/area' -import { AssessmentStatus } from '@meta/area/country' -import { AssessmentName } from '@meta/assessment' -import { AssessmentStatusTransitions } from '@meta/assessment/assessments' -import { Users } from '@meta/user' +import { Areas } from 'meta/area' +import { AssessmentStatus } from 'meta/area/country' +import { AssessmentName } from 'meta/assessment' +import { AssessmentStatusTransitions } from 'meta/assessment/assessments' +import { Users } from 'meta/user' -import { useAppDispatch } from '@client/store' -import { AssessmentActions, useAssessmentCountry, useCycle } from '@client/store/assessment' -import { useUser } from '@client/store/user' -import { useCountryIso } from '@client/hooks' -import Icon from '@client/components/Icon' -import PopoverControl, { PopoverItem } from '@client/components/PopoverControl' -import { Breakpoints } from '@client/utils/breakpoints' +import { useAppDispatch } from 'client/store' +import { AssessmentActions, useAssessmentCountry, useCycle } from 'client/store/assessment' +import { useUser } from 'client/store/user' +import { useCountryIso } from 'client/hooks' +import Icon from 'client/components/Icon' +import PopoverControl, { PopoverItem } from 'client/components/PopoverControl' +import { Breakpoints } from 'client/utils/breakpoints' import StatusConfirm from './StatusConfirm' import { StatusTransition } from './types' diff --git a/src/client/components/PageLayout/Toolbar/Status/StatusConfirm.tsx b/src/client/components/PageLayout/Toolbar/Status/StatusConfirm.tsx index 807507930d..545b0d2311 100644 --- a/src/client/components/PageLayout/Toolbar/Status/StatusConfirm.tsx +++ b/src/client/components/PageLayout/Toolbar/Status/StatusConfirm.tsx @@ -5,16 +5,16 @@ import { useParams } from 'react-router-dom' import classNames from 'classnames' -import { AssessmentName } from '@meta/assessment' -import { Users } from '@meta/user' +import { AssessmentName } from 'meta/assessment' +import { Users } from 'meta/user' -import { useAppDispatch } from '@client/store' -import { AssessmentActions, useAssessmentCountry } from '@client/store/assessment' -import { useUser } from '@client/store/user' -import { useCountryIso } from '@client/hooks' -import { Modal, ModalBody, ModalClose, ModalFooter, ModalHeader } from '@client/components/Modal' -import { useRecipients } from '@client/components/PageLayout/Toolbar/Status/useRecipients' -import UserList from '@client/components/UserList' +import { useAppDispatch } from 'client/store' +import { AssessmentActions, useAssessmentCountry } from 'client/store/assessment' +import { useUser } from 'client/store/user' +import { useCountryIso } from 'client/hooks' +import { Modal, ModalBody, ModalClose, ModalFooter, ModalHeader } from 'client/components/Modal' +import { useRecipients } from 'client/components/PageLayout/Toolbar/Status/useRecipients' +import UserList from 'client/components/UserList' import { StatusTransition } from './types' diff --git a/src/client/components/PageLayout/Toolbar/Status/types.ts b/src/client/components/PageLayout/Toolbar/Status/types.ts index 582f93c500..a73ae974ba 100644 --- a/src/client/components/PageLayout/Toolbar/Status/types.ts +++ b/src/client/components/PageLayout/Toolbar/Status/types.ts @@ -1,4 +1,4 @@ -import { AssessmentStatus } from '@meta/area/country' +import { AssessmentStatus } from 'meta/area/country' export interface StatusTransition { status: AssessmentStatus diff --git a/src/client/components/PageLayout/Toolbar/Status/useRecipients.ts b/src/client/components/PageLayout/Toolbar/Status/useRecipients.ts index 87b675ce52..d6fab4703c 100644 --- a/src/client/components/PageLayout/Toolbar/Status/useRecipients.ts +++ b/src/client/components/PageLayout/Toolbar/Status/useRecipients.ts @@ -1,7 +1,7 @@ -import { User } from '@meta/user' -import { UserRoles } from '@meta/user/userRoles' +import { User } from 'meta/user' +import { UserRoles } from 'meta/user/userRoles' -import { useUsers } from '@client/store/ui/userManagement' +import { useUsers } from 'client/store/ui/userManagement' import { StatusTransition } from './types' diff --git a/src/client/components/PageLayout/Toolbar/ToggleNavigationControl/ToggleNavigationControl.tsx b/src/client/components/PageLayout/Toolbar/ToggleNavigationControl/ToggleNavigationControl.tsx index d7c38dda17..3c6dacfac2 100644 --- a/src/client/components/PageLayout/Toolbar/ToggleNavigationControl/ToggleNavigationControl.tsx +++ b/src/client/components/PageLayout/Toolbar/ToggleNavigationControl/ToggleNavigationControl.tsx @@ -3,10 +3,10 @@ import React from 'react' import classNames from 'classnames' -import { useAppDispatch } from '@client/store' -import { NavigationActions, useNavigationVisible } from '@client/store/ui/navigation' -import { useIsAdmin, useIsCycleLanding } from '@client/hooks' -import Icon from '@client/components/Icon' +import { useAppDispatch } from 'client/store' +import { NavigationActions, useNavigationVisible } from 'client/store/ui/navigation' +import { useIsAdmin, useIsCycleLanding } from 'client/hooks' +import Icon from 'client/components/Icon' const ToggleNavigationControl: React.FC = () => { const dispatch = useAppDispatch() diff --git a/src/client/components/PageLayout/Toolbar/Toolbar.tsx b/src/client/components/PageLayout/Toolbar/Toolbar.tsx index 7781e259c3..21023db82d 100644 --- a/src/client/components/PageLayout/Toolbar/Toolbar.tsx +++ b/src/client/components/PageLayout/Toolbar/Toolbar.tsx @@ -4,18 +4,18 @@ import { useTranslation } from 'react-i18next' import MediaQuery from 'react-responsive' import { Link } from 'react-router-dom' -import { ClientRoutes } from '@meta/app' -import { Areas } from '@meta/area' -import { Users } from '@meta/user' +import { ClientRoutes } from 'meta/app' +import { Areas } from 'meta/area' +import { Users } from 'meta/user' -import { useAssessment, useCountry, useCycle } from '@client/store/assessment' -import { useUser } from '@client/store/user' -import { useCountryIso } from '@client/hooks' -import { useIsPrint } from '@client/hooks/useIsPath' -import AreaSelector from '@client/components/AreaSelector/AreaSelector' -import Icon from '@client/components/Icon' -import LinkHome from '@client/components/LinkHome' -import { Breakpoints } from '@client/utils' +import { useAssessment, useCountry, useCycle } from 'client/store/assessment' +import { useUser } from 'client/store/user' +import { useCountryIso } from 'client/hooks' +import { useIsPrint } from 'client/hooks/useIsPath' +import AreaSelector from 'client/components/AreaSelector/AreaSelector' +import Icon from 'client/components/Icon' +import LinkHome from 'client/components/LinkHome' +import { Breakpoints } from 'client/utils' import Lock from './Lock' import Status from './Status' diff --git a/src/client/components/PercentInput/PercentInput.tsx b/src/client/components/PercentInput/PercentInput.tsx index 3a69b845bd..caf6475eb7 100644 --- a/src/client/components/PercentInput/PercentInput.tsx +++ b/src/client/components/PercentInput/PercentInput.tsx @@ -1,10 +1,10 @@ import './PercentInput.scss' import React from 'react' -import { Numbers } from '@utils/numbers' +import { Numbers } from 'utils/numbers' import * as R from 'ramda' -import { Sanitizer } from '@client/utils/sanitizer' +import { Sanitizer } from 'client/utils/sanitizer' type State = any type Props = { diff --git a/src/client/components/ReviewIndicator/ReviewIndicator.tsx b/src/client/components/ReviewIndicator/ReviewIndicator.tsx index 22af86007c..9a35cb3c7d 100644 --- a/src/client/components/ReviewIndicator/ReviewIndicator.tsx +++ b/src/client/components/ReviewIndicator/ReviewIndicator.tsx @@ -4,14 +4,14 @@ import { useParams } from 'react-router-dom' import classNames from 'classnames' -import { MessageTopicStatus, MessageTopicType } from '@meta/messageCenter' +import { MessageTopicStatus, MessageTopicType } from 'meta/messageCenter' -import { useAppDispatch } from '@client/store' -import { useAssessment, useCycle } from '@client/store/assessment' -import { MessageCenterActions } from '@client/store/ui/messageCenter' -import { useReviewStatus } from '@client/store/ui/review/hooks' -import { useCountryIso } from '@client/hooks' -import Icon from '@client/components/Icon' +import { useAppDispatch } from 'client/store' +import { useAssessment, useCycle } from 'client/store/assessment' +import { MessageCenterActions } from 'client/store/ui/messageCenter' +import { useReviewStatus } from 'client/store/ui/review/hooks' +import { useCountryIso } from 'client/hooks' +import Icon from 'client/components/Icon' type Props = { title: string diff --git a/src/client/components/ReviewSummaryIndicator/ReviewSummaryIndicator.tsx b/src/client/components/ReviewSummaryIndicator/ReviewSummaryIndicator.tsx index f39c18deb5..0b04ecd946 100644 --- a/src/client/components/ReviewSummaryIndicator/ReviewSummaryIndicator.tsx +++ b/src/client/components/ReviewSummaryIndicator/ReviewSummaryIndicator.tsx @@ -3,8 +3,8 @@ import React from 'react' import classNames from 'classnames' -import { ReviewStatus } from '@meta/assessment' -import { MessageTopicStatus } from '@meta/messageCenter' +import { ReviewStatus } from 'meta/assessment' +import { MessageTopicStatus } from 'meta/messageCenter' type Props = { status: ReviewStatus diff --git a/src/client/components/TextInput/TextInput.tsx b/src/client/components/TextInput/TextInput.tsx index 66f3117690..5b5625b0e7 100644 --- a/src/client/components/TextInput/TextInput.tsx +++ b/src/client/components/TextInput/TextInput.tsx @@ -7,7 +7,7 @@ import React from 'react' import { isEmpty } from 'ramda' -import { DOMs } from '@client/utils/dom' +import { DOMs } from 'client/utils/dom' type State = any type Props = { diff --git a/src/client/components/ThousandSeparatedDecimalInput/ThousandSeparatedDecimalInput.tsx b/src/client/components/ThousandSeparatedDecimalInput/ThousandSeparatedDecimalInput.tsx index 2786dc2c63..70e92c7109 100644 --- a/src/client/components/ThousandSeparatedDecimalInput/ThousandSeparatedDecimalInput.tsx +++ b/src/client/components/ThousandSeparatedDecimalInput/ThousandSeparatedDecimalInput.tsx @@ -1,10 +1,10 @@ import './ThousandSeparatedDecimalInput.scss' import React from 'react' -import { Numbers } from '@utils/numbers' +import { Numbers } from 'utils/numbers' import * as R from 'ramda' -import { Sanitizer } from '@client/utils/sanitizer' +import { Sanitizer } from 'client/utils/sanitizer' type State = any type Props = any diff --git a/src/client/components/ThousandSeparatedIntegerInput/ThousandSeparatedIntegerInput.tsx b/src/client/components/ThousandSeparatedIntegerInput/ThousandSeparatedIntegerInput.tsx index 61bb3d6eea..2590948c73 100644 --- a/src/client/components/ThousandSeparatedIntegerInput/ThousandSeparatedIntegerInput.tsx +++ b/src/client/components/ThousandSeparatedIntegerInput/ThousandSeparatedIntegerInput.tsx @@ -4,7 +4,7 @@ import './ThousandSeparatedIntegerInput.scss' import React from 'react' -import { Numbers } from '@utils/numbers' +import { Numbers } from 'utils/numbers' import * as R from 'ramda' type State = any diff --git a/src/client/components/Toaster/Toaster.tsx b/src/client/components/Toaster/Toaster.tsx index d8054ab5bc..4afb766ddc 100644 --- a/src/client/components/Toaster/Toaster.tsx +++ b/src/client/components/Toaster/Toaster.tsx @@ -2,9 +2,9 @@ import './Toaster.scss' import React from 'react' import { useTranslation } from 'react-i18next' -import Icon from '@client/components/Icon' -import { NotificationMessage, NotificationActions, useNotification } from '@client/store/ui/notification' -import { useAppDispatch } from '@client/store' +import Icon from 'client/components/Icon' +import { NotificationMessage, NotificationActions, useNotification } from 'client/store/ui/notification' +import { useAppDispatch } from 'client/store' type ToastProps = { notification: NotificationMessage diff --git a/src/client/components/Tooltips/Tooltips.tsx b/src/client/components/Tooltips/Tooltips.tsx index 53ba90c6dd..0af49b255e 100644 --- a/src/client/components/Tooltips/Tooltips.tsx +++ b/src/client/components/Tooltips/Tooltips.tsx @@ -2,7 +2,7 @@ import './Tooltips.scss' import React from 'react' import { Tooltip } from 'react-tooltip' -import { TooltipId } from '@meta/tooltip' +import { TooltipId } from 'meta/tooltip' const Tooltips: React.FC = () => (
diff --git a/src/client/components/UserList/AdministrationListElement/AdministrationListElement.tsx b/src/client/components/UserList/AdministrationListElement/AdministrationListElement.tsx index 40cb866f11..8d7c11fb04 100644 --- a/src/client/components/UserList/AdministrationListElement/AdministrationListElement.tsx +++ b/src/client/components/UserList/AdministrationListElement/AdministrationListElement.tsx @@ -4,12 +4,12 @@ import { Link } from 'react-router-dom' import classNames from 'classnames' -import { ClientRoutes } from '@meta/app' -import { Global } from '@meta/area' -import { RoleName, User, Users, UserStatus } from '@meta/user' +import { ClientRoutes } from 'meta/app' +import { Global } from 'meta/area' +import { RoleName, User, Users, UserStatus } from 'meta/user' -import { useAssessment, useCycle } from '@client/store/assessment' -import { useFilteredRoleNames } from '@client/store/ui/userManagement' +import { useAssessment, useCycle } from 'client/store/assessment' +import { useFilteredRoleNames } from 'client/store/ui/userManagement' import UserRolesField from '../UserRolesField' diff --git a/src/client/components/UserList/CollaboratorListElement/CollaboratorListElement.tsx b/src/client/components/UserList/CollaboratorListElement/CollaboratorListElement.tsx index d6a26d6444..d2b2d832a9 100644 --- a/src/client/components/UserList/CollaboratorListElement/CollaboratorListElement.tsx +++ b/src/client/components/UserList/CollaboratorListElement/CollaboratorListElement.tsx @@ -2,12 +2,12 @@ import React from 'react' import classNames from 'classnames' -import { User, Users, UserStatus } from '@meta/user' +import { User, Users, UserStatus } from 'meta/user' -import { useCycle } from '@client/store/assessment' -import { useCountryIso } from '@client/hooks' -import InvitationColumn from '@client/components/UserList/CollaboratorListElement/InvitationColumn' -import UserEditColumn from '@client/components/UserList/CollaboratorListElement/UserEditColumn' +import { useCycle } from 'client/store/assessment' +import { useCountryIso } from 'client/hooks' +import InvitationColumn from 'client/components/UserList/CollaboratorListElement/InvitationColumn' +import UserEditColumn from 'client/components/UserList/CollaboratorListElement/UserEditColumn' import UserField from '../UserField' import UserRoleField from '../UserRoleField' diff --git a/src/client/components/UserList/CollaboratorListElement/InvitationColumn.tsx b/src/client/components/UserList/CollaboratorListElement/InvitationColumn.tsx index 745134f6d1..0ac2024324 100644 --- a/src/client/components/UserList/CollaboratorListElement/InvitationColumn.tsx +++ b/src/client/components/UserList/CollaboratorListElement/InvitationColumn.tsx @@ -3,17 +3,17 @@ import { useTranslation } from 'react-i18next' import classNames from 'classnames' -import { RoleName, User, UserRole, Users } from '@meta/user' -import { UserRoles } from '@meta/user/userRoles' +import { RoleName, User, UserRole, Users } from 'meta/user' +import { UserRoles } from 'meta/user/userRoles' -import { useAppDispatch } from '@client/store' -import { useAssessment, useCycle } from '@client/store/assessment' -import { UserManagementActions } from '@client/store/ui/userManagement' -import { useUser } from '@client/store/user' -import { useCountryIso } from '@client/hooks' -import { useToaster } from '@client/hooks/useToaster' -import Icon from '@client/components/Icon' -import UserInvitationInfo from '@client/components/UserList/UserInvitationInfo' +import { useAppDispatch } from 'client/store' +import { useAssessment, useCycle } from 'client/store/assessment' +import { UserManagementActions } from 'client/store/ui/userManagement' +import { useUser } from 'client/store/user' +import { useCountryIso } from 'client/hooks' +import { useToaster } from 'client/hooks/useToaster' +import Icon from 'client/components/Icon' +import UserInvitationInfo from 'client/components/UserList/UserInvitationInfo' interface Props { invitationUuid: string diff --git a/src/client/components/UserList/CollaboratorListElement/UserEditColumn.tsx b/src/client/components/UserList/CollaboratorListElement/UserEditColumn.tsx index 993f4308f4..9be8e17f6e 100644 --- a/src/client/components/UserList/CollaboratorListElement/UserEditColumn.tsx +++ b/src/client/components/UserList/CollaboratorListElement/UserEditColumn.tsx @@ -2,12 +2,12 @@ import React from 'react' import { useTranslation } from 'react-i18next' import { Link } from 'react-router-dom' -import { ClientRoutes } from '@meta/app' -import { User, Users } from '@meta/user' +import { ClientRoutes } from 'meta/app' +import { User, Users } from 'meta/user' -import { useAssessment, useCycle } from '@client/store/assessment' -import { useUser } from '@client/store/user' -import { useCountryIso } from '@client/hooks' +import { useAssessment, useCycle } from 'client/store/assessment' +import { useUser } from 'client/store/user' +import { useCountryIso } from 'client/hooks' interface Props { id: number diff --git a/src/client/components/UserList/UserField/UserField.tsx b/src/client/components/UserList/UserField/UserField.tsx index 84364699f1..54bb1e09ff 100644 --- a/src/client/components/UserList/UserField/UserField.tsx +++ b/src/client/components/UserList/UserField/UserField.tsx @@ -1,6 +1,6 @@ import React from 'react' -import { User } from '@meta/user' +import { User } from 'meta/user' const UserField: React.FC<{ user: User; field: keyof User }> = ({ user, field }) => ( diff --git a/src/client/components/UserList/UserInvitationInfo/UserInvitationInfo.tsx b/src/client/components/UserList/UserInvitationInfo/UserInvitationInfo.tsx index eb5cce81e5..0f97c8b904 100644 --- a/src/client/components/UserList/UserInvitationInfo/UserInvitationInfo.tsx +++ b/src/client/components/UserList/UserInvitationInfo/UserInvitationInfo.tsx @@ -2,15 +2,15 @@ import './UserInvitationInfo.scss' import React from 'react' import { useTranslation } from 'react-i18next' -import { ClientRoutes } from '@meta/app' -import { User, Users } from '@meta/user' +import { ClientRoutes } from 'meta/app' +import { User, Users } from 'meta/user' -import { useAppDispatch } from '@client/store' -import { useAssessment, useCycle } from '@client/store/assessment' -import { UserManagementActions } from '@client/store/ui/userManagement' -import { useCountryIso } from '@client/hooks' -import { useToaster } from '@client/hooks/useToaster' -import Icon from '@client/components/Icon' +import { useAppDispatch } from 'client/store' +import { useAssessment, useCycle } from 'client/store/assessment' +import { UserManagementActions } from 'client/store/ui/userManagement' +import { useCountryIso } from 'client/hooks' +import { useToaster } from 'client/hooks/useToaster' +import Icon from 'client/components/Icon' const UserInvitationInfo: React.FC<{ user: User; onClose: () => void }> = ({ user, onClose }) => { const dispatch = useAppDispatch() diff --git a/src/client/components/UserList/UserList.tsx b/src/client/components/UserList/UserList.tsx index eed6effbe0..bf270b30e1 100644 --- a/src/client/components/UserList/UserList.tsx +++ b/src/client/components/UserList/UserList.tsx @@ -2,7 +2,7 @@ import './UserList.scss' import React from 'react' import { useTranslation } from 'react-i18next' -import { User } from '@meta/user' +import { User } from 'meta/user' import AdministrationListElement from './AdministrationListElement' import CollaboratorListElement from './CollaboratorListElement' diff --git a/src/client/components/UserList/UserListButtonExport/UserListButtonExport.tsx b/src/client/components/UserList/UserListButtonExport/UserListButtonExport.tsx index ed1a57b66e..2f40df5efa 100644 --- a/src/client/components/UserList/UserListButtonExport/UserListButtonExport.tsx +++ b/src/client/components/UserList/UserListButtonExport/UserListButtonExport.tsx @@ -2,13 +2,13 @@ import React from 'react' import { CSVLink } from 'react-csv' import { useTranslation } from 'react-i18next' -import { Areas } from '@meta/area' -import { RoleName, User, Users } from '@meta/user' +import { Areas } from 'meta/area' +import { RoleName, User, Users } from 'meta/user' -import { useCycle } from '@client/store/assessment' -import { useFilteredRoleNames, useUsers } from '@client/store/ui/userManagement' -import { useCountryIso } from '@client/hooks' -import Icon from '@client/components/Icon' +import { useCycle } from 'client/store/assessment' +import { useFilteredRoleNames, useUsers } from 'client/store/ui/userManagement' +import { useCountryIso } from 'client/hooks' +import Icon from 'client/components/Icon' type Props = { isAdmin?: boolean diff --git a/src/client/components/UserList/UserListHeader/UserListHeader.tsx b/src/client/components/UserList/UserListHeader/UserListHeader.tsx index 1b6f188544..f766542d57 100644 --- a/src/client/components/UserList/UserListHeader/UserListHeader.tsx +++ b/src/client/components/UserList/UserListHeader/UserListHeader.tsx @@ -1,9 +1,9 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { RoleName, Users } from '@meta/user' +import { RoleName, Users } from 'meta/user' -import { useFilteredRoleNames } from '@client/store/ui/userManagement' +import { useFilteredRoleNames } from 'client/store/ui/userManagement' import UserListButtonExport from '../UserListButtonExport' diff --git a/src/client/components/UserList/UserRoleField/UserRoleField.tsx b/src/client/components/UserList/UserRoleField/UserRoleField.tsx index 158299df9e..04d4ee0c9d 100644 --- a/src/client/components/UserList/UserRoleField/UserRoleField.tsx +++ b/src/client/components/UserList/UserRoleField/UserRoleField.tsx @@ -1,10 +1,10 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { CountryIso } from '@meta/area' -import { User, Users } from '@meta/user' +import { CountryIso } from 'meta/area' +import { User, Users } from 'meta/user' -import { useCycle } from '@client/store/assessment' +import { useCycle } from 'client/store/assessment' const UserRoleField: React.FC<{ user: User; countryIso: CountryIso }> = ({ user, countryIso }) => { const { t } = useTranslation() diff --git a/src/client/components/UserList/UserRolesField/UserRolesField.tsx b/src/client/components/UserList/UserRolesField/UserRolesField.tsx index c1aa7d3642..37d08cac14 100644 --- a/src/client/components/UserList/UserRolesField/UserRolesField.tsx +++ b/src/client/components/UserList/UserRolesField/UserRolesField.tsx @@ -1,9 +1,9 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { Areas } from '@meta/area' -import { TooltipId } from '@meta/tooltip' -import { RoleName, User, Users } from '@meta/user' +import { Areas } from 'meta/area' +import { TooltipId } from 'meta/tooltip' +import { RoleName, User, Users } from 'meta/user' const UserRolesField: React.FC<{ roleName: RoleName; user: User }> = ({ roleName, user }) => { const { t } = useTranslation() diff --git a/src/client/components/UserListFilters/UserListFilters.tsx b/src/client/components/UserListFilters/UserListFilters.tsx index 9c0dbe6940..d3403304f8 100644 --- a/src/client/components/UserListFilters/UserListFilters.tsx +++ b/src/client/components/UserListFilters/UserListFilters.tsx @@ -2,13 +2,13 @@ import './UserListFilters.scss' import React, { useState } from 'react' import { useTranslation } from 'react-i18next' -import { CountryIso, Region, RegionCode } from '@meta/area' -import { RoleName } from '@meta/user' +import { CountryIso, Region, RegionCode } from 'meta/area' +import { RoleName } from 'meta/user' -import { useAppDispatch } from '@client/store' -import { useCountries } from '@client/store/assessment' -import { useSecondaryRegion } from '@client/store/assessment/hooks' -import { useFilters, UserManagementActions, useRoleNames } from '@client/store/ui/userManagement' +import { useAppDispatch } from 'client/store' +import { useCountries } from 'client/store/assessment' +import { useSecondaryRegion } from 'client/store/assessment/hooks' +import { useFilters, UserManagementActions, useRoleNames } from 'client/store/ui/userManagement' import CountrySelectModal from '../CountrySelectModal' import MultiSelect from '../MultiSelect' diff --git a/src/client/components/UsersCount/UsersCount.tsx b/src/client/components/UsersCount/UsersCount.tsx index 8df41732ce..fddcf89a9e 100644 --- a/src/client/components/UsersCount/UsersCount.tsx +++ b/src/client/components/UsersCount/UsersCount.tsx @@ -2,9 +2,9 @@ import './UsersCount.scss' import React from 'react' import { useTranslation } from 'react-i18next' -import { Users } from '@meta/user' +import { Users } from 'meta/user' -import { useRoleNames, useUsersCount } from '@client/store/ui/userManagement' +import { useRoleNames, useUsersCount } from 'client/store/ui/userManagement' const UsersCount: React.FC = () => { const { t } = useTranslation() diff --git a/src/client/components/VerticallyGrowingTextField/VerticallyGrowingTextField.tsx b/src/client/components/VerticallyGrowingTextField/VerticallyGrowingTextField.tsx index 1022a53722..0a280401ab 100644 --- a/src/client/components/VerticallyGrowingTextField/VerticallyGrowingTextField.tsx +++ b/src/client/components/VerticallyGrowingTextField/VerticallyGrowingTextField.tsx @@ -1,7 +1,7 @@ import './VerticallyGrowingTextField.scss' import React, { forwardRef, MutableRefObject, useEffect, useRef } from 'react' -import { useIsPrint } from '@client/hooks/useIsPath' +import { useIsPrint } from 'client/hooks/useIsPath' interface Props extends React.TextareaHTMLAttributes { minWidth?: number diff --git a/src/client/hooks/useCountryIso.ts b/src/client/hooks/useCountryIso.ts index 5e4b9227ff..5ef110e446 100644 --- a/src/client/hooks/useCountryIso.ts +++ b/src/client/hooks/useCountryIso.ts @@ -1,8 +1,8 @@ import { useMatch, useParams } from 'react-router-dom' -import { CountryIso } from '@meta/area' +import { CountryIso } from 'meta/area' -import { useIsAdmin, useIsCycleLanding, useIsLogin, useIsUserEditPage } from '@client/hooks/useIsPath' +import { useIsAdmin, useIsCycleLanding, useIsLogin, useIsUserEditPage } from 'client/hooks/useIsPath' export const useCountryIso = (): CountryIso => { const { countryIso } = useParams<{ countryIso: CountryIso }>() diff --git a/src/client/hooks/useCountryLandingSections.ts b/src/client/hooks/useCountryLandingSections.ts index a8196b4163..c90e84de3b 100644 --- a/src/client/hooks/useCountryLandingSections.ts +++ b/src/client/hooks/useCountryLandingSections.ts @@ -1,8 +1,8 @@ // TODO implement useCountryLandingSections import React from 'react' -import { useUser } from '@client/store/user' -import { User } from '@meta/user' -import { CountryIso } from '@meta/area' +import { useUser } from 'client/store/user' +import { User } from 'meta/user' +import { CountryIso } from 'meta/area' import { useCountryIso } from './useCountryIso' type Section = { diff --git a/src/client/hooks/useIsDataExportView.ts b/src/client/hooks/useIsDataExportView.ts index c52650de0a..66203a7f23 100644 --- a/src/client/hooks/useIsDataExportView.ts +++ b/src/client/hooks/useIsDataExportView.ts @@ -1,4 +1,4 @@ -import { Areas } from '@meta/area' +import { Areas } from 'meta/area' import { useCountryIso } from './useCountryIso' diff --git a/src/client/hooks/useIsPath.ts b/src/client/hooks/useIsPath.ts index 0df4ffb1f3..69525c594d 100644 --- a/src/client/hooks/useIsPath.ts +++ b/src/client/hooks/useIsPath.ts @@ -1,7 +1,7 @@ import { matchPath, useLocation, useParams } from 'react-router-dom' -import { ClientRoutes } from '@meta/app' -import { AssessmentName, AssessmentNames } from '@meta/assessment' +import { ClientRoutes } from 'meta/app' +import { AssessmentName, AssessmentNames } from 'meta/assessment' export const useIsPath = ({ path, exact = true }: { path: string; exact?: boolean }): boolean => { const { pathname } = useLocation() diff --git a/src/client/hooks/useToaster.ts b/src/client/hooks/useToaster.ts index 36a13b1793..77cbf86a33 100644 --- a/src/client/hooks/useToaster.ts +++ b/src/client/hooks/useToaster.ts @@ -1,9 +1,9 @@ import { useMemo } from 'react' -import { UUIDs } from '@utils/uuids' +import { UUIDs } from 'utils/uuids' -import { useAppDispatch } from '@client/store' -import { NotificationActions } from '@client/store/ui/notification' +import { useAppDispatch } from 'client/store' +import { NotificationActions } from 'client/store/ui/notification' export type ToasterHook = { toaster: { diff --git a/src/client/i18n.ts b/src/client/i18n.ts index 23d509de7c..3f610b39dd 100644 --- a/src/client/i18n.ts +++ b/src/client/i18n.ts @@ -1,6 +1,6 @@ import { initReactI18next } from 'react-i18next' -import { createParams } from '@i18n/i18nFactory' +import { createParams } from 'i18n/i18nFactory' import i18n from 'i18next' i18n diff --git a/src/client/pages/Admin/Admin.tsx b/src/client/pages/Admin/Admin.tsx index 0734bf8210..57e5ee766b 100644 --- a/src/client/pages/Admin/Admin.tsx +++ b/src/client/pages/Admin/Admin.tsx @@ -3,14 +3,14 @@ import React from 'react' import { useTranslation } from 'react-i18next' import { Navigate, NavLink, Route, Routes } from 'react-router-dom' -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' import classNames from 'classnames' -import { AdminRouteNames, ClientRoutes } from '@meta/app' -import { Users } from '@meta/user' +import { AdminRouteNames, ClientRoutes } from 'meta/app' +import { Users } from 'meta/user' -import { useCountries } from '@client/store/assessment' -import { useUser } from '@client/store/user' +import { useCountries } from 'client/store/assessment' +import { useUser } from 'client/store/user' import UserManagement from './UserManagement' diff --git a/src/client/pages/Admin/UserManagement/UserManagement.tsx b/src/client/pages/Admin/UserManagement/UserManagement.tsx index 4b033b0f53..6d5fddeba6 100644 --- a/src/client/pages/Admin/UserManagement/UserManagement.tsx +++ b/src/client/pages/Admin/UserManagement/UserManagement.tsx @@ -1,14 +1,14 @@ import './UserManagement.scss' import React, { useEffect, useState } from 'react' -import { useAppDispatch } from '@client/store' -import { useAssessment, useCycle } from '@client/store/assessment' -import { useFilters, UserManagementActions, useUsers, useUsersCount } from '@client/store/ui/userManagement' -import Paginator from '@client/components/Paginator' -import UserList from '@client/components/UserList' -import UserListFilters from '@client/components/UserListFilters' -import UsersCount from '@client/components/UsersCount/UsersCount' -import { DOMs } from '@client/utils/dom' +import { useAppDispatch } from 'client/store' +import { useAssessment, useCycle } from 'client/store/assessment' +import { useFilters, UserManagementActions, useUsers, useUsersCount } from 'client/store/ui/userManagement' +import Paginator from 'client/components/Paginator' +import UserList from 'client/components/UserList' +import UserListFilters from 'client/components/UserListFilters' +import UsersCount from 'client/components/UsersCount/UsersCount' +import { DOMs } from 'client/utils/dom' const UserManagement: React.FC = () => { const dispatch = useAppDispatch() diff --git a/src/client/pages/Assessment/Assessment.tsx b/src/client/pages/Assessment/Assessment.tsx index 0dec51057b..d0cbd18d5f 100644 --- a/src/client/pages/Assessment/Assessment.tsx +++ b/src/client/pages/Assessment/Assessment.tsx @@ -1,12 +1,12 @@ import React, { useEffect } from 'react' import { Route, Routes, useParams } from 'react-router-dom' -import { ClientRoutes } from '@meta/app' -import { AssessmentName } from '@meta/assessment' +import { ClientRoutes } from 'meta/app' +import { AssessmentName } from 'meta/assessment' -import { useAppDispatch } from '@client/store' -import { AssessmentActions, useAssessment } from '@client/store/assessment' -import { useOnUpdate } from '@client/hooks' +import { useAppDispatch } from 'client/store' +import { AssessmentActions, useAssessment } from 'client/store/assessment' +import { useOnUpdate } from 'client/hooks' import Cycle from '../Cycle' diff --git a/src/client/pages/AssessmentDataDownload/index.tsx b/src/client/pages/AssessmentDataDownload/index.tsx index 3ad4071701..e068c543d0 100644 --- a/src/client/pages/AssessmentDataDownload/index.tsx +++ b/src/client/pages/AssessmentDataDownload/index.tsx @@ -2,10 +2,10 @@ import './dataDownload.scss' import React, { useEffect } from 'react' import { useTranslation } from 'react-i18next' -import { useAssessment, useCycle } from '@client/store/assessment' -import { useCountryIso } from '@client/hooks' -import Icon from '@client/components/Icon' -import { DOMs } from '@client/utils/dom' +import { useAssessment, useCycle } from 'client/store/assessment' +import { useCountryIso } from 'client/hooks' +import Icon from 'client/components/Icon' +import { DOMs } from 'client/utils/dom' import resources from './resources' diff --git a/src/client/pages/AssessmentHome/AssessmentHome.tsx b/src/client/pages/AssessmentHome/AssessmentHome.tsx index 2b1362658e..310116b525 100644 --- a/src/client/pages/AssessmentHome/AssessmentHome.tsx +++ b/src/client/pages/AssessmentHome/AssessmentHome.tsx @@ -1,10 +1,10 @@ import './AssessmentHome.scss' import React from 'react' -import { AssessmentNames } from '@meta/assessment' +import { AssessmentNames } from 'meta/assessment' -import { useAssessment } from '@client/store/assessment' -import MessageCenter from '@client/components/MessageCenter' +import { useAssessment } from 'client/store/assessment' +import MessageCenter from 'client/components/MessageCenter' import FraHome from './FraHome' import PanEuropeanHome from './PanEuropeanHome' diff --git a/src/client/pages/AssessmentHome/FraHome/ButtonDownloadDashboard/ButtonDownloadDashboard.tsx b/src/client/pages/AssessmentHome/FraHome/ButtonDownloadDashboard/ButtonDownloadDashboard.tsx index 13704c31b7..3200e300e1 100644 --- a/src/client/pages/AssessmentHome/FraHome/ButtonDownloadDashboard/ButtonDownloadDashboard.tsx +++ b/src/client/pages/AssessmentHome/FraHome/ButtonDownloadDashboard/ButtonDownloadDashboard.tsx @@ -3,13 +3,13 @@ import React from 'react' import { useTranslation } from 'react-i18next' import { Link, matchPath, useLocation } from 'react-router-dom' -import { ApiEndPoint } from '@meta/api/endpoint' -import { AssessmentHomeRouteNames, ClientRoutes } from '@meta/app' -import { Areas } from '@meta/area' +import { ApiEndPoint } from 'meta/api/endpoint' +import { AssessmentHomeRouteNames, ClientRoutes } from 'meta/app' +import { Areas } from 'meta/area' -import { useAssessment, useCycle } from '@client/store/assessment' -import { useCountryIso } from '@client/hooks' -import Icon from '@client/components/Icon' +import { useAssessment, useCycle } from 'client/store/assessment' +import { useCountryIso } from 'client/hooks' +import Icon from 'client/components/Icon' const ButtonDownloadDashboard: React.FC = () => { const { pathname } = useLocation() diff --git a/src/client/pages/AssessmentHome/FraHome/Collaborators/Collaborators.tsx b/src/client/pages/AssessmentHome/FraHome/Collaborators/Collaborators.tsx index e5a65244f6..3caff6588d 100644 --- a/src/client/pages/AssessmentHome/FraHome/Collaborators/Collaborators.tsx +++ b/src/client/pages/AssessmentHome/FraHome/Collaborators/Collaborators.tsx @@ -1,13 +1,13 @@ import React from 'react' -import { Users } from '@meta/user' +import { Users } from 'meta/user' -import { useCycle } from '@client/store/assessment' -import { useUsers } from '@client/store/ui/userManagement' -import { useUser } from '@client/store/user' -import { useCountryIso } from '@client/hooks' -import InviteUserForm from '@client/components/InviteUserForm' -import UserList from '@client/components/UserList' +import { useCycle } from 'client/store/assessment' +import { useUsers } from 'client/store/ui/userManagement' +import { useUser } from 'client/store/user' +import { useCountryIso } from 'client/hooks' +import InviteUserForm from 'client/components/InviteUserForm' +import UserList from 'client/components/UserList' const Collaborators: React.FC = () => { const user = useUser() diff --git a/src/client/pages/AssessmentHome/FraHome/CountryMessageBoard/CountryMessageBoard.tsx b/src/client/pages/AssessmentHome/FraHome/CountryMessageBoard/CountryMessageBoard.tsx index 660721e0c3..d330946eb5 100644 --- a/src/client/pages/AssessmentHome/FraHome/CountryMessageBoard/CountryMessageBoard.tsx +++ b/src/client/pages/AssessmentHome/FraHome/CountryMessageBoard/CountryMessageBoard.tsx @@ -1,11 +1,11 @@ import './CountryMessageBoard.scss' import React from 'react' -import { Authorizer } from '@meta/user' +import { Authorizer } from 'meta/user' -import { useCycle } from '@client/store/assessment' -import { useUser } from '@client/store/user' -import { useCountryIso } from '@client/hooks' +import { useCycle } from 'client/store/assessment' +import { useUser } from 'client/store/user' +import { useCountryIso } from 'client/hooks' import MessageBoard from './MessageBoard' import MessageBoardUsers from './MessageBoardUsers' diff --git a/src/client/pages/AssessmentHome/FraHome/CountryMessageBoard/MessageBoard.tsx b/src/client/pages/AssessmentHome/FraHome/CountryMessageBoard/MessageBoard.tsx index d4b12c549f..f1016c9620 100644 --- a/src/client/pages/AssessmentHome/FraHome/CountryMessageBoard/MessageBoard.tsx +++ b/src/client/pages/AssessmentHome/FraHome/CountryMessageBoard/MessageBoard.tsx @@ -1,10 +1,10 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { Areas } from '@meta/area' -import { MessageTopicType, Topics } from '@meta/messageCenter' +import { Areas } from 'meta/area' +import { MessageTopicType, Topics } from 'meta/messageCenter' -import { useCountryIso } from '@client/hooks' +import { useCountryIso } from 'client/hooks' import MessageButton from './MessageButton' diff --git a/src/client/pages/AssessmentHome/FraHome/CountryMessageBoard/MessageBoardUsers.tsx b/src/client/pages/AssessmentHome/FraHome/CountryMessageBoard/MessageBoardUsers.tsx index 5be359e758..b8ffeed1ed 100644 --- a/src/client/pages/AssessmentHome/FraHome/CountryMessageBoard/MessageBoardUsers.tsx +++ b/src/client/pages/AssessmentHome/FraHome/CountryMessageBoard/MessageBoardUsers.tsx @@ -3,14 +3,14 @@ import { useTranslation } from 'react-i18next' import classNames from 'classnames' -import { ApiEndPoint } from '@meta/api/endpoint' -import { MessageTopicType, Topics } from '@meta/messageCenter' -import { Users } from '@meta/user' +import { ApiEndPoint } from 'meta/api/endpoint' +import { MessageTopicType, Topics } from 'meta/messageCenter' +import { Users } from 'meta/user' -import { useCycle } from '@client/store/assessment' -import { useUsers } from '@client/store/ui/userManagement' -import { useUser } from '@client/store/user' -import { useCountryIso } from '@client/hooks' +import { useCycle } from 'client/store/assessment' +import { useUsers } from 'client/store/ui/userManagement' +import { useUser } from 'client/store/user' +import { useCountryIso } from 'client/hooks' import MessageButton from './MessageButton' diff --git a/src/client/pages/AssessmentHome/FraHome/CountryMessageBoard/MessageButton/MessageButton.tsx b/src/client/pages/AssessmentHome/FraHome/CountryMessageBoard/MessageButton/MessageButton.tsx index 6a2ab292f9..b51e1ac6fe 100644 --- a/src/client/pages/AssessmentHome/FraHome/CountryMessageBoard/MessageButton/MessageButton.tsx +++ b/src/client/pages/AssessmentHome/FraHome/CountryMessageBoard/MessageButton/MessageButton.tsx @@ -2,15 +2,15 @@ import './MessageButton.scss' import React, { useEffect, useRef } from 'react' import { useTranslation } from 'react-i18next' -import { ApiEndPoint } from '@meta/api/endpoint' +import { ApiEndPoint } from 'meta/api/endpoint' -import { MessageTopicType } from '@meta/messageCenter' +import { MessageTopicType } from 'meta/messageCenter' -import { useAppDispatch } from '@client/store' -import { useAssessment, useCycle } from '@client/store/assessment' -import { MessageCenterActions } from '@client/store/ui/messageCenter' -import { useCountryIso, useGetRequest } from '@client/hooks' -import Icon from '@client/components/Icon' +import { useAppDispatch } from 'client/store' +import { useAssessment, useCycle } from 'client/store/assessment' +import { MessageCenterActions } from 'client/store/ui/messageCenter' +import { useCountryIso, useGetRequest } from 'client/hooks' +import Icon from 'client/components/Icon' type Props = { topicKey: string diff --git a/src/client/pages/AssessmentHome/FraHome/CountrySelector/CountrySelector.tsx b/src/client/pages/AssessmentHome/FraHome/CountrySelector/CountrySelector.tsx index 8d87e0e8f1..78d8421e48 100644 --- a/src/client/pages/AssessmentHome/FraHome/CountrySelector/CountrySelector.tsx +++ b/src/client/pages/AssessmentHome/FraHome/CountrySelector/CountrySelector.tsx @@ -1,16 +1,16 @@ import React, { useState } from 'react' import { useTranslation } from 'react-i18next' -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { CountryIso, Region, RegionCode } from '@meta/area' +import { CountryIso, Region, RegionCode } from 'meta/area' -import { useAppDispatch } from '@client/store' -import { useCountries } from '@client/store/assessment' -import { useSecondaryRegion } from '@client/store/assessment/hooks' -import { useHomeCountriesFilter } from '@client/store/ui/home' -import { HomeActions } from '@client/store/ui/home/slice' -import CountrySelectModal from '@client/components/CountrySelectModal' +import { useAppDispatch } from 'client/store' +import { useCountries } from 'client/store/assessment' +import { useSecondaryRegion } from 'client/store/assessment/hooks' +import { useHomeCountriesFilter } from 'client/store/ui/home' +import { HomeActions } from 'client/store/ui/home/slice' +import CountrySelectModal from 'client/components/CountrySelectModal' const __MIN_COUNTRIES__ = 9 diff --git a/src/client/pages/AssessmentHome/FraHome/FraHome.tsx b/src/client/pages/AssessmentHome/FraHome/FraHome.tsx index 6768c807a8..eab014ece6 100644 --- a/src/client/pages/AssessmentHome/FraHome/FraHome.tsx +++ b/src/client/pages/AssessmentHome/FraHome/FraHome.tsx @@ -4,11 +4,11 @@ import { Navigate, NavLink, Route, Routes } from 'react-router-dom' import classNames from 'classnames' -import { ClientRoutes } from '@meta/app' -import { Areas } from '@meta/area' +import { ClientRoutes } from 'meta/app' +import { Areas } from 'meta/area' -import { useCountryIso } from '@client/hooks' -import User from '@client/pages/User' +import { useCountryIso } from 'client/hooks' +import User from 'client/pages/User' import { useSections } from './hooks/useSections' import ButtonDownloadDashboard from './ButtonDownloadDashboard' diff --git a/src/client/pages/AssessmentHome/FraHome/Links/Links.tsx b/src/client/pages/AssessmentHome/FraHome/Links/Links.tsx index 8714187040..cc2b813f64 100644 --- a/src/client/pages/AssessmentHome/FraHome/Links/Links.tsx +++ b/src/client/pages/AssessmentHome/FraHome/Links/Links.tsx @@ -2,18 +2,18 @@ import './Links.scss' import React, { useCallback, useEffect, useRef } from 'react' import { useTranslation } from 'react-i18next' -import { ApiEndPoint } from '@meta/api/endpoint' -import { CountryIso } from '@meta/area' -import { Users } from '@meta/user' - -import { useAppDispatch } from '@client/store' -import { useAssessment, useCycle } from '@client/store/assessment' -import { AssessmentFilesActions } from '@client/store/ui/assessmentFiles' -import { useAssessmentFiles } from '@client/store/ui/assessmentFiles/hooks' -import { useUser } from '@client/store/user' -import { useCountryIso } from '@client/hooks' -import { useToaster } from '@client/hooks/useToaster' -import Icon from '@client/components/Icon' +import { ApiEndPoint } from 'meta/api/endpoint' +import { CountryIso } from 'meta/area' +import { Users } from 'meta/user' + +import { useAppDispatch } from 'client/store' +import { useAssessment, useCycle } from 'client/store/assessment' +import { AssessmentFilesActions } from 'client/store/ui/assessmentFiles' +import { useAssessmentFiles } from 'client/store/ui/assessmentFiles/hooks' +import { useUser } from 'client/store/user' +import { useCountryIso } from 'client/hooks' +import { useToaster } from 'client/hooks/useToaster' +import Icon from 'client/components/Icon' const Links: React.FC = () => { const dispatch = useAppDispatch() diff --git a/src/client/pages/AssessmentHome/FraHome/RecentActivity/RecentActivity.tsx b/src/client/pages/AssessmentHome/FraHome/RecentActivity/RecentActivity.tsx index 1d3fbb3573..4e749be129 100644 --- a/src/client/pages/AssessmentHome/FraHome/RecentActivity/RecentActivity.tsx +++ b/src/client/pages/AssessmentHome/FraHome/RecentActivity/RecentActivity.tsx @@ -2,14 +2,14 @@ import React, { useEffect, useRef } from 'react' import { useTranslation } from 'react-i18next' import { Link } from 'react-router-dom' -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { ApiEndPoint } from '@meta/api/endpoint' -import { ClientRoutes } from '@meta/app' -import { ActivityLog } from '@meta/assessment' +import { ApiEndPoint } from 'meta/api/endpoint' +import { ClientRoutes } from 'meta/app' +import { ActivityLog } from 'meta/assessment' -import { useAssessment, useCycle } from '@client/store/assessment' -import { useCountryIso, useGetRequest } from '@client/hooks' +import { useAssessment, useCycle } from 'client/store/assessment' +import { useCountryIso, useGetRequest } from 'client/hooks' import RecentActivityItem from './RecentActivityItem/RecentActivityItem' diff --git a/src/client/pages/AssessmentHome/FraHome/RecentActivity/RecentActivityItem/RecentActivityItem.tsx b/src/client/pages/AssessmentHome/FraHome/RecentActivity/RecentActivityItem/RecentActivityItem.tsx index 0761b19c52..74cd74eeca 100644 --- a/src/client/pages/AssessmentHome/FraHome/RecentActivity/RecentActivityItem/RecentActivityItem.tsx +++ b/src/client/pages/AssessmentHome/FraHome/RecentActivity/RecentActivityItem/RecentActivityItem.tsx @@ -5,14 +5,14 @@ import { Link } from 'react-router-dom' import classNames from 'classnames' -import { ApiEndPoint } from '@meta/api/endpoint' -import { ClientRoutes } from '@meta/app' -import { ActivityLog, ActivityLogs } from '@meta/assessment' -import { Users } from '@meta/user' - -import { useAssessment, useCycle } from '@client/store/assessment' -import { useCountryIso } from '@client/hooks' -import { Dates } from '@client/utils' +import { ApiEndPoint } from 'meta/api/endpoint' +import { ClientRoutes } from 'meta/app' +import { ActivityLog, ActivityLogs } from 'meta/assessment' +import { Users } from 'meta/user' + +import { useAssessment, useCycle } from 'client/store/assessment' +import { useCountryIso } from 'client/hooks' +import { Dates } from 'client/utils' type Props = { activity: ActivityLog diff --git a/src/client/pages/AssessmentHome/FraHome/SelectedCountries/SelectedCountries.tsx b/src/client/pages/AssessmentHome/FraHome/SelectedCountries/SelectedCountries.tsx index e10a2b87e9..29a95d6648 100644 --- a/src/client/pages/AssessmentHome/FraHome/SelectedCountries/SelectedCountries.tsx +++ b/src/client/pages/AssessmentHome/FraHome/SelectedCountries/SelectedCountries.tsx @@ -1,11 +1,11 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Areas, CountryIso } from '@meta/area' +import { Areas, CountryIso } from 'meta/area' -import { useHomeCountriesFilter } from '@client/store/ui/home' +import { useHomeCountriesFilter } from 'client/store/ui/home' const SelectedCountries: React.FC = () => { const { i18n } = useTranslation() diff --git a/src/client/pages/AssessmentHome/FraHome/hooks/useSections.tsx b/src/client/pages/AssessmentHome/FraHome/hooks/useSections.tsx index d7a2ea4127..5a607bbe37 100644 --- a/src/client/pages/AssessmentHome/FraHome/hooks/useSections.tsx +++ b/src/client/pages/AssessmentHome/FraHome/hooks/useSections.tsx @@ -1,11 +1,11 @@ import React from 'react' -import { Users } from '@meta/user' +import { Users } from 'meta/user' -import { useCycle } from '@client/store/assessment' -import { useUser } from '@client/store/user' -import { useCountryIso } from '@client/hooks' -import Dashboard from '@client/pages/Dashboard' +import { useCycle } from 'client/store/assessment' +import { useUser } from 'client/store/user' +import { useCountryIso } from 'client/hooks' +import Dashboard from 'client/pages/Dashboard' import Collaborators from '../Collaborators' import CountryMessageBoard from '../CountryMessageBoard' diff --git a/src/client/pages/AssessmentHome/PanEuropeanHome/PanEuropeanHome.tsx b/src/client/pages/AssessmentHome/PanEuropeanHome/PanEuropeanHome.tsx index ebb073ac9f..195d204a24 100644 --- a/src/client/pages/AssessmentHome/PanEuropeanHome/PanEuropeanHome.tsx +++ b/src/client/pages/AssessmentHome/PanEuropeanHome/PanEuropeanHome.tsx @@ -5,11 +5,11 @@ import { Navigate, NavLink, Route, Routes } from 'react-router-dom' import classNames from 'classnames' -import { AssessmentHomeRouteNames, ClientRoutes } from '@meta/app' -import { Areas } from '@meta/area' +import { AssessmentHomeRouteNames, ClientRoutes } from 'meta/app' +import { Areas } from 'meta/area' -import { useCountryIso } from '@client/hooks' -import User from '@client/pages/User' +import { useCountryIso } from 'client/hooks' +import User from 'client/pages/User' import { useSections } from './hooks/useSections' diff --git a/src/client/pages/AssessmentHome/PanEuropeanHome/hooks/useSections.tsx b/src/client/pages/AssessmentHome/PanEuropeanHome/hooks/useSections.tsx index 8299b36f1c..166febf543 100644 --- a/src/client/pages/AssessmentHome/PanEuropeanHome/hooks/useSections.tsx +++ b/src/client/pages/AssessmentHome/PanEuropeanHome/hooks/useSections.tsx @@ -1,13 +1,13 @@ import React from 'react' -import { Users } from '@meta/user' - -import { useCycle } from '@client/store/assessment' -import { useUser } from '@client/store/user' -import { useCountryIso } from '@client/hooks' -import Collaborators from '@client/pages/AssessmentHome/FraHome/Collaborators' -import CountryMessageBoard from '@client/pages/AssessmentHome/FraHome/CountryMessageBoard' -import RecentActivity from '@client/pages/AssessmentHome/FraHome/RecentActivity' +import { Users } from 'meta/user' + +import { useCycle } from 'client/store/assessment' +import { useUser } from 'client/store/user' +import { useCountryIso } from 'client/hooks' +import Collaborators from 'client/pages/AssessmentHome/FraHome/Collaborators' +import CountryMessageBoard from 'client/pages/AssessmentHome/FraHome/CountryMessageBoard' +import RecentActivity from 'client/pages/AssessmentHome/FraHome/RecentActivity' import Overview from '../Overview' diff --git a/src/client/pages/AssessmentPrint/AssessmentPrint.tsx b/src/client/pages/AssessmentPrint/AssessmentPrint.tsx index 53985f4751..4e5ccbff59 100644 --- a/src/client/pages/AssessmentPrint/AssessmentPrint.tsx +++ b/src/client/pages/AssessmentPrint/AssessmentPrint.tsx @@ -1,10 +1,10 @@ import './style.scss' import React, { memo } from 'react' -import { AssessmentNames } from '@meta/assessment' +import { AssessmentNames } from 'meta/assessment' -import { useAssessment } from '@client/store/assessment' -import Loading from '@client/components/Loading' +import { useAssessment } from 'client/store/assessment' +import Loading from 'client/components/Loading' import FraPrint from './FraPrint' diff --git a/src/client/pages/AssessmentPrint/FraPrint/ContactPersons/ContactPersons.tsx b/src/client/pages/AssessmentPrint/FraPrint/ContactPersons/ContactPersons.tsx index 45e45e8e79..7315222a7b 100644 --- a/src/client/pages/AssessmentPrint/FraPrint/ContactPersons/ContactPersons.tsx +++ b/src/client/pages/AssessmentPrint/FraPrint/ContactPersons/ContactPersons.tsx @@ -2,15 +2,15 @@ import './ContactPersons.scss' import React, { useEffect } from 'react' import { useTranslation } from 'react-i18next' -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { SubSections } from '@meta/assessment' -import { CollaboratorPermissions, RoleName, User, Users, UserStatus } from '@meta/user' +import { SubSections } from 'meta/assessment' +import { CollaboratorPermissions, RoleName, User, Users, UserStatus } from 'meta/user' -import { useAppDispatch } from '@client/store' -import { useAssessment, useAssessmentSections, useCycle } from '@client/store/assessment' -import { UserManagementActions, useUsers } from '@client/store/ui/userManagement' -import { useCountryIso } from '@client/hooks' +import { useAppDispatch } from 'client/store' +import { useAssessment, useAssessmentSections, useCycle } from 'client/store/assessment' +import { UserManagementActions, useUsers } from 'client/store/ui/userManagement' +import { useCountryIso } from 'client/hooks' const allowedRoleNames = [ RoleName.COLLABORATOR, diff --git a/src/client/pages/AssessmentPrint/FraPrint/FraPrint.tsx b/src/client/pages/AssessmentPrint/FraPrint/FraPrint.tsx index 3719ff6bf1..974fa7bbd6 100644 --- a/src/client/pages/AssessmentPrint/FraPrint/FraPrint.tsx +++ b/src/client/pages/AssessmentPrint/FraPrint/FraPrint.tsx @@ -2,15 +2,15 @@ import './FraPrint.scss' import React, { useEffect } from 'react' import { useTranslation } from 'react-i18next' -import { Labels } from '@meta/assessment' - -import { useAppDispatch } from '@client/store' -import { useAssessment, useAssessmentSections, useCountry, useCycle } from '@client/store/assessment' -import { MetadataActions } from '@client/store/metadata' -import { useCountryIso } from '@client/hooks' -import { useIsPrint } from '@client/hooks/useIsPath' -import Loading from '@client/components/Loading' -import AssessmentSection from '@client/pages/AssessmentSection' +import { Labels } from 'meta/assessment' + +import { useAppDispatch } from 'client/store' +import { useAssessment, useAssessmentSections, useCountry, useCycle } from 'client/store/assessment' +import { MetadataActions } from 'client/store/metadata' +import { useCountryIso } from 'client/hooks' +import { useIsPrint } from 'client/hooks/useIsPath' +import Loading from 'client/components/Loading' +import AssessmentSection from 'client/pages/AssessmentSection' import ContactPersons from './ContactPersons' import TableOfContent from './TableOfContent' diff --git a/src/client/pages/AssessmentPrint/FraPrint/TableOfContent/TableOfContent.tsx b/src/client/pages/AssessmentPrint/FraPrint/TableOfContent/TableOfContent.tsx index 14afebf660..1df2a6e407 100644 --- a/src/client/pages/AssessmentPrint/FraPrint/TableOfContent/TableOfContent.tsx +++ b/src/client/pages/AssessmentPrint/FraPrint/TableOfContent/TableOfContent.tsx @@ -2,9 +2,9 @@ import './TableOfContent.scss' import React from 'react' import { useTranslation } from 'react-i18next' -import { Labels } from '@meta/assessment' +import { Labels } from 'meta/assessment' -import { useAssessmentSections, useCycle } from '@client/store/assessment' +import { useAssessmentSections, useCycle } from 'client/store/assessment' type Props = { deskStudy: boolean diff --git a/src/client/pages/AssessmentPrint/OriginalDataPointsPrint/OriginalDataPointsPrint.tsx b/src/client/pages/AssessmentPrint/OriginalDataPointsPrint/OriginalDataPointsPrint.tsx index 811f9bff92..d95a07281c 100644 --- a/src/client/pages/AssessmentPrint/OriginalDataPointsPrint/OriginalDataPointsPrint.tsx +++ b/src/client/pages/AssessmentPrint/OriginalDataPointsPrint/OriginalDataPointsPrint.tsx @@ -1,12 +1,12 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import DataSources from '@client/pages/OriginalDataPoint/components/DataSources' -import ExtentOfForest from '@client/pages/OriginalDataPoint/components/ExtentOfForest' -import ForestCharacteristics from '@client/pages/OriginalDataPoint/components/ForestCharacteristics' -import NationalClasses from '@client/pages/OriginalDataPoint/components/NationalClasses' +import DataSources from 'client/pages/OriginalDataPoint/components/DataSources' +import ExtentOfForest from 'client/pages/OriginalDataPoint/components/ExtentOfForest' +import ForestCharacteristics from 'client/pages/OriginalDataPoint/components/ForestCharacteristics' +import NationalClasses from 'client/pages/OriginalDataPoint/components/NationalClasses' import { useOriginalDataPoints } from './useOriginalDataPoints' diff --git a/src/client/pages/AssessmentPrint/OriginalDataPointsPrint/useOriginalDataPoints.ts b/src/client/pages/AssessmentPrint/OriginalDataPointsPrint/useOriginalDataPoints.ts index 61637be975..4d9413864b 100644 --- a/src/client/pages/AssessmentPrint/OriginalDataPointsPrint/useOriginalDataPoints.ts +++ b/src/client/pages/AssessmentPrint/OriginalDataPointsPrint/useOriginalDataPoints.ts @@ -1,10 +1,10 @@ import { useEffect } from 'react' -import { ApiEndPoint } from '@meta/api/endpoint' -import { OriginalDataPoint } from '@meta/assessment' +import { ApiEndPoint } from 'meta/api/endpoint' +import { OriginalDataPoint } from 'meta/assessment' -import { useAssessment, useCycle } from '@client/store/assessment' -import { useCountryIso, useGetRequest } from '@client/hooks' +import { useAssessment, useCycle } from 'client/store/assessment' +import { useCountryIso, useGetRequest } from 'client/hooks' export const useOriginalDataPoints = (): { originalDataPoints: Array; loading: boolean } => { const assessment = useAssessment() diff --git a/src/client/pages/AssessmentSection/AssessmentSection.tsx b/src/client/pages/AssessmentSection/AssessmentSection.tsx index cc5a7d720b..9bc61f964b 100644 --- a/src/client/pages/AssessmentSection/AssessmentSection.tsx +++ b/src/client/pages/AssessmentSection/AssessmentSection.tsx @@ -3,15 +3,15 @@ import React from 'react' import { useTranslation } from 'react-i18next' import { useParams } from 'react-router-dom' -import { AssessmentName, Labels, SubSections } from '@meta/assessment' - -import { useAssessmentSection, useCycle } from '@client/store/assessment' -import { useIsSectionDataEmpty } from '@client/store/data' -import { useTableSections } from '@client/store/metadata' -import { useIsEditDescriptionsEnabled, useIsEditTableDataEnabled } from '@client/store/user/hooks' -import { useCountryIso } from '@client/hooks' -import { useIsPrint } from '@client/hooks/useIsPath' -import CommentableDescription from '@client/pages/AssessmentSection/Descriptions/CommentableDescription' +import { AssessmentName, Labels, SubSections } from 'meta/assessment' + +import { useAssessmentSection, useCycle } from 'client/store/assessment' +import { useIsSectionDataEmpty } from 'client/store/data' +import { useTableSections } from 'client/store/metadata' +import { useIsEditDescriptionsEnabled, useIsEditTableDataEnabled } from 'client/store/user/hooks' +import { useCountryIso } from 'client/hooks' +import { useIsPrint } from 'client/hooks/useIsPath' +import CommentableDescription from 'client/pages/AssessmentSection/Descriptions/CommentableDescription' import { useListenNodeUpdates } from './hooks/useListenNodeUpdates' import DataTable from './DataTable' diff --git a/src/client/pages/AssessmentSection/DataTable/Chart/chartContainer.tsx b/src/client/pages/AssessmentSection/DataTable/Chart/chartContainer.tsx index a3a7be38c8..76e9bc507d 100644 --- a/src/client/pages/AssessmentSection/DataTable/Chart/chartContainer.tsx +++ b/src/client/pages/AssessmentSection/DataTable/Chart/chartContainer.tsx @@ -2,13 +2,13 @@ import './style.scss' import React, { memo } from 'react' import { useTranslation } from 'react-i18next' -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { CountryIso } from '@meta/area' -import { RecordCountryData } from '@meta/data' +import { CountryIso } from 'meta/area' +import { RecordCountryData } from 'meta/data' -import { useCountryIso } from '@client/hooks' -import { useIsPrint } from '@client/hooks/useIsPath' +import { useCountryIso } from 'client/hooks' +import { useIsPrint } from 'client/hooks/useIsPath' import DataTrend from './components/dataTrend' import Legend from './components/legend' diff --git a/src/client/pages/AssessmentSection/DataTable/Chart/chartWrapper.tsx b/src/client/pages/AssessmentSection/DataTable/Chart/chartWrapper.tsx index 595a10b52f..76593113ea 100644 --- a/src/client/pages/AssessmentSection/DataTable/Chart/chartWrapper.tsx +++ b/src/client/pages/AssessmentSection/DataTable/Chart/chartWrapper.tsx @@ -1,10 +1,10 @@ import React, { useEffect, useRef, useState } from 'react' -import { RecordCountryData } from '@meta/data' +import { RecordCountryData } from 'meta/data' -import { useOnResize } from '@client/hooks' -import { useIsPrint } from '@client/hooks/useIsPath' -import { DOMs } from '@client/utils/dom' +import { useOnResize } from 'client/hooks' +import { useIsPrint } from 'client/hooks/useIsPath' +import { DOMs } from 'client/utils/dom' import ChartContainer from './chartContainer' diff --git a/src/client/pages/AssessmentSection/DataTable/Chart/components/dataPath.tsx b/src/client/pages/AssessmentSection/DataTable/Chart/components/dataPath.tsx index abd705162c..632ed11471 100644 --- a/src/client/pages/AssessmentSection/DataTable/Chart/components/dataPath.tsx +++ b/src/client/pages/AssessmentSection/DataTable/Chart/components/dataPath.tsx @@ -3,7 +3,7 @@ import React, { useEffect, useRef } from 'react' import * as d3 from 'd3' import { interpolatePath } from 'd3-interpolate-path' -import { usePrevious } from '@client/hooks' +import { usePrevious } from 'client/hooks' import * as Chart from '../chart' diff --git a/src/client/pages/AssessmentSection/DataTable/Chart/components/dataPoints.tsx b/src/client/pages/AssessmentSection/DataTable/Chart/components/dataPoints.tsx index d57309b09e..87bf49b126 100644 --- a/src/client/pages/AssessmentSection/DataTable/Chart/components/dataPoints.tsx +++ b/src/client/pages/AssessmentSection/DataTable/Chart/components/dataPoints.tsx @@ -3,7 +3,7 @@ import ReactDOM from 'react-dom' import ReactDOMServer from 'react-dom/server' import { useTranslation } from 'react-i18next' -import { Numbers } from '@utils/numbers' +import { Numbers } from 'utils/numbers' import * as d3 from 'd3' import d3Tip from 'd3-tip' diff --git a/src/client/pages/AssessmentSection/DataTable/Chart/components/dataTrend.tsx b/src/client/pages/AssessmentSection/DataTable/Chart/components/dataTrend.tsx index 913695455f..bc8aaa4dee 100644 --- a/src/client/pages/AssessmentSection/DataTable/Chart/components/dataTrend.tsx +++ b/src/client/pages/AssessmentSection/DataTable/Chart/components/dataTrend.tsx @@ -1,6 +1,6 @@ import React, { memo } from 'react' -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' import { getTrendOdps } from '../chart' import DataPath from './dataPath' diff --git a/src/client/pages/AssessmentSection/DataTable/Chart/components/noDataPlaceholder.tsx b/src/client/pages/AssessmentSection/DataTable/Chart/components/noDataPlaceholder.tsx index 8c11de9993..6fe8efff31 100644 --- a/src/client/pages/AssessmentSection/DataTable/Chart/components/noDataPlaceholder.tsx +++ b/src/client/pages/AssessmentSection/DataTable/Chart/components/noDataPlaceholder.tsx @@ -3,7 +3,7 @@ import { useTranslation } from 'react-i18next' import * as d3 from 'd3' -import { usePrevious } from '@client/hooks' +import { usePrevious } from 'client/hooks' import { defaultTransitionDuration, hasData as _hasData } from '../chart' diff --git a/src/client/pages/AssessmentSection/DataTable/DataTable.tsx b/src/client/pages/AssessmentSection/DataTable/DataTable.tsx index 1f0c93888b..10722ed1bb 100644 --- a/src/client/pages/AssessmentSection/DataTable/DataTable.tsx +++ b/src/client/pages/AssessmentSection/DataTable/DataTable.tsx @@ -2,14 +2,14 @@ import './DataTable.scss' import React from 'react' import { useTranslation } from 'react-i18next' -import { AssessmentName, Table as TableType } from '@meta/assessment' -import { RecordAssessmentDatas } from '@meta/data' +import { AssessmentName, Table as TableType } from 'meta/assessment' +import { RecordAssessmentDatas } from 'meta/data' -import { useCycle } from '@client/store/assessment' -import { useTableData } from '@client/store/data' -import { useIsEditTableDataEnabled } from '@client/store/user' -import { useCountryIso } from '@client/hooks' -import { useIsPrint } from '@client/hooks/useIsPath' +import { useCycle } from 'client/store/assessment' +import { useTableData } from 'client/store/data' +import { useIsEditTableDataEnabled } from 'client/store/user' +import { useCountryIso } from 'client/hooks' +import { useIsPrint } from 'client/hooks/useIsPath' import { useGetTableData } from './hooks/useGetTableData' import { useODPDeleteListener } from './hooks/useODPDeleteListener' diff --git a/src/client/pages/AssessmentSection/DataTable/GenerateValues/FieldsOption/FieldsOption.tsx b/src/client/pages/AssessmentSection/DataTable/GenerateValues/FieldsOption/FieldsOption.tsx index 0823f03238..14a69e5189 100644 --- a/src/client/pages/AssessmentSection/DataTable/GenerateValues/FieldsOption/FieldsOption.tsx +++ b/src/client/pages/AssessmentSection/DataTable/GenerateValues/FieldsOption/FieldsOption.tsx @@ -1,9 +1,9 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import ButtonCheckBox from '@client/components/ButtonCheckBox' +import ButtonCheckBox from 'client/components/ButtonCheckBox' import { GenerateValuesField } from '../field' import { Method } from '../method' diff --git a/src/client/pages/AssessmentSection/DataTable/GenerateValues/GenerateValues.tsx b/src/client/pages/AssessmentSection/DataTable/GenerateValues/GenerateValues.tsx index 127ed092c2..704cf1653f 100644 --- a/src/client/pages/AssessmentSection/DataTable/GenerateValues/GenerateValues.tsx +++ b/src/client/pages/AssessmentSection/DataTable/GenerateValues/GenerateValues.tsx @@ -2,10 +2,10 @@ import './GenerateValues.scss' import React, { useState } from 'react' import { useTranslation } from 'react-i18next' -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { AssessmentName, CycleName, Row } from '@meta/assessment' -import { RecordAssessmentData } from '@meta/data' +import { AssessmentName, CycleName, Row } from 'meta/assessment' +import { RecordAssessmentData } from 'meta/data' import FieldsOption from './FieldsOption' import { Method } from './method' diff --git a/src/client/pages/AssessmentSection/DataTable/GenerateValues/method.ts b/src/client/pages/AssessmentSection/DataTable/GenerateValues/method.ts index affff4dbd7..f6c1cdbd24 100644 --- a/src/client/pages/AssessmentSection/DataTable/GenerateValues/method.ts +++ b/src/client/pages/AssessmentSection/DataTable/GenerateValues/method.ts @@ -1,8 +1,8 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { NodeValue } from '@meta/assessment' +import { NodeValue } from 'meta/assessment' -import { GenerateValuesField } from '@client/pages/AssessmentSection/DataTable/GenerateValues/field' +import { GenerateValuesField } from 'client/pages/AssessmentSection/DataTable/GenerateValues/field' export enum Method { placeholder = 'placeholder', diff --git a/src/client/pages/AssessmentSection/DataTable/GenerateValues/useGenerateValues.ts b/src/client/pages/AssessmentSection/DataTable/GenerateValues/useGenerateValues.ts index 1983791ea3..02e07dbc0a 100644 --- a/src/client/pages/AssessmentSection/DataTable/GenerateValues/useGenerateValues.ts +++ b/src/client/pages/AssessmentSection/DataTable/GenerateValues/useGenerateValues.ts @@ -1,14 +1,14 @@ import { useState } from 'react' import { useTranslation } from 'react-i18next' -import { AssessmentName, ColType, CycleName, Row, RowType } from '@meta/assessment' -import { RecordAssessmentData, RecordAssessmentDatas, RecordCountryData } from '@meta/data' +import { AssessmentName, ColType, CycleName, Row, RowType } from 'meta/assessment' +import { RecordAssessmentData, RecordAssessmentDatas, RecordCountryData } from 'meta/data' -import { useAppDispatch } from '@client/store' -import { useCycle } from '@client/store/assessment' -import { DataActions } from '@client/store/data' -import { useIsEstimationPending } from '@client/store/ui/assessmentSection' -import { useCountryIso } from '@client/hooks' +import { useAppDispatch } from 'client/store' +import { useCycle } from 'client/store/assessment' +import { DataActions } from 'client/store/data' +import { useIsEstimationPending } from 'client/store/ui/assessmentSection' +import { useCountryIso } from 'client/hooks' import { GenerateValuesField } from './field' import { Method, Methods } from './method' diff --git a/src/client/pages/AssessmentSection/DataTable/Table/ButtonCopyValues/ButtonCopyValues.tsx b/src/client/pages/AssessmentSection/DataTable/Table/ButtonCopyValues/ButtonCopyValues.tsx index 6ff307b122..a20c6adc52 100644 --- a/src/client/pages/AssessmentSection/DataTable/Table/ButtonCopyValues/ButtonCopyValues.tsx +++ b/src/client/pages/AssessmentSection/DataTable/Table/ButtonCopyValues/ButtonCopyValues.tsx @@ -2,10 +2,10 @@ import './ButtonCopyValues.scss' import React, { MutableRefObject, useCallback } from 'react' import { useTranslation } from 'react-i18next' -import { Table, TableNames } from '@meta/assessment' +import { Table, TableNames } from 'meta/assessment' -import { useUser } from '@client/store/user' -import { getData } from '@client/components/ButtonTableExport/utils' +import { useUser } from 'client/store/user' +import { getData } from 'client/components/ButtonTableExport/utils' type CopyValuesProps = { tableRef: MutableRefObject diff --git a/src/client/pages/AssessmentSection/DataTable/Table/DataValidations/DataValidations.tsx b/src/client/pages/AssessmentSection/DataTable/Table/DataValidations/DataValidations.tsx index 9011c42e38..4ed08ec3d0 100644 --- a/src/client/pages/AssessmentSection/DataTable/Table/DataValidations/DataValidations.tsx +++ b/src/client/pages/AssessmentSection/DataTable/Table/DataValidations/DataValidations.tsx @@ -2,13 +2,13 @@ import './DataValidations.scss' import React from 'react' import { useTranslation } from 'react-i18next' -import { Table } from '@meta/assessment' -import { RecordAssessmentDatas } from '@meta/data' +import { Table } from 'meta/assessment' +import { RecordAssessmentDatas } from 'meta/data' -import { useAssessment, useCycle } from '@client/store/assessment' -import { useTableData } from '@client/store/data' -import { useCountryIso } from '@client/hooks' -import Icon from '@client/components/Icon' +import { useAssessment, useCycle } from 'client/store/assessment' +import { useTableData } from 'client/store/data' +import { useCountryIso } from 'client/hooks' +import Icon from 'client/components/Icon' type Props = { table: Table diff --git a/src/client/pages/AssessmentSection/DataTable/Table/Row/Row.ts b/src/client/pages/AssessmentSection/DataTable/Table/Row/Row.ts index 95e0af9572..1a579cc25d 100644 --- a/src/client/pages/AssessmentSection/DataTable/Table/Row/Row.ts +++ b/src/client/pages/AssessmentSection/DataTable/Table/Row/Row.ts @@ -1,6 +1,6 @@ import React from 'react' -import { RowType } from '@meta/assessment' +import { RowType } from 'meta/assessment' import { Props } from './props' import RowData from './RowData' diff --git a/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Calculated/Calculated.tsx b/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Calculated/Calculated.tsx index 65dd3cd8f3..7d35ae57ad 100644 --- a/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Calculated/Calculated.tsx +++ b/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Calculated/Calculated.tsx @@ -1,6 +1,6 @@ import React from 'react' -import { Numbers } from '@utils/numbers' +import { Numbers } from 'utils/numbers' import { PropsCell } from '../props' diff --git a/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Cell.tsx b/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Cell.tsx index 2041f70523..f428245e10 100644 --- a/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Cell.tsx +++ b/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Cell.tsx @@ -3,14 +3,14 @@ import React from 'react' import classNames from 'classnames' -import { AssessmentName, Col, Cols, ColType, NodeValueValidations, Row, Table } from '@meta/assessment' -import { RecordAssessmentData, RecordAssessmentDatas } from '@meta/data' -import { TooltipId } from '@meta/tooltip' -import { Authorizer } from '@meta/user' - -import { useAssessment, useAssessmentSection, useCountry, useCycle } from '@client/store/assessment' -import { useUser } from '@client/store/user' -import { useCountryIso } from '@client/hooks' +import { AssessmentName, Col, Cols, ColType, NodeValueValidations, Row, Table } from 'meta/assessment' +import { RecordAssessmentData, RecordAssessmentDatas } from 'meta/data' +import { TooltipId } from 'meta/tooltip' +import { Authorizer } from 'meta/user' + +import { useAssessment, useAssessmentSection, useCountry, useCycle } from 'client/store/assessment' +import { useUser } from 'client/store/user' +import { useCountryIso } from 'client/hooks' import useClassName from './hooks/useClassName' import useErrorMessages from './hooks/useErrorMessages' diff --git a/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Multiselect/Multiselect.tsx b/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Multiselect/Multiselect.tsx index 664e8ffe3b..cfe28df934 100644 --- a/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Multiselect/Multiselect.tsx +++ b/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Multiselect/Multiselect.tsx @@ -1,8 +1,8 @@ import React, { useEffect, useRef } from 'react' -import MultiSelect from '@client/components/MultiSelect' -import { PropsCell } from '@client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/props' -import { DOMs } from '@client/utils/dom' +import MultiSelect from 'client/components/MultiSelect' +import { PropsCell } from 'client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/props' +import { DOMs } from 'client/utils/dom' const Multiselect: React.FC = (props) => { const { onChangeNodeValue, col, nodeValue, disabled } = props diff --git a/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Number/Number.tsx b/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Number/Number.tsx index 36aee6fa57..02e4a6785c 100644 --- a/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Number/Number.tsx +++ b/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Number/Number.tsx @@ -1,9 +1,9 @@ import React from 'react' -import { ColType } from '@meta/assessment' +import { ColType } from 'meta/assessment' -import ThousandSeparatedDecimalInput from '@client/components/ThousandSeparatedDecimalInput' -import ThousandSeparatedIntegerInput from '@client/components/ThousandSeparatedIntegerInput' +import ThousandSeparatedDecimalInput from 'client/components/ThousandSeparatedDecimalInput' +import ThousandSeparatedIntegerInput from 'client/components/ThousandSeparatedIntegerInput' import { PropsCell } from '../props' diff --git a/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Placeholder/Placeholder.tsx b/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Placeholder/Placeholder.tsx index 6078017037..399d912c06 100644 --- a/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Placeholder/Placeholder.tsx +++ b/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Placeholder/Placeholder.tsx @@ -1,9 +1,9 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { Cols } from '@meta/assessment' +import { Cols } from 'meta/assessment' -import { useCycle } from '@client/store/assessment' +import { useCycle } from 'client/store/assessment' import { PropsCell } from '../props' diff --git a/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Select/OptionNotSelected.tsx b/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Select/OptionNotSelected.tsx index ba1dabd1ee..fcfe3925be 100644 --- a/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Select/OptionNotSelected.tsx +++ b/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Select/OptionNotSelected.tsx @@ -1,3 +1,3 @@ -import { ColSelectOption } from '@meta/assessment' +import { ColSelectOption } from 'meta/assessment' export const optionNotSelected: ColSelectOption = { name: 'notSelected', hidden: false } diff --git a/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Select/Select.tsx b/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Select/Select.tsx index 4943f5d4e5..703bfa333f 100644 --- a/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Select/Select.tsx +++ b/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Select/Select.tsx @@ -3,11 +3,11 @@ import { useTranslation } from 'react-i18next' import { i18n } from 'i18next' -import { ColSelectOption } from '@meta/assessment' +import { ColSelectOption } from 'meta/assessment' -import { PropsCell } from '@client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/props' -import { optionNotSelected } from '@client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Select/OptionNotSelected' -import { DOMs } from '@client/utils/dom' +import { PropsCell } from 'client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/props' +import { optionNotSelected } from 'client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Select/OptionNotSelected' +import { DOMs } from 'client/utils/dom' const getOptionLabel = (option: ColSelectOption, i18n: i18n, labelKeyPrefix: string): string => { const label = Number.isInteger(+option.name) ? option.name : i18n.t(`${labelKeyPrefix}.${option.name}`) diff --git a/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Taxon/Taxon.tsx b/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Taxon/Taxon.tsx index 3fe95267bb..8dcaad93e8 100644 --- a/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Taxon/Taxon.tsx +++ b/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Taxon/Taxon.tsx @@ -2,10 +2,10 @@ import React from 'react' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { Taxon as TaxonType } from '@meta/extData/taxon' +import { ApiEndPoint } from 'meta/api/endpoint' +import { Taxon as TaxonType } from 'meta/extData/taxon' -import Autocomplete from '@client/components/Autocomplete' +import Autocomplete from 'client/components/Autocomplete' import { PropsCell } from '../props' diff --git a/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Text/Text.tsx b/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Text/Text.tsx index a0a824821f..b4202a845c 100644 --- a/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Text/Text.tsx +++ b/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Text/Text.tsx @@ -1,10 +1,10 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { ColType } from '@meta/assessment' +import { ColType } from 'meta/assessment' -import TextInput from '@client/components/TextInput' -import VerticallyGrowingTextField from '@client/components/VerticallyGrowingTextField' +import TextInput from 'client/components/TextInput' +import VerticallyGrowingTextField from 'client/components/VerticallyGrowingTextField' import { PropsCell } from '../props' diff --git a/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/hooks/useClassName.ts b/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/hooks/useClassName.ts index 0357382a2b..224af404ee 100644 --- a/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/hooks/useClassName.ts +++ b/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/hooks/useClassName.ts @@ -1,4 +1,4 @@ -import { Col, Cols, ColType, Cycle, Row } from '@meta/assessment' +import { Col, Cols, ColType, Cycle, Row } from 'meta/assessment' type Props = { cycle: Cycle diff --git a/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/hooks/useErrorMessages.tsx b/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/hooks/useErrorMessages.tsx index 236cf20c48..c761571edf 100644 --- a/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/hooks/useErrorMessages.tsx +++ b/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/hooks/useErrorMessages.tsx @@ -2,7 +2,7 @@ import React from 'react' import ReactDOMServer from 'react-dom/server' import { TFunction, useTranslation } from 'react-i18next' -import { NodeValue, NodeValueValidationMessageParam } from '@meta/assessment' +import { NodeValue, NodeValueValidationMessageParam } from 'meta/assessment' type Props = { nodeValue: NodeValue diff --git a/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/hooks/useOnChange.ts b/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/hooks/useOnChange.ts index d56af08998..6cca256e0b 100644 --- a/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/hooks/useOnChange.ts +++ b/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/hooks/useOnChange.ts @@ -1,14 +1,14 @@ import React from 'react' -import { NodesBodyValue } from '@meta/api/request' -import { Col, Cols, ColType, NodeValue, Row, RowType, Table } from '@meta/assessment' -import { RecordAssessmentData, RecordAssessmentDatas } from '@meta/data' - -import { useAppDispatch } from '@client/store' -import { useAssessment, useAssessmentSection, useCycle } from '@client/store/assessment' -import { DataActions } from '@client/store/data' -import { useCountryIso } from '@client/hooks' -import { Sanitizer } from '@client/utils/sanitizer' +import { NodesBodyValue } from 'meta/api/request' +import { Col, Cols, ColType, NodeValue, Row, RowType, Table } from 'meta/assessment' +import { RecordAssessmentData, RecordAssessmentDatas } from 'meta/data' + +import { useAppDispatch } from 'client/store' +import { useAssessment, useAssessmentSection, useCycle } from 'client/store/assessment' +import { DataActions } from 'client/store/data' +import { useCountryIso } from 'client/hooks' +import { Sanitizer } from 'client/utils/sanitizer' type Props = { table: Table diff --git a/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/props.ts b/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/props.ts index 21dc7fa830..cf28a6dfb7 100644 --- a/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/props.ts +++ b/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/props.ts @@ -1,4 +1,4 @@ -import { AssessmentName, Col, NodeValue, Row, Table } from '@meta/assessment' +import { AssessmentName, Col, NodeValue, Row, Table } from 'meta/assessment' import { OnChange, OnChangeNodeValue, OnPaste } from './hooks/useOnChange' diff --git a/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/CellHeader/CellHeader.tsx b/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/CellHeader/CellHeader.tsx index e809706463..5b0e1aad97 100644 --- a/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/CellHeader/CellHeader.tsx +++ b/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/CellHeader/CellHeader.tsx @@ -4,11 +4,11 @@ import { Link } from 'react-router-dom' import classNames from 'classnames' -import { ClientRoutes } from '@meta/app' -import { AssessmentName, Col, Cols, Row } from '@meta/assessment' +import { ClientRoutes } from 'meta/app' +import { AssessmentName, Col, Cols, Row } from 'meta/assessment' -import { useCycle } from '@client/store/assessment' -import { useCountryIso } from '@client/hooks' +import { useCycle } from 'client/store/assessment' +import { useCountryIso } from 'client/hooks' const CellHeader: React.FC<{ assessmentName: AssessmentName; col: Col; row: Row }> = (props) => { const { assessmentName, col, row } = props diff --git a/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/RowData.tsx b/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/RowData.tsx index 6567445aea..6fde42b487 100644 --- a/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/RowData.tsx +++ b/src/client/pages/AssessmentSection/DataTable/Table/Row/RowData/RowData.tsx @@ -1,12 +1,12 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { Cols, ColType } from '@meta/assessment' -import { Topics } from '@meta/messageCenter' +import { Cols, ColType } from 'meta/assessment' +import { Topics } from 'meta/messageCenter' -import { useCycle } from '@client/store/assessment' -import { useTopicKeys } from '@client/store/ui/messageCenter/hooks' -import ReviewIndicator from '@client/components/ReviewIndicator' +import { useCycle } from 'client/store/assessment' +import { useTopicKeys } from 'client/store/ui/messageCenter/hooks' +import ReviewIndicator from 'client/components/ReviewIndicator' import { Props } from '../props' import Cell from './Cell' diff --git a/src/client/pages/AssessmentSection/DataTable/Table/Row/RowNoticeMessage/RowNoticeMessage.tsx b/src/client/pages/AssessmentSection/DataTable/Table/Row/RowNoticeMessage/RowNoticeMessage.tsx index a778bbaf75..ad6cda0784 100644 --- a/src/client/pages/AssessmentSection/DataTable/Table/Row/RowNoticeMessage/RowNoticeMessage.tsx +++ b/src/client/pages/AssessmentSection/DataTable/Table/Row/RowNoticeMessage/RowNoticeMessage.tsx @@ -1,9 +1,9 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { Cols } from '@meta/assessment' +import { Cols } from 'meta/assessment' -import { useCycle } from '@client/store/assessment' +import { useCycle } from 'client/store/assessment' import { Props } from '../props' diff --git a/src/client/pages/AssessmentSection/DataTable/Table/Row/props.ts b/src/client/pages/AssessmentSection/DataTable/Table/Row/props.ts index 32dc557a75..8abf749bf0 100644 --- a/src/client/pages/AssessmentSection/DataTable/Table/Row/props.ts +++ b/src/client/pages/AssessmentSection/DataTable/Table/Row/props.ts @@ -1,5 +1,5 @@ -import { AssessmentName, Row, Table } from '@meta/assessment' -import { RecordAssessmentData } from '@meta/data' +import { AssessmentName, Row, Table } from 'meta/assessment' +import { RecordAssessmentData } from 'meta/data' export type Props = { assessmentName: AssessmentName diff --git a/src/client/pages/AssessmentSection/DataTable/Table/Table.tsx b/src/client/pages/AssessmentSection/DataTable/Table/Table.tsx index 17560f0b84..d76810be8a 100644 --- a/src/client/pages/AssessmentSection/DataTable/Table/Table.tsx +++ b/src/client/pages/AssessmentSection/DataTable/Table/Table.tsx @@ -2,19 +2,19 @@ import React, { useRef } from 'react' import classNames from 'classnames' -import { AssessmentName, Table as TableType } from '@meta/assessment' -import { RecordAssessmentData } from '@meta/data' - -import { useCycle } from '@client/store/assessment' -import { useShowOriginalDatapoints } from '@client/store/ui/assessmentSection/hooks' -import { useIsDataLocked } from '@client/store/ui/dataLock' -import { useCountryIso } from '@client/hooks' -import { useIsPrint } from '@client/hooks/useIsPath' -import ButtonTableClear from '@client/components/ButtonTableClear' -import ButtonTableExport from '@client/components/ButtonTableExport' -import ButtonCopyValues from '@client/pages/AssessmentSection/DataTable/Table/ButtonCopyValues' -import TableBody from '@client/pages/AssessmentSection/DataTable/Table/TableBody' -import TableHead from '@client/pages/AssessmentSection/DataTable/Table/TableHead' +import { AssessmentName, Table as TableType } from 'meta/assessment' +import { RecordAssessmentData } from 'meta/data' + +import { useCycle } from 'client/store/assessment' +import { useShowOriginalDatapoints } from 'client/store/ui/assessmentSection/hooks' +import { useIsDataLocked } from 'client/store/ui/dataLock' +import { useCountryIso } from 'client/hooks' +import { useIsPrint } from 'client/hooks/useIsPath' +import ButtonTableClear from 'client/components/ButtonTableClear' +import ButtonTableExport from 'client/components/ButtonTableExport' +import ButtonCopyValues from 'client/pages/AssessmentSection/DataTable/Table/ButtonCopyValues' +import TableBody from 'client/pages/AssessmentSection/DataTable/Table/TableBody' +import TableHead from 'client/pages/AssessmentSection/DataTable/Table/TableHead' import { parseTable } from './utils/parseTable' import DataValidations from './DataValidations' diff --git a/src/client/pages/AssessmentSection/DataTable/Table/TableBody/TableBody.tsx b/src/client/pages/AssessmentSection/DataTable/Table/TableBody/TableBody.tsx index d9ed9ec4e8..5587160306 100644 --- a/src/client/pages/AssessmentSection/DataTable/Table/TableBody/TableBody.tsx +++ b/src/client/pages/AssessmentSection/DataTable/Table/TableBody/TableBody.tsx @@ -1,9 +1,9 @@ import React from 'react' -import { Row as TypeRow, RowType, Table } from '@meta/assessment' -import { RecordAssessmentData } from '@meta/data' +import { Row as TypeRow, RowType, Table } from 'meta/assessment' +import { RecordAssessmentData } from 'meta/data' -import Row from '@client/pages/AssessmentSection/DataTable/Table/Row' +import Row from 'client/pages/AssessmentSection/DataTable/Table/Row' type Props = { disabled: boolean diff --git a/src/client/pages/AssessmentSection/DataTable/Table/TableHead/OdpHeaderCell/OdpHeaderCell.tsx b/src/client/pages/AssessmentSection/DataTable/Table/TableHead/OdpHeaderCell/OdpHeaderCell.tsx index ba2518b8d7..137eb33080 100644 --- a/src/client/pages/AssessmentSection/DataTable/Table/TableHead/OdpHeaderCell/OdpHeaderCell.tsx +++ b/src/client/pages/AssessmentSection/DataTable/Table/TableHead/OdpHeaderCell/OdpHeaderCell.tsx @@ -2,14 +2,14 @@ import React from 'react' import { useTranslation } from 'react-i18next' import { Link } from 'react-router-dom' -import { ClientRoutes } from '@meta/app' -import { TooltipId } from '@meta/tooltip' +import { ClientRoutes } from 'meta/app' +import { TooltipId } from 'meta/tooltip' -import { useAssessment, useCycle } from '@client/store/assessment' -import { useOdpReviewSummary } from '@client/store/ui/review/hooks' -import { useCountryIso } from '@client/hooks' -import { useIsPrint } from '@client/hooks/useIsPath' -import ReviewSummaryIndicator from '@client/components/ReviewSummaryIndicator' +import { useAssessment, useCycle } from 'client/store/assessment' +import { useOdpReviewSummary } from 'client/store/ui/review/hooks' +import { useCountryIso } from 'client/hooks' +import { useIsPrint } from 'client/hooks/useIsPath' +import ReviewSummaryIndicator from 'client/components/ReviewSummaryIndicator' type Props = { className: string diff --git a/src/client/pages/AssessmentSection/DataTable/Table/TableHead/TableHead.tsx b/src/client/pages/AssessmentSection/DataTable/Table/TableHead/TableHead.tsx index 08f42d5e16..b592645e93 100644 --- a/src/client/pages/AssessmentSection/DataTable/Table/TableHead/TableHead.tsx +++ b/src/client/pages/AssessmentSection/DataTable/Table/TableHead/TableHead.tsx @@ -1,13 +1,13 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { Col as TypeCol, Cols, Row as TypeRow, RowType, Table } from '@meta/assessment' -import { RecordAssessmentData } from '@meta/data' +import { Col as TypeCol, Cols, Row as TypeRow, RowType, Table } from 'meta/assessment' +import { RecordAssessmentData } from 'meta/data' -import { useAssessmentCountry, useCycle } from '@client/store/assessment' -import { useOriginalDataPointYears } from '@client/store/data' -import { useShowOriginalDatapoints } from '@client/store/ui/assessmentSection' -import { getODPColSpan } from '@client/pages/AssessmentSection/DataTable/Table/utils/getODPColSpan' +import { useAssessmentCountry, useCycle } from 'client/store/assessment' +import { useOriginalDataPointYears } from 'client/store/data' +import { useShowOriginalDatapoints } from 'client/store/ui/assessmentSection' +import { getODPColSpan } from 'client/pages/AssessmentSection/DataTable/Table/utils/getODPColSpan' import OdpHeaderCell from './OdpHeaderCell' diff --git a/src/client/pages/AssessmentSection/DataTable/Table/utils/getODPColSpan.ts b/src/client/pages/AssessmentSection/DataTable/Table/utils/getODPColSpan.ts index 5e19703e26..6b0785579b 100644 --- a/src/client/pages/AssessmentSection/DataTable/Table/utils/getODPColSpan.ts +++ b/src/client/pages/AssessmentSection/DataTable/Table/utils/getODPColSpan.ts @@ -1,8 +1,8 @@ -import { Arrays } from '@utils/arrays' -import { Objects } from '@utils/objects' +import { Arrays } from 'utils/arrays' +import { Objects } from 'utils/objects' -import { AssessmentName, CycleName, Table } from '@meta/assessment' -import { RecordAssessmentData, RecordAssessmentDatas } from '@meta/data' +import { AssessmentName, CycleName, Table } from 'meta/assessment' +import { RecordAssessmentData, RecordAssessmentDatas } from 'meta/data' export const getODPColSpan = (props: { assessmentName: AssessmentName diff --git a/src/client/pages/AssessmentSection/DataTable/Table/utils/parseTable.ts b/src/client/pages/AssessmentSection/DataTable/Table/utils/parseTable.ts index f3514142de..e72432edf7 100644 --- a/src/client/pages/AssessmentSection/DataTable/Table/utils/parseTable.ts +++ b/src/client/pages/AssessmentSection/DataTable/Table/utils/parseTable.ts @@ -1,9 +1,9 @@ -import { Arrays } from '@utils/arrays' -import { UUIDs } from '@utils/uuids' +import { Arrays } from 'utils/arrays' +import { UUIDs } from 'utils/uuids' -import { CountryIso } from '@meta/area' -import { AssessmentName, Col as TypeCol, Cycle, Row as TypeRow, RowType, Table } from '@meta/assessment' -import { RecordAssessmentData, RecordAssessmentDatas } from '@meta/data' +import { CountryIso } from 'meta/area' +import { AssessmentName, Col as TypeCol, Cycle, Row as TypeRow, RowType, Table } from 'meta/assessment' +import { RecordAssessmentData, RecordAssessmentDatas } from 'meta/data' type Props = { assessmentName: AssessmentName diff --git a/src/client/pages/AssessmentSection/DataTable/hooks/useCalculations.ts b/src/client/pages/AssessmentSection/DataTable/hooks/useCalculations.ts index 55772f60e0..a634110095 100644 --- a/src/client/pages/AssessmentSection/DataTable/hooks/useCalculations.ts +++ b/src/client/pages/AssessmentSection/DataTable/hooks/useCalculations.ts @@ -1,17 +1,17 @@ import { useEffect, useMemo } from 'react' import { isAnyOf } from '@reduxjs/toolkit' -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { AssessmentMetaCaches, NodeValueValidation, RowType, Table, VariableCache } from '@meta/assessment' -import { NodeUpdate, RecordAssessmentDatas } from '@meta/data' -import { ExpressionEvaluator } from '@meta/expressionEvaluator' +import { AssessmentMetaCaches, NodeValueValidation, RowType, Table, VariableCache } from 'meta/assessment' +import { NodeUpdate, RecordAssessmentDatas } from 'meta/data' +import { ExpressionEvaluator } from 'meta/expressionEvaluator' -import { useAppDispatch } from '@client/store' -import { useAssessment, useCycle } from '@client/store/assessment' -import { DataActions } from '@client/store/data' -import { addAppListener } from '@client/store/middleware/listener' -import { useCountryIso } from '@client/hooks' +import { useAppDispatch } from 'client/store' +import { useAssessment, useCycle } from 'client/store/assessment' +import { DataActions } from 'client/store/data' +import { addAppListener } from 'client/store/middleware/listener' +import { useCountryIso } from 'client/hooks' export const useCalculations = (props: { table: Table }): void => { const { table } = props diff --git a/src/client/pages/AssessmentSection/DataTable/hooks/useGetTableData.ts b/src/client/pages/AssessmentSection/DataTable/hooks/useGetTableData.ts index 7a2d02086e..e73d05f6be 100644 --- a/src/client/pages/AssessmentSection/DataTable/hooks/useGetTableData.ts +++ b/src/client/pages/AssessmentSection/DataTable/hooks/useGetTableData.ts @@ -1,12 +1,12 @@ import { useEffect, useMemo } from 'react' import { batch } from 'react-redux' -import { CountryIso } from '@meta/area' -import { AssessmentName, Table, TableNames } from '@meta/assessment' +import { CountryIso } from 'meta/area' +import { AssessmentName, Table, TableNames } from 'meta/assessment' -import { useAppDispatch } from '@client/store' -import { DataActions } from '@client/store/data/slice' -import { useCanEdit } from '@client/store/user' +import { useAppDispatch } from 'client/store' +import { DataActions } from 'client/store/data/slice' +import { useCanEdit } from 'client/store/user' type Props = { assessmentName: AssessmentName diff --git a/src/client/pages/AssessmentSection/DataTable/hooks/useODPDeleteListener.ts b/src/client/pages/AssessmentSection/DataTable/hooks/useODPDeleteListener.ts index ae02f1a485..505c0e8791 100644 --- a/src/client/pages/AssessmentSection/DataTable/hooks/useODPDeleteListener.ts +++ b/src/client/pages/AssessmentSection/DataTable/hooks/useODPDeleteListener.ts @@ -1,11 +1,11 @@ import { useEffect } from 'react' import { useDispatch } from 'react-redux' -import { CountryIso } from '@meta/area' -import { Sockets } from '@meta/socket' +import { CountryIso } from 'meta/area' +import { Sockets } from 'meta/socket' -import { DataActions } from '@client/store/data' -import { SocketClient } from '@client/service/socket' +import { DataActions } from 'client/store/data' +import { SocketClient } from 'client/service/socket' // Listen to websocket updates for deleting an odp // ODP deleted from data by countryIso, year diff --git a/src/client/pages/AssessmentSection/DataTable/hooks/useValidations.ts b/src/client/pages/AssessmentSection/DataTable/hooks/useValidations.ts index 88d3a0e0e9..ec952471be 100644 --- a/src/client/pages/AssessmentSection/DataTable/hooks/useValidations.ts +++ b/src/client/pages/AssessmentSection/DataTable/hooks/useValidations.ts @@ -2,15 +2,15 @@ import { useEffect, useMemo } from 'react' import { isAnyOf } from '@reduxjs/toolkit' -import { NodeValueValidation, NodeValueValidations, RowType, Table } from '@meta/assessment' -import { NodeUpdate, RecordAssessmentDatas } from '@meta/data' -import { ExpressionEvaluator } from '@meta/expressionEvaluator' +import { NodeValueValidation, NodeValueValidations, RowType, Table } from 'meta/assessment' +import { NodeUpdate, RecordAssessmentDatas } from 'meta/data' +import { ExpressionEvaluator } from 'meta/expressionEvaluator' -import { useAppDispatch } from '@client/store' -import { useAssessment, useCycle } from '@client/store/assessment' -import { DataActions } from '@client/store/data' -import { addAppListener } from '@client/store/middleware/listener' -import { useCountryIso } from '@client/hooks' +import { useAppDispatch } from 'client/store' +import { useAssessment, useCycle } from 'client/store/assessment' +import { DataActions } from 'client/store/data' +import { addAppListener } from 'client/store/middleware/listener' +import { useCountryIso } from 'client/hooks' export const useValidations = (props: { table: Table }): void => { const { table } = props diff --git a/src/client/pages/AssessmentSection/DataTable/hooks/useValidationsAndCalculations.ts b/src/client/pages/AssessmentSection/DataTable/hooks/useValidationsAndCalculations.ts index 46e75d0073..c53d66574b 100644 --- a/src/client/pages/AssessmentSection/DataTable/hooks/useValidationsAndCalculations.ts +++ b/src/client/pages/AssessmentSection/DataTable/hooks/useValidationsAndCalculations.ts @@ -1,7 +1,7 @@ -import { Table } from '@meta/assessment' +import { Table } from 'meta/assessment' -import { useCalculations } from '@client/pages/AssessmentSection/DataTable/hooks/useCalculations' -import { useValidations } from '@client/pages/AssessmentSection/DataTable/hooks/useValidations' +import { useCalculations } from 'client/pages/AssessmentSection/DataTable/hooks/useCalculations' +import { useValidations } from 'client/pages/AssessmentSection/DataTable/hooks/useValidations' export const useValidationsAndCalculations = (props: { table: Table }) => { useValidations(props) diff --git a/src/client/pages/AssessmentSection/Descriptions/AnalysisDescriptions/AnalysisDescriptions.tsx b/src/client/pages/AssessmentSection/Descriptions/AnalysisDescriptions/AnalysisDescriptions.tsx index ebea0cd220..ca99d90c3b 100644 --- a/src/client/pages/AssessmentSection/Descriptions/AnalysisDescriptions/AnalysisDescriptions.tsx +++ b/src/client/pages/AssessmentSection/Descriptions/AnalysisDescriptions/AnalysisDescriptions.tsx @@ -1,9 +1,9 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { AnalysisAndProcessingDescription } from '@meta/assessment/description' +import { AnalysisAndProcessingDescription } from 'meta/assessment/description' -import { useCycle } from '@client/store/assessment' +import { useCycle } from 'client/store/assessment' import CommentableDescription from '../CommentableDescription' diff --git a/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/CommentableDescription.tsx b/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/CommentableDescription.tsx index b384af59e1..725b3188cb 100644 --- a/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/CommentableDescription.tsx +++ b/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/CommentableDescription.tsx @@ -2,12 +2,12 @@ import React from 'react' import classNames from 'classnames' -import { CommentableDescriptionValue } from '@meta/assessment' -import { Topics } from '@meta/messageCenter' +import { CommentableDescriptionValue } from 'meta/assessment' +import { Topics } from 'meta/messageCenter' -import { useAssessment, useCycle } from '@client/store/assessment' -import { useCountryIso } from '@client/hooks' -import ReviewIndicator from '@client/components/ReviewIndicator' +import { useAssessment, useCycle } from 'client/store/assessment' +import { useCountryIso } from 'client/hooks' +import ReviewIndicator from 'client/components/ReviewIndicator' import Description from './Description' diff --git a/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/ButtonCopyDataSources.tsx b/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/ButtonCopyDataSources.tsx index a040762ab3..b4c034deff 100644 --- a/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/ButtonCopyDataSources.tsx +++ b/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/ButtonCopyDataSources.tsx @@ -1,13 +1,13 @@ import React, { useCallback } from 'react' import { useTranslation } from 'react-i18next' -import { CommentableDescriptionValue } from '@meta/assessment' +import { CommentableDescriptionValue } from 'meta/assessment' -import { useAppDispatch } from '@client/store' -import { useAssessment, useCycle } from '@client/store/assessment' -import { usePreviousSection } from '@client/store/assessment/hooks/usePreviousSection' -import { DataActions } from '@client/store/data' -import { useCountryIso } from '@client/hooks' +import { useAppDispatch } from 'client/store' +import { useAssessment, useCycle } from 'client/store/assessment' +import { usePreviousSection } from 'client/store/assessment/hooks/usePreviousSection' +import { DataActions } from 'client/store/data' +import { useCountryIso } from 'client/hooks' interface Props { disabled: boolean diff --git a/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/DataSourceColumn/ColumnComments.tsx b/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/DataSourceColumn/ColumnComments.tsx index fa78e3f51c..c866eeb976 100644 --- a/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/DataSourceColumn/ColumnComments.tsx +++ b/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/DataSourceColumn/ColumnComments.tsx @@ -2,10 +2,10 @@ import React from 'react' import classNames from 'classnames' -import { DataSource } from '@meta/assessment' +import { DataSource } from 'meta/assessment' -import DataColumn from '@client/components/DataGrid/DataColumn' -import VerticallyGrowingTextField from '@client/components/VerticallyGrowingTextField' +import DataColumn from 'client/components/DataGrid/DataColumn' +import VerticallyGrowingTextField from 'client/components/VerticallyGrowingTextField' import { datasourceValidators } from './datasourceValidators' diff --git a/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/DataSourceColumn/ColumnReference.tsx b/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/DataSourceColumn/ColumnReference.tsx index 32ce8ffab6..cc24ceae80 100644 --- a/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/DataSourceColumn/ColumnReference.tsx +++ b/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/DataSourceColumn/ColumnReference.tsx @@ -2,11 +2,11 @@ import React, { useCallback, useState } from 'react' import classNames from 'classnames' -import { DataSource } from '@meta/assessment' +import { DataSource } from 'meta/assessment' -import DataColumn from '@client/components/DataGrid/DataColumn' -import Icon from '@client/components/Icon' -import VerticallyGrowingTextField from '@client/components/VerticallyGrowingTextField' +import DataColumn from 'client/components/DataGrid/DataColumn' +import Icon from 'client/components/Icon' +import VerticallyGrowingTextField from 'client/components/VerticallyGrowingTextField' import { datasourceValidators } from './datasourceValidators' diff --git a/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/DataSourceColumn/ColumnTypeOfDataSource.tsx b/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/DataSourceColumn/ColumnTypeOfDataSource.tsx index a231e8377d..8dec9bc85d 100644 --- a/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/DataSourceColumn/ColumnTypeOfDataSource.tsx +++ b/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/DataSourceColumn/ColumnTypeOfDataSource.tsx @@ -3,12 +3,12 @@ import { useTranslation } from 'react-i18next' import classNames from 'classnames' -import { DataSource, DataSourceType } from '@meta/assessment' -import { DataSourceDescription } from '@meta/assessment/description/nationalDataDataSourceDescription' +import { DataSource, DataSourceType } from 'meta/assessment' +import { DataSourceDescription } from 'meta/assessment/description/nationalDataDataSourceDescription' -import Autocomplete from '@client/components/Autocomplete' -import DataColumn from '@client/components/DataGrid/DataColumn' -import VerticallyGrowingTextField from '@client/components/VerticallyGrowingTextField' +import Autocomplete from 'client/components/Autocomplete' +import DataColumn from 'client/components/DataGrid/DataColumn' +import VerticallyGrowingTextField from 'client/components/VerticallyGrowingTextField' type Props = { disabled: boolean diff --git a/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/DataSourceColumn/ColumnVariables.tsx b/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/DataSourceColumn/ColumnVariables.tsx index 5cc5d79795..45e29d7da1 100644 --- a/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/DataSourceColumn/ColumnVariables.tsx +++ b/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/DataSourceColumn/ColumnVariables.tsx @@ -1,12 +1,12 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { DataSource, Labels } from '@meta/assessment' -import { DataSourceDescription } from '@meta/assessment/description/nationalDataDataSourceDescription' +import { DataSource, Labels } from 'meta/assessment' +import { DataSourceDescription } from 'meta/assessment/description/nationalDataDataSourceDescription' -import DataColumn from '@client/components/DataGrid/DataColumn' -import MultiSelect from '@client/components/MultiSelect' -import VerticallyGrowingTextField from '@client/components/VerticallyGrowingTextField' +import DataColumn from 'client/components/DataGrid/DataColumn' +import MultiSelect from 'client/components/MultiSelect' +import VerticallyGrowingTextField from 'client/components/VerticallyGrowingTextField' type Props = { disabled: boolean diff --git a/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/DataSourceColumn/ColumnYearForDataSource.tsx b/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/DataSourceColumn/ColumnYearForDataSource.tsx index 8845be255e..5a934c4091 100644 --- a/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/DataSourceColumn/ColumnYearForDataSource.tsx +++ b/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/DataSourceColumn/ColumnYearForDataSource.tsx @@ -1,13 +1,13 @@ import React from 'react' -import { Arrays } from '@utils/arrays' +import { Arrays } from 'utils/arrays' import classNames from 'classnames' -import { DataSource } from '@meta/assessment' +import { DataSource } from 'meta/assessment' -import { useCycle } from '@client/store/assessment' -import Autocomplete from '@client/components/Autocomplete' -import DataColumn from '@client/components/DataGrid/DataColumn' +import { useCycle } from 'client/store/assessment' +import Autocomplete from 'client/components/Autocomplete' +import DataColumn from 'client/components/DataGrid/DataColumn' import { datasourceValidators } from './datasourceValidators' diff --git a/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/DataSourceColumn/datasourceValidators.tsx b/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/DataSourceColumn/datasourceValidators.tsx index 6631691b74..308dabcb9a 100644 --- a/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/DataSourceColumn/datasourceValidators.tsx +++ b/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/DataSourceColumn/datasourceValidators.tsx @@ -1,4 +1,4 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' export const datasourceValidators: Record boolean> = { // check at least one character exists diff --git a/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/DataSourceRow.tsx b/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/DataSourceRow.tsx index 02d328478c..2275d483d7 100644 --- a/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/DataSourceRow.tsx +++ b/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/DataSourceRow.tsx @@ -1,11 +1,11 @@ import React, { useCallback } from 'react' -import { DataSource } from '@meta/assessment' -import { DataSourceDescription } from '@meta/assessment/description/nationalDataDataSourceDescription' +import { DataSource } from 'meta/assessment' +import { DataSourceDescription } from 'meta/assessment/description/nationalDataDataSourceDescription' -import { useIsDataLocked } from '@client/store/ui/dataLock' -import Icon from '@client/components/Icon' -import ReviewIndicator from '@client/components/ReviewIndicator' +import { useIsDataLocked } from 'client/store/ui/dataLock' +import Icon from 'client/components/Icon' +import ReviewIndicator from 'client/components/ReviewIndicator' import ColumnComments from './DataSourceColumn/ColumnComments' import ColumnReference from './DataSourceColumn/ColumnReference' diff --git a/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/DataSources.tsx b/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/DataSources.tsx index 78e6a8d542..d2e642d7a5 100644 --- a/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/DataSources.tsx +++ b/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/DataSources.tsx @@ -2,14 +2,14 @@ import './DataSources.scss' import React, { useCallback } from 'react' import { useTranslation } from 'react-i18next' -import { Objects } from '@utils/objects' -import { UUIDs } from '@utils/uuids' +import { Objects } from 'utils/objects' +import { UUIDs } from 'utils/uuids' -import { CommentableDescriptionValue, DataSource } from '@meta/assessment' +import { CommentableDescriptionValue, DataSource } from 'meta/assessment' -import { useAssessment, useAssessmentSection, useCycle } from '@client/store/assessment' -import DataGrid from '@client/components/DataGrid' -import DataColumn from '@client/components/DataGrid/DataColumn' +import { useAssessment, useAssessmentSection, useCycle } from 'client/store/assessment' +import DataGrid from 'client/components/DataGrid' +import DataColumn from 'client/components/DataGrid/DataColumn' import { useDescriptions } from '../../../Descriptions' import { useGetDataSourcesLinked } from './hooks/useGetDataSourcesLinked' diff --git a/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/hooks/useGetDataSourcesLinked.ts b/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/hooks/useGetDataSourcesLinked.ts index 3dacf7e2ee..f0c4c2522f 100644 --- a/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/hooks/useGetDataSourcesLinked.ts +++ b/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/hooks/useGetDataSourcesLinked.ts @@ -1,11 +1,11 @@ import { useEffect } from 'react' -import { DataSourceLinked, Description } from '@meta/assessment' +import { DataSourceLinked, Description } from 'meta/assessment' -import { useAppDispatch } from '@client/store' -import { useAssessment, useCycle } from '@client/store/assessment' -import { DataActions, useDataSourcesLinked } from '@client/store/data' -import { useCountryIso } from '@client/hooks' +import { useAppDispatch } from 'client/store' +import { useAssessment, useCycle } from 'client/store/assessment' +import { DataActions, useDataSourcesLinked } from 'client/store/data' +import { useCountryIso } from 'client/hooks' export const useGetDataSourcesLinked = (props: { descriptions: Description diff --git a/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/Description.tsx b/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/Description.tsx index 1c29f9bac3..54e950cefa 100644 --- a/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/Description.tsx +++ b/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/Description.tsx @@ -2,20 +2,20 @@ import './Description.scss' import React, { useCallback, useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import { Objects } from '@utils/objects' - -import { CommentableDescriptionValue } from '@meta/assessment' - -import { useAppDispatch } from '@client/store' -import { useAssessment, useAssessmentSection, useCycle } from '@client/store/assessment' -import { DataActions, useCommentableDescriptionValue } from '@client/store/data' -import { useIsDataLocked } from '@client/store/ui/dataLock' -import { useUser } from '@client/store/user' -import { useCountryIso } from '@client/hooks' -import { useIsPrint } from '@client/hooks/useIsPath' -import EditorWYSIWYG from '@client/components/EditorWYSIWYG' -import MarkdownPreview from '@client/components/MarkdownPreview' -import DataSources from '@client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/DataSources' +import { Objects } from 'utils/objects' + +import { CommentableDescriptionValue } from 'meta/assessment' + +import { useAppDispatch } from 'client/store' +import { useAssessment, useAssessmentSection, useCycle } from 'client/store/assessment' +import { DataActions, useCommentableDescriptionValue } from 'client/store/data' +import { useIsDataLocked } from 'client/store/ui/dataLock' +import { useUser } from 'client/store/user' +import { useCountryIso } from 'client/hooks' +import { useIsPrint } from 'client/hooks/useIsPath' +import EditorWYSIWYG from 'client/components/EditorWYSIWYG' +import MarkdownPreview from 'client/components/MarkdownPreview' +import DataSources from 'client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/DataSources/DataSources' import { useDescriptions } from '../../Descriptions' import Title from './Title' diff --git a/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/Title/Title.tsx b/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/Title/Title.tsx index d8427a1692..60a89201db 100644 --- a/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/Title/Title.tsx +++ b/src/client/pages/AssessmentSection/Descriptions/CommentableDescription/Description/Title/Title.tsx @@ -3,9 +3,9 @@ import { useTranslation } from 'react-i18next' import classNames from 'classnames' -import { TooltipId } from '@meta/tooltip' +import { TooltipId } from 'meta/tooltip' -import Icon from '@client/components/Icon' +import Icon from 'client/components/Icon' type Props = { error?: boolean diff --git a/src/client/pages/AssessmentSection/Descriptions/Descriptions.tsx b/src/client/pages/AssessmentSection/Descriptions/Descriptions.tsx index a0d3ffb57e..366fca22f4 100644 --- a/src/client/pages/AssessmentSection/Descriptions/Descriptions.tsx +++ b/src/client/pages/AssessmentSection/Descriptions/Descriptions.tsx @@ -1,10 +1,10 @@ import React from 'react' -import { Description } from '@meta/assessment' +import { Description } from 'meta/assessment' -import { useAssessmentCountry } from '@client/store/assessment' -import { useHasOriginalDataPointData } from '@client/store/data' -import { useIsPrint } from '@client/hooks/useIsPath' +import { useAssessmentCountry } from 'client/store/assessment' +import { useHasOriginalDataPointData } from 'client/store/data' +import { useIsPrint } from 'client/hooks/useIsPath' import AnalysisDescriptions from './AnalysisDescriptions' import NationalDataDescriptions from './NationalDataDescriptions' diff --git a/src/client/pages/AssessmentSection/Descriptions/GeneralComments/GeneralComments.tsx b/src/client/pages/AssessmentSection/Descriptions/GeneralComments/GeneralComments.tsx index 02f148f735..d2004560b3 100644 --- a/src/client/pages/AssessmentSection/Descriptions/GeneralComments/GeneralComments.tsx +++ b/src/client/pages/AssessmentSection/Descriptions/GeneralComments/GeneralComments.tsx @@ -1,7 +1,7 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { AssessmentNames } from '@meta/assessment' +import { AssessmentNames } from 'meta/assessment' import CommentableDescription from '../CommentableDescription' diff --git a/src/client/pages/AssessmentSection/Descriptions/NationalDataDescriptions/NationalDataDescriptions.tsx b/src/client/pages/AssessmentSection/Descriptions/NationalDataDescriptions/NationalDataDescriptions.tsx index 8952fbc18b..ea3ddf728d 100644 --- a/src/client/pages/AssessmentSection/Descriptions/NationalDataDescriptions/NationalDataDescriptions.tsx +++ b/src/client/pages/AssessmentSection/Descriptions/NationalDataDescriptions/NationalDataDescriptions.tsx @@ -1,7 +1,7 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { NationalDataDescription } from '@meta/assessment/description' +import { NationalDataDescription } from 'meta/assessment/description' import CommentableDescription from '../CommentableDescription' diff --git a/src/client/pages/AssessmentSection/SectionHeader/ExtentOfForest/ExtentOfForest.tsx b/src/client/pages/AssessmentSection/SectionHeader/ExtentOfForest/ExtentOfForest.tsx index a9898c57af..3833855c61 100644 --- a/src/client/pages/AssessmentSection/SectionHeader/ExtentOfForest/ExtentOfForest.tsx +++ b/src/client/pages/AssessmentSection/SectionHeader/ExtentOfForest/ExtentOfForest.tsx @@ -2,12 +2,12 @@ import React from 'react' import { useTranslation } from 'react-i18next' import { useNavigate } from 'react-router-dom' -import { useAppDispatch } from '@client/store' -import { useAssessment, useCycle } from '@client/store/assessment' -import { OriginalDataPointActions } from '@client/store/ui/originalDataPoint' -import { useUser } from '@client/store/user' -import { useCountryIso } from '@client/hooks' -import Icon from '@client/components/Icon' +import { useAppDispatch } from 'client/store' +import { useAssessment, useCycle } from 'client/store/assessment' +import { OriginalDataPointActions } from 'client/store/ui/originalDataPoint' +import { useUser } from 'client/store/user' +import { useCountryIso } from 'client/hooks' +import Icon from 'client/components/Icon' import { Props } from '../props' diff --git a/src/client/pages/AssessmentSection/SectionHeader/ForestCharacteristics/ForestCharacteristics.tsx b/src/client/pages/AssessmentSection/SectionHeader/ForestCharacteristics/ForestCharacteristics.tsx index a2936fc32a..2e8e86992f 100644 --- a/src/client/pages/AssessmentSection/SectionHeader/ForestCharacteristics/ForestCharacteristics.tsx +++ b/src/client/pages/AssessmentSection/SectionHeader/ForestCharacteristics/ForestCharacteristics.tsx @@ -1,11 +1,11 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { useAppDispatch } from '@client/store' -import { AssessmentActions, useAssessment, useAssessmentCountry, useCycle } from '@client/store/assessment' -import { useHasOriginalDataPointData } from '@client/store/data' -import { useUser } from '@client/store/user' -import { useCountryIso } from '@client/hooks' +import { useAppDispatch } from 'client/store' +import { AssessmentActions, useAssessment, useAssessmentCountry, useCycle } from 'client/store/assessment' +import { useHasOriginalDataPointData } from 'client/store/data' +import { useUser } from 'client/store/user' +import { useCountryIso } from 'client/hooks' import { Props } from '../props' diff --git a/src/client/pages/AssessmentSection/SectionHeader/SectionHeader.ts b/src/client/pages/AssessmentSection/SectionHeader/SectionHeader.ts index 77014b8b4c..4769d58e11 100644 --- a/src/client/pages/AssessmentSection/SectionHeader/SectionHeader.ts +++ b/src/client/pages/AssessmentSection/SectionHeader/SectionHeader.ts @@ -1,6 +1,6 @@ import React from 'react' -import { AssessmentNames } from '@meta/assessment' +import { AssessmentNames } from 'meta/assessment' import ExtentOfForest from './ExtentOfForest' import ForestCharacteristics from './ForestCharacteristics' diff --git a/src/client/pages/AssessmentSection/SectionHeader/props.ts b/src/client/pages/AssessmentSection/SectionHeader/props.ts index 914aa66cc0..9bef49233b 100644 --- a/src/client/pages/AssessmentSection/SectionHeader/props.ts +++ b/src/client/pages/AssessmentSection/SectionHeader/props.ts @@ -1,4 +1,4 @@ -import { AssessmentName } from '@meta/assessment' +import { AssessmentName } from 'meta/assessment' export type Props = { assessmentName: AssessmentName diff --git a/src/client/pages/AssessmentSection/Title/ExtentOfForest/ExtentOfForest.tsx b/src/client/pages/AssessmentSection/Title/ExtentOfForest/ExtentOfForest.tsx index e156774f57..25ebe00731 100644 --- a/src/client/pages/AssessmentSection/Title/ExtentOfForest/ExtentOfForest.tsx +++ b/src/client/pages/AssessmentSection/Title/ExtentOfForest/ExtentOfForest.tsx @@ -1,16 +1,16 @@ import React, { useCallback } from 'react' import { useTranslation } from 'react-i18next' -import { Labels } from '@meta/assessment' -import { Users } from '@meta/user' - -import { useAppDispatch } from '@client/store' -import { useCycle } from '@client/store/assessment' -import { useOriginalDataPointYears } from '@client/store/data' -import { AssessmentSectionActions, useShowOriginalDatapoints } from '@client/store/ui/assessmentSection' -import { useUser } from '@client/store/user' -import { useIsPrint } from '@client/hooks/useIsPath' -import OriginalDataPointsPrint from '@client/pages/AssessmentPrint/OriginalDataPointsPrint' +import { Labels } from 'meta/assessment' +import { Users } from 'meta/user' + +import { useAppDispatch } from 'client/store' +import { useCycle } from 'client/store/assessment' +import { useOriginalDataPointYears } from 'client/store/data' +import { AssessmentSectionActions, useShowOriginalDatapoints } from 'client/store/ui/assessmentSection' +import { useUser } from 'client/store/user' +import { useIsPrint } from 'client/hooks/useIsPath' +import OriginalDataPointsPrint from 'client/pages/AssessmentPrint/OriginalDataPointsPrint' import { Props } from '../props' diff --git a/src/client/pages/AssessmentSection/Title/ForestCharacteristics/ForestCharacteristics.tsx b/src/client/pages/AssessmentSection/Title/ForestCharacteristics/ForestCharacteristics.tsx index 10c568e81a..973437bfc6 100644 --- a/src/client/pages/AssessmentSection/Title/ForestCharacteristics/ForestCharacteristics.tsx +++ b/src/client/pages/AssessmentSection/Title/ForestCharacteristics/ForestCharacteristics.tsx @@ -1,12 +1,12 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { Labels } from '@meta/assessment' +import { Labels } from 'meta/assessment' -import { useCycle } from '@client/store/assessment' -import { useOriginalDataPointYears } from '@client/store/data' -import { useIsPrint } from '@client/hooks/useIsPath' -import OriginalDataPointsPrint from '@client/pages/AssessmentPrint/OriginalDataPointsPrint' +import { useCycle } from 'client/store/assessment' +import { useOriginalDataPointYears } from 'client/store/data' +import { useIsPrint } from 'client/hooks/useIsPath' +import OriginalDataPointsPrint from 'client/pages/AssessmentPrint/OriginalDataPointsPrint' import { Props } from '../props' diff --git a/src/client/pages/AssessmentSection/Title/Title.tsx b/src/client/pages/AssessmentSection/Title/Title.tsx index 5c897850b3..d9c89fa6a7 100644 --- a/src/client/pages/AssessmentSection/Title/Title.tsx +++ b/src/client/pages/AssessmentSection/Title/Title.tsx @@ -1,10 +1,10 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { AssessmentNames, Labels, SubSections } from '@meta/assessment' +import { AssessmentNames, Labels, SubSections } from 'meta/assessment' -import { useAssessment, useCycle } from '@client/store/assessment' -import DefinitionLink from '@client/components/DefinitionLink' +import { useAssessment, useCycle } from 'client/store/assessment' +import DefinitionLink from 'client/components/DefinitionLink' import ExtentOfForest from './ExtentOfForest/ExtentOfForest' import ForestCharacteristics from './ForestCharacteristics/ForestCharacteristics' diff --git a/src/client/pages/AssessmentSection/Title/TitleExcelCalculator/ExcelCalculatorDownload.tsx b/src/client/pages/AssessmentSection/Title/TitleExcelCalculator/ExcelCalculatorDownload.tsx index 6dcd98f303..3fcd886f98 100644 --- a/src/client/pages/AssessmentSection/Title/TitleExcelCalculator/ExcelCalculatorDownload.tsx +++ b/src/client/pages/AssessmentSection/Title/TitleExcelCalculator/ExcelCalculatorDownload.tsx @@ -1,12 +1,12 @@ import React, { useState } from 'react' import { useTranslation } from 'react-i18next' -import { ApiEndPoint } from '@meta/api/endpoint' -import { Authorizer } from '@meta/user' +import { ApiEndPoint } from 'meta/api/endpoint' +import { Authorizer } from 'meta/user' -import { useAssessment, useAssessmentSection, useCountry, useCycle } from '@client/store/assessment' -import { useUser } from '@client/store/user' -import { useCountryIso } from '@client/hooks' +import { useAssessment, useAssessmentSection, useCountry, useCycle } from 'client/store/assessment' +import { useUser } from 'client/store/user' +import { useCountryIso } from 'client/hooks' const domains: Array = ['boreal', 'temperate', 'tropical', 'subtropical'] diff --git a/src/client/pages/AssessmentSection/Title/TitleExcelCalculator/TitleExcelCalculator.tsx b/src/client/pages/AssessmentSection/Title/TitleExcelCalculator/TitleExcelCalculator.tsx index c53bc8903f..e0399952ad 100644 --- a/src/client/pages/AssessmentSection/Title/TitleExcelCalculator/TitleExcelCalculator.tsx +++ b/src/client/pages/AssessmentSection/Title/TitleExcelCalculator/TitleExcelCalculator.tsx @@ -2,10 +2,10 @@ import './TitleExcelCalculator.scss' import React from 'react' import { useTranslation } from 'react-i18next' -import { Labels } from '@meta/assessment' +import { Labels } from 'meta/assessment' -import { useCycle } from '@client/store/assessment' -import { useIsPrint } from '@client/hooks/useIsPath' +import { useCycle } from 'client/store/assessment' +import { useIsPrint } from 'client/hooks/useIsPath' import { Props } from '../props' import ExcelCalculatorDownload from './ExcelCalculatorDownload' diff --git a/src/client/pages/AssessmentSection/Title/props.ts b/src/client/pages/AssessmentSection/Title/props.ts index bba8675a9c..586c7b478d 100644 --- a/src/client/pages/AssessmentSection/Title/props.ts +++ b/src/client/pages/AssessmentSection/Title/props.ts @@ -1,4 +1,4 @@ -import { SubSection } from '@meta/assessment' +import { SubSection } from 'meta/assessment' export type Props = { subSection: SubSection diff --git a/src/client/pages/AssessmentSection/hooks/useListenNodeUpdates.ts b/src/client/pages/AssessmentSection/hooks/useListenNodeUpdates.ts index 87d0608dc3..2fcb47a2fd 100644 --- a/src/client/pages/AssessmentSection/hooks/useListenNodeUpdates.ts +++ b/src/client/pages/AssessmentSection/hooks/useListenNodeUpdates.ts @@ -1,13 +1,13 @@ import { useEffect } from 'react' -import { CountryIso } from '@meta/area' -import { AssessmentName } from '@meta/assessment' -import { NodeUpdates } from '@meta/data' -import { Sockets } from '@meta/socket' +import { CountryIso } from 'meta/area' +import { AssessmentName } from 'meta/assessment' +import { NodeUpdates } from 'meta/data' +import { Sockets } from 'meta/socket' -import { useAppDispatch } from '@client/store' -import { DataActions } from '@client/store/data' -import { SocketClient } from '@client/service/socket' +import { useAppDispatch } from 'client/store' +import { DataActions } from 'client/store/data' +import { SocketClient } from 'client/service/socket' type Props = { countryIso: CountryIso diff --git a/src/client/pages/AssessmentSection/hooks/useListenValidationsUpdate.ts b/src/client/pages/AssessmentSection/hooks/useListenValidationsUpdate.ts index afcb4c0fd5..1e32c4d37a 100644 --- a/src/client/pages/AssessmentSection/hooks/useListenValidationsUpdate.ts +++ b/src/client/pages/AssessmentSection/hooks/useListenValidationsUpdate.ts @@ -1,13 +1,13 @@ import { useEffect } from 'react' -import { CountryIso } from '@meta/area' -import { AssessmentName } from '@meta/assessment' -import { NodeUpdates } from '@meta/data' -import { Sockets } from '@meta/socket' - -import { useAppDispatch } from '@client/store' -import { DataActions } from '@client/store/data' -import { SocketClient } from '@client/service/socket' +import { CountryIso } from 'meta/area' +import { AssessmentName } from 'meta/assessment' +import { NodeUpdates } from 'meta/data' +import { Sockets } from 'meta/socket' + +import { useAppDispatch } from 'client/store' +import { DataActions } from 'client/store/data' +import { SocketClient } from 'client/service/socket' type Props = { countryIso: CountryIso diff --git a/src/client/pages/Country/Country.tsx b/src/client/pages/Country/Country.tsx index 11fd68b06e..c024ebc516 100644 --- a/src/client/pages/Country/Country.tsx +++ b/src/client/pages/Country/Country.tsx @@ -4,26 +4,26 @@ import { Navigate, Route, Routes, useParams } from 'react-router-dom' import classNames from 'classnames' -import { ClientRoutes } from '@meta/app' -import { Areas } from '@meta/area' -import { AssessmentName } from '@meta/assessment' -import { Sockets } from '@meta/socket' -import { Authorizer } from '@meta/user' - -import { useAppDispatch } from '@client/store' -import { AssessmentActions, useCountries, useCountry, useCycle } from '@client/store/assessment' -import { useNavigationVisible } from '@client/store/ui/navigation' -import { ReviewActions } from '@client/store/ui/review' -import { useUser } from '@client/store/user' -import { useCountryIso, useIsDataExportView } from '@client/hooks' -import Navigation from '@client/components/Navigation' -import AssessmentDataDownload from '@client/pages/AssessmentDataDownload' -import AssessmentHome from '@client/pages/AssessmentHome' -import AssessmentSection from '@client/pages/AssessmentSection' -import useGetUsers from '@client/pages/Country/hooks/useGetUsers' -import DataExport from '@client/pages/DataExport' -import OriginalDataPoint from '@client/pages/OriginalDataPoint' -import { SocketClient } from '@client/service/socket' +import { ClientRoutes } from 'meta/app' +import { Areas } from 'meta/area' +import { AssessmentName } from 'meta/assessment' +import { Sockets } from 'meta/socket' +import { Authorizer } from 'meta/user' + +import { useAppDispatch } from 'client/store' +import { AssessmentActions, useCountries, useCountry, useCycle } from 'client/store/assessment' +import { useNavigationVisible } from 'client/store/ui/navigation' +import { ReviewActions } from 'client/store/ui/review' +import { useUser } from 'client/store/user' +import { useCountryIso, useIsDataExportView } from 'client/hooks' +import Navigation from 'client/components/Navigation' +import AssessmentDataDownload from 'client/pages/AssessmentDataDownload' +import AssessmentHome from 'client/pages/AssessmentHome' +import AssessmentSection from 'client/pages/AssessmentSection' +import useGetUsers from 'client/pages/Country/hooks/useGetUsers' +import DataExport from 'client/pages/DataExport' +import OriginalDataPoint from 'client/pages/OriginalDataPoint' +import { SocketClient } from 'client/service/socket' import AssessmentPrint from '../AssessmentPrint' import Geo from '../Geo' diff --git a/src/client/pages/Country/SectionWrapper/SectionWrapper.tsx b/src/client/pages/Country/SectionWrapper/SectionWrapper.tsx index 8ed78480e5..77229e9599 100644 --- a/src/client/pages/Country/SectionWrapper/SectionWrapper.tsx +++ b/src/client/pages/Country/SectionWrapper/SectionWrapper.tsx @@ -1,19 +1,19 @@ import React, { useEffect, useLayoutEffect } from 'react' import { useParams } from 'react-router-dom' -import { AssessmentName } from '@meta/assessment' -import { Sockets } from '@meta/socket' +import { AssessmentName } from 'meta/assessment' +import { Sockets } from 'meta/socket' -import { useAppDispatch } from '@client/store' -import { useAssessmentSections } from '@client/store/assessment' -import { useGetTableSections, useTableSections } from '@client/store/metadata' -import { useOriginalDataPoint } from '@client/store/ui/originalDataPoint' -import { ReviewActions } from '@client/store/ui/review' -import { useUser } from '@client/store/user' -import { useCountryIso } from '@client/hooks' -import MessageCenter from '@client/components/MessageCenter' -import { SocketClient } from '@client/service/socket' -import { DOMs } from '@client/utils/dom' +import { useAppDispatch } from 'client/store' +import { useAssessmentSections } from 'client/store/assessment' +import { useGetTableSections, useTableSections } from 'client/store/metadata' +import { useOriginalDataPoint } from 'client/store/ui/originalDataPoint' +import { ReviewActions } from 'client/store/ui/review' +import { useUser } from 'client/store/user' +import { useCountryIso } from 'client/hooks' +import MessageCenter from 'client/components/MessageCenter' +import { SocketClient } from 'client/service/socket' +import { DOMs } from 'client/utils/dom' type Props = { children: JSX.Element diff --git a/src/client/pages/Country/hooks/useGetUsers.ts b/src/client/pages/Country/hooks/useGetUsers.ts index 3e947fc83f..5451a75d28 100644 --- a/src/client/pages/Country/hooks/useGetUsers.ts +++ b/src/client/pages/Country/hooks/useGetUsers.ts @@ -1,12 +1,12 @@ import { useEffect } from 'react' -import { Authorizer } from '@meta/user' +import { Authorizer } from 'meta/user' -import { useAppDispatch } from '@client/store' -import { useAssessment, useCycle } from '@client/store/assessment' -import { UserManagementActions } from '@client/store/ui/userManagement' -import { useUser } from '@client/store/user' -import { useCountryIso } from '@client/hooks' +import { useAppDispatch } from 'client/store' +import { useAssessment, useCycle } from 'client/store/assessment' +import { UserManagementActions } from 'client/store/ui/userManagement' +import { useUser } from 'client/store/user' +import { useCountryIso } from 'client/hooks' export default () => { const dispatch = useAppDispatch() diff --git a/src/client/pages/Cycle/Cycle.tsx b/src/client/pages/Cycle/Cycle.tsx index bca2ad651b..b0d75dc444 100644 --- a/src/client/pages/Cycle/Cycle.tsx +++ b/src/client/pages/Cycle/Cycle.tsx @@ -2,17 +2,17 @@ import './Cycle.scss' import React, { useEffect } from 'react' import { Route, Routes, useNavigate, useParams } from 'react-router-dom' -import { ClientRoutes } from '@meta/app' -import { AssessmentName, AssessmentNames } from '@meta/assessment' +import { ClientRoutes } from 'meta/app' +import { AssessmentName, AssessmentNames } from 'meta/assessment' -import { useAppDispatch } from '@client/store' -import { AssessmentActions, useAssessment, useCycle } from '@client/store/assessment' -import { useUserCycles } from '@client/store/user' -import { useIsAdmin, useIsLogin, useIsPrint, useIsUserEditPage } from '@client/hooks/useIsPath' -import AssessmentSwitch from '@client/components/AssessmentSwitch' -import PageLayout from '@client/components/PageLayout' -import Partners from '@client/components/Partners' -import Overview from '@client/pages/AssessmentHome/PanEuropeanHome/Overview' +import { useAppDispatch } from 'client/store' +import { AssessmentActions, useAssessment, useCycle } from 'client/store/assessment' +import { useUserCycles } from 'client/store/user' +import { useIsAdmin, useIsLogin, useIsPrint, useIsUserEditPage } from 'client/hooks/useIsPath' +import AssessmentSwitch from 'client/components/AssessmentSwitch' +import PageLayout from 'client/components/PageLayout' +import Partners from 'client/components/Partners' +import Overview from 'client/pages/AssessmentHome/PanEuropeanHome/Overview' import Admin from '../Admin' import Country from '../Country' diff --git a/src/client/pages/Cycle/Introduction/Introduction.tsx b/src/client/pages/Cycle/Introduction/Introduction.tsx index e867c69bb5..ba6745812f 100644 --- a/src/client/pages/Cycle/Introduction/Introduction.tsx +++ b/src/client/pages/Cycle/Introduction/Introduction.tsx @@ -3,12 +3,12 @@ import React from 'react' import { useTranslation } from 'react-i18next' import { Link } from 'react-router-dom' -import { ClientRoutes } from '@meta/app' -import { Global } from '@meta/area' -import { AssessmentNames } from '@meta/assessment' +import { ClientRoutes } from 'meta/app' +import { Global } from 'meta/area' +import { AssessmentNames } from 'meta/assessment' -import { useCycle } from '@client/store/assessment' -import AreaSelector from '@client/components/AreaSelector/AreaSelector' +import { useCycle } from 'client/store/assessment' +import AreaSelector from 'client/components/AreaSelector/AreaSelector' const Introduction: React.FC = () => { const { i18n, t } = useTranslation() diff --git a/src/client/pages/Dashboard/CarbonGrowingStock/CarbonGrowingStock.tsx b/src/client/pages/Dashboard/CarbonGrowingStock/CarbonGrowingStock.tsx index 39ac07bb09..639ab03cff 100644 --- a/src/client/pages/Dashboard/CarbonGrowingStock/CarbonGrowingStock.tsx +++ b/src/client/pages/Dashboard/CarbonGrowingStock/CarbonGrowingStock.tsx @@ -1,15 +1,15 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { Numbers } from '@utils/numbers' +import { Numbers } from 'utils/numbers' -import { Areas } from '@meta/area' -import { TableNames } from '@meta/assessment' -import { RecordAssessmentData, RecordAssessmentDatas } from '@meta/data' +import { Areas } from 'meta/area' +import { TableNames } from 'meta/assessment' +import { RecordAssessmentData, RecordAssessmentDatas } from 'meta/data' -import { useAssessment, useCycle } from '@client/store/assessment' -import { useCountryIso } from '@client/hooks' -import useStatisticalFactsheetsState from '@client/pages/Dashboard/hooks/useDashboardData' +import { useAssessment, useCycle } from 'client/store/assessment' +import { useCountryIso } from 'client/hooks' +import useStatisticalFactsheetsState from 'client/pages/Dashboard/hooks/useDashboardData' import Table from '../components/Table' diff --git a/src/client/pages/Dashboard/Dashboard.tsx b/src/client/pages/Dashboard/Dashboard.tsx index 83ca792b8d..f77fda46c5 100644 --- a/src/client/pages/Dashboard/Dashboard.tsx +++ b/src/client/pages/Dashboard/Dashboard.tsx @@ -2,13 +2,13 @@ import './Dashboard.scss' import React from 'react' import { useTranslation } from 'react-i18next' -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' import classNames from 'classnames' -import { Areas } from '@meta/area' +import { Areas } from 'meta/area' -import { useHomeCountriesFilter } from '@client/store/ui/home' -import { useCountryIso } from '@client/hooks' +import { useHomeCountriesFilter } from 'client/store/ui/home' +import { useCountryIso } from 'client/hooks' import CarbonGrowingStock from './CarbonGrowingStock' import ForestArea from './ForestArea' diff --git a/src/client/pages/Dashboard/ForestArea/ForestArea.tsx b/src/client/pages/Dashboard/ForestArea/ForestArea.tsx index dc8689f1b6..f40695af63 100644 --- a/src/client/pages/Dashboard/ForestArea/ForestArea.tsx +++ b/src/client/pages/Dashboard/ForestArea/ForestArea.tsx @@ -3,13 +3,13 @@ import { useTranslation } from 'react-i18next' import { ChartOptions } from 'chart.js' -import { Areas } from '@meta/area' -import { TableNames } from '@meta/assessment' -import { RecordAssessmentDatas } from '@meta/data' +import { Areas } from 'meta/area' +import { TableNames } from 'meta/assessment' +import { RecordAssessmentDatas } from 'meta/data' -import { useAssessment, useCycle } from '@client/store/assessment' -import { useCountryIso } from '@client/hooks' -import Chart from '@client/components/Chart' +import { useAssessment, useCycle } from 'client/store/assessment' +import { useCountryIso } from 'client/hooks' +import Chart from 'client/components/Chart' import useDashboardData from '../hooks/useDashboardData' import { commonOptions, preferences, scaleLabel } from '../utils/preferences' diff --git a/src/client/pages/Dashboard/ForestAreaPercent/ForestAreaPercent.tsx b/src/client/pages/Dashboard/ForestAreaPercent/ForestAreaPercent.tsx index 18267a554f..9b9d743383 100644 --- a/src/client/pages/Dashboard/ForestAreaPercent/ForestAreaPercent.tsx +++ b/src/client/pages/Dashboard/ForestAreaPercent/ForestAreaPercent.tsx @@ -1,16 +1,16 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { Numbers } from '@utils/numbers' +import { Numbers } from 'utils/numbers' import { ChartOptions } from 'chart.js' -import { Areas } from '@meta/area' -import { TableNames } from '@meta/assessment' -import { RecordAssessmentDatas } from '@meta/data' +import { Areas } from 'meta/area' +import { TableNames } from 'meta/assessment' +import { RecordAssessmentDatas } from 'meta/data' -import { useAssessment, useCycle } from '@client/store/assessment' -import { useCountryIso } from '@client/hooks' -import Chart from '@client/components/Chart' +import { useAssessment, useCycle } from 'client/store/assessment' +import { useCountryIso } from 'client/hooks' +import Chart from 'client/components/Chart' import useDashboardData from '../hooks/useDashboardData' import { ChartColors, commonOptions } from '../utils/preferences' diff --git a/src/client/pages/Dashboard/ForestAreaWithinProtectedAreas/ForestAreaWithinProtectedAreas.tsx b/src/client/pages/Dashboard/ForestAreaWithinProtectedAreas/ForestAreaWithinProtectedAreas.tsx index 5adbf487b1..2dfde4679c 100644 --- a/src/client/pages/Dashboard/ForestAreaWithinProtectedAreas/ForestAreaWithinProtectedAreas.tsx +++ b/src/client/pages/Dashboard/ForestAreaWithinProtectedAreas/ForestAreaWithinProtectedAreas.tsx @@ -1,16 +1,16 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { Numbers } from '@utils/numbers' +import { Numbers } from 'utils/numbers' import { ChartOptions } from 'chart.js' -import { Areas } from '@meta/area' -import { TableNames } from '@meta/assessment' -import { RecordAssessmentDatas } from '@meta/data' +import { Areas } from 'meta/area' +import { TableNames } from 'meta/assessment' +import { RecordAssessmentDatas } from 'meta/data' -import { useAssessment, useCycle } from '@client/store/assessment' -import { useCountryIso } from '@client/hooks' -import Chart from '@client/components/Chart' +import { useAssessment, useCycle } from 'client/store/assessment' +import { useCountryIso } from 'client/hooks' +import Chart from 'client/components/Chart' import useDashboardData from '../hooks/useDashboardData' import { ChartColors, commonOptions } from '../utils/preferences' diff --git a/src/client/pages/Dashboard/ForestOwnership/ForestOwnership.tsx b/src/client/pages/Dashboard/ForestOwnership/ForestOwnership.tsx index f27d29841a..ccb0123f62 100644 --- a/src/client/pages/Dashboard/ForestOwnership/ForestOwnership.tsx +++ b/src/client/pages/Dashboard/ForestOwnership/ForestOwnership.tsx @@ -1,17 +1,17 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { Numbers } from '@utils/numbers' +import { Numbers } from 'utils/numbers' import { ChartOptions } from 'chart.js' -import { Areas } from '@meta/area' -import { TableNames } from '@meta/assessment' -import { RecordAssessmentDatas } from '@meta/data' +import { Areas } from 'meta/area' +import { TableNames } from 'meta/assessment' +import { RecordAssessmentDatas } from 'meta/data' -import { useAssessment, useCycle } from '@client/store/assessment' -import { useCountryIso } from '@client/hooks' -import Chart from '@client/components/Chart' -import { ChartDataType } from '@client/components/Chart/Chart' +import { useAssessment, useCycle } from 'client/store/assessment' +import { useCountryIso } from 'client/hooks' +import Chart from 'client/components/Chart' +import { ChartDataType } from 'client/components/Chart/Chart' import useDashboardData from '../hooks/useDashboardData' import { formatValue } from '../utils/numberUtils' diff --git a/src/client/pages/Dashboard/NaturallyRegeneratingForest/NaturallyRegeneratingForest.tsx b/src/client/pages/Dashboard/NaturallyRegeneratingForest/NaturallyRegeneratingForest.tsx index fa96e1fbbb..47c1f5051a 100644 --- a/src/client/pages/Dashboard/NaturallyRegeneratingForest/NaturallyRegeneratingForest.tsx +++ b/src/client/pages/Dashboard/NaturallyRegeneratingForest/NaturallyRegeneratingForest.tsx @@ -1,16 +1,16 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { Numbers } from '@utils/numbers' +import { Numbers } from 'utils/numbers' import { ChartOptions } from 'chart.js' -import { Areas } from '@meta/area' -import { TableNames } from '@meta/assessment' -import { RecordAssessmentDatas } from '@meta/data' +import { Areas } from 'meta/area' +import { TableNames } from 'meta/assessment' +import { RecordAssessmentDatas } from 'meta/data' -import { useAssessment, useCycle } from '@client/store/assessment' -import { useCountryIso } from '@client/hooks' -import Chart from '@client/components/Chart' +import { useAssessment, useCycle } from 'client/store/assessment' +import { useCountryIso } from 'client/hooks' +import Chart from 'client/components/Chart' import useDashboardData from '../hooks/useDashboardData' import { commonOptions, preferences, scaleLabel } from '../utils/preferences' diff --git a/src/client/pages/Dashboard/PrimaryDesignatedManagementObjective/PrimaryDesignatedManagementObjective.tsx b/src/client/pages/Dashboard/PrimaryDesignatedManagementObjective/PrimaryDesignatedManagementObjective.tsx index bd86628d88..dd40b94735 100644 --- a/src/client/pages/Dashboard/PrimaryDesignatedManagementObjective/PrimaryDesignatedManagementObjective.tsx +++ b/src/client/pages/Dashboard/PrimaryDesignatedManagementObjective/PrimaryDesignatedManagementObjective.tsx @@ -1,11 +1,11 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { Areas } from '@meta/area' -import { TableNames } from '@meta/assessment' +import { Areas } from 'meta/area' +import { TableNames } from 'meta/assessment' -import { useCountryIso } from '@client/hooks' -import useStatisticalFactsheetsState from '@client/pages/Dashboard/hooks/useDashboardData' +import { useCountryIso } from 'client/hooks' +import useStatisticalFactsheetsState from 'client/pages/Dashboard/hooks/useDashboardData' import Table from '../components/Table' diff --git a/src/client/pages/Dashboard/PrimaryForest/PrimaryForest.tsx b/src/client/pages/Dashboard/PrimaryForest/PrimaryForest.tsx index 9e219a96f6..fd8bfd333d 100644 --- a/src/client/pages/Dashboard/PrimaryForest/PrimaryForest.tsx +++ b/src/client/pages/Dashboard/PrimaryForest/PrimaryForest.tsx @@ -1,17 +1,17 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { Numbers } from '@utils/numbers' -import { Objects } from '@utils/objects' +import { Numbers } from 'utils/numbers' +import { Objects } from 'utils/objects' import { ChartOptions } from 'chart.js' -import { Areas } from '@meta/area' -import { TableNames } from '@meta/assessment' -import { RecordAssessmentDatas } from '@meta/data' +import { Areas } from 'meta/area' +import { TableNames } from 'meta/assessment' +import { RecordAssessmentDatas } from 'meta/data' -import { useAssessment, useCycle } from '@client/store/assessment' -import { useCountryIso } from '@client/hooks' -import Chart from '@client/components/Chart' +import { useAssessment, useCycle } from 'client/store/assessment' +import { useCountryIso } from 'client/hooks' +import Chart from 'client/components/Chart' import useDashboardData from '../hooks/useDashboardData' import { ChartColors, commonOptions } from '../utils/preferences' diff --git a/src/client/pages/Dashboard/components/Table/Table.tsx b/src/client/pages/Dashboard/components/Table/Table.tsx index 71626cf96a..f1032be76b 100644 --- a/src/client/pages/Dashboard/components/Table/Table.tsx +++ b/src/client/pages/Dashboard/components/Table/Table.tsx @@ -1,16 +1,16 @@ import React, { useRef } from 'react' import { useTranslation } from 'react-i18next' -import { Numbers } from '@utils/numbers' -import { Objects } from '@utils/objects' +import { Numbers } from 'utils/numbers' +import { Objects } from 'utils/objects' -import { Areas } from '@meta/area' -import { TableNames } from '@meta/assessment' -import { RecordAssessmentData, RecordAssessmentDatas } from '@meta/data' +import { Areas } from 'meta/area' +import { TableNames } from 'meta/assessment' +import { RecordAssessmentData, RecordAssessmentDatas } from 'meta/data' -import { useAssessment, useCycle } from '@client/store/assessment' -import { useCountryIso } from '@client/hooks' -import ButtonTableExport from '@client/components/ButtonTableExport' +import { useAssessment, useCycle } from 'client/store/assessment' +import { useCountryIso } from 'client/hooks' +import ButtonTableExport from 'client/components/ButtonTableExport' import { formatValue } from '../../utils/numberUtils' diff --git a/src/client/pages/Dashboard/hooks/useDashboardData.ts b/src/client/pages/Dashboard/hooks/useDashboardData.ts index 77092ceb64..69e869ce1e 100644 --- a/src/client/pages/Dashboard/hooks/useDashboardData.ts +++ b/src/client/pages/Dashboard/hooks/useDashboardData.ts @@ -1,14 +1,14 @@ import { useEffect } from 'react' -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { ApiEndPoint } from '@meta/api/endpoint' -import { Areas } from '@meta/area' -import { RecordAssessmentData } from '@meta/data' +import { ApiEndPoint } from 'meta/api/endpoint' +import { Areas } from 'meta/area' +import { RecordAssessmentData } from 'meta/data' -import { useAssessment, useCycle } from '@client/store/assessment' -import { useHomeCountriesFilter } from '@client/store/ui/home' -import { useCountryIso, useGetRequest } from '@client/hooks' +import { useAssessment, useCycle } from 'client/store/assessment' +import { useHomeCountriesFilter } from 'client/store/ui/home' +import { useCountryIso, useGetRequest } from 'client/hooks' interface Props { variables: string[] diff --git a/src/client/pages/Dashboard/utils/preferences.ts b/src/client/pages/Dashboard/utils/preferences.ts index dc07ee1f48..4980c8e5fd 100644 --- a/src/client/pages/Dashboard/utils/preferences.ts +++ b/src/client/pages/Dashboard/utils/preferences.ts @@ -1,4 +1,4 @@ -import { Numbers } from '@utils/numbers' +import { Numbers } from 'utils/numbers' export enum ChartColors { // Greens diff --git a/src/client/pages/DataExport/ColumnSelect/ColumnSelect.tsx b/src/client/pages/DataExport/ColumnSelect/ColumnSelect.tsx index fdec5e50fc..e48501ecdd 100644 --- a/src/client/pages/DataExport/ColumnSelect/ColumnSelect.tsx +++ b/src/client/pages/DataExport/ColumnSelect/ColumnSelect.tsx @@ -3,14 +3,14 @@ import { useTranslation } from 'react-i18next' import MediaQuery from 'react-responsive' import { useParams } from 'react-router-dom' -import { AssessmentName } from '@meta/assessment' +import { AssessmentName } from 'meta/assessment' -import { useAppDispatch } from '@client/store' -import { DataExportActions, DataExportSelection, useDataExportSelection } from '@client/store/ui/dataExport' -import { DataExportActionType } from '@client/store/ui/dataExport/actionTypes' -import ButtonCheckBox from '@client/components/ButtonCheckBox' -import { getColumnLabelKeys } from '@client/pages/DataExport/utils' -import { Breakpoints } from '@client/utils/breakpoints' +import { useAppDispatch } from 'client/store' +import { DataExportActions, DataExportSelection, useDataExportSelection } from 'client/store/ui/dataExport' +import { DataExportActionType } from 'client/store/ui/dataExport/actionTypes' +import ButtonCheckBox from 'client/components/ButtonCheckBox' +import { getColumnLabelKeys } from 'client/pages/DataExport/utils' +import { Breakpoints } from 'client/utils/breakpoints' const ColumnSelect: React.FC<{ columns: Array }> = ({ columns }) => { const dispatch = useAppDispatch() diff --git a/src/client/pages/DataExport/CountrySelect/CountrySelect.tsx b/src/client/pages/DataExport/CountrySelect/CountrySelect.tsx index c2486f53c7..6147c0ec01 100644 --- a/src/client/pages/DataExport/CountrySelect/CountrySelect.tsx +++ b/src/client/pages/DataExport/CountrySelect/CountrySelect.tsx @@ -3,16 +3,16 @@ import { useTranslation } from 'react-i18next' import MediaQuery from 'react-responsive' import { useParams } from 'react-router-dom' -import { Functions } from '@utils/functions' -import { Strings } from '@utils/strings' +import { Functions } from 'utils/functions' +import { Strings } from 'utils/strings' -import { Areas, Country } from '@meta/area' +import { Areas, Country } from 'meta/area' -import { useAppDispatch } from '@client/store' -import { DataExportActions, useDataExportCountries, useDataExportSelection } from '@client/store/ui/dataExport' -import { DataExportActionType } from '@client/store/ui/dataExport/actionTypes' -import ButtonCheckBox from '@client/components/ButtonCheckBox' -import { Breakpoints } from '@client/utils/breakpoints' +import { useAppDispatch } from 'client/store' +import { DataExportActions, useDataExportCountries, useDataExportSelection } from 'client/store/ui/dataExport' +import { DataExportActionType } from 'client/store/ui/dataExport/actionTypes' +import ButtonCheckBox from 'client/components/ButtonCheckBox' +import { Breakpoints } from 'client/utils/breakpoints' const CountrySelect: React.FC = () => { const dispatch = useAppDispatch() diff --git a/src/client/pages/DataExport/DataExport.tsx b/src/client/pages/DataExport/DataExport.tsx index 4f3d15d13d..424798929a 100644 --- a/src/client/pages/DataExport/DataExport.tsx +++ b/src/client/pages/DataExport/DataExport.tsx @@ -2,15 +2,15 @@ import './DataExport.scss' import React, { useEffect } from 'react' import { useParams } from 'react-router-dom' -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Row } from '@meta/assessment' +import { Row } from 'meta/assessment' -import { useAppDispatch } from '@client/store' -import { useCycle } from '@client/store/assessment' -import { useTableSections } from '@client/store/metadata' -import { DataExportActions, useDataExportCountries, useDataExportSelection } from '@client/store/ui/dataExport' -import { useCountryIso } from '@client/hooks' +import { useAppDispatch } from 'client/store' +import { useCycle } from 'client/store/assessment' +import { useTableSections } from 'client/store/metadata' +import { DataExportActions, useDataExportCountries, useDataExportSelection } from 'client/store/ui/dataExport' +import { useCountryIso } from 'client/hooks' import ColumnSelect from './ColumnSelect' import CountrySelect from './CountrySelect' diff --git a/src/client/pages/DataExport/ResultsTable/ResultsTable.tsx b/src/client/pages/DataExport/ResultsTable/ResultsTable.tsx index a16fecf0f7..175212601d 100644 --- a/src/client/pages/DataExport/ResultsTable/ResultsTable.tsx +++ b/src/client/pages/DataExport/ResultsTable/ResultsTable.tsx @@ -3,17 +3,17 @@ import React, { useEffect, useRef, useState } from 'react' import { useTranslation } from 'react-i18next' import { useParams } from 'react-router-dom' -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Areas, CountryIso } from '@meta/area' -import { AssessmentName } from '@meta/assessment' -import { Unit } from '@meta/dataExport' +import { Areas, CountryIso } from 'meta/area' +import { AssessmentName } from 'meta/assessment' +import { Unit } from 'meta/dataExport' -import { useCycle } from '@client/store/assessment' -import { useTableSections } from '@client/store/metadata' -import { useDataExportCountries, useDataExportSelection } from '@client/store/ui/dataExport' -import ButtonTableExport from '@client/components/ButtonTableExport' -import { convertValue, formatValue, getColumnLabelKeys } from '@client/pages/DataExport/utils' +import { useCycle } from 'client/store/assessment' +import { useTableSections } from 'client/store/metadata' +import { useDataExportCountries, useDataExportSelection } from 'client/store/ui/dataExport' +import ButtonTableExport from 'client/components/ButtonTableExport' +import { convertValue, formatValue, getColumnLabelKeys } from 'client/pages/DataExport/utils' import RowFooter from './RowFooter' import Title from './Title' diff --git a/src/client/pages/DataExport/ResultsTable/RowFooter/RowFooter.tsx b/src/client/pages/DataExport/ResultsTable/RowFooter/RowFooter.tsx index ce8cc2e04e..874faf4471 100644 --- a/src/client/pages/DataExport/ResultsTable/RowFooter/RowFooter.tsx +++ b/src/client/pages/DataExport/ResultsTable/RowFooter/RowFooter.tsx @@ -1,6 +1,6 @@ import React from 'react' -import { Dates } from '@utils/dates' +import { Dates } from 'utils/dates' const RowFooter: React.FC = () => { const date = new Date() diff --git a/src/client/pages/DataExport/ResultsTable/Title/Title.tsx b/src/client/pages/DataExport/ResultsTable/Title/Title.tsx index 826a3fd94d..211c6f818e 100644 --- a/src/client/pages/DataExport/ResultsTable/Title/Title.tsx +++ b/src/client/pages/DataExport/ResultsTable/Title/Title.tsx @@ -2,14 +2,14 @@ import React from 'react' import { useTranslation } from 'react-i18next' import { useParams } from 'react-router-dom' -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Cols, Row } from '@meta/assessment' -import { Unit, UnitFactors } from '@meta/dataExport' +import { Cols, Row } from 'meta/assessment' +import { Unit, UnitFactors } from 'meta/dataExport' -import { useCycle } from '@client/store/assessment' -import { useTableSections } from '@client/store/metadata' -import { getUnitLabelKey } from '@client/pages/DataExport/utils' +import { useCycle } from 'client/store/assessment' +import { useTableSections } from 'client/store/metadata' +import { getUnitLabelKey } from 'client/pages/DataExport/utils' type Props = { baseUnit?: Unit diff --git a/src/client/pages/DataExport/ResultsTable/useFetchResults.ts b/src/client/pages/DataExport/ResultsTable/useFetchResults.ts index 116884d470..fda55181b7 100644 --- a/src/client/pages/DataExport/ResultsTable/useFetchResults.ts +++ b/src/client/pages/DataExport/ResultsTable/useFetchResults.ts @@ -1,11 +1,11 @@ import { useEffect } from 'react' -import { ApiEndPoint } from '@meta/api/endpoint' -import { AssessmentName } from '@meta/assessment' -import { RecordAssessmentData } from '@meta/data' +import { ApiEndPoint } from 'meta/api/endpoint' +import { AssessmentName } from 'meta/assessment' +import { RecordAssessmentData } from 'meta/data' -import { useDataExportSelection } from '@client/store/ui/dataExport' -import { useCountryIso, useGetRequest } from '@client/hooks' +import { useDataExportSelection } from 'client/store/ui/dataExport' +import { useCountryIso, useGetRequest } from 'client/hooks' type Props = { columnsAlwaysExport: Array diff --git a/src/client/pages/DataExport/VariableSelect/VariableSelect.tsx b/src/client/pages/DataExport/VariableSelect/VariableSelect.tsx index 05640fc932..cca1877e87 100644 --- a/src/client/pages/DataExport/VariableSelect/VariableSelect.tsx +++ b/src/client/pages/DataExport/VariableSelect/VariableSelect.tsx @@ -3,15 +3,15 @@ import { useTranslation } from 'react-i18next' import MediaQuery from 'react-responsive' import { useParams } from 'react-router-dom' -import { AssessmentName, AssessmentNames, Labels, Row } from '@meta/assessment' +import { AssessmentName, AssessmentNames, Labels, Row } from 'meta/assessment' -import { useAppDispatch } from '@client/store' -import { useCycle } from '@client/store/assessment' -import { DataExportActions, DataExportSelection, useDataExportSelection } from '@client/store/ui/dataExport' -import { DataExportActionType } from '@client/store/ui/dataExport/actionTypes' -import ButtonCheckBox from '@client/components/ButtonCheckBox' -import DefinitionLink from '@client/components/DefinitionLink' -import { Breakpoints } from '@client/utils/breakpoints' +import { useAppDispatch } from 'client/store' +import { useCycle } from 'client/store/assessment' +import { DataExportActions, DataExportSelection, useDataExportSelection } from 'client/store/ui/dataExport' +import { DataExportActionType } from 'client/store/ui/dataExport/actionTypes' +import ButtonCheckBox from 'client/components/ButtonCheckBox' +import DefinitionLink from 'client/components/DefinitionLink' +import { Breakpoints } from 'client/utils/breakpoints' const Heading: Record = { [AssessmentNames.fra]: 'common.variable', diff --git a/src/client/pages/DataExport/utils/format.ts b/src/client/pages/DataExport/utils/format.ts index f8c2673047..42d5cf933e 100644 --- a/src/client/pages/DataExport/utils/format.ts +++ b/src/client/pages/DataExport/utils/format.ts @@ -1,11 +1,11 @@ -import { Numbers } from '@utils/numbers' +import { Numbers } from 'utils/numbers' -import { CountryIso } from '@meta/area' -import { AssessmentName, AssessmentNames, CycleName } from '@meta/assessment' -import { RecordAssessmentDatas, RecordCountryData } from '@meta/data' -import { Unit, UnitConverter, UnitFactors } from '@meta/dataExport' +import { CountryIso } from 'meta/area' +import { AssessmentName, AssessmentNames, CycleName } from 'meta/assessment' +import { RecordAssessmentDatas, RecordCountryData } from 'meta/data' +import { Unit, UnitConverter, UnitFactors } from 'meta/dataExport' -// import { getPanEuropeanTableMapping } from '@client/pages/DataExport/utils/panEuropean' +// import { getPanEuropeanTableMapping } from 'client/pages/DataExport/utils/panEuropean' const sections: Record = { designatedManagementObjective: 'primary_designated_management_objective', diff --git a/src/client/pages/DataExport/utils/labelKeys.ts b/src/client/pages/DataExport/utils/labelKeys.ts index 3487a5be22..1424025d59 100644 --- a/src/client/pages/DataExport/utils/labelKeys.ts +++ b/src/client/pages/DataExport/utils/labelKeys.ts @@ -1,5 +1,5 @@ -import { AssessmentName, AssessmentNames } from '@meta/assessment' -import { Unit } from '@meta/dataExport' +import { AssessmentName, AssessmentNames } from 'meta/assessment' +import { Unit } from 'meta/dataExport' import { isYearWithWord } from './checks' diff --git a/src/client/pages/Geo/Geo.tsx b/src/client/pages/Geo/Geo.tsx index b20aee00d9..f0624a8653 100644 --- a/src/client/pages/Geo/Geo.tsx +++ b/src/client/pages/Geo/Geo.tsx @@ -1,7 +1,7 @@ import './geo.scss' import React, { Suspense } from 'react' -import Loading from '@client/components/Loading' +import Loading from 'client/components/Loading' const GeoMapWrapper = React.lazy(() => import('./GeoMapWrapper')) diff --git a/src/client/pages/Geo/GeoMap/GeoMap.tsx b/src/client/pages/Geo/GeoMap/GeoMap.tsx index a767a6e2fd..f813447fc1 100644 --- a/src/client/pages/Geo/GeoMap/GeoMap.tsx +++ b/src/client/pages/Geo/GeoMap/GeoMap.tsx @@ -1,12 +1,12 @@ import './geoMap.scss' import React, { useEffect, useRef, useState } from 'react' -import { useAppDispatch } from '@client/store' -import { GeoActions } from '@client/store/ui/geo' -import { useCountryIso } from '@client/hooks' -import { useMapLayersHandler } from '@client/pages/Geo/GeoMap/hooks' -import { getCountryBounds } from '@client/pages/Geo/utils/countryBounds' -import { mapController } from '@client/utils' +import { useAppDispatch } from 'client/store' +import { GeoActions } from 'client/store/ui/geo' +import { useCountryIso } from 'client/hooks' +import { useMapLayersHandler } from 'client/pages/Geo/GeoMap/hooks' +import { getCountryBounds } from 'client/pages/Geo/utils/countryBounds' +import { mapController } from 'client/utils' type Props = { viewport?: google.maps.LatLngBoundsLiteral diff --git a/src/client/pages/Geo/GeoMap/GeoMapMenuButton/geoMapMenuButton.tsx b/src/client/pages/Geo/GeoMap/GeoMapMenuButton/geoMapMenuButton.tsx index 8661922663..6b8b2628f7 100644 --- a/src/client/pages/Geo/GeoMap/GeoMapMenuButton/geoMapMenuButton.tsx +++ b/src/client/pages/Geo/GeoMap/GeoMapMenuButton/geoMapMenuButton.tsx @@ -3,11 +3,11 @@ import React, { useCallback } from 'react' import classNames from 'classnames' -import { MapPanel } from '@meta/geo' +import { MapPanel } from 'meta/geo' -import { useAppDispatch } from '@client/store' -import { GeoActions, useSelectedPanel } from '@client/store/ui/geo' -import GeoIcon from '@client/components/GeoIcon' +import { useAppDispatch } from 'client/store' +import { GeoActions, useSelectedPanel } from 'client/store/ui/geo' +import GeoIcon from 'client/components/GeoIcon' interface Props { panel: MapPanel diff --git a/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerAgreementLevelsControl/MapVisualizerAgreementLevelsControl.tsx b/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerAgreementLevelsControl/MapVisualizerAgreementLevelsControl.tsx index 1359f68859..e2124e1fbd 100644 --- a/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerAgreementLevelsControl/MapVisualizerAgreementLevelsControl.tsx +++ b/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerAgreementLevelsControl/MapVisualizerAgreementLevelsControl.tsx @@ -5,13 +5,13 @@ import { batch } from 'react-redux' import axios from 'axios' import classNames from 'classnames' -import { ApiEndPoint } from '@meta/api/endpoint' -import { ExtraEstimation, ForestSource } from '@meta/geo' -import { LayerSource } from '@meta/geo/forest' +import { ApiEndPoint } from 'meta/api/endpoint' +import { ExtraEstimation, ForestSource } from 'meta/geo' +import { LayerSource } from 'meta/geo/forest' -import { useAppDispatch } from '@client/store' -import { GeoActions, useForestSourceOptions, useGeoStatistics } from '@client/store/ui/geo' -import { useCountryIso } from '@client/hooks' +import { useAppDispatch } from 'client/store' +import { GeoActions, useForestSourceOptions, useGeoStatistics } from 'client/store/ui/geo' +import { useCountryIso } from 'client/hooks' import GeoMapMenuListElement from '../../GeoMapMenuListElement' import { forestLayers } from '../MapVisualizerPanel' diff --git a/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerPanel/BurnedAreaLayerSection/BurnedAreaLayerSection.tsx b/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerPanel/BurnedAreaLayerSection/BurnedAreaLayerSection.tsx index a346809648..0b3a729d1c 100644 --- a/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerPanel/BurnedAreaLayerSection/BurnedAreaLayerSection.tsx +++ b/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerPanel/BurnedAreaLayerSection/BurnedAreaLayerSection.tsx @@ -1,10 +1,10 @@ import './BurnedAreaLayerSection.scss' import React from 'react' -import { BurnedAreaKey, LayerStatus } from '@meta/geo' +import { BurnedAreaKey, LayerStatus } from 'meta/geo' -import { useAppDispatch } from '@client/store' -import { GeoActions, useBurnedAreasOptions } from '@client/store/ui/geo' +import { useAppDispatch } from 'client/store' +import { GeoActions, useBurnedAreasOptions } from 'client/store/ui/geo' import GeoMapMenuListElement from '../../../GeoMapMenuListElement' import { burnedAreaLayers, GLOBAL_OPACITY_KEY } from '../layers' diff --git a/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerPanel/BurnedAreaLayerSection/BurnedAreasLayerOptionsPanel/BurnedAreasLayerOptionsPanel.tsx b/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerPanel/BurnedAreaLayerSection/BurnedAreasLayerOptionsPanel/BurnedAreasLayerOptionsPanel.tsx index d2a8244d00..f180ada18e 100644 --- a/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerPanel/BurnedAreaLayerSection/BurnedAreasLayerOptionsPanel/BurnedAreasLayerOptionsPanel.tsx +++ b/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerPanel/BurnedAreaLayerSection/BurnedAreasLayerOptionsPanel/BurnedAreasLayerOptionsPanel.tsx @@ -2,11 +2,11 @@ import './BurnedAreasLayerOptionsPanel.scss' import React, { useState } from 'react' import { batch } from 'react-redux' -import { BurnedAreaKey } from '@meta/geo' +import { BurnedAreaKey } from 'meta/geo' -import { useAppDispatch } from '@client/store' -import { GeoActions, useBurnedAreasOptions, useIsGeoMapAvailable } from '@client/store/ui/geo' -import { mapController } from '@client/utils' +import { useAppDispatch } from 'client/store' +import { GeoActions, useBurnedAreasOptions, useIsGeoMapAvailable } from 'client/store/ui/geo' +import { mapController } from 'client/utils' import { GLOBAL_OPACITY_KEY } from '../..' diff --git a/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerPanel/ForestLayerSection/CustomAssetControl/CustomAssetControl.tsx b/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerPanel/ForestLayerSection/CustomAssetControl/CustomAssetControl.tsx index 7171b4c807..e90ecbaf5c 100644 --- a/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerPanel/ForestLayerSection/CustomAssetControl/CustomAssetControl.tsx +++ b/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerPanel/ForestLayerSection/CustomAssetControl/CustomAssetControl.tsx @@ -3,10 +3,10 @@ import React, { ChangeEvent, useState } from 'react' import classNames from 'classnames' -import { ForestSource, LayerStatus } from '@meta/geo' +import { ForestSource, LayerStatus } from 'meta/geo' -import { useAppDispatch } from '@client/store' -import { GeoActions, useForestSourceOptions } from '@client/store/ui/geo' +import { useAppDispatch } from 'client/store' +import { GeoActions, useForestSourceOptions } from 'client/store/ui/geo' import LayerOptionsPanel from '../../LayerOptionsPanel' diff --git a/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerPanel/ForestLayerSection/ForestLayerSection.tsx b/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerPanel/ForestLayerSection/ForestLayerSection.tsx index fc13858f95..68b1acdf9b 100644 --- a/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerPanel/ForestLayerSection/ForestLayerSection.tsx +++ b/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerPanel/ForestLayerSection/ForestLayerSection.tsx @@ -1,11 +1,11 @@ import './ForestLayerSection.scss' import React from 'react' -import { ForestSource, LayerStatus } from '@meta/geo' -import { forestAgreementRecipes } from '@meta/geo/forest' +import { ForestSource, LayerStatus } from 'meta/geo' +import { forestAgreementRecipes } from 'meta/geo/forest' -import { useAppDispatch } from '@client/store' -import { GeoActions, useForestSourceOptions } from '@client/store/ui/geo' +import { useAppDispatch } from 'client/store' +import { GeoActions, useForestSourceOptions } from 'client/store/ui/geo' import GeoMapMenuListElement from '../../../GeoMapMenuListElement' import AgreementLevelsControl from '../../MapVisualizerAgreementLevelsControl' diff --git a/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerPanel/LayerOptionsPanel/LayerOptionsPanel.tsx b/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerPanel/LayerOptionsPanel/LayerOptionsPanel.tsx index db0c07e1f8..81ff35e956 100644 --- a/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerPanel/LayerOptionsPanel/LayerOptionsPanel.tsx +++ b/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerPanel/LayerOptionsPanel/LayerOptionsPanel.tsx @@ -2,11 +2,11 @@ import './LayerOptionsPanel.scss' import React, { useState } from 'react' import { batch } from 'react-redux' -import { ForestSource, HansenPercentage, hansenPercentages } from '@meta/geo/forest' +import { ForestSource, HansenPercentage, hansenPercentages } from 'meta/geo/forest' -import { useAppDispatch } from '@client/store' -import { GeoActions, useForestSourceOptions, useIsGeoMapAvailable } from '@client/store/ui/geo' -import { mapController } from '@client/utils' +import { useAppDispatch } from 'client/store' +import { GeoActions, useForestSourceOptions, useIsGeoMapAvailable } from 'client/store/ui/geo' +import { mapController } from 'client/utils' import { GLOBAL_OPACITY_KEY } from '..' diff --git a/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerPanel/ProtectedAreaLayerSection/CustomAssetControl/CustomAssetControl.tsx b/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerPanel/ProtectedAreaLayerSection/CustomAssetControl/CustomAssetControl.tsx index a217428bbc..1a156da4c3 100644 --- a/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerPanel/ProtectedAreaLayerSection/CustomAssetControl/CustomAssetControl.tsx +++ b/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerPanel/ProtectedAreaLayerSection/CustomAssetControl/CustomAssetControl.tsx @@ -3,10 +3,10 @@ import React, { ChangeEvent, useState } from 'react' import classNames from 'classnames' -import { LayerStatus, ProtectedAreaKey } from '@meta/geo' +import { LayerStatus, ProtectedAreaKey } from 'meta/geo' -import { useAppDispatch } from '@client/store' -import { GeoActions, useProtectedAreasOptions } from '@client/store/ui/geo' +import { useAppDispatch } from 'client/store' +import { GeoActions, useProtectedAreasOptions } from 'client/store/ui/geo' import ProtectedAreasLayerOptionsPanel from '../ProtectedAreasLayerOptionsPanel' diff --git a/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerPanel/ProtectedAreaLayerSection/ProtectedAreaLayerSection.tsx b/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerPanel/ProtectedAreaLayerSection/ProtectedAreaLayerSection.tsx index 583dbba2fd..35b4a2cb0c 100644 --- a/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerPanel/ProtectedAreaLayerSection/ProtectedAreaLayerSection.tsx +++ b/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerPanel/ProtectedAreaLayerSection/ProtectedAreaLayerSection.tsx @@ -1,10 +1,10 @@ import './ProtectedAreaLayerSection.scss' import React from 'react' -import { LayerStatus, ProtectedAreaKey } from '@meta/geo' +import { LayerStatus, ProtectedAreaKey } from 'meta/geo' -import { useAppDispatch } from '@client/store' -import { GeoActions, useProtectedAreasOptions } from '@client/store/ui/geo' +import { useAppDispatch } from 'client/store' +import { GeoActions, useProtectedAreasOptions } from 'client/store/ui/geo' import GeoMapMenuListElement from '../../../GeoMapMenuListElement' import { GLOBAL_OPACITY_KEY, protectedAreaLayers } from '../layers' diff --git a/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerPanel/ProtectedAreaLayerSection/ProtectedAreasLayerOptionsPanel/ProtectedAreasLayerOptionsPanel.tsx b/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerPanel/ProtectedAreaLayerSection/ProtectedAreasLayerOptionsPanel/ProtectedAreasLayerOptionsPanel.tsx index 4696ef655a..0ba4953b4f 100644 --- a/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerPanel/ProtectedAreaLayerSection/ProtectedAreasLayerOptionsPanel/ProtectedAreasLayerOptionsPanel.tsx +++ b/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerPanel/ProtectedAreaLayerSection/ProtectedAreasLayerOptionsPanel/ProtectedAreasLayerOptionsPanel.tsx @@ -1,9 +1,9 @@ import './ProtectedAreasLayerOptionsPanel.scss' import React, { useState } from 'react' -import { useAppDispatch } from '@client/store' -import { GeoActions, useIsGeoMapAvailable, useProtectedAreasOptions } from '@client/store/ui/geo' -import { mapController } from '@client/utils' +import { useAppDispatch } from 'client/store' +import { GeoActions, useIsGeoMapAvailable, useProtectedAreasOptions } from 'client/store/ui/geo' +import { mapController } from 'client/utils' import { GLOBAL_OPACITY_KEY } from '../..' diff --git a/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerPanel/layers.ts b/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerPanel/layers.ts index e47cf67822..47f1677b80 100644 --- a/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerPanel/layers.ts +++ b/src/client/pages/Geo/GeoMap/GeoMapMenuData/MapVisualizerPanel/layers.ts @@ -1,4 +1,4 @@ -import { BurnedAreaKey, ForestSource, ProtectedAreaKey } from '@meta/geo' +import { BurnedAreaKey, ForestSource, ProtectedAreaKey } from 'meta/geo' export interface ForestLayer { key: ForestSource diff --git a/src/client/pages/Geo/GeoMap/GeoMapMenuData/geoMapMenuData.tsx b/src/client/pages/Geo/GeoMap/GeoMapMenuData/geoMapMenuData.tsx index 14e5398176..2798e71c1c 100644 --- a/src/client/pages/Geo/GeoMap/GeoMapMenuData/geoMapMenuData.tsx +++ b/src/client/pages/Geo/GeoMap/GeoMapMenuData/geoMapMenuData.tsx @@ -1,7 +1,7 @@ import './geoMapMenuData.scss' import React from 'react' -import { useSelectedPanel } from '@client/store/ui/geo' +import { useSelectedPanel } from 'client/store/ui/geo' import GeoMapMenuButton from '../GeoMapMenuButton' import MapVisualizerPanel from './MapVisualizerPanel' diff --git a/src/client/pages/Geo/GeoMap/GeoMapMenuItem/geoMapMenuItem.tsx b/src/client/pages/Geo/GeoMap/GeoMapMenuItem/geoMapMenuItem.tsx index c8490e1e96..87233333c5 100644 --- a/src/client/pages/Geo/GeoMap/GeoMapMenuItem/geoMapMenuItem.tsx +++ b/src/client/pages/Geo/GeoMap/GeoMapMenuItem/geoMapMenuItem.tsx @@ -3,9 +3,9 @@ import React, { useCallback, useState } from 'react' import classNames from 'classnames' -import { LayerStatus } from '@meta/geo' +import { LayerStatus } from 'meta/geo' -import Icon from '@client/components/Icon' +import Icon from 'client/components/Icon' interface Props { title: string diff --git a/src/client/pages/Geo/GeoMap/GeoMapMenuListElement/GeoMapMenuListElement.tsx b/src/client/pages/Geo/GeoMap/GeoMapMenuListElement/GeoMapMenuListElement.tsx index ab638f94d7..c42ecc910a 100644 --- a/src/client/pages/Geo/GeoMap/GeoMapMenuListElement/GeoMapMenuListElement.tsx +++ b/src/client/pages/Geo/GeoMap/GeoMapMenuListElement/GeoMapMenuListElement.tsx @@ -3,7 +3,7 @@ import React from 'react' import classNames from 'classnames' -import { LayerStatus } from '@meta/geo' +import { LayerStatus } from 'meta/geo' interface Props { title: string diff --git a/src/client/pages/Geo/GeoMap/GeoMapMenuMosaic/GeoMapMenuMosaic.tsx b/src/client/pages/Geo/GeoMap/GeoMapMenuMosaic/GeoMapMenuMosaic.tsx index 317a8d1eec..b398173e8f 100644 --- a/src/client/pages/Geo/GeoMap/GeoMapMenuMosaic/GeoMapMenuMosaic.tsx +++ b/src/client/pages/Geo/GeoMap/GeoMapMenuMosaic/GeoMapMenuMosaic.tsx @@ -1,9 +1,9 @@ import './GeoMapMenuMosaic.scss' import React, { useEffect } from 'react' -import { LayerStatus } from '@meta/geo' +import { LayerStatus } from 'meta/geo' -import { useAppDispatch } from '@client/store' +import { useAppDispatch } from 'client/store' import { GeoActions, useAppliedMosaicOptions, @@ -12,9 +12,9 @@ import { useMosaicSelected, useMosaicUrl, useSelectedPanel, -} from '@client/store/ui/geo' -import { useCountryIso } from '@client/hooks' -import { mapController } from '@client/utils' +} from 'client/store/ui/geo' +import { useCountryIso } from 'client/hooks' +import { mapController } from 'client/utils' import GeoMapMenuButton from '../GeoMapMenuButton' import MosaicControl from './MosaicControl' diff --git a/src/client/pages/Geo/GeoMap/GeoMapMenuMosaic/MosaicControl/MosaicControl.tsx b/src/client/pages/Geo/GeoMap/GeoMapMenuMosaic/MosaicControl/MosaicControl.tsx index 880573de66..436ee6c4a2 100644 --- a/src/client/pages/Geo/GeoMap/GeoMapMenuMosaic/MosaicControl/MosaicControl.tsx +++ b/src/client/pages/Geo/GeoMap/GeoMapMenuMosaic/MosaicControl/MosaicControl.tsx @@ -1,8 +1,8 @@ import './MosaicControl.scss' import React from 'react' -import { useAppDispatch } from '@client/store' -import { GeoActions, useMosaicSelected } from '@client/store/ui/geo' +import { useAppDispatch } from 'client/store' +import { GeoActions, useMosaicSelected } from 'client/store/ui/geo' import GeoMenuItem from '../../GeoMapMenuItem' import SatelliteSourcePanel from '../SatelliteSourcePanel' diff --git a/src/client/pages/Geo/GeoMap/GeoMapMenuMosaic/SatelliteSourceHeader/satelliteSourceHeader.tsx b/src/client/pages/Geo/GeoMap/GeoMapMenuMosaic/SatelliteSourceHeader/satelliteSourceHeader.tsx index f2ac1f3403..ac7321d80e 100644 --- a/src/client/pages/Geo/GeoMap/GeoMapMenuMosaic/SatelliteSourceHeader/satelliteSourceHeader.tsx +++ b/src/client/pages/Geo/GeoMap/GeoMapMenuMosaic/SatelliteSourceHeader/satelliteSourceHeader.tsx @@ -3,7 +3,7 @@ import React, { useCallback } from 'react' import classNames from 'classnames' -import Icon from '@client/components/Icon' +import Icon from 'client/components/Icon' interface Props { title: string diff --git a/src/client/pages/Geo/GeoMap/GeoMapMenuMosaic/SatelliteSourcePanel/SatelliteSourcePanel.tsx b/src/client/pages/Geo/GeoMap/GeoMapMenuMosaic/SatelliteSourcePanel/SatelliteSourcePanel.tsx index 87389e38cc..0feda2616b 100644 --- a/src/client/pages/Geo/GeoMap/GeoMapMenuMosaic/SatelliteSourcePanel/SatelliteSourcePanel.tsx +++ b/src/client/pages/Geo/GeoMap/GeoMapMenuMosaic/SatelliteSourcePanel/SatelliteSourcePanel.tsx @@ -1,10 +1,10 @@ import './SatelliteSourcePanel.scss' import React from 'react' -import { LayerStatus, MosaicOptions, MosaicSource } from '@meta/geo' +import { LayerStatus, MosaicOptions, MosaicSource } from 'meta/geo' -import { useAppDispatch } from '@client/store' -import { GeoActions, useAppliedMosaicOptions, useUiMosaicOptions } from '@client/store/ui/geo' +import { useAppDispatch } from 'client/store' +import { GeoActions, useAppliedMosaicOptions, useUiMosaicOptions } from 'client/store/ui/geo' interface ControlProps { label: string diff --git a/src/client/pages/Geo/GeoMap/GeoMapMenuStatistics/StatisticalGraphsPanel/StatisticalGraphsPanel.tsx b/src/client/pages/Geo/GeoMap/GeoMapMenuStatistics/StatisticalGraphsPanel/StatisticalGraphsPanel.tsx index bb601a46c3..b9ebfadc68 100644 --- a/src/client/pages/Geo/GeoMap/GeoMapMenuStatistics/StatisticalGraphsPanel/StatisticalGraphsPanel.tsx +++ b/src/client/pages/Geo/GeoMap/GeoMapMenuStatistics/StatisticalGraphsPanel/StatisticalGraphsPanel.tsx @@ -1,13 +1,13 @@ import './StatisticalGraphsPanel.scss' import React, { useEffect, useState } from 'react' -import { Numbers } from '@utils/numbers' +import { Numbers } from 'utils/numbers' import { ChartOptions, Plugin } from 'chart.js' -import { ExtraEstimation, extraEstimationsMetadata, ForestSource, sourcesMetadata } from '@meta/geo' +import { ExtraEstimation, extraEstimationsMetadata, ForestSource, sourcesMetadata } from 'meta/geo' -import Chart from '@client/components/Chart' -import { displayPercentagesPlugin, whiteBackgroundplugin } from '@client/pages/Geo/utils/chartPlugins' +import Chart from 'client/components/Chart' +import { displayPercentagesPlugin, whiteBackgroundplugin } from 'client/pages/Geo/utils/chartPlugins' type Props = { data: [string, number, number][] diff --git a/src/client/pages/Geo/GeoMap/GeoMapMenuStatistics/TreeCoverAreaPanel/TreeCoverAreaPanel.tsx b/src/client/pages/Geo/GeoMap/GeoMapMenuStatistics/TreeCoverAreaPanel/TreeCoverAreaPanel.tsx index 1ec2476cbf..fae344e1f1 100644 --- a/src/client/pages/Geo/GeoMap/GeoMapMenuStatistics/TreeCoverAreaPanel/TreeCoverAreaPanel.tsx +++ b/src/client/pages/Geo/GeoMap/GeoMapMenuStatistics/TreeCoverAreaPanel/TreeCoverAreaPanel.tsx @@ -1,7 +1,7 @@ import './TreeCoverAreaPanel.scss' import React from 'react' -import { Numbers } from '@utils/numbers' +import { Numbers } from 'utils/numbers' import StatisticsTable from '../../components/StatisticsTable' diff --git a/src/client/pages/Geo/GeoMap/GeoMapMenuStatistics/geoMapMenuStatistics.tsx b/src/client/pages/Geo/GeoMap/GeoMapMenuStatistics/geoMapMenuStatistics.tsx index 8a35673f3d..3a479b0b13 100644 --- a/src/client/pages/Geo/GeoMap/GeoMapMenuStatistics/geoMapMenuStatistics.tsx +++ b/src/client/pages/Geo/GeoMap/GeoMapMenuStatistics/geoMapMenuStatistics.tsx @@ -1,9 +1,9 @@ import './geoMapMenuStatistics.scss' import React from 'react' -import { useGeoStatistics, useSelectedPanel } from '@client/store/ui/geo' -import { useCountryIso } from '@client/hooks' -import { useGeoStatisticsHandler } from '@client/pages/Geo/GeoMap/hooks' +import { useGeoStatistics, useSelectedPanel } from 'client/store/ui/geo' +import { useCountryIso } from 'client/hooks' +import { useGeoStatisticsHandler } from 'client/pages/Geo/GeoMap/hooks' import GeoMapMenuButton from '../GeoMapMenuButton' import GeoMenuItem from '../GeoMapMenuItem' diff --git a/src/client/pages/Geo/GeoMap/components/ButtonStatisticsTableExport/ButtonStatisticsTableExport.tsx b/src/client/pages/Geo/GeoMap/components/ButtonStatisticsTableExport/ButtonStatisticsTableExport.tsx index 96383cb660..be0fc7d246 100644 --- a/src/client/pages/Geo/GeoMap/components/ButtonStatisticsTableExport/ButtonStatisticsTableExport.tsx +++ b/src/client/pages/Geo/GeoMap/components/ButtonStatisticsTableExport/ButtonStatisticsTableExport.tsx @@ -2,7 +2,7 @@ import './ButtonStatisticsTableExport.scss' import React, { MutableRefObject, useEffect, useRef, useState } from 'react' import { CSVLink } from 'react-csv' -import Icon from '@client/components/Icon' +import Icon from 'client/components/Icon' import * as Utils from './utils' diff --git a/src/client/pages/Geo/GeoMap/hooks/useAgreementLayerHandler.ts b/src/client/pages/Geo/GeoMap/hooks/useAgreementLayerHandler.ts index d6d4942845..3b1f7906b5 100644 --- a/src/client/pages/Geo/GeoMap/hooks/useAgreementLayerHandler.ts +++ b/src/client/pages/Geo/GeoMap/hooks/useAgreementLayerHandler.ts @@ -2,15 +2,15 @@ import { useEffect, useRef } from 'react' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { ForestSource, Layer } from '@meta/geo' -import { LayerSource, LayerStatus } from '@meta/geo/forest' - -import { useAppDispatch } from '@client/store' -import { GeoActions, useForestSourceOptions } from '@client/store/ui/geo' -import { GetForestLayerRequestBody } from '@client/store/ui/geo/actions/getForestLayer' -import { useCountryIso } from '@client/hooks' -import { mapController } from '@client/utils' +import { ApiEndPoint } from 'meta/api/endpoint' +import { ForestSource, Layer } from 'meta/geo' +import { LayerSource, LayerStatus } from 'meta/geo/forest' + +import { useAppDispatch } from 'client/store' +import { GeoActions, useForestSourceOptions } from 'client/store/ui/geo' +import { GetForestLayerRequestBody } from 'client/store/ui/geo/actions/getForestLayer' +import { useCountryIso } from 'client/hooks' +import { mapController } from 'client/utils' export const useAgreementLayerHandler = () => { const dispatch = useAppDispatch() diff --git a/src/client/pages/Geo/GeoMap/hooks/useBurnedAreaLayersHandler.ts b/src/client/pages/Geo/GeoMap/hooks/useBurnedAreaLayersHandler.ts index 26b5b2f63a..60d5ef0987 100644 --- a/src/client/pages/Geo/GeoMap/hooks/useBurnedAreaLayersHandler.ts +++ b/src/client/pages/Geo/GeoMap/hooks/useBurnedAreaLayersHandler.ts @@ -1,14 +1,14 @@ import { useEffect, useRef } from 'react' -import { ApiEndPoint } from '@meta/api/endpoint' -import { BurnedAreaKey } from '@meta/geo' +import { ApiEndPoint } from 'meta/api/endpoint' +import { BurnedAreaKey } from 'meta/geo' -import { useAppDispatch } from '@client/store' -import { GeoActions, useBurnedAreasOptions, useIsGeoMapAvailable } from '@client/store/ui/geo' -import { getBurnedAreaLayer } from '@client/store/ui/geo/actions' -import { GetBurnedAreaLayerRequestBody } from '@client/store/ui/geo/actions/getBurnedAreaLayer' -import { useCountryIso, usePrevious } from '@client/hooks' -import { mapController } from '@client/utils' +import { useAppDispatch } from 'client/store' +import { GeoActions, useBurnedAreasOptions, useIsGeoMapAvailable } from 'client/store/ui/geo' +import { getBurnedAreaLayer } from 'client/store/ui/geo/actions' +import { GetBurnedAreaLayerRequestBody } from 'client/store/ui/geo/actions/getBurnedAreaLayer' +import { useCountryIso, usePrevious } from 'client/hooks' +import { mapController } from 'client/utils' import { burnedAreaLayers } from '../GeoMapMenuData/MapVisualizerPanel' diff --git a/src/client/pages/Geo/GeoMap/hooks/useForestLayersHandler.ts b/src/client/pages/Geo/GeoMap/hooks/useForestLayersHandler.ts index 04ab01b62f..511cf576fb 100644 --- a/src/client/pages/Geo/GeoMap/hooks/useForestLayersHandler.ts +++ b/src/client/pages/Geo/GeoMap/hooks/useForestLayersHandler.ts @@ -1,15 +1,15 @@ import { useEffect, useRef } from 'react' -import { ApiEndPoint } from '@meta/api/endpoint' -import { ForestSource } from '@meta/geo' -import { HansenPercentage } from '@meta/geo/forest' +import { ApiEndPoint } from 'meta/api/endpoint' +import { ForestSource } from 'meta/geo' +import { HansenPercentage } from 'meta/geo/forest' -import { useAppDispatch } from '@client/store' -import { GeoActions, useForestSourceOptions, useIsGeoMapAvailable } from '@client/store/ui/geo' -import { getForestLayer } from '@client/store/ui/geo/actions' -import { GetForestLayerRequestBody } from '@client/store/ui/geo/actions/getForestLayer' -import { useCountryIso, usePrevious } from '@client/hooks' -import { mapController } from '@client/utils' +import { useAppDispatch } from 'client/store' +import { GeoActions, useForestSourceOptions, useIsGeoMapAvailable } from 'client/store/ui/geo' +import { getForestLayer } from 'client/store/ui/geo/actions' +import { GetForestLayerRequestBody } from 'client/store/ui/geo/actions/getForestLayer' +import { useCountryIso, usePrevious } from 'client/hooks' +import { mapController } from 'client/utils' import { forestLayers } from '../GeoMapMenuData/MapVisualizerPanel' diff --git a/src/client/pages/Geo/GeoMap/hooks/useGeoStatisticsHandler.ts b/src/client/pages/Geo/GeoMap/hooks/useGeoStatisticsHandler.ts index 11221d9fd6..8e09750c5a 100644 --- a/src/client/pages/Geo/GeoMap/hooks/useGeoStatisticsHandler.ts +++ b/src/client/pages/Geo/GeoMap/hooks/useGeoStatisticsHandler.ts @@ -1,11 +1,11 @@ import { useEffect } from 'react' -import { useAppDispatch } from '@client/store' -import { GeoActions, useGeoStatistics } from '@client/store/ui/geo' -import { getForestEstimationData } from '@client/store/ui/geo/actions' -import { useCountryIso } from '@client/hooks' -import { useRecipeLayerPropertyName } from '@client/pages/Geo/GeoMap/hooks' -import { builForestEstimationsDataTable } from '@client/pages/Geo/utils/forestEstimations' +import { useAppDispatch } from 'client/store' +import { GeoActions, useGeoStatistics } from 'client/store/ui/geo' +import { getForestEstimationData } from 'client/store/ui/geo/actions' +import { useCountryIso } from 'client/hooks' +import { useRecipeLayerPropertyName } from 'client/pages/Geo/GeoMap/hooks' +import { builForestEstimationsDataTable } from 'client/pages/Geo/utils/forestEstimations' export const useGeoStatisticsHandler = () => { const dispatch = useAppDispatch() diff --git a/src/client/pages/Geo/GeoMap/hooks/useProtectedAreaLayersHandler.ts b/src/client/pages/Geo/GeoMap/hooks/useProtectedAreaLayersHandler.ts index 579c4d6cf2..58bd4be2e7 100644 --- a/src/client/pages/Geo/GeoMap/hooks/useProtectedAreaLayersHandler.ts +++ b/src/client/pages/Geo/GeoMap/hooks/useProtectedAreaLayersHandler.ts @@ -1,14 +1,14 @@ import { useEffect } from 'react' -import { ApiEndPoint } from '@meta/api/endpoint' -import { ProtectedAreaKey } from '@meta/geo' +import { ApiEndPoint } from 'meta/api/endpoint' +import { ProtectedAreaKey } from 'meta/geo' -import { useAppDispatch } from '@client/store' -import { GeoActions, useIsGeoMapAvailable, useProtectedAreasOptions } from '@client/store/ui/geo' -import { getProtectedAreaLayer } from '@client/store/ui/geo/actions' -import { GetProtectedAreaLayerRequestBody } from '@client/store/ui/geo/actions/getProtectedAreaLayer' -import { useCountryIso, usePrevious } from '@client/hooks' -import { mapController } from '@client/utils' +import { useAppDispatch } from 'client/store' +import { GeoActions, useIsGeoMapAvailable, useProtectedAreasOptions } from 'client/store/ui/geo' +import { getProtectedAreaLayer } from 'client/store/ui/geo/actions' +import { GetProtectedAreaLayerRequestBody } from 'client/store/ui/geo/actions/getProtectedAreaLayer' +import { useCountryIso, usePrevious } from 'client/hooks' +import { mapController } from 'client/utils' import { protectedAreaLayers } from '../GeoMapMenuData/MapVisualizerPanel' diff --git a/src/client/pages/Geo/GeoMap/hooks/useRecipeLayerPropertyName.ts b/src/client/pages/Geo/GeoMap/hooks/useRecipeLayerPropertyName.ts index 8c21a0d44b..6619a8f532 100644 --- a/src/client/pages/Geo/GeoMap/hooks/useRecipeLayerPropertyName.ts +++ b/src/client/pages/Geo/GeoMap/hooks/useRecipeLayerPropertyName.ts @@ -1,8 +1,8 @@ import { useEffect, useState } from 'react' -import { getRecipeAgreementAreaProperty } from '@meta/geo/forest' +import { getRecipeAgreementAreaProperty } from 'meta/geo/forest' -import { useForestSourceOptions } from '@client/store/ui/geo' +import { useForestSourceOptions } from 'client/store/ui/geo' export const useRecipeLayerPropertyName = () => { const [recipeLayerPropertyName, setRecipeLayerPropertyName] = useState(null) diff --git a/src/client/pages/Geo/GeoMapWrapper/GeoMapWrapper.tsx b/src/client/pages/Geo/GeoMapWrapper/GeoMapWrapper.tsx index ffd33b0520..d99986fb4b 100644 --- a/src/client/pages/Geo/GeoMapWrapper/GeoMapWrapper.tsx +++ b/src/client/pages/Geo/GeoMapWrapper/GeoMapWrapper.tsx @@ -3,7 +3,7 @@ import React from 'react' import { Status, Wrapper } from '@googlemaps/react-wrapper' -import Loading from '@client/components/Loading' +import Loading from 'client/components/Loading' import GeoMap from '../GeoMap' import GeoMapMenuData from '../GeoMap/GeoMapMenuData' diff --git a/src/client/pages/Geo/utils/countryBounds.ts b/src/client/pages/Geo/utils/countryBounds.ts index 4af68fa475..53f3804a7d 100644 --- a/src/client/pages/Geo/utils/countryBounds.ts +++ b/src/client/pages/Geo/utils/countryBounds.ts @@ -1,8 +1,8 @@ import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { CountryIso } from '@meta/area' -import { Bounds } from '@meta/geo' +import { ApiEndPoint } from 'meta/api/endpoint' +import { CountryIso } from 'meta/area' +import { Bounds } from 'meta/geo' /** * Makes an API call to get the Bounds of a country. * diff --git a/src/client/pages/Geo/utils/forestEstimations.ts b/src/client/pages/Geo/utils/forestEstimations.ts index 37c6e68b23..99800ea0be 100644 --- a/src/client/pages/Geo/utils/forestEstimations.ts +++ b/src/client/pages/Geo/utils/forestEstimations.ts @@ -1,5 +1,5 @@ -import { ExtraEstimation, ForestEstimations, ForestEstimationsData, ForestSource, sourcesMetadata } from '@meta/geo' -import { hansenPercentages } from '@meta/geo/forest' +import { ExtraEstimation, ForestEstimations, ForestEstimationsData, ForestSource, sourcesMetadata } from 'meta/geo' +import { hansenPercentages } from 'meta/geo/forest' /** * Turns the Forest Estimations object into a table, and adds the area reported diff --git a/src/client/pages/Landing/Landing.tsx b/src/client/pages/Landing/Landing.tsx index 8cd8823768..6a741938e3 100644 --- a/src/client/pages/Landing/Landing.tsx +++ b/src/client/pages/Landing/Landing.tsx @@ -1,13 +1,13 @@ import React, { useEffect } from 'react' import { Navigate } from 'react-router-dom' -import { ClientRoutes } from '@meta/app' -import { RoleName } from '@meta/user' -import { UserRoles } from '@meta/user/userRoles' +import { ClientRoutes } from 'meta/app' +import { RoleName } from 'meta/user' +import { UserRoles } from 'meta/user/userRoles' -import { useAppDispatch } from '@client/store' -import { AssessmentActions, useAssessment, useCycle } from '@client/store/assessment' -import { useUser } from '@client/store/user' +import { useAppDispatch } from 'client/store' +import { AssessmentActions, useAssessment, useCycle } from 'client/store/assessment' +import { useUser } from 'client/store/user' const Landing: React.FC = () => { const dispatch = useAppDispatch() diff --git a/src/client/pages/Login/Invitation/Invitation.tsx b/src/client/pages/Login/Invitation/Invitation.tsx index 1779e4e2df..48db609f43 100644 --- a/src/client/pages/Login/Invitation/Invitation.tsx +++ b/src/client/pages/Login/Invitation/Invitation.tsx @@ -2,17 +2,17 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' import { Link, useNavigate } from 'react-router-dom' -import { ApiEndPoint } from '@meta/api/endpoint' -import { ClientRoutes } from '@meta/app' -import { Assessments } from '@meta/assessment' -import { AuthProvider, Users } from '@meta/user' -import { UserRoles } from '@meta/user/userRoles' - -import { useAppDispatch } from '@client/store' -import { LoginActions, useInvitation } from '@client/store/login' -import { useUser } from '@client/store/user' -import { isError, LoginValidator } from '@client/pages/Login/utils/LoginValidator' -import { Urls } from '@client/utils' +import { ApiEndPoint } from 'meta/api/endpoint' +import { ClientRoutes } from 'meta/app' +import { Assessments } from 'meta/assessment' +import { AuthProvider, Users } from 'meta/user' +import { UserRoles } from 'meta/user/userRoles' + +import { useAppDispatch } from 'client/store' +import { LoginActions, useInvitation } from 'client/store/login' +import { useUser } from 'client/store/user' +import { isError, LoginValidator } from 'client/pages/Login/utils/LoginValidator' +import { Urls } from 'client/utils' const Invitation: React.FC = () => { const dispatch = useAppDispatch() diff --git a/src/client/pages/Login/Login.tsx b/src/client/pages/Login/Login.tsx index 1c7aa8a699..e3024a30ab 100644 --- a/src/client/pages/Login/Login.tsx +++ b/src/client/pages/Login/Login.tsx @@ -2,9 +2,9 @@ import './Login.scss' import React from 'react' import { Route, Routes } from 'react-router-dom' -import { ClientRoutes } from '@meta/app' +import { ClientRoutes } from 'meta/app' -import Partners from '@client/components/Partners' +import Partners from 'client/components/Partners' import Invitation from './Invitation' import LoginForm from './LoginForm' diff --git a/src/client/pages/Login/LoginForm/LoginForm.tsx b/src/client/pages/Login/LoginForm/LoginForm.tsx index 23329659c3..a15efe123a 100644 --- a/src/client/pages/Login/LoginForm/LoginForm.tsx +++ b/src/client/pages/Login/LoginForm/LoginForm.tsx @@ -2,18 +2,18 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' import { Link, useNavigate } from 'react-router-dom' -import { Objects } from '@utils/index' +import { Objects } from 'utils/objects' -import { ApiEndPoint } from '@meta/api/endpoint' -import { ClientRoutes } from '@meta/app' +import { ApiEndPoint } from 'meta/api/endpoint' +import { ClientRoutes } from 'meta/app' -import { useAppDispatch } from '@client/store' -import { useAssessment, useCycle } from '@client/store/assessment' -import { LoginActions } from '@client/store/login' -import { useUser } from '@client/store/user' -import { useToaster } from '@client/hooks/useToaster' -import { isError, LoginValidator } from '@client/pages/Login/utils/LoginValidator' -import { Urls } from '@client/utils/urls' +import { useAppDispatch } from 'client/store' +import { useAssessment, useCycle } from 'client/store/assessment' +import { LoginActions } from 'client/store/login' +import { useUser } from 'client/store/user' +import { useToaster } from 'client/hooks/useToaster' +import { isError, LoginValidator } from 'client/pages/Login/utils/LoginValidator' +import { Urls } from 'client/utils/urls' const LoginForm: React.FC = () => { const dispatch = useAppDispatch() @@ -105,10 +105,7 @@ const LoginForm: React.FC = () => { return (
- + {t('login.signInGoogle')} diff --git a/src/client/pages/Login/ResetPassword/ResetPassword.tsx b/src/client/pages/Login/ResetPassword/ResetPassword.tsx index 1ffe881f7a..8346ab7caa 100644 --- a/src/client/pages/Login/ResetPassword/ResetPassword.tsx +++ b/src/client/pages/Login/ResetPassword/ResetPassword.tsx @@ -2,14 +2,14 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' import { useNavigate } from 'react-router-dom' -import { ApiEndPoint } from '@meta/api/endpoint' - -import { useAppDispatch } from '@client/store' -import { useAssessment, useCycle } from '@client/store/assessment' -import { LoginActions } from '@client/store/login' -import { useGetRequest } from '@client/hooks' -import { isError, LoginValidator } from '@client/pages/Login/utils/LoginValidator' -import { Urls } from '@client/utils' +import { ApiEndPoint } from 'meta/api/endpoint' + +import { useAppDispatch } from 'client/store' +import { useAssessment, useCycle } from 'client/store/assessment' +import { LoginActions } from 'client/store/login' +import { useGetRequest } from 'client/hooks' +import { isError, LoginValidator } from 'client/pages/Login/utils/LoginValidator' +import { Urls } from 'client/utils' const ResetPassword: React.FC = () => { const dispatch = useAppDispatch() diff --git a/src/client/pages/Login/utils/LoginValidator.tsx b/src/client/pages/Login/utils/LoginValidator.tsx index 6ee6aa30bf..5fd428fca1 100644 --- a/src/client/pages/Login/utils/LoginValidator.tsx +++ b/src/client/pages/Login/utils/LoginValidator.tsx @@ -1,4 +1,4 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' const emailRegex = /.+@.+\..+/ diff --git a/src/client/pages/OriginalDataPoint/OriginalDataPoint.tsx b/src/client/pages/OriginalDataPoint/OriginalDataPoint.tsx index 00d43fc84d..c0ae7c8343 100644 --- a/src/client/pages/OriginalDataPoint/OriginalDataPoint.tsx +++ b/src/client/pages/OriginalDataPoint/OriginalDataPoint.tsx @@ -3,13 +3,13 @@ import React, { useEffect } from 'react' import { useTranslation } from 'react-i18next' import { useNavigate, useParams } from 'react-router-dom' -import { AssessmentName, TableNames } from '@meta/assessment' +import { AssessmentName, TableNames } from 'meta/assessment' -import { useAppDispatch } from '@client/store' -import { OriginalDataPointActions, useOriginalDataPoint } from '@client/store/ui/originalDataPoint' -import { ReviewActions } from '@client/store/ui/review' -import { useIsEditTableDataEnabled, useUser } from '@client/store/user' -import { useCountryIso } from '@client/hooks' +import { useAppDispatch } from 'client/store' +import { OriginalDataPointActions, useOriginalDataPoint } from 'client/store/ui/originalDataPoint' +import { ReviewActions } from 'client/store/ui/review' +import { useIsEditTableDataEnabled, useUser } from 'client/store/user' +import { useCountryIso } from 'client/hooks' import ButtonBar from './components/ButtonBar' import Comments from './components/Comments' diff --git a/src/client/pages/OriginalDataPoint/components/ButtonBar/ButtonBar.tsx b/src/client/pages/OriginalDataPoint/components/ButtonBar/ButtonBar.tsx index 021c314a48..61f3d6623f 100644 --- a/src/client/pages/OriginalDataPoint/components/ButtonBar/ButtonBar.tsx +++ b/src/client/pages/OriginalDataPoint/components/ButtonBar/ButtonBar.tsx @@ -3,17 +3,17 @@ import React from 'react' import { useTranslation } from 'react-i18next' import { useNavigate, useParams } from 'react-router-dom' -import { ClientRoutes } from '@meta/app' -import { AssessmentName } from '@meta/assessment' +import { ClientRoutes } from 'meta/app' +import { AssessmentName } from 'meta/assessment' -import { useAppDispatch } from '@client/store' -import { useAssessment, useCycle } from '@client/store/assessment' +import { useAppDispatch } from 'client/store' +import { useAssessment, useCycle } from 'client/store/assessment' import { OriginalDataPointActions, useIsOriginalDataPointUpdating, useOriginalDataPoint, -} from '@client/store/ui/originalDataPoint' -import { useCountryIso } from '@client/hooks' +} from 'client/store/ui/originalDataPoint' +import { useCountryIso } from 'client/hooks' type Props = { canEditData: boolean diff --git a/src/client/pages/OriginalDataPoint/components/Comments/Comments.tsx b/src/client/pages/OriginalDataPoint/components/Comments/Comments.tsx index cb24a82b5d..f51c0952f2 100644 --- a/src/client/pages/OriginalDataPoint/components/Comments/Comments.tsx +++ b/src/client/pages/OriginalDataPoint/components/Comments/Comments.tsx @@ -3,9 +3,9 @@ import React from 'react' import classNames from 'classnames' // import ReviewIndicator from '@webapp/app/assessment/components/review/reviewIndicator' -import { useOriginalDataPoint } from '@client/store/ui/originalDataPoint' +import { useOriginalDataPoint } from 'client/store/ui/originalDataPoint' -// import { useCountryIso } from '@client/hooks' +// import { useCountryIso } from 'client/hooks' // import { useTranslation } from 'react-i18next' import { useNationalClassNameComments } from '../../hooks' import CommentsEditor from './CommentsEditor' diff --git a/src/client/pages/OriginalDataPoint/components/Comments/CommentsEditor.tsx b/src/client/pages/OriginalDataPoint/components/Comments/CommentsEditor.tsx index b9b457fec9..c6c69c3413 100644 --- a/src/client/pages/OriginalDataPoint/components/Comments/CommentsEditor.tsx +++ b/src/client/pages/OriginalDataPoint/components/Comments/CommentsEditor.tsx @@ -1,13 +1,13 @@ import React, { useCallback, useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' -import { useAppDispatch } from '@client/store' -import { useAssessment, useCycle } from '@client/store/assessment' -import { useIsDataLocked } from '@client/store/ui/dataLock' -import { OriginalDataPointActions, useOriginalDataPoint } from '@client/store/ui/originalDataPoint' -import { useCountryIso } from '@client/hooks' -import EditorWYSIWYG from '@client/components/EditorWYSIWYG' -import MarkdownPreview from '@client/components/MarkdownPreview' +import { useAppDispatch } from 'client/store' +import { useAssessment, useCycle } from 'client/store/assessment' +import { useIsDataLocked } from 'client/store/ui/dataLock' +import { OriginalDataPointActions, useOriginalDataPoint } from 'client/store/ui/originalDataPoint' +import { useCountryIso } from 'client/hooks' +import EditorWYSIWYG from 'client/components/EditorWYSIWYG' +import MarkdownPreview from 'client/components/MarkdownPreview' type Props = { canEditData: boolean diff --git a/src/client/pages/OriginalDataPoint/components/DataSources/DataSources.tsx b/src/client/pages/OriginalDataPoint/components/DataSources/DataSources.tsx index fa77429384..41087a5a10 100644 --- a/src/client/pages/OriginalDataPoint/components/DataSources/DataSources.tsx +++ b/src/client/pages/OriginalDataPoint/components/DataSources/DataSources.tsx @@ -1,19 +1,19 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { ODPDataSourceMethod, OriginalDataPoint } from '@meta/assessment/originalDataPoint' -import { Topics } from '@meta/messageCenter' +import { ODPDataSourceMethod, OriginalDataPoint } from 'meta/assessment/originalDataPoint' +import { Topics } from 'meta/messageCenter' -import { useAppDispatch } from '@client/store' -import { useAssessment, useCycle } from '@client/store/assessment' -import { OriginalDataPointActions } from '@client/store/ui/originalDataPoint' -import { useCountryIso } from '@client/hooks' -import { useIsPrint } from '@client/hooks/useIsPath' -import MultiSelect from '@client/components/MultiSelect' -import ReviewIndicator from '@client/components/ReviewIndicator' -import VerticallyGrowingTextField from '@client/components/VerticallyGrowingTextField' +import { useAppDispatch } from 'client/store' +import { useAssessment, useCycle } from 'client/store/assessment' +import { OriginalDataPointActions } from 'client/store/ui/originalDataPoint' +import { useCountryIso } from 'client/hooks' +import { useIsPrint } from 'client/hooks/useIsPath' +import MultiSelect from 'client/components/MultiSelect' +import ReviewIndicator from 'client/components/ReviewIndicator' +import VerticallyGrowingTextField from 'client/components/VerticallyGrowingTextField' type Props = { canEditData: boolean diff --git a/src/client/pages/OriginalDataPoint/components/ExtentOfForest/ExtentOfForest.tsx b/src/client/pages/OriginalDataPoint/components/ExtentOfForest/ExtentOfForest.tsx index 87395a5a96..4434d86b72 100644 --- a/src/client/pages/OriginalDataPoint/components/ExtentOfForest/ExtentOfForest.tsx +++ b/src/client/pages/OriginalDataPoint/components/ExtentOfForest/ExtentOfForest.tsx @@ -1,13 +1,13 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { Numbers } from '@utils/numbers' +import { Numbers } from 'utils/numbers' -import { ODPs, OriginalDataPoint } from '@meta/assessment/originalDataPoint' +import { ODPs, OriginalDataPoint } from 'meta/assessment/originalDataPoint' -import { useAssessment, useCycle } from '@client/store/assessment' -import { useIsPrint } from '@client/hooks/useIsPath' -import DefinitionLink from '@client/components/DefinitionLink' +import { useAssessment, useCycle } from 'client/store/assessment' +import { useIsPrint } from 'client/hooks/useIsPath' +import DefinitionLink from 'client/components/DefinitionLink' import NationalClassValidations from '../NationalClassValidations' import ExtentOfForestRow from './ExtentOfForestRow' diff --git a/src/client/pages/OriginalDataPoint/components/ExtentOfForest/ExtentOfForestRow.tsx b/src/client/pages/OriginalDataPoint/components/ExtentOfForest/ExtentOfForestRow.tsx index b86746b3af..bfd5175f5e 100644 --- a/src/client/pages/OriginalDataPoint/components/ExtentOfForest/ExtentOfForestRow.tsx +++ b/src/client/pages/OriginalDataPoint/components/ExtentOfForest/ExtentOfForestRow.tsx @@ -1,20 +1,20 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { Numbers } from '@utils/numbers' -import { Objects } from '@utils/objects' +import { Numbers } from 'utils/numbers' +import { Objects } from 'utils/objects' import classNames from 'classnames' -import { OriginalDataPoint } from '@meta/assessment' -import { NationalClassValidation } from '@meta/assessment/originalDataPoint/odps/validateODP' -import { Topics } from '@meta/messageCenter' +import { OriginalDataPoint } from 'meta/assessment' +import { NationalClassValidation } from 'meta/assessment/originalDataPoint/odps/validateODP' +import { Topics } from 'meta/messageCenter' -import { useAppDispatch } from '@client/store' -import { useAssessment, useCycle } from '@client/store/assessment' -import { OriginalDataPointActions } from '@client/store/ui/originalDataPoint' -import PercentInput from '@client/components/PercentInput' -import ReviewIndicator from '@client/components/ReviewIndicator' -import ThousandSeparatedDecimalInput from '@client/components/ThousandSeparatedDecimalInput' +import { useAppDispatch } from 'client/store' +import { useAssessment, useCycle } from 'client/store/assessment' +import { OriginalDataPointActions } from 'client/store/ui/originalDataPoint' +import PercentInput from 'client/components/PercentInput' +import ReviewIndicator from 'client/components/ReviewIndicator' +import ThousandSeparatedDecimalInput from 'client/components/ThousandSeparatedDecimalInput' import { useNationalClassNameComments } from '../../hooks' diff --git a/src/client/pages/OriginalDataPoint/components/ForestCharacteristics/ForestCharacteristics.tsx b/src/client/pages/OriginalDataPoint/components/ForestCharacteristics/ForestCharacteristics.tsx index 496baa15eb..976ca4141f 100644 --- a/src/client/pages/OriginalDataPoint/components/ForestCharacteristics/ForestCharacteristics.tsx +++ b/src/client/pages/OriginalDataPoint/components/ForestCharacteristics/ForestCharacteristics.tsx @@ -1,13 +1,13 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { Numbers } from '@utils/numbers' +import { Numbers } from 'utils/numbers' -import { ODPs, OriginalDataPoint } from '@meta/assessment' +import { ODPs, OriginalDataPoint } from 'meta/assessment' -import { useAssessment, useCycle } from '@client/store/assessment' -import { useIsPrint } from '@client/hooks/useIsPath' -import DefinitionLink from '@client/components/DefinitionLink' +import { useAssessment, useCycle } from 'client/store/assessment' +import { useIsPrint } from 'client/hooks/useIsPath' +import DefinitionLink from 'client/components/DefinitionLink' import NationalClassValidations from '../NationalClassValidations' import ForestCharacteristicsNaturallyRegenerating from './ForestCharacteristicsNaturallyRegenerating' diff --git a/src/client/pages/OriginalDataPoint/components/ForestCharacteristics/ForestCharacteristicsNaturallyRegenerating.tsx b/src/client/pages/OriginalDataPoint/components/ForestCharacteristics/ForestCharacteristicsNaturallyRegenerating.tsx index 6d46b364d8..19e40e16da 100644 --- a/src/client/pages/OriginalDataPoint/components/ForestCharacteristics/ForestCharacteristicsNaturallyRegenerating.tsx +++ b/src/client/pages/OriginalDataPoint/components/ForestCharacteristics/ForestCharacteristicsNaturallyRegenerating.tsx @@ -1,12 +1,12 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { Numbers } from '@utils/numbers' +import { Numbers } from 'utils/numbers' -import { ODPs } from '@meta/assessment' -import { NationalClassValidation } from '@meta/assessment/originalDataPoint/odps/validateODP' +import { ODPs } from 'meta/assessment' +import { NationalClassValidation } from 'meta/assessment/originalDataPoint/odps/validateODP' -import { useOriginalDataPoint } from '@client/store/ui/originalDataPoint' +import { useOriginalDataPoint } from 'client/store/ui/originalDataPoint' import NationalClassValidations from '../NationalClassValidations' import ForestCharacteristicsNaturallyRegeneratingRow from './ForestCharacteristicsNaturallyRegeneratingRow' diff --git a/src/client/pages/OriginalDataPoint/components/ForestCharacteristics/ForestCharacteristicsNaturallyRegeneratingRow.tsx b/src/client/pages/OriginalDataPoint/components/ForestCharacteristics/ForestCharacteristicsNaturallyRegeneratingRow.tsx index 25e3c0a9e6..ff17e78b95 100644 --- a/src/client/pages/OriginalDataPoint/components/ForestCharacteristics/ForestCharacteristicsNaturallyRegeneratingRow.tsx +++ b/src/client/pages/OriginalDataPoint/components/ForestCharacteristics/ForestCharacteristicsNaturallyRegeneratingRow.tsx @@ -1,18 +1,18 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { Numbers } from '@utils/numbers' +import { Numbers } from 'utils/numbers' import classNames from 'classnames' -import { ODPNationalClass } from '@meta/assessment' -import { NationalClassValidation } from '@meta/assessment/originalDataPoint/odps/validateODP' -import { Topics } from '@meta/messageCenter' +import { ODPNationalClass } from 'meta/assessment' +import { NationalClassValidation } from 'meta/assessment/originalDataPoint/odps/validateODP' +import { Topics } from 'meta/messageCenter' -import { useAppDispatch } from '@client/store' -import { useAssessment, useCycle } from '@client/store/assessment' -import { OriginalDataPointActions, useOriginalDataPoint } from '@client/store/ui/originalDataPoint' -import PercentInput from '@client/components/PercentInput' -import ReviewIndicator from '@client/components/ReviewIndicator' +import { useAppDispatch } from 'client/store' +import { useAssessment, useCycle } from 'client/store/assessment' +import { OriginalDataPointActions, useOriginalDataPoint } from 'client/store/ui/originalDataPoint' +import PercentInput from 'client/components/PercentInput' +import ReviewIndicator from 'client/components/ReviewIndicator' import { useNationalClassNameComments } from '../../hooks' diff --git a/src/client/pages/OriginalDataPoint/components/ForestCharacteristics/ForestCharacteristicsPlantation.tsx b/src/client/pages/OriginalDataPoint/components/ForestCharacteristics/ForestCharacteristicsPlantation.tsx index 07742b7bb8..942556c99c 100644 --- a/src/client/pages/OriginalDataPoint/components/ForestCharacteristics/ForestCharacteristicsPlantation.tsx +++ b/src/client/pages/OriginalDataPoint/components/ForestCharacteristics/ForestCharacteristicsPlantation.tsx @@ -1,12 +1,12 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { Numbers } from '@utils/numbers' +import { Numbers } from 'utils/numbers' -import { ODPs } from '@meta/assessment' -import { NationalClassValidation } from '@meta/assessment/originalDataPoint/odps/validateODP' +import { ODPs } from 'meta/assessment' +import { NationalClassValidation } from 'meta/assessment/originalDataPoint/odps/validateODP' -import { useOriginalDataPoint } from '@client/store/ui/originalDataPoint' +import { useOriginalDataPoint } from 'client/store/ui/originalDataPoint' import NationalClassValidations from '../NationalClassValidations' import ForestCharacteristicsPlantationRow from './ForestCharacteristicsPlantationRow' diff --git a/src/client/pages/OriginalDataPoint/components/ForestCharacteristics/ForestCharacteristicsPlantationRow.tsx b/src/client/pages/OriginalDataPoint/components/ForestCharacteristics/ForestCharacteristicsPlantationRow.tsx index 43af714834..8da30dc1dd 100644 --- a/src/client/pages/OriginalDataPoint/components/ForestCharacteristics/ForestCharacteristicsPlantationRow.tsx +++ b/src/client/pages/OriginalDataPoint/components/ForestCharacteristics/ForestCharacteristicsPlantationRow.tsx @@ -1,18 +1,18 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { Numbers } from '@utils/numbers' +import { Numbers } from 'utils/numbers' import classNames from 'classnames' -import { ODPNationalClass } from '@meta/assessment' -import { NationalClassValidation } from '@meta/assessment/originalDataPoint/odps/validateODP' -import { Topics } from '@meta/messageCenter' +import { ODPNationalClass } from 'meta/assessment' +import { NationalClassValidation } from 'meta/assessment/originalDataPoint/odps/validateODP' +import { Topics } from 'meta/messageCenter' -import { useAppDispatch } from '@client/store' -import { useAssessment, useCycle } from '@client/store/assessment' -import { OriginalDataPointActions, useOriginalDataPoint } from '@client/store/ui/originalDataPoint' -import PercentInput from '@client/components/PercentInput' -import ReviewIndicator from '@client/components/ReviewIndicator' +import { useAppDispatch } from 'client/store' +import { useAssessment, useCycle } from 'client/store/assessment' +import { OriginalDataPointActions, useOriginalDataPoint } from 'client/store/ui/originalDataPoint' +import PercentInput from 'client/components/PercentInput' +import ReviewIndicator from 'client/components/ReviewIndicator' import { useNationalClassNameComments } from '../../hooks' diff --git a/src/client/pages/OriginalDataPoint/components/ForestCharacteristics/ForestCharacteristicsRow.tsx b/src/client/pages/OriginalDataPoint/components/ForestCharacteristics/ForestCharacteristicsRow.tsx index 0b9a24975f..1d4f3d2f07 100644 --- a/src/client/pages/OriginalDataPoint/components/ForestCharacteristics/ForestCharacteristicsRow.tsx +++ b/src/client/pages/OriginalDataPoint/components/ForestCharacteristics/ForestCharacteristicsRow.tsx @@ -1,18 +1,18 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { Numbers } from '@utils/numbers' +import { Numbers } from 'utils/numbers' import classNames from 'classnames' -import { ODPNationalClass, OriginalDataPoint } from '@meta/assessment' -import { NationalClassValidation } from '@meta/assessment/originalDataPoint/odps/validateODP' -import { Topics } from '@meta/messageCenter' +import { ODPNationalClass, OriginalDataPoint } from 'meta/assessment' +import { NationalClassValidation } from 'meta/assessment/originalDataPoint/odps/validateODP' +import { Topics } from 'meta/messageCenter' -import { useAppDispatch } from '@client/store' -import { useAssessment, useCycle } from '@client/store/assessment' -import { OriginalDataPointActions } from '@client/store/ui/originalDataPoint' -import PercentInput from '@client/components/PercentInput' -import ReviewIndicator from '@client/components/ReviewIndicator' +import { useAppDispatch } from 'client/store' +import { useAssessment, useCycle } from 'client/store/assessment' +import { OriginalDataPointActions } from 'client/store/ui/originalDataPoint' +import PercentInput from 'client/components/PercentInput' +import ReviewIndicator from 'client/components/ReviewIndicator' import { useNationalClassNameComments } from '../../hooks' diff --git a/src/client/pages/OriginalDataPoint/components/NationalClassValidations/NationalClassValidations.tsx b/src/client/pages/OriginalDataPoint/components/NationalClassValidations/NationalClassValidations.tsx index fb9f760dd9..1d9fd47ba3 100644 --- a/src/client/pages/OriginalDataPoint/components/NationalClassValidations/NationalClassValidations.tsx +++ b/src/client/pages/OriginalDataPoint/components/NationalClassValidations/NationalClassValidations.tsx @@ -2,10 +2,10 @@ import './NationalClassValidations.scss' import React from 'react' import { useTranslation } from 'react-i18next' -import { ODPNationalClass } from '@meta/assessment' -import { NationalClassValidation } from '@meta/assessment/originalDataPoint/odps/validateODP' +import { ODPNationalClass } from 'meta/assessment' +import { NationalClassValidation } from 'meta/assessment/originalDataPoint/odps/validateODP' -import Icon from '@client/components/Icon' +import Icon from 'client/components/Icon' type Props = { nationalClasses: Array diff --git a/src/client/pages/OriginalDataPoint/components/NationalClasses/NationalClass/NationalClass.tsx b/src/client/pages/OriginalDataPoint/components/NationalClasses/NationalClass/NationalClass.tsx index d476654a54..71d9e12592 100644 --- a/src/client/pages/OriginalDataPoint/components/NationalClasses/NationalClass/NationalClass.tsx +++ b/src/client/pages/OriginalDataPoint/components/NationalClasses/NationalClass/NationalClass.tsx @@ -1,20 +1,20 @@ import React from 'react' import { useTranslation } from 'react-i18next' -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' import classNames from 'classnames' -import { ODPs, OriginalDataPoint } from '@meta/assessment' -import { Topics } from '@meta/messageCenter' +import { ODPs, OriginalDataPoint } from 'meta/assessment' +import { Topics } from 'meta/messageCenter' -import { useAppDispatch } from '@client/store' -import { useAssessment, useCycle } from '@client/store/assessment' -import { OriginalDataPointActions } from '@client/store/ui/originalDataPoint' -import { useCountryIso } from '@client/hooks' -import { useIsPrint } from '@client/hooks/useIsPath' -import Icon from '@client/components/Icon' -import ReviewIndicator from '@client/components/ReviewIndicator' -import VerticallyGrowingTextField from '@client/components/VerticallyGrowingTextField' +import { useAppDispatch } from 'client/store' +import { useAssessment, useCycle } from 'client/store/assessment' +import { OriginalDataPointActions } from 'client/store/ui/originalDataPoint' +import { useCountryIso } from 'client/hooks' +import { useIsPrint } from 'client/hooks/useIsPath' +import Icon from 'client/components/Icon' +import ReviewIndicator from 'client/components/ReviewIndicator' +import VerticallyGrowingTextField from 'client/components/VerticallyGrowingTextField' import { useNationalClassNameComments } from '../../../hooks' diff --git a/src/client/pages/OriginalDataPoint/components/NationalClasses/NationalClasses.tsx b/src/client/pages/OriginalDataPoint/components/NationalClasses/NationalClasses.tsx index 54c77f07b6..d29937e422 100644 --- a/src/client/pages/OriginalDataPoint/components/NationalClasses/NationalClasses.tsx +++ b/src/client/pages/OriginalDataPoint/components/NationalClasses/NationalClasses.tsx @@ -1,17 +1,17 @@ import React, { useCallback, useState } from 'react' import { useTranslation } from 'react-i18next' -import { OriginalDataPoint } from '@meta/assessment' +import { OriginalDataPoint } from 'meta/assessment' -import { useAppDispatch } from '@client/store' -import { useAssessment, useCycle } from '@client/store/assessment' +import { useAppDispatch } from 'client/store' +import { useAssessment, useCycle } from 'client/store/assessment' import { OriginalDataPointActions, useIsOriginalDataPointUpdating, useOriginalDataPointReservedYears, -} from '@client/store/ui/originalDataPoint' -import { useCountryIso } from '@client/hooks' -import { useIsPrint } from '@client/hooks/useIsPath' +} from 'client/store/ui/originalDataPoint' +import { useCountryIso } from 'client/hooks' +import { useIsPrint } from 'client/hooks/useIsPath' import NationalClass from './NationalClass' diff --git a/src/client/pages/OriginalDataPoint/components/OriginalData/OriginalData.tsx b/src/client/pages/OriginalDataPoint/components/OriginalData/OriginalData.tsx index 24e0313c97..c6cd76e754 100644 --- a/src/client/pages/OriginalDataPoint/components/OriginalData/OriginalData.tsx +++ b/src/client/pages/OriginalDataPoint/components/OriginalData/OriginalData.tsx @@ -4,11 +4,11 @@ import { NavLink, useParams } from 'react-router-dom' import classNames from 'classnames' -import { ClientRoutes } from '@meta/app' -import { AssessmentName, OriginalDataPoint } from '@meta/assessment' +import { ClientRoutes } from 'meta/app' +import { AssessmentName, OriginalDataPoint } from 'meta/assessment' -import { useAssessmentCountry, useCycle } from '@client/store/assessment' -import { useCountryIso } from '@client/hooks' +import { useAssessmentCountry, useCycle } from 'client/store/assessment' +import { useCountryIso } from 'client/hooks' import ExtentOfForest from '../ExtentOfForest' import ForestCharacteristics from '../ForestCharacteristics' diff --git a/src/client/pages/OriginalDataPoint/components/YearSelection/YearSelection.tsx b/src/client/pages/OriginalDataPoint/components/YearSelection/YearSelection.tsx index d775317889..01638ac045 100644 --- a/src/client/pages/OriginalDataPoint/components/YearSelection/YearSelection.tsx +++ b/src/client/pages/OriginalDataPoint/components/YearSelection/YearSelection.tsx @@ -2,16 +2,16 @@ import React from 'react' import { useTranslation } from 'react-i18next' import { useParams } from 'react-router-dom' -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' import classNames from 'classnames' -import { ClientRoutes } from '@meta/app' -import { ODPs, OriginalDataPoint } from '@meta/assessment' +import { ClientRoutes } from 'meta/app' +import { ODPs, OriginalDataPoint } from 'meta/assessment' -import { useAppDispatch } from '@client/store' -import { useAssessment, useCycle } from '@client/store/assessment' -import { OriginalDataPointActions, useODPYears, useOriginalDataPoint } from '@client/store/ui/originalDataPoint' -import { useCountryIso } from '@client/hooks' +import { useAppDispatch } from 'client/store' +import { useAssessment, useCycle } from 'client/store/assessment' +import { OriginalDataPointActions, useODPYears, useOriginalDataPoint } from 'client/store/ui/originalDataPoint' +import { useCountryIso } from 'client/hooks' type Props = { canEditData: boolean diff --git a/src/client/pages/OriginalDataPoint/hooks/useNationalClassNameComments.ts b/src/client/pages/OriginalDataPoint/hooks/useNationalClassNameComments.ts index 693221463f..694a6d37c9 100644 --- a/src/client/pages/OriginalDataPoint/hooks/useNationalClassNameComments.ts +++ b/src/client/pages/OriginalDataPoint/hooks/useNationalClassNameComments.ts @@ -1,7 +1,7 @@ -import { Arrays } from '@utils/arrays' -import { Objects } from '@utils/objects' +import { Arrays } from 'utils/arrays' +import { Objects } from 'utils/objects' -import { useAppSelector } from '@client/store' +import { useAppSelector } from 'client/store' export const useNationalClassNameComments = (targetRow: Array): string => { const commentsOpen = useAppSelector((_state) => { diff --git a/src/client/pages/PageRoutes/PageRoutes.tsx b/src/client/pages/PageRoutes/PageRoutes.tsx index cc1c03024f..bd0dfabb28 100644 --- a/src/client/pages/PageRoutes/PageRoutes.tsx +++ b/src/client/pages/PageRoutes/PageRoutes.tsx @@ -2,14 +2,14 @@ import React, { useEffect } from 'react' import { useTranslation } from 'react-i18next' import { Navigate, Route, Routes } from 'react-router-dom' -import { ClientRoutes } from '@meta/app' - -import { useAppDispatch } from '@client/store' -import { AssessmentActions, useIsAppInitialized } from '@client/store/assessment' -import Toaster from '@client/components/Toaster' -import Tooltips from '@client/components/Tooltips' -import { SocketClient } from '@client/service/socket' -import { Urls } from '@client/utils' +import { ClientRoutes } from 'meta/app' + +import { useAppDispatch } from 'client/store' +import { AssessmentActions, useIsAppInitialized } from 'client/store/assessment' +import Toaster from 'client/components/Toaster' +import Tooltips from 'client/components/Tooltips' +import { SocketClient } from 'client/service/socket' +import { Urls } from 'client/utils' import Assessment from '../Assessment' import Landing from '../Landing' diff --git a/src/client/pages/PageRoutes/useTheme.ts b/src/client/pages/PageRoutes/useTheme.ts index b8c14fcab1..e3464c4932 100644 --- a/src/client/pages/PageRoutes/useTheme.ts +++ b/src/client/pages/PageRoutes/useTheme.ts @@ -1,8 +1,8 @@ import { useEffect } from 'react' -import { AssessmentNames } from '@meta/assessment' +import { AssessmentNames } from 'meta/assessment' -import { useAssessment } from '@client/store/assessment' +import { useAssessment } from 'client/store/assessment' const defaultTheme = { '--ui-accent-light': '#d7eef1', diff --git a/src/client/pages/PageRoutes/useUserRedirect.ts b/src/client/pages/PageRoutes/useUserRedirect.ts index 82ee1a2dcd..ff99d0c0b7 100644 --- a/src/client/pages/PageRoutes/useUserRedirect.ts +++ b/src/client/pages/PageRoutes/useUserRedirect.ts @@ -1,12 +1,12 @@ import { useEffect } from 'react' import { useNavigate } from 'react-router-dom' -import { ClientRoutes } from '@meta/app' -import { Users } from '@meta/user' -import { UserRoles } from '@meta/user/userRoles' +import { ClientRoutes } from 'meta/app' +import { Users } from 'meta/user' +import { UserRoles } from 'meta/user/userRoles' -import { useAssessment, useCycle, useIsAppInitialized } from '@client/store/assessment' -import { useUser } from '@client/store/user' +import { useAssessment, useCycle, useIsAppInitialized } from 'client/store/assessment' +import { useUser } from 'client/store/user' export const useUserRedirect = (): void => { const isAppInitialized = useIsAppInitialized() diff --git a/src/client/pages/User/ButtonContinue.tsx b/src/client/pages/User/ButtonContinue.tsx index ecf62b7588..f62a0e62e0 100644 --- a/src/client/pages/User/ButtonContinue.tsx +++ b/src/client/pages/User/ButtonContinue.tsx @@ -2,11 +2,11 @@ import React, { useCallback } from 'react' import { useTranslation } from 'react-i18next' import { useLocation, useNavigate } from 'react-router-dom' -import { ClientRoutes } from '@meta/app' -import { Users } from '@meta/user' -import { UserRoles } from '@meta/user/userRoles' +import { ClientRoutes } from 'meta/app' +import { Users } from 'meta/user' +import { UserRoles } from 'meta/user/userRoles' -import { useUserToEdit } from '@client/store/ui/userManagement/hooks' +import { useUserToEdit } from 'client/store/ui/userManagement/hooks' const ButtonContinue = () => { const { t } = useTranslation() diff --git a/src/client/pages/User/User.tsx b/src/client/pages/User/User.tsx index aa68df01e6..794f756d34 100644 --- a/src/client/pages/User/User.tsx +++ b/src/client/pages/User/User.tsx @@ -3,19 +3,19 @@ import React, { useEffect } from 'react' import { useTranslation } from 'react-i18next' import { useLocation, useParams } from 'react-router-dom' -import { Areas } from '@meta/area' -import { AssessmentName } from '@meta/assessment' -import { Users } from '@meta/user' +import { Areas } from 'meta/area' +import { AssessmentName } from 'meta/assessment' +import { Users } from 'meta/user' -import { useAppDispatch } from '@client/store' -import { useCycle } from '@client/store/assessment' -import { useUserToEdit } from '@client/store/ui//userManagement/hooks' -import { UserManagementActions } from '@client/store/ui/userManagement' -import { useUser } from '@client/store/user' -import { useCountryIso, useIsCountry } from '@client/hooks' -import { useToaster } from '@client/hooks/useToaster' -import EditUserForm from '@client/components/EditUserForm' -import ButtonContinue from '@client/pages/User/ButtonContinue' +import { useAppDispatch } from 'client/store' +import { useCycle } from 'client/store/assessment' +import { useUserToEdit } from 'client/store/ui//userManagement/hooks' +import { UserManagementActions } from 'client/store/ui/userManagement' +import { useUser } from 'client/store/user' +import { useCountryIso, useIsCountry } from 'client/hooks' +import { useToaster } from 'client/hooks/useToaster' +import EditUserForm from 'client/components/EditUserForm' +import ButtonContinue from 'client/pages/User/ButtonContinue' const User: React.FC = () => { const { t } = useTranslation() diff --git a/src/client/store/assessment/actions/getAreas.ts b/src/client/store/assessment/actions/getAreas.ts index c8c23455de..d478913896 100644 --- a/src/client/store/assessment/actions/getAreas.ts +++ b/src/client/store/assessment/actions/getAreas.ts @@ -1,8 +1,8 @@ import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { Country, RegionGroup } from '@meta/area' +import { ApiEndPoint } from 'meta/api/endpoint' +import { Country, RegionGroup } from 'meta/area' export const getAreas = createAsyncThunk< { countries: Array; regionGroups: Record }, diff --git a/src/client/store/assessment/actions/getAssessment.ts b/src/client/store/assessment/actions/getAssessment.ts index 2d48068e9b..ec7d9661b4 100644 --- a/src/client/store/assessment/actions/getAssessment.ts +++ b/src/client/store/assessment/actions/getAssessment.ts @@ -1,8 +1,8 @@ import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { Assessment } from '@meta/assessment' +import { ApiEndPoint } from 'meta/api/endpoint' +import { Assessment } from 'meta/assessment' export const getAssessment = createAsyncThunk( 'assessment/get', diff --git a/src/client/store/assessment/actions/getSections.ts b/src/client/store/assessment/actions/getSections.ts index a2ba01c2d4..b02da6e17c 100644 --- a/src/client/store/assessment/actions/getSections.ts +++ b/src/client/store/assessment/actions/getSections.ts @@ -1,8 +1,8 @@ import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { Section } from '@meta/assessment' +import { ApiEndPoint } from 'meta/api/endpoint' +import { Section } from 'meta/assessment' export const getSections = createAsyncThunk< Array
, diff --git a/src/client/store/assessment/actions/initApp.ts b/src/client/store/assessment/actions/initApp.ts index 55bd147336..ebc964a492 100644 --- a/src/client/store/assessment/actions/initApp.ts +++ b/src/client/store/assessment/actions/initApp.ts @@ -1,8 +1,8 @@ import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { Assessment } from '@meta/assessment' +import { ApiEndPoint } from 'meta/api/endpoint' +import { Assessment } from 'meta/assessment' export const initApp = createAsyncThunk< { assessment: Assessment }, diff --git a/src/client/store/assessment/actions/updateCountry.ts b/src/client/store/assessment/actions/updateCountry.ts index 951d95537c..e66409c4e9 100644 --- a/src/client/store/assessment/actions/updateCountry.ts +++ b/src/client/store/assessment/actions/updateCountry.ts @@ -1,9 +1,9 @@ import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { Country, CountryIso } from '@meta/area' -import { AssessmentName } from '@meta/assessment' +import { ApiEndPoint } from 'meta/api/endpoint' +import { Country, CountryIso } from 'meta/area' +import { AssessmentName } from 'meta/assessment' export const updateCountry = createAsyncThunk< Country, diff --git a/src/client/store/assessment/actions/updateCountryProp.ts b/src/client/store/assessment/actions/updateCountryProp.ts index 7082e3f10e..4d97a0bb17 100644 --- a/src/client/store/assessment/actions/updateCountryProp.ts +++ b/src/client/store/assessment/actions/updateCountryProp.ts @@ -1,9 +1,9 @@ import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { Country, CountryIso } from '@meta/area' -import { AssessmentName } from '@meta/assessment' +import { ApiEndPoint } from 'meta/api/endpoint' +import { Country, CountryIso } from 'meta/area' +import { AssessmentName } from 'meta/assessment' export const updateCountryProp = createAsyncThunk< Country, diff --git a/src/client/store/assessment/hooks/index.ts b/src/client/store/assessment/hooks/index.ts index 20d71a2ba9..4bd426f2a0 100644 --- a/src/client/store/assessment/hooks/index.ts +++ b/src/client/store/assessment/hooks/index.ts @@ -1,13 +1,13 @@ import { useTranslation } from 'react-i18next' import { useParams } from 'react-router-dom' -import { Strings } from '@utils/strings' +import { Strings } from 'utils/strings' -import { Country, CountryIso, RegionGroup } from '@meta/area' -import { Assessment, Section, SubSection } from '@meta/assessment' +import { Country, CountryIso, RegionGroup } from 'meta/area' +import { Assessment, Section, SubSection } from 'meta/assessment' -import { useAppSelector } from '@client/store' -import { useCountryIso } from '@client/hooks' +import { useAppSelector } from 'client/store' +import { useCountryIso } from 'client/hooks' export { useCycle } from './useCycle' diff --git a/src/client/store/assessment/hooks/useCycle.ts b/src/client/store/assessment/hooks/useCycle.ts index f9b95ca2f0..3b79b3bdde 100644 --- a/src/client/store/assessment/hooks/useCycle.ts +++ b/src/client/store/assessment/hooks/useCycle.ts @@ -1,8 +1,8 @@ import { useParams } from 'react-router-dom' -import { Cycle, CycleUuid } from '@meta/assessment' +import { Cycle, CycleUuid } from 'meta/assessment' -import { useAppSelector } from '@client/store' +import { useAppSelector } from 'client/store' /** * Return current cycle diff --git a/src/client/store/assessment/hooks/usePreviousSection.ts b/src/client/store/assessment/hooks/usePreviousSection.ts index f6a4c6bee3..dfa485a41c 100644 --- a/src/client/store/assessment/hooks/usePreviousSection.ts +++ b/src/client/store/assessment/hooks/usePreviousSection.ts @@ -1,6 +1,6 @@ -import { SubSection, SubSections } from '@meta/assessment' +import { SubSection, SubSections } from 'meta/assessment' -import { useAssessmentSection, useAssessmentSections } from '@client/store/assessment' +import { useAssessmentSection, useAssessmentSections } from 'client/store/assessment' export const usePreviousSection = (sectionName?: string): SubSection => { const sections = useAssessmentSections() diff --git a/src/client/store/assessment/stateType.ts b/src/client/store/assessment/stateType.ts index 50f26884ac..472f4a24fe 100644 --- a/src/client/store/assessment/stateType.ts +++ b/src/client/store/assessment/stateType.ts @@ -1,5 +1,5 @@ -import { Country, CountryIso, RegionGroup } from '@meta/area' -import { Assessment, Section } from '@meta/assessment' +import { Country, CountryIso, RegionGroup } from 'meta/area' +import { Assessment, Section } from 'meta/assessment' type Countries = { [key in CountryIso]?: Country diff --git a/src/client/store/data/actions/clearTableData.ts b/src/client/store/data/actions/clearTableData.ts index 7094f40445..b31b2a130e 100644 --- a/src/client/store/data/actions/clearTableData.ts +++ b/src/client/store/data/actions/clearTableData.ts @@ -1,8 +1,8 @@ import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { CycleDataParams } from '@meta/api/request' +import { ApiEndPoint } from 'meta/api/endpoint' +import { CycleDataParams } from 'meta/api/request' export const clearTableData = createAsyncThunk( 'section/tableData/clear', diff --git a/src/client/store/data/actions/copyPreviousDatasources.ts b/src/client/store/data/actions/copyPreviousDatasources.ts index 8033669727..da6c2386d1 100644 --- a/src/client/store/data/actions/copyPreviousDatasources.ts +++ b/src/client/store/data/actions/copyPreviousDatasources.ts @@ -1,10 +1,10 @@ import { createAsyncThunk } from '@reduxjs/toolkit' -import { UUIDs } from '@utils/uuids' +import { UUIDs } from 'utils/uuids' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { CycleDataParams } from '@meta/api/request' -import { CommentableDescriptionValue, DataSource } from '@meta/assessment' +import { ApiEndPoint } from 'meta/api/endpoint' +import { CycleDataParams } from 'meta/api/request' +import { CommentableDescriptionValue, DataSource } from 'meta/assessment' import { updateDescription } from './updateDescription' diff --git a/src/client/store/data/actions/getDescription.ts b/src/client/store/data/actions/getDescription.ts index 6bcaab10f1..eb847956c6 100644 --- a/src/client/store/data/actions/getDescription.ts +++ b/src/client/store/data/actions/getDescription.ts @@ -1,9 +1,9 @@ import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { CycleDataParams } from '@meta/api/request' -import { CommentableDescriptionValue } from '@meta/assessment' +import { ApiEndPoint } from 'meta/api/endpoint' +import { CycleDataParams } from 'meta/api/request' +import { CommentableDescriptionValue } from 'meta/assessment' export const getDescription = createAsyncThunk< Record & { value: CommentableDescriptionValue }, diff --git a/src/client/store/data/actions/getLinkedDataSources.ts b/src/client/store/data/actions/getLinkedDataSources.ts index 807341b918..b78d6a6c48 100644 --- a/src/client/store/data/actions/getLinkedDataSources.ts +++ b/src/client/store/data/actions/getLinkedDataSources.ts @@ -1,9 +1,9 @@ import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { CountryIso } from '@meta/area' -import { AssessmentName, CycleName, DataSourceLinked, DataSourceLinkedVariable } from '@meta/assessment' +import { ApiEndPoint } from 'meta/api/endpoint' +import { CountryIso } from 'meta/area' +import { AssessmentName, CycleName, DataSourceLinked, DataSourceLinkedVariable } from 'meta/assessment' type Params = { countryIso: CountryIso diff --git a/src/client/store/data/actions/getOriginalDataPointData.ts b/src/client/store/data/actions/getOriginalDataPointData.ts index 7fd69d4807..d886fd8683 100644 --- a/src/client/store/data/actions/getOriginalDataPointData.ts +++ b/src/client/store/data/actions/getOriginalDataPointData.ts @@ -1,9 +1,9 @@ import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { CountryIso } from '@meta/area' -import { RecordAssessmentData } from '@meta/data' +import { ApiEndPoint } from 'meta/api/endpoint' +import { CountryIso } from 'meta/area' +import { RecordAssessmentData } from 'meta/data' export const getOriginalDataPointData = createAsyncThunk< RecordAssessmentData, diff --git a/src/client/store/data/actions/getTableData.ts b/src/client/store/data/actions/getTableData.ts index ca5aa18f9c..8d578b82ba 100644 --- a/src/client/store/data/actions/getTableData.ts +++ b/src/client/store/data/actions/getTableData.ts @@ -1,9 +1,9 @@ import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { CycleParams } from '@meta/api/request' -import { RecordAssessmentData } from '@meta/data' +import { ApiEndPoint } from 'meta/api/endpoint' +import { CycleParams } from 'meta/api/request' +import { RecordAssessmentData } from 'meta/data' export const getTableData = createAsyncThunk< RecordAssessmentData, diff --git a/src/client/store/data/actions/postEstimate.ts b/src/client/store/data/actions/postEstimate.ts index ae5196b5f2..52a565f54e 100644 --- a/src/client/store/data/actions/postEstimate.ts +++ b/src/client/store/data/actions/postEstimate.ts @@ -1,9 +1,9 @@ import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { CycleDataParams, EstimateBody } from '@meta/api/request' -import { RecordAssessmentData } from '@meta/data' +import { ApiEndPoint } from 'meta/api/endpoint' +import { CycleDataParams, EstimateBody } from 'meta/api/request' +import { RecordAssessmentData } from 'meta/data' export const postEstimate = createAsyncThunk( 'section/post/estimate', diff --git a/src/client/store/data/actions/updateDescription.ts b/src/client/store/data/actions/updateDescription.ts index 674bb3cce8..4c7227fa24 100644 --- a/src/client/store/data/actions/updateDescription.ts +++ b/src/client/store/data/actions/updateDescription.ts @@ -1,10 +1,10 @@ import { createAsyncThunk } from '@reduxjs/toolkit' -import { Functions } from '@utils/functions' +import { Functions } from 'utils/functions' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { CycleDataParams } from '@meta/api/request' -import { CommentableDescriptionValue } from '@meta/assessment' +import { ApiEndPoint } from 'meta/api/endpoint' +import { CycleDataParams } from 'meta/api/request' +import { CommentableDescriptionValue } from 'meta/assessment' type Props = CycleDataParams & { name: string; value: CommentableDescriptionValue } diff --git a/src/client/store/data/actions/updateNodeValues.ts b/src/client/store/data/actions/updateNodeValues.ts index 3aaf360365..c83d38ad34 100644 --- a/src/client/store/data/actions/updateNodeValues.ts +++ b/src/client/store/data/actions/updateNodeValues.ts @@ -1,9 +1,9 @@ import { createAsyncThunk } from '@reduxjs/toolkit' -import { Functions } from '@utils/functions' +import { Functions } from 'utils/functions' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { CycleDataParams, NodesBody } from '@meta/api/request' +import { ApiEndPoint } from 'meta/api/endpoint' +import { CycleDataParams, NodesBody } from 'meta/api/request' type Props = CycleDataParams & NodesBody diff --git a/src/client/store/data/hooks/useCommentableDescriptionValue.ts b/src/client/store/data/hooks/useCommentableDescriptionValue.ts index 888e20c09c..1e8d86b172 100644 --- a/src/client/store/data/hooks/useCommentableDescriptionValue.ts +++ b/src/client/store/data/hooks/useCommentableDescriptionValue.ts @@ -1,7 +1,7 @@ -import { CommentableDescriptionValue } from '@meta/assessment' +import { CommentableDescriptionValue } from 'meta/assessment' -import { useAppSelector } from '@client/store' -import { useAssessment, useCycle } from '@client/store/assessment' +import { useAppSelector } from 'client/store' +import { useAssessment, useCycle } from 'client/store/assessment' export const useCommentableDescriptionValue = (props: { name: string diff --git a/src/client/store/data/hooks/useDataSourcesLinked.ts b/src/client/store/data/hooks/useDataSourcesLinked.ts index d2a31d9951..7d142339f8 100644 --- a/src/client/store/data/hooks/useDataSourcesLinked.ts +++ b/src/client/store/data/hooks/useDataSourcesLinked.ts @@ -1,7 +1,7 @@ -import { DataSourceLinked } from '@meta/assessment' +import { DataSourceLinked } from 'meta/assessment' -import { useAppSelector } from '@client/store' -import { useAssessment, useCycle } from '@client/store/assessment' +import { useAppSelector } from 'client/store' +import { useAssessment, useCycle } from 'client/store/assessment' export const useDataSourcesLinked = (props: { sectionName: string }): Array | undefined => { const assessment = useAssessment() diff --git a/src/client/store/data/hooks/useHasOriginalDataPointData.ts b/src/client/store/data/hooks/useHasOriginalDataPointData.ts index eb0dff4e08..f03e1de263 100644 --- a/src/client/store/data/hooks/useHasOriginalDataPointData.ts +++ b/src/client/store/data/hooks/useHasOriginalDataPointData.ts @@ -1,3 +1,3 @@ -import { useOriginalDataPointData } from '@client/store/data/hooks/useOriginalDataPointData' +import { useOriginalDataPointData } from 'client/store/data/hooks/useOriginalDataPointData' export const useHasOriginalDataPointData = (): boolean => Object.keys(useOriginalDataPointData() ?? {}).length > 0 diff --git a/src/client/store/data/hooks/useIsSectionDataEmpty.ts b/src/client/store/data/hooks/useIsSectionDataEmpty.ts index 855057dcac..f5e1d8f4d0 100644 --- a/src/client/store/data/hooks/useIsSectionDataEmpty.ts +++ b/src/client/store/data/hooks/useIsSectionDataEmpty.ts @@ -1,11 +1,11 @@ import { useEffect, useMemo, useState } from 'react' -import { TableSection } from '@meta/assessment' -import { RecordAssessmentDatas } from '@meta/data' +import { TableSection } from 'meta/assessment' +import { RecordAssessmentDatas } from 'meta/data' -import { useAppSelector } from '@client/store' -import { useAssessment, useCycle } from '@client/store/assessment' -import { useCountryIso } from '@client/hooks' +import { useAppSelector } from 'client/store' +import { useAssessment, useCycle } from 'client/store/assessment' +import { useCountryIso } from 'client/hooks' export const useIsSectionDataEmpty = (tableSections: TableSection[]) => { const assessment = useAssessment() diff --git a/src/client/store/data/hooks/useOriginalDataPointData.ts b/src/client/store/data/hooks/useOriginalDataPointData.ts index b119a71c77..f69b897379 100644 --- a/src/client/store/data/hooks/useOriginalDataPointData.ts +++ b/src/client/store/data/hooks/useOriginalDataPointData.ts @@ -1,9 +1,9 @@ -import { TableNames } from '@meta/assessment' -import { RecordAssessmentDatas, RecordColumnData } from '@meta/data' +import { TableNames } from 'meta/assessment' +import { RecordAssessmentDatas, RecordColumnData } from 'meta/data' -import { useAppSelector } from '@client/store' -import { useAssessment, useCycle } from '@client/store/assessment' -import { useCountryIso } from '@client/hooks' +import { useAppSelector } from 'client/store' +import { useAssessment, useCycle } from 'client/store/assessment' +import { useCountryIso } from 'client/hooks' export const useOriginalDataPointData = (): RecordColumnData | undefined => { const assessment = useAssessment() diff --git a/src/client/store/data/hooks/useTableData.ts b/src/client/store/data/hooks/useTableData.ts index 710e2c1e59..7a8cc20e2a 100644 --- a/src/client/store/data/hooks/useTableData.ts +++ b/src/client/store/data/hooks/useTableData.ts @@ -1,12 +1,12 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Table, TableNames } from '@meta/assessment' -import { RecordAssessmentData, RecordAssessmentDatas } from '@meta/data' +import { Table, TableNames } from 'meta/assessment' +import { RecordAssessmentData, RecordAssessmentDatas } from 'meta/data' -import { useAppSelector } from '@client/store' -import { useAssessment, useAssessmentCountry, useCycle } from '@client/store/assessment' -import { useShowOriginalDatapoints } from '@client/store/ui/assessmentSection/hooks' -import { useCountryIso } from '@client/hooks' +import { useAppSelector } from 'client/store' +import { useAssessment, useAssessmentCountry, useCycle } from 'client/store/assessment' +import { useShowOriginalDatapoints } from 'client/store/ui/assessmentSection/hooks' +import { useCountryIso } from 'client/hooks' import { useOriginalDataPointData } from './useOriginalDataPointData' diff --git a/src/client/store/data/slice.ts b/src/client/store/data/slice.ts index 3d99f94e94..6c03e77b1f 100644 --- a/src/client/store/data/slice.ts +++ b/src/client/store/data/slice.ts @@ -1,10 +1,10 @@ import { createSlice, PayloadAction, Reducer } from '@reduxjs/toolkit' -import { CountryIso } from '@meta/area' -import { AssessmentName, CycleName, TableNames } from '@meta/assessment' -import { NodeUpdates, RecordAssessmentDatas } from '@meta/data' +import { CountryIso } from 'meta/area' +import { AssessmentName, CycleName, TableNames } from 'meta/assessment' +import { NodeUpdates, RecordAssessmentDatas } from 'meta/data' -import { AssessmentActions } from '@client/store/assessment' +import { AssessmentActions } from 'client/store/assessment' import { clearTableData } from './actions/clearTableData' import { copyPreviousDatasources } from './actions/copyPreviousDatasources' diff --git a/src/client/store/data/stateType.ts b/src/client/store/data/stateType.ts index c82f34315c..2045dff6c9 100644 --- a/src/client/store/data/stateType.ts +++ b/src/client/store/data/stateType.ts @@ -1,5 +1,5 @@ -import { AssessmentName, CommentableDescriptionValue, CycleName, DataSourceLinked, SectionName } from '@meta/assessment' -import { RecordAssessmentData } from '@meta/data' +import { AssessmentName, CommentableDescriptionValue, CycleName, DataSourceLinked, SectionName } from 'meta/assessment' +import { RecordAssessmentData } from 'meta/data' export interface DataBaseState { descriptions: Record> diff --git a/src/client/store/login/actions/acceptInvitation.ts b/src/client/store/login/actions/acceptInvitation.ts index 826d4d7ed3..2e2983e745 100644 --- a/src/client/store/login/actions/acceptInvitation.ts +++ b/src/client/store/login/actions/acceptInvitation.ts @@ -1,8 +1,8 @@ import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { User } from '@meta/user' +import { ApiEndPoint } from 'meta/api/endpoint' +import { User } from 'meta/user' export const acceptInvitation = createAsyncThunk( 'user/invitation/accept', diff --git a/src/client/store/login/actions/changePassword.ts b/src/client/store/login/actions/changePassword.ts index 71ac0f4e74..6e6a3db21b 100644 --- a/src/client/store/login/actions/changePassword.ts +++ b/src/client/store/login/actions/changePassword.ts @@ -1,12 +1,12 @@ import { NavigateFunction } from 'react-router-dom' import { createAsyncThunk } from '@reduxjs/toolkit' -import { UUIDs } from '@utils/uuids' +import { UUIDs } from 'utils/uuids' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' +import { ApiEndPoint } from 'meta/api/endpoint' -import { NotificationActions, NotificationMessage } from '@client/store/ui/notification' +import { NotificationActions, NotificationMessage } from 'client/store/ui/notification' export const changePassword = createAsyncThunk< { message?: string; error?: string }, diff --git a/src/client/store/login/actions/createResetPassword.ts b/src/client/store/login/actions/createResetPassword.ts index b74fece311..3030cc388d 100644 --- a/src/client/store/login/actions/createResetPassword.ts +++ b/src/client/store/login/actions/createResetPassword.ts @@ -1,13 +1,13 @@ import { NavigateFunction } from 'react-router-dom' import { createAsyncThunk } from '@reduxjs/toolkit' -import { UUIDs } from '@utils/uuids' +import { UUIDs } from 'utils/uuids' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { AssessmentName } from '@meta/assessment' +import { ApiEndPoint } from 'meta/api/endpoint' +import { AssessmentName } from 'meta/assessment' -import { NotificationActions, NotificationMessage } from '@client/store/ui/notification' +import { NotificationActions, NotificationMessage } from 'client/store/ui/notification' export const createResetPassword = createAsyncThunk< { message?: string; error?: string }, diff --git a/src/client/store/login/actions/fetchUserByInvitation.ts b/src/client/store/login/actions/fetchUserByInvitation.ts index b48480fee0..41a9dd79de 100644 --- a/src/client/store/login/actions/fetchUserByInvitation.ts +++ b/src/client/store/login/actions/fetchUserByInvitation.ts @@ -1,7 +1,7 @@ import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' +import { ApiEndPoint } from 'meta/api/endpoint' export const fetchUserByInvitation = createAsyncThunk( 'user/fetch/invitation', diff --git a/src/client/store/login/actions/localLogin.ts b/src/client/store/login/actions/localLogin.ts index cd07f988e6..6061f31afb 100644 --- a/src/client/store/login/actions/localLogin.ts +++ b/src/client/store/login/actions/localLogin.ts @@ -3,9 +3,9 @@ import { NavigateFunction } from 'react-router-dom' import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' +import { ApiEndPoint } from 'meta/api/endpoint' -import { initApp } from '@client/store/assessment/actions/initApp' +import { initApp } from 'client/store/assessment/actions/initApp' export const localLogin = createAsyncThunk< void, diff --git a/src/client/store/login/hooks/index.ts b/src/client/store/login/hooks/index.ts index c244ca2c70..8a7f5255ce 100644 --- a/src/client/store/login/hooks/index.ts +++ b/src/client/store/login/hooks/index.ts @@ -1,7 +1,7 @@ -import { Assessment } from '@meta/assessment' -import { AuthProvider, RoleName, User, UserRole } from '@meta/user' +import { Assessment } from 'meta/assessment' +import { AuthProvider, RoleName, User, UserRole } from 'meta/user' -import { useAppSelector } from '@client/store' +import { useAppSelector } from 'client/store' export const useInvitation = (): | { diff --git a/src/client/store/login/stateType.ts b/src/client/store/login/stateType.ts index af7f32ee0f..dd977846dc 100644 --- a/src/client/store/login/stateType.ts +++ b/src/client/store/login/stateType.ts @@ -1,5 +1,5 @@ -import { Assessment } from '@meta/assessment' -import { AuthProvider, RoleName, User, UserRole } from '@meta/user' +import { Assessment } from 'meta/assessment' +import { AuthProvider, RoleName, User, UserRole } from 'meta/user' export interface LoginState { login: { diff --git a/src/client/store/metadata/actions/getTableSections.ts b/src/client/store/metadata/actions/getTableSections.ts index 6042e530d5..a18586d2b7 100644 --- a/src/client/store/metadata/actions/getTableSections.ts +++ b/src/client/store/metadata/actions/getTableSections.ts @@ -1,9 +1,9 @@ import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { CycleParams } from '@meta/api/request' -import { TableSection } from '@meta/assessment' +import { ApiEndPoint } from 'meta/api/endpoint' +import { CycleParams } from 'meta/api/request' +import { TableSection } from 'meta/assessment' import { setTableSections } from './setTableSections' diff --git a/src/client/store/metadata/actions/setTableSections.ts b/src/client/store/metadata/actions/setTableSections.ts index 8b70ec9bc5..a73d6db0e0 100644 --- a/src/client/store/metadata/actions/setTableSections.ts +++ b/src/client/store/metadata/actions/setTableSections.ts @@ -1,6 +1,6 @@ import { createAction } from '@reduxjs/toolkit' -import { AssessmentName, CycleName, TableSection } from '@meta/assessment' +import { AssessmentName, CycleName, TableSection } from 'meta/assessment' export const setTableSections = createAction<{ tableSections: Record> diff --git a/src/client/store/metadata/hooks/useGetTableSections.ts b/src/client/store/metadata/hooks/useGetTableSections.ts index 62e263a73f..7fac0236fb 100644 --- a/src/client/store/metadata/hooks/useGetTableSections.ts +++ b/src/client/store/metadata/hooks/useGetTableSections.ts @@ -1,8 +1,8 @@ import { useEffect } from 'react' -import { useAppDispatch } from '@client/store' -import { useAssessment, useAssessmentSection, useCycle } from '@client/store/assessment' -import { useCountryIso } from '@client/hooks' +import { useAppDispatch } from 'client/store' +import { useAssessment, useAssessmentSection, useCycle } from 'client/store/assessment' +import { useCountryIso } from 'client/hooks' import { MetadataActions } from '../slice' import { useTableSections } from './useTableSections' diff --git a/src/client/store/metadata/hooks/useTableSections.ts b/src/client/store/metadata/hooks/useTableSections.ts index 539b36c125..ddb300d451 100644 --- a/src/client/store/metadata/hooks/useTableSections.ts +++ b/src/client/store/metadata/hooks/useTableSections.ts @@ -1,7 +1,7 @@ -import { TableSection } from '@meta/assessment' +import { TableSection } from 'meta/assessment' -import { useAppSelector } from '@client/store' -import { useAssessment, useCycle } from '@client/store/assessment' +import { useAppSelector } from 'client/store' +import { useAssessment, useCycle } from 'client/store/assessment' export const useTableSections = (props: { sectionName: string }): Array => { const assessment = useAssessment() diff --git a/src/client/store/metadata/slice.ts b/src/client/store/metadata/slice.ts index a36ee3fd73..d04319a618 100644 --- a/src/client/store/metadata/slice.ts +++ b/src/client/store/metadata/slice.ts @@ -1,6 +1,6 @@ import { createSlice, Reducer } from '@reduxjs/toolkit' -import { AssessmentActions } from '@client/store/assessment' +import { AssessmentActions } from 'client/store/assessment' import { getTableSections } from './actions/getTableSections' import { setTableSections } from './actions/setTableSections' diff --git a/src/client/store/metadata/stateType.ts b/src/client/store/metadata/stateType.ts index 08ee3689fe..65f10e0a4d 100644 --- a/src/client/store/metadata/stateType.ts +++ b/src/client/store/metadata/stateType.ts @@ -1,5 +1,5 @@ -import { AssessmentName, CycleName, TableSection } from '@meta/assessment' -import { SectionName } from '@meta/assessment/section' +import { AssessmentName, CycleName, TableSection } from 'meta/assessment' +import { SectionName } from 'meta/assessment/section' export interface MetadataBaseState { tableSections?: Record> diff --git a/src/client/store/middleware/axios.ts b/src/client/store/middleware/axios.ts index 7e7ba58656..e277630092 100644 --- a/src/client/store/middleware/axios.ts +++ b/src/client/store/middleware/axios.ts @@ -1,8 +1,8 @@ -import { UUIDs } from '@utils/uuids' +import { UUIDs } from 'utils/uuids' import axios, { AxiosStatic } from 'axios' import { Action, Dispatch, Middleware, MiddlewareAPI } from 'redux' -import { NotificationActions } from '@client/store/ui/notification/slice' +import { NotificationActions } from 'client/store/ui/notification/slice' const createAxiosMiddleware = (axios: AxiosStatic): Middleware => diff --git a/src/client/store/ui/assessmentFiles/actions/deleteFile.ts b/src/client/store/ui/assessmentFiles/actions/deleteFile.ts index f70a24b16d..10f99147d8 100644 --- a/src/client/store/ui/assessmentFiles/actions/deleteFile.ts +++ b/src/client/store/ui/assessmentFiles/actions/deleteFile.ts @@ -1,9 +1,9 @@ import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { CycleParams } from '@meta/api/request' -import { CountryIso } from '@meta/area' +import { ApiEndPoint } from 'meta/api/endpoint' +import { CycleParams } from 'meta/api/request' +import { CountryIso } from 'meta/area' type Params = CycleParams & { uuid: string diff --git a/src/client/store/ui/assessmentFiles/actions/getFiles.ts b/src/client/store/ui/assessmentFiles/actions/getFiles.ts index 37cad9cea5..1f2f3684f7 100644 --- a/src/client/store/ui/assessmentFiles/actions/getFiles.ts +++ b/src/client/store/ui/assessmentFiles/actions/getFiles.ts @@ -1,9 +1,9 @@ import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { CycleParams } from '@meta/api/request' -import { AssessmentFile } from '@meta/assessment' +import { ApiEndPoint } from 'meta/api/endpoint' +import { CycleParams } from 'meta/api/request' +import { AssessmentFile } from 'meta/assessment' export const getFiles = createAsyncThunk, CycleParams>('assessment/files/get', async (params) => { const { data } = await axios.get(ApiEndPoint.File.Assessment.many(), { params }) diff --git a/src/client/store/ui/assessmentFiles/actions/upload.ts b/src/client/store/ui/assessmentFiles/actions/upload.ts index e75d3774dc..2ab7aca3db 100644 --- a/src/client/store/ui/assessmentFiles/actions/upload.ts +++ b/src/client/store/ui/assessmentFiles/actions/upload.ts @@ -1,10 +1,10 @@ import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { CycleParams } from '@meta/api/request' -import { CountryIso } from '@meta/area' -import { AssessmentFile } from '@meta/assessment' +import { ApiEndPoint } from 'meta/api/endpoint' +import { CycleParams } from 'meta/api/request' +import { CountryIso } from 'meta/area' +import { AssessmentFile } from 'meta/assessment' type Params = CycleParams & { file: File | null diff --git a/src/client/store/ui/assessmentFiles/hooks/index.ts b/src/client/store/ui/assessmentFiles/hooks/index.ts index 98ec7abfc0..7dd12293e3 100644 --- a/src/client/store/ui/assessmentFiles/hooks/index.ts +++ b/src/client/store/ui/assessmentFiles/hooks/index.ts @@ -1,4 +1,4 @@ -import { useAppSelector } from '@client/store' +import { useAppSelector } from 'client/store' import { AssessmentFilesState } from '../stateType' diff --git a/src/client/store/ui/assessmentFiles/stateType.ts b/src/client/store/ui/assessmentFiles/stateType.ts index 71b3f5fbde..8585886e62 100644 --- a/src/client/store/ui/assessmentFiles/stateType.ts +++ b/src/client/store/ui/assessmentFiles/stateType.ts @@ -1,5 +1,5 @@ -import { CountryIso } from '@meta/area' -import { AssessmentFile } from '@meta/assessment' +import { CountryIso } from 'meta/area' +import { AssessmentFile } from 'meta/assessment' export type AssessmentFilesState = { [key in CountryIso | string]: Array diff --git a/src/client/store/ui/assessmentSection/hooks/index.ts b/src/client/store/ui/assessmentSection/hooks/index.ts index b09b5b1b7a..0a7424e668 100644 --- a/src/client/store/ui/assessmentSection/hooks/index.ts +++ b/src/client/store/ui/assessmentSection/hooks/index.ts @@ -1,4 +1,4 @@ -import { useAppSelector } from '@client/store' +import { useAppSelector } from 'client/store' export { useIsEstimationPending } from './useIsEstimatePending' diff --git a/src/client/store/ui/assessmentSection/hooks/useIsEstimatePending.ts b/src/client/store/ui/assessmentSection/hooks/useIsEstimatePending.ts index 9f392cc07b..1c39449ced 100644 --- a/src/client/store/ui/assessmentSection/hooks/useIsEstimatePending.ts +++ b/src/client/store/ui/assessmentSection/hooks/useIsEstimatePending.ts @@ -1,4 +1,4 @@ -import { useAppSelector } from '@client/store' +import { useAppSelector } from 'client/store' export const useIsEstimationPending = (): boolean => useAppSelector((state) => state.ui.assessmentSection.estimationPending) diff --git a/src/client/store/ui/assessmentSection/slice.ts b/src/client/store/ui/assessmentSection/slice.ts index 1384d7cfab..7e63c474dd 100644 --- a/src/client/store/ui/assessmentSection/slice.ts +++ b/src/client/store/ui/assessmentSection/slice.ts @@ -1,6 +1,6 @@ import { createSlice, Reducer } from '@reduxjs/toolkit' -import { DataActions } from '@client/store/data' +import { DataActions } from 'client/store/data' import { postEstimate } from '../../data/actions/postEstimate' import { AssessmentSectionState } from './stateType' diff --git a/src/client/store/ui/dataExport/actionTypes.ts b/src/client/store/ui/dataExport/actionTypes.ts index a67060398e..bb1cfe1243 100644 --- a/src/client/store/ui/dataExport/actionTypes.ts +++ b/src/client/store/ui/dataExport/actionTypes.ts @@ -1,8 +1,8 @@ import { Action } from 'redux' -import { Country } from '@meta/area' +import { Country } from 'meta/area' -import { DataExportSelection } from '@client/store/ui/dataExport/stateType' +import { DataExportSelection } from 'client/store/ui/dataExport/stateType' export enum DataExportActionType { countriesUpdate = 'dataExport/countries/update', diff --git a/src/client/store/ui/dataExport/hooks/index.ts b/src/client/store/ui/dataExport/hooks/index.ts index 17faa378b9..c377350a7c 100644 --- a/src/client/store/ui/dataExport/hooks/index.ts +++ b/src/client/store/ui/dataExport/hooks/index.ts @@ -1,12 +1,12 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Areas, Country, RegionCode } from '@meta/area' +import { Areas, Country, RegionCode } from 'meta/area' -import { useAppDispatch, useAppSelector } from '@client/store' -import { useCountries } from '@client/store/assessment' -import { DataExportActions, DataExportSelection } from '@client/store/ui/dataExport' -import { useHomeCountriesFilter } from '@client/store/ui/home' -import { useCountryIso } from '@client/hooks' +import { useAppDispatch, useAppSelector } from 'client/store' +import { useCountries } from 'client/store/assessment' +import { DataExportActions, DataExportSelection } from 'client/store/ui/dataExport' +import { useHomeCountriesFilter } from 'client/store/ui/home' +import { useCountryIso } from 'client/hooks' export const useDataExportCountries = (): Array => { const dispatch = useAppDispatch() diff --git a/src/client/store/ui/dataExport/stateType.ts b/src/client/store/ui/dataExport/stateType.ts index ba157a4adb..b0c3003b9e 100644 --- a/src/client/store/ui/dataExport/stateType.ts +++ b/src/client/store/ui/dataExport/stateType.ts @@ -1,4 +1,4 @@ -import { Country } from '@meta/area' +import { Country } from 'meta/area' export interface DataExportSelection { countryISOs: Array diff --git a/src/client/store/ui/dataLock/hooks/index.ts b/src/client/store/ui/dataLock/hooks/index.ts index 12bb826804..029c52bf6a 100644 --- a/src/client/store/ui/dataLock/hooks/index.ts +++ b/src/client/store/ui/dataLock/hooks/index.ts @@ -1,3 +1,3 @@ -import { useAppSelector } from '@client/store' +import { useAppSelector } from 'client/store' export const useIsDataLocked = (): boolean => useAppSelector((state) => state.ui?.dataLock?.locked) diff --git a/src/client/store/ui/geo/actions/getBurnedAreaLayer.ts b/src/client/store/ui/geo/actions/getBurnedAreaLayer.ts index 852ea7b33e..e604762a3a 100644 --- a/src/client/store/ui/geo/actions/getBurnedAreaLayer.ts +++ b/src/client/store/ui/geo/actions/getBurnedAreaLayer.ts @@ -1,8 +1,8 @@ import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { CountryIso } from '@meta/area' -import { LayerSource } from '@meta/geo' +import { CountryIso } from 'meta/area' +import { LayerSource } from 'meta/geo' export interface GenericLayerConfig { countryIso: CountryIso diff --git a/src/client/store/ui/geo/actions/getForestEstimationData.ts b/src/client/store/ui/geo/actions/getForestEstimationData.ts index 96d8143474..217b610182 100644 --- a/src/client/store/ui/geo/actions/getForestEstimationData.ts +++ b/src/client/store/ui/geo/actions/getForestEstimationData.ts @@ -1,8 +1,8 @@ import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { ForestEstimations } from '@meta/geo' +import { ApiEndPoint } from 'meta/api/endpoint' +import { ForestEstimations } from 'meta/geo' interface GetForestEstimationDataProps { countryIso: string diff --git a/src/client/store/ui/geo/actions/getForestLayer.ts b/src/client/store/ui/geo/actions/getForestLayer.ts index 0d2cf675ec..2c33ce02da 100644 --- a/src/client/store/ui/geo/actions/getForestLayer.ts +++ b/src/client/store/ui/geo/actions/getForestLayer.ts @@ -1,8 +1,8 @@ import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { CountryIso } from '@meta/area' -import { LayerSource } from '@meta/geo' +import { CountryIso } from 'meta/area' +import { LayerSource } from 'meta/geo' export interface GenericLayerConfig { countryIso: CountryIso diff --git a/src/client/store/ui/geo/actions/getProtectedAreaLayer.ts b/src/client/store/ui/geo/actions/getProtectedAreaLayer.ts index dcb287bba9..0723aa3e09 100644 --- a/src/client/store/ui/geo/actions/getProtectedAreaLayer.ts +++ b/src/client/store/ui/geo/actions/getProtectedAreaLayer.ts @@ -1,8 +1,8 @@ import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { CountryIso } from '@meta/area' -import { LayerSource } from '@meta/geo' +import { CountryIso } from 'meta/area' +import { LayerSource } from 'meta/geo' export interface GenericLayerConfig { countryIso: CountryIso diff --git a/src/client/store/ui/geo/actions/postMosaicOptions.ts b/src/client/store/ui/geo/actions/postMosaicOptions.ts index f31d5189cf..0054d155d8 100644 --- a/src/client/store/ui/geo/actions/postMosaicOptions.ts +++ b/src/client/store/ui/geo/actions/postMosaicOptions.ts @@ -1,9 +1,9 @@ import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { CountryIso } from '@meta/area' -import { MosaicOptions } from '@meta/geo' +import { ApiEndPoint } from 'meta/api/endpoint' +import { CountryIso } from 'meta/area' +import { MosaicOptions } from 'meta/geo' const getReqBody = (mosaicOptions: MosaicOptions, countryIso: CountryIso) => { const { sources, year, maxCloudCoverage } = mosaicOptions diff --git a/src/client/store/ui/geo/hooks/index.ts b/src/client/store/ui/geo/hooks/index.ts index a2c93d9ad3..fe1014dad0 100644 --- a/src/client/store/ui/geo/hooks/index.ts +++ b/src/client/store/ui/geo/hooks/index.ts @@ -1,4 +1,4 @@ -import { CountryIso } from '@meta/area' +import { CountryIso } from 'meta/area' import { BurnedAreasOptions, ForestOptions, @@ -6,9 +6,9 @@ import { MapPanel, MosaicOptions, ProtectedAreasOptions, -} from '@meta/geo' +} from 'meta/geo' -import { useAppSelector } from '@client/store' +import { useAppSelector } from 'client/store' export const useMosaicUrl = (countryIso: CountryIso): string => useAppSelector((state) => state.geo?.mosaicOptions.mosaicUrl[countryIso]) diff --git a/src/client/store/ui/geo/slice.ts b/src/client/store/ui/geo/slice.ts index 106a1d7198..3c7d9cf681 100644 --- a/src/client/store/ui/geo/slice.ts +++ b/src/client/store/ui/geo/slice.ts @@ -9,8 +9,8 @@ import { MosaicOptions, MosaicSource, ProtectedAreaKey, -} from '@meta/geo' -import { forestAgreementRecipes, ForestSource, HansenPercentage } from '@meta/geo/forest' +} from 'meta/geo' +import { forestAgreementRecipes, ForestSource, HansenPercentage } from 'meta/geo/forest' import { postMosaicOptions } from './actions/postMosaicOptions' import { getBurnedAreaLayer, getForestEstimationData, getForestLayer, getProtectedAreaLayer } from './actions' diff --git a/src/client/store/ui/geo/stateType.ts b/src/client/store/ui/geo/stateType.ts index 16198ccc8a..3cbbb11219 100644 --- a/src/client/store/ui/geo/stateType.ts +++ b/src/client/store/ui/geo/stateType.ts @@ -1,4 +1,4 @@ -import { CountryIso } from '@meta/area' +import { CountryIso } from 'meta/area' import { BurnedAreasOptions, ForestOptions, @@ -6,7 +6,7 @@ import { MapPanel, MosaicOptions, ProtectedAreasOptions, -} from '@meta/geo' +} from 'meta/geo' export type GeoState = { isMapAvailable: boolean diff --git a/src/client/store/ui/home/hooks.ts b/src/client/store/ui/home/hooks.ts index f71ba41ce0..fbbff02b89 100644 --- a/src/client/store/ui/home/hooks.ts +++ b/src/client/store/ui/home/hooks.ts @@ -1,4 +1,4 @@ -import { RootState, useAppSelector } from '@client/store' +import { RootState, useAppSelector } from 'client/store' export const useHomeCountriesFilter = (): Array => useAppSelector((state: RootState) => state?.ui?.home?.countriesFilter ?? []) diff --git a/src/client/store/ui/home/slice.ts b/src/client/store/ui/home/slice.ts index b789029ad3..71caf514f2 100644 --- a/src/client/store/ui/home/slice.ts +++ b/src/client/store/ui/home/slice.ts @@ -1,8 +1,8 @@ import { createSlice } from '@reduxjs/toolkit' -import { CountryIso } from '@meta/area' +import { CountryIso } from 'meta/area' -import { AssessmentActions } from '@client/store/assessment' +import { AssessmentActions } from 'client/store/assessment' import { HomeState } from './stateType' diff --git a/src/client/store/ui/messageCenter/actions/markMessageDeleted.ts b/src/client/store/ui/messageCenter/actions/markMessageDeleted.ts index fcfa124730..9911b3477a 100644 --- a/src/client/store/ui/messageCenter/actions/markMessageDeleted.ts +++ b/src/client/store/ui/messageCenter/actions/markMessageDeleted.ts @@ -1,8 +1,8 @@ -import { ApiEndPoint } from '@meta/api/endpoint' +import { ApiEndPoint } from 'meta/api/endpoint' import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { CycleDataParams } from '@meta/api/request' +import { CycleDataParams } from 'meta/api/request' type Params = CycleDataParams & { topicKey: string diff --git a/src/client/store/ui/messageCenter/actions/openTopic.ts b/src/client/store/ui/messageCenter/actions/openTopic.ts index ce375a48b7..7c00137501 100644 --- a/src/client/store/ui/messageCenter/actions/openTopic.ts +++ b/src/client/store/ui/messageCenter/actions/openTopic.ts @@ -1,9 +1,9 @@ -import { ApiEndPoint } from '@meta/api/endpoint' +import { ApiEndPoint } from 'meta/api/endpoint' import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { CycleDataParams } from '@meta/api/request' -import { MessageTopic, MessageTopicStatus, MessageTopicType } from '@meta/messageCenter' +import { CycleDataParams } from 'meta/api/request' +import { MessageTopic, MessageTopicStatus, MessageTopicType } from 'meta/messageCenter' type Params = Omit & { key: string diff --git a/src/client/store/ui/messageCenter/actions/postMessage.ts b/src/client/store/ui/messageCenter/actions/postMessage.ts index 340a55adca..117b590cf3 100644 --- a/src/client/store/ui/messageCenter/actions/postMessage.ts +++ b/src/client/store/ui/messageCenter/actions/postMessage.ts @@ -1,9 +1,9 @@ -import { ApiEndPoint } from '@meta/api/endpoint' +import { ApiEndPoint } from 'meta/api/endpoint' import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { CycleDataParams } from '@meta/api/request' -import { MessageTopicType } from '@meta/messageCenter' +import { CycleDataParams } from 'meta/api/request' +import { MessageTopicType } from 'meta/messageCenter' type Params = CycleDataParams & { key: string diff --git a/src/client/store/ui/messageCenter/actions/resolveTopic.ts b/src/client/store/ui/messageCenter/actions/resolveTopic.ts index f2c226a262..ed5d7e3bcb 100644 --- a/src/client/store/ui/messageCenter/actions/resolveTopic.ts +++ b/src/client/store/ui/messageCenter/actions/resolveTopic.ts @@ -1,8 +1,8 @@ -import { ApiEndPoint } from '@meta/api/endpoint' +import { ApiEndPoint } from 'meta/api/endpoint' import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { CycleDataParams } from '@meta/api/request' +import { CycleDataParams } from 'meta/api/request' type Params = CycleDataParams & { key: string diff --git a/src/client/store/ui/messageCenter/hooks/index.ts b/src/client/store/ui/messageCenter/hooks/index.ts index 4c239fd949..4a4531badc 100644 --- a/src/client/store/ui/messageCenter/hooks/index.ts +++ b/src/client/store/ui/messageCenter/hooks/index.ts @@ -1,5 +1,5 @@ -import { useAppSelector } from '@client/store' -import { MessageTopic } from '@meta/messageCenter' +import { useAppSelector } from 'client/store' +import { MessageTopic } from 'meta/messageCenter' export const useTopics = (): Array => useAppSelector((state) => state.ui.messageCenter.topics) diff --git a/src/client/store/ui/messageCenter/slice.ts b/src/client/store/ui/messageCenter/slice.ts index c91f1d3430..b5469f7276 100644 --- a/src/client/store/ui/messageCenter/slice.ts +++ b/src/client/store/ui/messageCenter/slice.ts @@ -1,6 +1,6 @@ import { createSlice, PayloadAction, Reducer } from '@reduxjs/toolkit' -import { Message, MessageTopic, MessageTopicStatus } from '@meta/messageCenter' +import { Message, MessageTopic, MessageTopicStatus } from 'meta/messageCenter' import { markMessageDeleted, openTopic, postMessage, resolveTopic } from './actions' import { MessageCenterState } from './stateType' diff --git a/src/client/store/ui/messageCenter/stateType.ts b/src/client/store/ui/messageCenter/stateType.ts index c91175f834..7bb915ebb3 100644 --- a/src/client/store/ui/messageCenter/stateType.ts +++ b/src/client/store/ui/messageCenter/stateType.ts @@ -1,4 +1,4 @@ -import { MessageTopic } from '@meta/messageCenter' +import { MessageTopic } from 'meta/messageCenter' export type MessageCenterState = { topics: Array diff --git a/src/client/store/ui/navigation/hooks/index.ts b/src/client/store/ui/navigation/hooks/index.ts index 17d1ba90ea..1e051b9154 100644 --- a/src/client/store/ui/navigation/hooks/index.ts +++ b/src/client/store/ui/navigation/hooks/index.ts @@ -1,5 +1,5 @@ -import { useCountryIso } from '@client/hooks' -import { useAppSelector } from '@client/store' +import { useCountryIso } from 'client/hooks' +import { useAppSelector } from 'client/store' export const useNavigationVisible = (): boolean => { const countryIso = useCountryIso() diff --git a/src/client/store/ui/notification/hooks/index.ts b/src/client/store/ui/notification/hooks/index.ts index d83a3a3e4c..d646fe4900 100644 --- a/src/client/store/ui/notification/hooks/index.ts +++ b/src/client/store/ui/notification/hooks/index.ts @@ -1,4 +1,4 @@ -import { useAppSelector } from '@client/store' -import { NotificationState } from '@client/store/ui/notification/stateType' +import { useAppSelector } from 'client/store' +import { NotificationState } from 'client/store/ui/notification/stateType' export const useNotification = (): NotificationState => useAppSelector((state) => state.ui.notification) diff --git a/src/client/store/ui/originalDataPoint/actions/copyPreviousNationalClasses.ts b/src/client/store/ui/originalDataPoint/actions/copyPreviousNationalClasses.ts index f596c3e4f8..696e58d029 100644 --- a/src/client/store/ui/originalDataPoint/actions/copyPreviousNationalClasses.ts +++ b/src/client/store/ui/originalDataPoint/actions/copyPreviousNationalClasses.ts @@ -1,9 +1,9 @@ import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { CycleParams } from '@meta/api/request' -import { ODPNationalClass, ODPs, OriginalDataPoint } from '@meta/assessment' +import { ApiEndPoint } from 'meta/api/endpoint' +import { CycleParams } from 'meta/api/request' +import { ODPNationalClass, ODPs, OriginalDataPoint } from 'meta/assessment' import { updateOriginalDataPoint } from './updateOriginalDataPoint' diff --git a/src/client/store/ui/originalDataPoint/actions/createOriginalDataPoint.ts b/src/client/store/ui/originalDataPoint/actions/createOriginalDataPoint.ts index 4ceaee776e..a6d3652e9f 100644 --- a/src/client/store/ui/originalDataPoint/actions/createOriginalDataPoint.ts +++ b/src/client/store/ui/originalDataPoint/actions/createOriginalDataPoint.ts @@ -2,9 +2,9 @@ import { NavigateFunction } from 'react-router-dom' import { createAsyncThunk } from '@reduxjs/toolkit' -import { CycleParams } from '@meta/api/request' -import { ClientRoutes } from '@meta/app' -import { ODPs, OriginalDataPoint } from '@meta/assessment' +import { CycleParams } from 'meta/api/request' +import { ClientRoutes } from 'meta/app' +import { ODPs, OriginalDataPoint } from 'meta/assessment' export const createOriginalDataPoint = createAsyncThunk< OriginalDataPoint, diff --git a/src/client/store/ui/originalDataPoint/actions/deleteOriginalDataPoint.ts b/src/client/store/ui/originalDataPoint/actions/deleteOriginalDataPoint.ts index 2952ed8be6..d3dc28d103 100644 --- a/src/client/store/ui/originalDataPoint/actions/deleteOriginalDataPoint.ts +++ b/src/client/store/ui/originalDataPoint/actions/deleteOriginalDataPoint.ts @@ -1,9 +1,9 @@ import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { CycleParams } from '@meta/api/request' -import { OriginalDataPoint } from '@meta/assessment' +import { ApiEndPoint } from 'meta/api/endpoint' +import { CycleParams } from 'meta/api/request' +import { OriginalDataPoint } from 'meta/assessment' export const deleteOriginalDataPoint = createAsyncThunk( 'originalDataPoint/delete', diff --git a/src/client/store/ui/originalDataPoint/actions/getOriginalDataPoint.ts b/src/client/store/ui/originalDataPoint/actions/getOriginalDataPoint.ts index c4eacce2ae..2aa204e734 100644 --- a/src/client/store/ui/originalDataPoint/actions/getOriginalDataPoint.ts +++ b/src/client/store/ui/originalDataPoint/actions/getOriginalDataPoint.ts @@ -1,9 +1,9 @@ import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { CycleParams } from '@meta/api/request' -import { ODPs, OriginalDataPoint } from '@meta/assessment' +import { ApiEndPoint } from 'meta/api/endpoint' +import { CycleParams } from 'meta/api/request' +import { ODPs, OriginalDataPoint } from 'meta/assessment' export const getOriginalDataPoint = createAsyncThunk( 'originalDataPoint/get/byYear', diff --git a/src/client/store/ui/originalDataPoint/actions/getOriginalDataPointReservedYears.ts b/src/client/store/ui/originalDataPoint/actions/getOriginalDataPointReservedYears.ts index b53bfe0c81..ecfbf3fc37 100644 --- a/src/client/store/ui/originalDataPoint/actions/getOriginalDataPointReservedYears.ts +++ b/src/client/store/ui/originalDataPoint/actions/getOriginalDataPointReservedYears.ts @@ -1,9 +1,9 @@ import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { CycleParams } from '@meta/api/request' -import { ODPReservedYear } from '@meta/assessment' +import { ApiEndPoint } from 'meta/api/endpoint' +import { CycleParams } from 'meta/api/request' +import { ODPReservedYear } from 'meta/assessment' export const getOriginalDataPointReservedYears = createAsyncThunk, CycleParams>( 'originalDataPoint/get/reservedYears', diff --git a/src/client/store/ui/originalDataPoint/actions/handlePaste.test.ts b/src/client/store/ui/originalDataPoint/actions/handlePaste.test.ts index 21ce5511b8..94af33af96 100644 --- a/src/client/store/ui/originalDataPoint/actions/handlePaste.test.ts +++ b/src/client/store/ui/originalDataPoint/actions/handlePaste.test.ts @@ -1,5 +1,5 @@ -import { CountryIso } from '@meta/area' -import { ODPNationalClass, OriginalDataPoint } from '@meta/assessment' +import { CountryIso } from 'meta/area' +import { ODPNationalClass, OriginalDataPoint } from 'meta/assessment' import handlePaste from './handlePaste' diff --git a/src/client/store/ui/originalDataPoint/actions/handlePaste.ts b/src/client/store/ui/originalDataPoint/actions/handlePaste.ts index c18714ca96..c02261587f 100644 --- a/src/client/store/ui/originalDataPoint/actions/handlePaste.ts +++ b/src/client/store/ui/originalDataPoint/actions/handlePaste.ts @@ -1,9 +1,9 @@ -import { Arrays } from '@utils/arrays' -import { Objects } from '@utils/objects' +import { Arrays } from 'utils/arrays' +import { Objects } from 'utils/objects' -import { ODPNationalClass, ODPs, OriginalDataPoint } from '@meta/assessment' +import { ODPNationalClass, ODPs, OriginalDataPoint } from 'meta/assessment' -import { Sanitizer } from '@client/utils/sanitizer' +import { Sanitizer } from 'client/utils/sanitizer' const handlePaste = ( columns: Array<{ name: string; type: string }>, diff --git a/src/client/store/ui/originalDataPoint/actions/pasteNationalClass.ts b/src/client/store/ui/originalDataPoint/actions/pasteNationalClass.ts index 9f22a508f6..23937eaae6 100644 --- a/src/client/store/ui/originalDataPoint/actions/pasteNationalClass.ts +++ b/src/client/store/ui/originalDataPoint/actions/pasteNationalClass.ts @@ -2,9 +2,9 @@ import React from 'react' import { createAsyncThunk } from '@reduxjs/toolkit' -import { ODPNationalClass, OriginalDataPoint } from '@meta/assessment' +import { ODPNationalClass, OriginalDataPoint } from 'meta/assessment' -import { readPasteClipboard } from '@client/utils/copyPasteUtil' +import { readPasteClipboard } from 'client/utils/copyPasteUtil' import handlePaste from './handlePaste' import { updateOriginalDataPoint } from './updateOriginalDataPoint' diff --git a/src/client/store/ui/originalDataPoint/actions/updateNationalClass.ts b/src/client/store/ui/originalDataPoint/actions/updateNationalClass.ts index 6a989cb7c8..cad1a130c2 100644 --- a/src/client/store/ui/originalDataPoint/actions/updateNationalClass.ts +++ b/src/client/store/ui/originalDataPoint/actions/updateNationalClass.ts @@ -1,8 +1,8 @@ import { createAsyncThunk } from '@reduxjs/toolkit' -import { ODPNationalClass, ODPs, OriginalDataPoint } from '@meta/assessment' +import { ODPNationalClass, ODPs, OriginalDataPoint } from 'meta/assessment' -import { Sanitizer } from '@client/utils/sanitizer' +import { Sanitizer } from 'client/utils/sanitizer' import { updateOriginalDataPoint } from './updateOriginalDataPoint' diff --git a/src/client/store/ui/originalDataPoint/actions/updateOriginalDataPoint.ts b/src/client/store/ui/originalDataPoint/actions/updateOriginalDataPoint.ts index 1b2812b447..6c1c656dc5 100644 --- a/src/client/store/ui/originalDataPoint/actions/updateOriginalDataPoint.ts +++ b/src/client/store/ui/originalDataPoint/actions/updateOriginalDataPoint.ts @@ -1,10 +1,10 @@ import { createAsyncThunk } from '@reduxjs/toolkit' -import { Functions } from '@utils/functions' +import { Functions } from 'utils/functions' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { CycleParams } from '@meta/api/request' -import { ODPs, OriginalDataPoint } from '@meta/assessment' +import { ApiEndPoint } from 'meta/api/endpoint' +import { CycleParams } from 'meta/api/request' +import { ODPs, OriginalDataPoint } from 'meta/assessment' type Props = CycleParams & { originalDataPoint: OriginalDataPoint diff --git a/src/client/store/ui/originalDataPoint/hooks/index.ts b/src/client/store/ui/originalDataPoint/hooks/index.ts index 4c1380f3c1..26b6ae7297 100644 --- a/src/client/store/ui/originalDataPoint/hooks/index.ts +++ b/src/client/store/ui/originalDataPoint/hooks/index.ts @@ -1,8 +1,8 @@ -import { Arrays } from '@utils/arrays' +import { Arrays } from 'utils/arrays' -import { Cycle } from '@meta/assessment' +import { Cycle } from 'meta/assessment' -import { useAppSelector } from '@client/store' +import { useAppSelector } from 'client/store' export const useOriginalDataPoint = () => useAppSelector((state) => state.ui.originalDataPoint?.data) diff --git a/src/client/store/ui/originalDataPoint/slice.ts b/src/client/store/ui/originalDataPoint/slice.ts index 69f4e0706f..bae56e7636 100644 --- a/src/client/store/ui/originalDataPoint/slice.ts +++ b/src/client/store/ui/originalDataPoint/slice.ts @@ -1,8 +1,8 @@ import { createSlice, PayloadAction, Reducer } from '@reduxjs/toolkit' -import { ODPReservedYear } from '@meta/assessment' +import { ODPReservedYear } from 'meta/assessment' -import { getOriginalDataPointReservedYears } from '@client/store/ui/originalDataPoint/actions/getOriginalDataPointReservedYears' +import { getOriginalDataPointReservedYears } from 'client/store/ui/originalDataPoint/actions/getOriginalDataPointReservedYears' import { copyPreviousNationalClasses } from './actions/copyPreviousNationalClasses' import { createOriginalDataPoint } from './actions/createOriginalDataPoint' diff --git a/src/client/store/ui/originalDataPoint/stateType.ts b/src/client/store/ui/originalDataPoint/stateType.ts index 3ed976f631..c19fe027ac 100644 --- a/src/client/store/ui/originalDataPoint/stateType.ts +++ b/src/client/store/ui/originalDataPoint/stateType.ts @@ -1,4 +1,4 @@ -import { ODPReservedYear, OriginalDataPoint } from '@meta/assessment' +import { ODPReservedYear, OriginalDataPoint } from 'meta/assessment' export type OriginalDataPointState = { data?: OriginalDataPoint diff --git a/src/client/store/ui/review/actions/getReviewStatus.ts b/src/client/store/ui/review/actions/getReviewStatus.ts index bc3f0ff1a7..392a3b7214 100644 --- a/src/client/store/ui/review/actions/getReviewStatus.ts +++ b/src/client/store/ui/review/actions/getReviewStatus.ts @@ -1,9 +1,9 @@ -import { ApiEndPoint } from '@meta/api/endpoint' +import { ApiEndPoint } from 'meta/api/endpoint' import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { CountryIso } from '@meta/area' -import { ReviewStatus } from '@meta/assessment' +import { CountryIso } from 'meta/area' +import { ReviewStatus } from 'meta/assessment' type Params = { countryIso: CountryIso diff --git a/src/client/store/ui/review/actions/getReviewSummary.ts b/src/client/store/ui/review/actions/getReviewSummary.ts index 173ec2bc5a..5bff7dfd82 100644 --- a/src/client/store/ui/review/actions/getReviewSummary.ts +++ b/src/client/store/ui/review/actions/getReviewSummary.ts @@ -1,9 +1,9 @@ import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { CountryIso } from '@meta/area' -import { ReviewSummary } from '@meta/assessment' +import { ApiEndPoint } from 'meta/api/endpoint' +import { CountryIso } from 'meta/area' +import { ReviewSummary } from 'meta/assessment' type Params = { countryIso: CountryIso diff --git a/src/client/store/ui/review/hooks/index.ts b/src/client/store/ui/review/hooks/index.ts index 7f89eaef2d..b8c6afcd94 100644 --- a/src/client/store/ui/review/hooks/index.ts +++ b/src/client/store/ui/review/hooks/index.ts @@ -1,7 +1,7 @@ -import { ReviewStatus } from '@meta/assessment' -import { MessageTopicStatus, Topics } from '@meta/messageCenter' +import { ReviewStatus } from 'meta/assessment' +import { MessageTopicStatus, Topics } from 'meta/messageCenter' -import { useAppSelector } from '@client/store' +import { useAppSelector } from 'client/store' export const useReviewStatus = (key: string): ReviewStatus => useAppSelector((state) => state.ui.review.status[key] || ({} as ReviewStatus)) diff --git a/src/client/store/ui/review/stateType.ts b/src/client/store/ui/review/stateType.ts index f069d71726..5eb80e235a 100644 --- a/src/client/store/ui/review/stateType.ts +++ b/src/client/store/ui/review/stateType.ts @@ -1,4 +1,4 @@ -import { ReviewStatus, ReviewSummary } from '@meta/assessment/review' +import { ReviewStatus, ReviewSummary } from 'meta/assessment/review' export type ReviewState = { status: { diff --git a/src/client/store/ui/userManagement/actions/getUserToEdit.ts b/src/client/store/ui/userManagement/actions/getUserToEdit.ts index 99d34ecfc4..6c49ae2e06 100644 --- a/src/client/store/ui/userManagement/actions/getUserToEdit.ts +++ b/src/client/store/ui/userManagement/actions/getUserToEdit.ts @@ -1,9 +1,9 @@ import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { CycleParams } from '@meta/api/request' -import { User } from '@meta/user' +import { ApiEndPoint } from 'meta/api/endpoint' +import { CycleParams } from 'meta/api/request' +import { User } from 'meta/user' type Params = (CycleParams & { id: number }) | { id: number } diff --git a/src/client/store/ui/userManagement/actions/getUsers.ts b/src/client/store/ui/userManagement/actions/getUsers.ts index 890c919075..d17de895a1 100644 --- a/src/client/store/ui/userManagement/actions/getUsers.ts +++ b/src/client/store/ui/userManagement/actions/getUsers.ts @@ -1,11 +1,11 @@ import { createAsyncThunk } from '@reduxjs/toolkit' -import { Functions } from '@utils/functions' +import { Functions } from 'utils/functions' import axios from 'axios' import { Dispatch } from 'redux' -import { ApiEndPoint } from '@meta/api/endpoint' -import { CountryIso } from '@meta/area' -import { RoleName } from '@meta/user' +import { ApiEndPoint } from 'meta/api/endpoint' +import { CountryIso } from 'meta/area' +import { RoleName } from 'meta/user' import { UserManagementActions } from '../slice' diff --git a/src/client/store/ui/userManagement/actions/getUsersCount.ts b/src/client/store/ui/userManagement/actions/getUsersCount.ts index 30903707ed..04c1fbd25b 100644 --- a/src/client/store/ui/userManagement/actions/getUsersCount.ts +++ b/src/client/store/ui/userManagement/actions/getUsersCount.ts @@ -1,12 +1,12 @@ import { createAsyncThunk } from '@reduxjs/toolkit' -import { Functions } from '@utils/functions' +import { Functions } from 'utils/functions' import axios from 'axios' import { Dispatch } from 'redux' -import { ApiEndPoint } from '@meta/api/endpoint' -import { CountryIso } from '@meta/area' -import { AssessmentName } from '@meta/assessment' -import { RoleName } from '@meta/user' +import { ApiEndPoint } from 'meta/api/endpoint' +import { CountryIso } from 'meta/area' +import { AssessmentName } from 'meta/assessment' +import { RoleName } from 'meta/user' import { UserManagementActions } from '../slice' diff --git a/src/client/store/ui/userManagement/actions/inviteUser.ts b/src/client/store/ui/userManagement/actions/inviteUser.ts index ce324d3b18..cb817e4752 100644 --- a/src/client/store/ui/userManagement/actions/inviteUser.ts +++ b/src/client/store/ui/userManagement/actions/inviteUser.ts @@ -1,9 +1,9 @@ import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { CycleParams } from '@meta/api/request' -import { RoleName } from '@meta/user' +import { ApiEndPoint } from 'meta/api/endpoint' +import { CycleParams } from 'meta/api/request' +import { RoleName } from 'meta/user' import { getUsers } from './getUsers' diff --git a/src/client/store/ui/userManagement/actions/removeInvitation.ts b/src/client/store/ui/userManagement/actions/removeInvitation.ts index 6854645304..a2799418a6 100644 --- a/src/client/store/ui/userManagement/actions/removeInvitation.ts +++ b/src/client/store/ui/userManagement/actions/removeInvitation.ts @@ -1,9 +1,9 @@ import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { CountryIso } from '@meta/area' -import { RoleName, UserRole } from '@meta/user' +import { ApiEndPoint } from 'meta/api/endpoint' +import { CountryIso } from 'meta/area' +import { RoleName, UserRole } from 'meta/user' type Params = { cycleName: string; assessmentName: string; countryIso: CountryIso; invitationUuid: string } diff --git a/src/client/store/ui/userManagement/actions/sendInvitationEmail.ts b/src/client/store/ui/userManagement/actions/sendInvitationEmail.ts index dae1151d2d..9f343bf031 100644 --- a/src/client/store/ui/userManagement/actions/sendInvitationEmail.ts +++ b/src/client/store/ui/userManagement/actions/sendInvitationEmail.ts @@ -1,10 +1,10 @@ import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { CountryIso } from '@meta/area' -import { AssessmentName } from '@meta/assessment' -import { RoleName, UserRole } from '@meta/user' +import { ApiEndPoint } from 'meta/api/endpoint' +import { CountryIso } from 'meta/area' +import { AssessmentName } from 'meta/assessment' +import { RoleName, UserRole } from 'meta/user' type Params = { assessmentName: AssessmentName; countryIso: CountryIso; cycleName: string; invitationUuid: string } diff --git a/src/client/store/ui/userManagement/actions/updateRoleProps.ts b/src/client/store/ui/userManagement/actions/updateRoleProps.ts index f70818efb9..258fac0347 100644 --- a/src/client/store/ui/userManagement/actions/updateRoleProps.ts +++ b/src/client/store/ui/userManagement/actions/updateRoleProps.ts @@ -1,11 +1,11 @@ import { createAsyncThunk } from '@reduxjs/toolkit' -import { Functions } from '@utils/functions' +import { Functions } from 'utils/functions' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { CountryIso } from '@meta/area' -import { AssessmentName } from '@meta/assessment' -import { UserRole } from '@meta/user/userRole' +import { ApiEndPoint } from 'meta/api/endpoint' +import { CountryIso } from 'meta/area' +import { AssessmentName } from 'meta/assessment' +import { UserRole } from 'meta/user/userRole' type Params = { id: number diff --git a/src/client/store/ui/userManagement/actions/updateSectionAuth.ts b/src/client/store/ui/userManagement/actions/updateSectionAuth.ts index 766ebf34f1..2e1eab9679 100644 --- a/src/client/store/ui/userManagement/actions/updateSectionAuth.ts +++ b/src/client/store/ui/userManagement/actions/updateSectionAuth.ts @@ -1,9 +1,9 @@ import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { CountryIso } from '@meta/area' -import { Collaborator, CollaboratorSectionsPermission } from '@meta/user' +import { ApiEndPoint } from 'meta/api/endpoint' +import { CountryIso } from 'meta/area' +import { Collaborator, CollaboratorSectionsPermission } from 'meta/user' export const updateSectionAuth = createAsyncThunk< Collaborator, diff --git a/src/client/store/ui/userManagement/actions/updateUser.ts b/src/client/store/ui/userManagement/actions/updateUser.ts index 739740ae44..470f46e2bf 100644 --- a/src/client/store/ui/userManagement/actions/updateUser.ts +++ b/src/client/store/ui/userManagement/actions/updateUser.ts @@ -1,11 +1,11 @@ import { createAsyncThunk } from '@reduxjs/toolkit' -import { Functions } from '@utils/functions' +import { Functions } from 'utils/functions' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { CountryIso } from '@meta/area' -import { AssessmentName } from '@meta/assessment' -import { User, Users } from '@meta/user' +import { ApiEndPoint } from 'meta/api/endpoint' +import { CountryIso } from 'meta/area' +import { AssessmentName } from 'meta/assessment' +import { User, Users } from 'meta/user' type Params = { assessmentName?: AssessmentName diff --git a/src/client/store/ui/userManagement/actions/updateUserAdminRole.ts b/src/client/store/ui/userManagement/actions/updateUserAdminRole.ts index 199f751a3a..e05ae81049 100644 --- a/src/client/store/ui/userManagement/actions/updateUserAdminRole.ts +++ b/src/client/store/ui/userManagement/actions/updateUserAdminRole.ts @@ -1,8 +1,8 @@ import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' -import { User } from '@meta/user' +import { ApiEndPoint } from 'meta/api/endpoint' +import { User } from 'meta/user' export const updateUserAdminRole = createAsyncThunk( 'userManagement/post/updateUserAdminRole', diff --git a/src/client/store/ui/userManagement/actions/updateUserRoles.ts b/src/client/store/ui/userManagement/actions/updateUserRoles.ts index c9a333a410..7221cf2e34 100644 --- a/src/client/store/ui/userManagement/actions/updateUserRoles.ts +++ b/src/client/store/ui/userManagement/actions/updateUserRoles.ts @@ -1,11 +1,11 @@ import { createAsyncThunk } from '@reduxjs/toolkit' -import { Functions } from '@utils/functions' +import { Functions } from 'utils/functions' import axios from 'axios' import { Dispatch } from 'redux' -import { ApiEndPoint } from '@meta/api/endpoint' -import { AssessmentName } from '@meta/assessment' -import { RoleName, UserRole } from '@meta/user' +import { ApiEndPoint } from 'meta/api/endpoint' +import { AssessmentName } from 'meta/assessment' +import { RoleName, UserRole } from 'meta/user' import { UserManagementActions } from '../slice' diff --git a/src/client/store/ui/userManagement/hooks/index.ts b/src/client/store/ui/userManagement/hooks/index.ts index 80eda3c6a2..8145bf25b1 100644 --- a/src/client/store/ui/userManagement/hooks/index.ts +++ b/src/client/store/ui/userManagement/hooks/index.ts @@ -1,9 +1,9 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { CountryIso } from '@meta/area' -import { RoleName, User } from '@meta/user' +import { CountryIso } from 'meta/area' +import { RoleName, User } from 'meta/user' -import { useAppSelector } from '@client/store/store' +import { useAppSelector } from 'client/store/store' const roleNames = [ RoleName.ADMINISTRATOR, diff --git a/src/client/store/ui/userManagement/stateType.ts b/src/client/store/ui/userManagement/stateType.ts index 8039bd9196..b1cd3038fa 100644 --- a/src/client/store/ui/userManagement/stateType.ts +++ b/src/client/store/ui/userManagement/stateType.ts @@ -1,5 +1,5 @@ -import { CountryIso } from '@meta/area' -import { RoleName, User } from '@meta/user' +import { CountryIso } from 'meta/area' +import { RoleName, User } from 'meta/user' export interface UserManagementState { count: { diff --git a/src/client/store/user/actions/index.ts b/src/client/store/user/actions/index.ts index 8f3c2caba0..51123e1452 100644 --- a/src/client/store/user/actions/index.ts +++ b/src/client/store/user/actions/index.ts @@ -1,7 +1,7 @@ import { createAsyncThunk } from '@reduxjs/toolkit' import axios from 'axios' -import { ApiEndPoint } from '@meta/api/endpoint' +import { ApiEndPoint } from 'meta/api/endpoint' export const logout = createAsyncThunk('user/post/logout', async () => { await axios.post(ApiEndPoint.Auth.logout()) diff --git a/src/client/store/user/hooks/index.ts b/src/client/store/user/hooks/index.ts index 070a3b7e9e..4f63942e3e 100644 --- a/src/client/store/user/hooks/index.ts +++ b/src/client/store/user/hooks/index.ts @@ -1,17 +1,17 @@ -import { CountryIso } from '@meta/area' -import { Cycle } from '@meta/assessment' -import { Authorizer, CollaboratorEditPropertyType, User, Users } from '@meta/user' +import { CountryIso } from 'meta/area' +import { Cycle } from 'meta/assessment' +import { Authorizer, CollaboratorEditPropertyType, User, Users } from 'meta/user' -import { useAppSelector } from '@client/store' +import { useAppSelector } from 'client/store' import { useAssessment, useAssessmentCountry, useAssessmentSection, useCountries, useCycle, -} from '@client/store/assessment' -import { useIsDataLocked } from '@client/store/ui/dataLock' -import { useIsPrint } from '@client/hooks/useIsPath' +} from 'client/store/assessment' +import { useIsDataLocked } from 'client/store/ui/dataLock' +import { useIsPrint } from 'client/hooks/useIsPath' export const useUser = (): User | undefined => useAppSelector((state) => state.user) diff --git a/src/client/store/user/slice.ts b/src/client/store/user/slice.ts index 6ce4467a28..33b90dafd0 100644 --- a/src/client/store/user/slice.ts +++ b/src/client/store/user/slice.ts @@ -1,6 +1,6 @@ import { createSlice, Reducer } from '@reduxjs/toolkit' -import { UserManagementActions } from '@client/store/ui/userManagement' +import { UserManagementActions } from 'client/store/ui/userManagement' import { initApp } from '../assessment/actions/initApp' import { LoginActions } from '../login' diff --git a/src/client/store/user/stateType.ts b/src/client/store/user/stateType.ts index 3539cb8413..b62a725b3f 100644 --- a/src/client/store/user/stateType.ts +++ b/src/client/store/user/stateType.ts @@ -1,3 +1,3 @@ -import { User } from '@meta/user' +import { User } from 'meta/user' export type UserState = User | undefined diff --git a/src/client/utils/copyPasteUtil.ts b/src/client/utils/copyPasteUtil.ts index f5e300880d..34c8dd63b5 100644 --- a/src/client/utils/copyPasteUtil.ts +++ b/src/client/utils/copyPasteUtil.ts @@ -1,5 +1,5 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ -import { Sanitizer } from '@client/utils/sanitizer' +import { Sanitizer } from 'client/utils/sanitizer' const parseValue = (raw: any, type: any) => { if (type === 'integer') { diff --git a/src/client/utils/dates.ts b/src/client/utils/dates.ts index 76018f4c37..368eb90f4c 100644 --- a/src/client/utils/dates.ts +++ b/src/client/utils/dates.ts @@ -1,4 +1,4 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' import { differenceInDays, differenceInHours, differenceInMonths, differenceInWeeks, format, parseISO } from 'date-fns' import { i18n } from 'i18next' diff --git a/src/client/utils/sanitizer/decimal.ts b/src/client/utils/sanitizer/decimal.ts index 8e203b8867..edef6ee61e 100644 --- a/src/client/utils/sanitizer/decimal.ts +++ b/src/client/utils/sanitizer/decimal.ts @@ -1,5 +1,5 @@ -import { Numbers } from '@utils/numbers' -import { Objects } from '@utils/objects' +import { Numbers } from 'utils/numbers' +import { Objects } from 'utils/objects' const isValidDecimalPart = (d: any, checkNoDecimals: any) => { if (checkNoDecimals) { diff --git a/src/client/utils/sanitizer/integer.ts b/src/client/utils/sanitizer/integer.ts index ca6104b782..89ad2dfe90 100644 --- a/src/client/utils/sanitizer/integer.ts +++ b/src/client/utils/sanitizer/integer.ts @@ -1,5 +1,5 @@ -import { Numbers } from '@utils/numbers' -import { Objects } from '@utils/objects' +import { Numbers } from 'utils/numbers' +import { Objects } from 'utils/objects' export const acceptableAsInteger = (newValue: string) => { const newValueTrimmed = newValue.trim() diff --git a/src/client/utils/sanitizer/sanitizer.ts b/src/client/utils/sanitizer/sanitizer.ts index 519ab2911d..18c1c513a0 100644 --- a/src/client/utils/sanitizer/sanitizer.ts +++ b/src/client/utils/sanitizer/sanitizer.ts @@ -1,4 +1,4 @@ -import { ColSelectOption, ColType } from '@meta/assessment' +import { ColSelectOption, ColType } from 'meta/assessment' import { acceptableAsDecimal, acceptNextDecimal } from './decimal' import { acceptableAsInteger, acceptNextInteger } from './integer' diff --git a/src/client/utils/sanitizer/select.ts b/src/client/utils/sanitizer/select.ts index 9633fec0a3..9bb61bce16 100644 --- a/src/client/utils/sanitizer/select.ts +++ b/src/client/utils/sanitizer/select.ts @@ -1,6 +1,6 @@ -import { ColSelectOption } from '@meta/assessment' +import { ColSelectOption } from 'meta/assessment' -import { optionNotSelected } from '@client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Select/OptionNotSelected' +import { optionNotSelected } from 'client/pages/AssessmentSection/DataTable/Table/Row/RowData/Cell/Select/OptionNotSelected' export const acceptNextSelectOption = (newValue: string, currentValue: string, options?: Array) => { const valid = Boolean([optionNotSelected, ...options].find((option) => option.name === newValue)) diff --git a/src/i18n/i18nFactory.ts b/src/i18n/i18nFactory.ts index 3b5dbddde7..529bf72541 100644 --- a/src/i18n/i18nFactory.ts +++ b/src/i18n/i18nFactory.ts @@ -1,7 +1,7 @@ import * as i18next from 'i18next' import { TFunction } from 'i18next' -import { Lang } from '@meta/lang' +import { Lang } from 'meta/lang' import * as enTranslation from './resources/en' import * as frTranslation from './resources/fr' import * as esTranslation from './resources/es' diff --git a/src/meta/api/request/admin/users.ts b/src/meta/api/request/admin/users.ts index 2336e28aad..731c27a60f 100644 --- a/src/meta/api/request/admin/users.ts +++ b/src/meta/api/request/admin/users.ts @@ -1,7 +1,7 @@ import { Request } from 'express' -import { CountryIso } from '@meta/area' -import { RoleName } from '@meta/user' +import { CountryIso } from 'meta/area' +import { RoleName } from 'meta/user' export type UsersRequest = Request< never, diff --git a/src/meta/api/request/auth/login.ts b/src/meta/api/request/auth/login.ts index fbee5d4fef..e4c3a9e6cf 100644 --- a/src/meta/api/request/auth/login.ts +++ b/src/meta/api/request/auth/login.ts @@ -1,6 +1,6 @@ import { Request } from 'express' -import { AssessmentName } from '@meta/assessment' +import { AssessmentName } from 'meta/assessment' export type LoginRequest = Request< unknown, diff --git a/src/meta/api/request/cycleData/table.ts b/src/meta/api/request/cycleData/table.ts index 0df127418a..71ef6a586c 100644 --- a/src/meta/api/request/cycleData/table.ts +++ b/src/meta/api/request/cycleData/table.ts @@ -1,4 +1,4 @@ -import { NodeValue } from '@meta/assessment' +import { NodeValue } from 'meta/assessment' /** * @deprecated diff --git a/src/meta/api/request/file/assessmentFile.ts b/src/meta/api/request/file/assessmentFile.ts index 70b70bbffc..02af634987 100644 --- a/src/meta/api/request/file/assessmentFile.ts +++ b/src/meta/api/request/file/assessmentFile.ts @@ -1,5 +1,5 @@ -import { CountryIso } from '@meta/area' -import { AssessmentName } from '@meta/assessment' +import { CountryIso } from 'meta/area' +import { AssessmentName } from 'meta/assessment' export type AssessmentFileBody = { assessmentName: AssessmentName diff --git a/src/meta/api/request/file/biomassStockFile.ts b/src/meta/api/request/file/biomassStockFile.ts index 53e8e20fa5..c27a32ddcf 100644 --- a/src/meta/api/request/file/biomassStockFile.ts +++ b/src/meta/api/request/file/biomassStockFile.ts @@ -1,6 +1,6 @@ import { Request } from 'express' -import { CountryIso } from '@meta/area' +import { CountryIso } from 'meta/area' export type BiomassStockFileRequest = Request< never, diff --git a/src/meta/api/request/geo/layer.ts b/src/meta/api/request/geo/layer.ts index a2635d0bd4..edc8654b77 100644 --- a/src/meta/api/request/geo/layer.ts +++ b/src/meta/api/request/geo/layer.ts @@ -1,7 +1,7 @@ import { Request } from 'express' -import { CountryIso } from '@meta/area' -import { LayerSource } from '@meta/geo' +import { CountryIso } from 'meta/area' +import { LayerSource } from 'meta/geo' export type LayerRequest = Request< never, diff --git a/src/meta/api/request/index.ts b/src/meta/api/request/index.ts index 0c50c2cf28..8a635704c4 100644 --- a/src/meta/api/request/index.ts +++ b/src/meta/api/request/index.ts @@ -1,6 +1,6 @@ import { Request } from 'express' -import { CountryIso } from '@meta/area' +import { CountryIso } from 'meta/area' // base params export type CycleParams = { diff --git a/src/meta/app.ts b/src/meta/app.ts index f9d695428e..4065b1118c 100644 --- a/src/meta/app.ts +++ b/src/meta/app.ts @@ -1,7 +1,7 @@ import { generatePath } from 'react-router' -import { CountryIso, Global, RegionCode } from '@meta/area' -import { AssessmentName } from '@meta/assessment' +import { CountryIso, Global, RegionCode } from 'meta/area' +import { AssessmentName } from 'meta/assessment' type ClientRoute = { path: { diff --git a/src/meta/area/areas.ts b/src/meta/area/areas.ts index 2dc522922a..a4b72a3fac 100644 --- a/src/meta/area/areas.ts +++ b/src/meta/area/areas.ts @@ -1,6 +1,6 @@ -import { Country, CountryIso, Global, RegionCode } from '@meta/area' -import { AssessmentStatus } from '@meta/area/country' -import { fraRegionCodes } from '@meta/area/regionCode' +import { Country, CountryIso, Global, RegionCode } from 'meta/area' +import { AssessmentStatus } from 'meta/area/country' +import { fraRegionCodes } from 'meta/area/regionCode' const getTranslationKey = (isoCode: CountryIso | RegionCode | Global): string => `area.${isoCode}.listName` diff --git a/src/meta/assessment/activityLogs.ts b/src/meta/assessment/activityLogs.ts index 2f52a5832d..e2952cb8f7 100644 --- a/src/meta/assessment/activityLogs.ts +++ b/src/meta/assessment/activityLogs.ts @@ -1,6 +1,6 @@ import { i18n } from 'i18next' -import { Users } from '@meta/user' +import { Users } from 'meta/user' import { ActivityLog, ActivityLogMessage } from './activityLog' diff --git a/src/meta/assessment/assessmentFile.ts b/src/meta/assessment/assessmentFile.ts index 88464187ea..7581e6c6b2 100644 --- a/src/meta/assessment/assessmentFile.ts +++ b/src/meta/assessment/assessmentFile.ts @@ -1,4 +1,4 @@ -import { CountryIso } from '@meta/area' +import { CountryIso } from 'meta/area' export interface AssessmentFile { id: number diff --git a/src/meta/assessment/assessments.test.ts b/src/meta/assessment/assessments.test.ts index eb23c9f60f..db3e550f52 100644 --- a/src/meta/assessment/assessments.test.ts +++ b/src/meta/assessment/assessments.test.ts @@ -1,6 +1,6 @@ -import { CountryIso } from '@meta/area' -import { AssessmentStatus, Country } from '@meta/area/country' -import { RoleName, User } from '@meta/user' +import { CountryIso } from 'meta/area' +import { AssessmentStatus, Country } from 'meta/area/country' +import { RoleName, User } from 'meta/user' import { AssessmentStatusTransition, AssessmentStatusTransitions } from './assessments' import { Cycle } from './cycle' diff --git a/src/meta/assessment/assessments.ts b/src/meta/assessment/assessments.ts index 118c886c67..a73456200a 100644 --- a/src/meta/assessment/assessments.ts +++ b/src/meta/assessment/assessments.ts @@ -1,5 +1,5 @@ -import { Areas, Country, CountryIso } from '@meta/area' -import { AssessmentStatus } from '@meta/area/country' +import { Areas, Country, CountryIso } from 'meta/area' +import { AssessmentStatus } from 'meta/area/country' import { User, Users } from '../user' import { AssessmentName } from './assessmentName' diff --git a/src/meta/assessment/col.ts b/src/meta/assessment/col.ts index ea8254fe78..124dfd9821 100644 --- a/src/meta/assessment/col.ts +++ b/src/meta/assessment/col.ts @@ -1,9 +1,9 @@ import { CSSProperties } from 'react' -import { AssessmentName } from '@meta/assessment/assessmentName' -import { CycledPropsObject, CycleName, CycleUuid } from '@meta/assessment/cycle' -import { VariableName } from '@meta/assessment/row' -import { TableName } from '@meta/assessment/table' +import { AssessmentName } from 'meta/assessment/assessmentName' +import { CycledPropsObject, CycleName, CycleUuid } from 'meta/assessment/cycle' +import { VariableName } from 'meta/assessment/row' +import { TableName } from 'meta/assessment/table' import { Label } from './label' diff --git a/src/meta/assessment/cols.ts b/src/meta/assessment/cols.ts index a71619a5d0..3e3a3480ca 100644 --- a/src/meta/assessment/cols.ts +++ b/src/meta/assessment/cols.ts @@ -1,7 +1,7 @@ import { TFunction } from 'i18next' -import { Cycle } from '@meta/assessment/cycle' -import { Labels } from '@meta/assessment/labels' +import { Cycle } from 'meta/assessment/cycle' +import { Labels } from 'meta/assessment/labels' import { Col, ColStyle, ColType } from './col' import { Row } from './row' diff --git a/src/meta/assessment/commentableDescription.ts b/src/meta/assessment/commentableDescription.ts index ed18e17787..d2bdfed288 100644 --- a/src/meta/assessment/commentableDescription.ts +++ b/src/meta/assessment/commentableDescription.ts @@ -1,5 +1,5 @@ -import { CountryIso } from '@meta/area' -import { DataSourceDescription } from '@meta/assessment/description' +import { CountryIso } from 'meta/area' +import { DataSourceDescription } from 'meta/assessment/description' // TODO: merge this with description diff --git a/src/meta/assessment/description/nationalDataDataSourceDescription.ts b/src/meta/assessment/description/nationalDataDataSourceDescription.ts index 8f455a86a7..4a25dd36fe 100644 --- a/src/meta/assessment/description/nationalDataDataSourceDescription.ts +++ b/src/meta/assessment/description/nationalDataDataSourceDescription.ts @@ -1,4 +1,4 @@ -import { Label } from '@meta/assessment' +import { Label } from 'meta/assessment' export type DataSourceLinkedVariable = { assessmentName: string diff --git a/src/meta/assessment/labels.ts b/src/meta/assessment/labels.ts index db7027ed3e..72ab937eee 100644 --- a/src/meta/assessment/labels.ts +++ b/src/meta/assessment/labels.ts @@ -1,7 +1,7 @@ import { TFunction } from 'i18next' -import { Cycle } from '@meta/assessment/cycle' -import { Label } from '@meta/assessment/label' +import { Cycle } from 'meta/assessment/cycle' +import { Label } from 'meta/assessment/label' const getLabel = (props: { label: Label; t: TFunction }): string | undefined => { const { label = {}, t } = props diff --git a/src/meta/assessment/node.ts b/src/meta/assessment/node.ts index 4c44b394b4..257cfe8769 100644 --- a/src/meta/assessment/node.ts +++ b/src/meta/assessment/node.ts @@ -1,5 +1,5 @@ -import { CountryIso } from '@meta/area' -import { NodeValueValidation } from '@meta/assessment/nodeValueValidation' +import { CountryIso } from 'meta/area' +import { NodeValueValidation } from 'meta/assessment/nodeValueValidation' export interface NodeValue { raw: any diff --git a/src/meta/assessment/nodeValueValidations.ts b/src/meta/assessment/nodeValueValidations.ts index 524d1929e6..7d95335474 100644 --- a/src/meta/assessment/nodeValueValidations.ts +++ b/src/meta/assessment/nodeValueValidations.ts @@ -1,5 +1,5 @@ -import { NodeValue } from '@meta/assessment/node' -import { NodeValueValidation, NodeValueValidationMessage } from '@meta/assessment/nodeValueValidation' +import { NodeValue } from 'meta/assessment/node' +import { NodeValueValidation, NodeValueValidationMessage } from 'meta/assessment/nodeValueValidation' const merge = (nodeValueValidations: Array): NodeValueValidation => { const valid = nodeValueValidations.every(({ valid }) => valid) diff --git a/src/meta/assessment/nodeValuesEstimation.ts b/src/meta/assessment/nodeValuesEstimation.ts index 7f1270fb75..a5b1ac59eb 100644 --- a/src/meta/assessment/nodeValuesEstimation.ts +++ b/src/meta/assessment/nodeValuesEstimation.ts @@ -1,4 +1,4 @@ -import { VariableName } from '@meta/assessment/row' +import { VariableName } from 'meta/assessment/row' export enum NodeValueEstimationMethod { annualChange = 'annualChange', diff --git a/src/meta/assessment/originalDataPoint/odpNationalClass.ts b/src/meta/assessment/originalDataPoint/odpNationalClass.ts index 91f745d803..277b303b44 100644 --- a/src/meta/assessment/originalDataPoint/odpNationalClass.ts +++ b/src/meta/assessment/originalDataPoint/odpNationalClass.ts @@ -1,4 +1,4 @@ -import { UUIDs } from '@utils/uuids' +import { UUIDs } from 'utils/uuids' const newNationalClass = (props?: { name?: string; definition?: string }): ODPNationalClass => ({ name: props?.name ?? '', diff --git a/src/meta/assessment/originalDataPoint/odps.test.ts b/src/meta/assessment/originalDataPoint/odps.test.ts index 0626881638..974634a5b2 100644 --- a/src/meta/assessment/originalDataPoint/odps.test.ts +++ b/src/meta/assessment/originalDataPoint/odps.test.ts @@ -1,6 +1,7 @@ -import { CountryIso } from '@meta/area' +import { Numbers } from 'utils/numbers' + +import { CountryIso } from 'meta/area' -import { Numbers } from '../../../utils' import { ODPs } from './odps' import { OriginalDataPoint } from './originalDataPoint' diff --git a/src/meta/assessment/originalDataPoint/odps/addNationalClassPlaceHolder.ts b/src/meta/assessment/originalDataPoint/odps/addNationalClassPlaceHolder.ts index 3626484f95..901c8d69b4 100644 --- a/src/meta/assessment/originalDataPoint/odps/addNationalClassPlaceHolder.ts +++ b/src/meta/assessment/originalDataPoint/odps/addNationalClassPlaceHolder.ts @@ -1,5 +1,5 @@ -import { OriginalDataPoint } from '@meta/assessment' -import { ODPNationalClassFactory } from '@meta/assessment/originalDataPoint' +import { OriginalDataPoint } from 'meta/assessment' +import { ODPNationalClassFactory } from 'meta/assessment/originalDataPoint' export const addNationalClassPlaceHolder = (odp: OriginalDataPoint): OriginalDataPoint => ({ ...odp, diff --git a/src/meta/assessment/originalDataPoint/odps/calc.ts b/src/meta/assessment/originalDataPoint/odps/calc.ts index b7234647ed..9b483e9ab3 100644 --- a/src/meta/assessment/originalDataPoint/odps/calc.ts +++ b/src/meta/assessment/originalDataPoint/odps/calc.ts @@ -1,5 +1,5 @@ -import { Numbers } from '@utils/numbers' -import { Objects } from '@utils/objects' +import { Numbers } from 'utils/numbers' +import { Objects } from 'utils/objects' import { ODPNationalClass } from '../odpNationalClass' import { OriginalDataPoint } from '../originalDataPoint' diff --git a/src/meta/assessment/originalDataPoint/odps/canCopyPreviousValues.ts b/src/meta/assessment/originalDataPoint/odps/canCopyPreviousValues.ts index 1f9495736b..d74084c6c8 100644 --- a/src/meta/assessment/originalDataPoint/odps/canCopyPreviousValues.ts +++ b/src/meta/assessment/originalDataPoint/odps/canCopyPreviousValues.ts @@ -1,4 +1,4 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' import { OriginalDataPoint } from '../originalDataPoint' diff --git a/src/meta/assessment/originalDataPoint/odps/deleteNationalClass.ts b/src/meta/assessment/originalDataPoint/odps/deleteNationalClass.ts index 8c10fde7cb..4e7fcaf8ee 100644 --- a/src/meta/assessment/originalDataPoint/odps/deleteNationalClass.ts +++ b/src/meta/assessment/originalDataPoint/odps/deleteNationalClass.ts @@ -1,4 +1,4 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' import { OriginalDataPoint } from '../originalDataPoint' diff --git a/src/meta/assessment/originalDataPoint/odps/removeNationalClassPlaceHolder.ts b/src/meta/assessment/originalDataPoint/odps/removeNationalClassPlaceHolder.ts index fc3ea0fc0f..4afae43423 100644 --- a/src/meta/assessment/originalDataPoint/odps/removeNationalClassPlaceHolder.ts +++ b/src/meta/assessment/originalDataPoint/odps/removeNationalClassPlaceHolder.ts @@ -1,4 +1,4 @@ -import { OriginalDataPoint } from '@meta/assessment' +import { OriginalDataPoint } from 'meta/assessment' export const removeNationalClassPlaceHolder = (odp: OriginalDataPoint): OriginalDataPoint => ({ ...odp, diff --git a/src/meta/assessment/originalDataPoint/odps/updateNationalClass.ts b/src/meta/assessment/originalDataPoint/odps/updateNationalClass.ts index e27598f21e..8012d9c098 100644 --- a/src/meta/assessment/originalDataPoint/odps/updateNationalClass.ts +++ b/src/meta/assessment/originalDataPoint/odps/updateNationalClass.ts @@ -1,5 +1,5 @@ -import { Numbers } from '@utils/numbers' -import { Objects } from '@utils/objects' +import { Numbers } from 'utils/numbers' +import { Objects } from 'utils/objects' import { ODPNationalClass, ODPNationalClassFactory } from '../odpNationalClass' import { OriginalDataPoint } from '../originalDataPoint' diff --git a/src/meta/assessment/originalDataPoint/odps/validateODP.ts b/src/meta/assessment/originalDataPoint/odps/validateODP.ts index b048f376a8..89d7bd47be 100644 --- a/src/meta/assessment/originalDataPoint/odps/validateODP.ts +++ b/src/meta/assessment/originalDataPoint/odps/validateODP.ts @@ -1,7 +1,7 @@ -import { Numbers } from '@utils/numbers' -import { Objects } from '@utils/objects' +import { Numbers } from 'utils/numbers' +import { Objects } from 'utils/objects' -import { ODPNationalClass } from '@meta/assessment' +import { ODPNationalClass } from 'meta/assessment' import { OriginalDataPoint } from '../originalDataPoint' diff --git a/src/meta/assessment/originalDataPoint/originalDataPoint.ts b/src/meta/assessment/originalDataPoint/originalDataPoint.ts index be5422677f..50331f58cd 100644 --- a/src/meta/assessment/originalDataPoint/originalDataPoint.ts +++ b/src/meta/assessment/originalDataPoint/originalDataPoint.ts @@ -1,4 +1,4 @@ -import { CountryIso } from '@meta/area' +import { CountryIso } from 'meta/area' import { ODPDataSourceMethod } from './odpDataSource' // import { ODPEditStatus } from './odpEditStatus' import { ODPNationalClass } from './odpNationalClass' // import { ODPValidation } from './odpValidation' diff --git a/src/meta/assessment/row.ts b/src/meta/assessment/row.ts index d53e921c2c..28fffbb8f2 100644 --- a/src/meta/assessment/row.ts +++ b/src/meta/assessment/row.ts @@ -1,4 +1,4 @@ -import { Col, CycledPropsObject, CycleUuid, VariableCache } from '@meta/assessment' +import { Col, CycledPropsObject, CycleUuid, VariableCache } from 'meta/assessment' export type VariableName = string diff --git a/src/meta/assessment/subSections.ts b/src/meta/assessment/subSections.ts index 4c4de564f4..590b2e6af0 100644 --- a/src/meta/assessment/subSections.ts +++ b/src/meta/assessment/subSections.ts @@ -1,5 +1,5 @@ -import { Cycle } from '@meta/assessment/cycle' -import { Section, SubSection } from '@meta/assessment/section' +import { Cycle } from 'meta/assessment/cycle' +import { Section, SubSection } from 'meta/assessment/section' const getAnchor = (props: { cycle: Cycle; subSection: SubSection }): string => { const { cycle, subSection } = props diff --git a/src/meta/data/RecordAssessmentData.ts b/src/meta/data/RecordAssessmentData.ts index bffd486eb0..f6ce8bb19b 100644 --- a/src/meta/data/RecordAssessmentData.ts +++ b/src/meta/data/RecordAssessmentData.ts @@ -1,5 +1,5 @@ -import { CountryIso } from '@meta/area' -import { AssessmentName, ColName, CycleName, NodeValue, TableName, VariableName } from '@meta/assessment' +import { CountryIso } from 'meta/area' +import { AssessmentName, ColName, CycleName, NodeValue, TableName, VariableName } from 'meta/assessment' export type RecordRowData = Record export type RecordColumnData = Record diff --git a/src/meta/data/nodeUpdates.ts b/src/meta/data/nodeUpdates.ts index 0eaa954685..27fe576a40 100644 --- a/src/meta/data/nodeUpdates.ts +++ b/src/meta/data/nodeUpdates.ts @@ -1,5 +1,5 @@ -import { CountryIso } from '@meta/area' -import { Assessment, Cycle, NodeValue } from '@meta/assessment' +import { CountryIso } from 'meta/area' +import { Assessment, Cycle, NodeValue } from 'meta/assessment' export type NodeUpdate = { tableName: string diff --git a/src/meta/data/recordAssessmentDatas/getDatum.ts b/src/meta/data/recordAssessmentDatas/getDatum.ts index b40cbfef2b..d4bfa59a62 100644 --- a/src/meta/data/recordAssessmentDatas/getDatum.ts +++ b/src/meta/data/recordAssessmentDatas/getDatum.ts @@ -1,5 +1,5 @@ -import { getNodeValue } from '@meta/data/recordAssessmentDatas/getNodeValue' -import { Props } from '@meta/data/recordAssessmentDatas/props' +import { getNodeValue } from 'meta/data/recordAssessmentDatas/getNodeValue' +import { Props } from 'meta/data/recordAssessmentDatas/props' export const getDatum = (props: Props): string | undefined => { return getNodeValue(props)?.raw diff --git a/src/meta/data/recordAssessmentDatas/getNodeValue.ts b/src/meta/data/recordAssessmentDatas/getNodeValue.ts index 10e7382ca1..c0898d896f 100644 --- a/src/meta/data/recordAssessmentDatas/getNodeValue.ts +++ b/src/meta/data/recordAssessmentDatas/getNodeValue.ts @@ -1,4 +1,4 @@ -import { NodeValue } from '@meta/assessment' +import { NodeValue } from 'meta/assessment' import { getTableData } from './getTableData' import { Props } from './props' diff --git a/src/meta/data/recordAssessmentDatas/hasErrors.ts b/src/meta/data/recordAssessmentDatas/hasErrors.ts index 65d78dc005..2b6ba30b2e 100644 --- a/src/meta/data/recordAssessmentDatas/hasErrors.ts +++ b/src/meta/data/recordAssessmentDatas/hasErrors.ts @@ -1,7 +1,7 @@ -import { CountryIso } from '@meta/area' -import { AssessmentName, CycleName, NodeValueValidations, TableName } from '@meta/assessment' -import { RecordAssessmentData } from '@meta/data' -import { getTableData } from '@meta/data/recordAssessmentDatas/getTableData' +import { CountryIso } from 'meta/area' +import { AssessmentName, CycleName, NodeValueValidations, TableName } from 'meta/assessment' +import { RecordAssessmentData } from 'meta/data' +import { getTableData } from 'meta/data/recordAssessmentDatas/getTableData' export const hasErrors = (props: { assessmentName: AssessmentName diff --git a/src/meta/data/recordAssessmentDatas/index.ts b/src/meta/data/recordAssessmentDatas/index.ts index 564b1a7fd2..8bcf4a0e7f 100644 --- a/src/meta/data/recordAssessmentDatas/index.ts +++ b/src/meta/data/recordAssessmentDatas/index.ts @@ -1,14 +1,14 @@ -import { getAssessmentData } from '@meta/data/recordAssessmentDatas/getAssessmentData' -import { getCountryData } from '@meta/data/recordAssessmentDatas/getCountryData' -import { getCycleData } from '@meta/data/recordAssessmentDatas/getCycleData' -import { getDatum } from '@meta/data/recordAssessmentDatas/getDatum' -import { getNodeValue } from '@meta/data/recordAssessmentDatas/getNodeValue' -import { getTableData } from '@meta/data/recordAssessmentDatas/getTableData' -import { hasErrors } from '@meta/data/recordAssessmentDatas/hasErrors' -import { isTableDataEmpty } from '@meta/data/recordAssessmentDatas/isTableDataEmpty' -import { mergeData } from '@meta/data/recordAssessmentDatas/mergeData' -import { updateDatum } from '@meta/data/recordAssessmentDatas/updateDatum' -import { updateDatumValidation } from '@meta/data/recordAssessmentDatas/updateDatumValidation' +import { getAssessmentData } from 'meta/data/recordAssessmentDatas/getAssessmentData' +import { getCountryData } from 'meta/data/recordAssessmentDatas/getCountryData' +import { getCycleData } from 'meta/data/recordAssessmentDatas/getCycleData' +import { getDatum } from 'meta/data/recordAssessmentDatas/getDatum' +import { getNodeValue } from 'meta/data/recordAssessmentDatas/getNodeValue' +import { getTableData } from 'meta/data/recordAssessmentDatas/getTableData' +import { hasErrors } from 'meta/data/recordAssessmentDatas/hasErrors' +import { isTableDataEmpty } from 'meta/data/recordAssessmentDatas/isTableDataEmpty' +import { mergeData } from 'meta/data/recordAssessmentDatas/mergeData' +import { updateDatum } from 'meta/data/recordAssessmentDatas/updateDatum' +import { updateDatumValidation } from 'meta/data/recordAssessmentDatas/updateDatumValidation' export const RecordAssessmentDatas = { getDatum, diff --git a/src/meta/data/recordAssessmentDatas/isTableDataEmpty.ts b/src/meta/data/recordAssessmentDatas/isTableDataEmpty.ts index 453f78228d..12443de447 100644 --- a/src/meta/data/recordAssessmentDatas/isTableDataEmpty.ts +++ b/src/meta/data/recordAssessmentDatas/isTableDataEmpty.ts @@ -1,7 +1,7 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { CountryIso } from '@meta/area' -import { AssessmentName, CycleName, TableName } from '@meta/assessment' +import { CountryIso } from 'meta/area' +import { AssessmentName, CycleName, TableName } from 'meta/assessment' import { RecordAssessmentData } from '../RecordAssessmentData' import { getTableData } from './getTableData' diff --git a/src/meta/data/recordAssessmentDatas/mergeData.ts b/src/meta/data/recordAssessmentDatas/mergeData.ts index 4bb456715e..081ff48223 100644 --- a/src/meta/data/recordAssessmentDatas/mergeData.ts +++ b/src/meta/data/recordAssessmentDatas/mergeData.ts @@ -3,8 +3,8 @@ * @param props - newTableData, tableData * @returns merged table data */ -import { CountryIso } from '@meta/area' -import { AssessmentName, CycleName } from '@meta/assessment' +import { CountryIso } from 'meta/area' +import { AssessmentName, CycleName } from 'meta/assessment' import { RecordAssessmentData } from '../RecordAssessmentData' diff --git a/src/meta/data/recordAssessmentDatas/props.ts b/src/meta/data/recordAssessmentDatas/props.ts index 8b2fde01bc..c495cde274 100644 --- a/src/meta/data/recordAssessmentDatas/props.ts +++ b/src/meta/data/recordAssessmentDatas/props.ts @@ -1,5 +1,5 @@ -import { CountryIso } from '@meta/area' -import { AssessmentName, CycleName } from '@meta/assessment' +import { CountryIso } from 'meta/area' +import { AssessmentName, CycleName } from 'meta/assessment' import { RecordAssessmentData } from '../RecordAssessmentData' diff --git a/src/meta/data/recordAssessmentDatas/updateDatum.ts b/src/meta/data/recordAssessmentDatas/updateDatum.ts index 07b40fba86..661ee624a9 100644 --- a/src/meta/data/recordAssessmentDatas/updateDatum.ts +++ b/src/meta/data/recordAssessmentDatas/updateDatum.ts @@ -1,4 +1,4 @@ -import { NodeValue } from '@meta/assessment' +import { NodeValue } from 'meta/assessment' import { RecordAssessmentData } from '../RecordAssessmentData' import { Props } from './props' diff --git a/src/meta/data/recordAssessmentDatas/updateDatumValidation.ts b/src/meta/data/recordAssessmentDatas/updateDatumValidation.ts index 352ec733c2..e51745945a 100644 --- a/src/meta/data/recordAssessmentDatas/updateDatumValidation.ts +++ b/src/meta/data/recordAssessmentDatas/updateDatumValidation.ts @@ -1,4 +1,4 @@ -import { NodeValue } from '@meta/assessment' +import { NodeValue } from 'meta/assessment' import { RecordAssessmentData } from '../RecordAssessmentData' import { getNodeValue } from './getNodeValue' diff --git a/src/meta/dataExport/unit.ts b/src/meta/dataExport/unit.ts index a0f092bfb3..4cd58eb483 100644 --- a/src/meta/dataExport/unit.ts +++ b/src/meta/dataExport/unit.ts @@ -1,4 +1,4 @@ -import { Numbers } from '@utils/numbers' +import { Numbers } from 'utils/numbers' export enum Unit { haThousand = 'haThousand', diff --git a/src/meta/expressionEvaluator/context.ts b/src/meta/expressionEvaluator/context.ts index 2e8757a7ef..659138b3dd 100644 --- a/src/meta/expressionEvaluator/context.ts +++ b/src/meta/expressionEvaluator/context.ts @@ -1,8 +1,8 @@ import { ExpressionContext } from '@openforis/arena-core' -import { CountryIso } from '@meta/area' -import { Assessment, Cycle, Row } from '@meta/assessment' -import { RecordCountryData } from '@meta/data' +import { CountryIso } from 'meta/area' +import { Assessment, Cycle, Row } from 'meta/assessment' +import { RecordCountryData } from 'meta/data' export interface Context extends ExpressionContext { assessment: Assessment diff --git a/src/meta/expressionEvaluator/evaluators/binary.ts b/src/meta/expressionEvaluator/evaluators/binary.ts index 0df128ee15..ee786b599e 100755 --- a/src/meta/expressionEvaluator/evaluators/binary.ts +++ b/src/meta/expressionEvaluator/evaluators/binary.ts @@ -1,6 +1,6 @@ import { BinaryExpression, ExpressionNodeEvaluator } from '@openforis/arena-core' -import { Numbers } from '@utils/numbers' -import { Objects } from '@utils/objects' +import { Numbers } from 'utils/numbers' +import { Objects } from 'utils/objects' import BigNumber from 'bignumber.js' import { Context } from '../context' diff --git a/src/meta/expressionEvaluator/evaluators/member.ts b/src/meta/expressionEvaluator/evaluators/member.ts index 85df8cfbcb..4f85cc12ca 100755 --- a/src/meta/expressionEvaluator/evaluators/member.ts +++ b/src/meta/expressionEvaluator/evaluators/member.ts @@ -1,8 +1,8 @@ import { MemberExpression } from '@openforis/arena-core' import { MemberEvaluator as ArenaMemberEvaluator } from '@openforis/arena-core/dist/expression/javascript/node/member' -import { AssessmentMetaCaches } from '@meta/assessment' -import { RecordAssessmentDatas } from '@meta/data' +import { AssessmentMetaCaches } from 'meta/assessment' +import { RecordAssessmentDatas } from 'meta/data' import { Context } from '../context' diff --git a/src/meta/expressionEvaluator/functions/NWFPProductHasCategory.ts b/src/meta/expressionEvaluator/functions/NWFPProductHasCategory.ts index 42ef8293c1..5047e6d33a 100644 --- a/src/meta/expressionEvaluator/functions/NWFPProductHasCategory.ts +++ b/src/meta/expressionEvaluator/functions/NWFPProductHasCategory.ts @@ -1,7 +1,7 @@ import { ExpressionFunction } from '@openforis/arena-core/dist/expression/function' -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { NodeValueValidation, NodeValueValidationMessage } from '@meta/assessment' +import { NodeValueValidation, NodeValueValidationMessage } from 'meta/assessment' import { Context } from '../context' diff --git a/src/meta/expressionEvaluator/functions/maxForestArea.ts b/src/meta/expressionEvaluator/functions/maxForestArea.ts index 65d22189ed..989462ee45 100644 --- a/src/meta/expressionEvaluator/functions/maxForestArea.ts +++ b/src/meta/expressionEvaluator/functions/maxForestArea.ts @@ -1,8 +1,8 @@ import { ExpressionFunction } from '@openforis/arena-core/dist/expression/function' -import { Numbers } from '@utils/numbers' +import { Numbers } from 'utils/numbers' -import { TableNames } from '@meta/assessment' -import { RecordAssessmentDatas } from '@meta/data' +import { TableNames } from 'meta/assessment' +import { RecordAssessmentDatas } from 'meta/data' import { Context } from '../context' diff --git a/src/meta/expressionEvaluator/functions/maxLandArea.ts b/src/meta/expressionEvaluator/functions/maxLandArea.ts index 0da3f2fc1b..26309b08db 100644 --- a/src/meta/expressionEvaluator/functions/maxLandArea.ts +++ b/src/meta/expressionEvaluator/functions/maxLandArea.ts @@ -1,8 +1,8 @@ import { ExpressionFunction } from '@openforis/arena-core/dist/expression/function' -import { Numbers } from '@utils/numbers' +import { Numbers } from 'utils/numbers' -import { TableNames } from '@meta/assessment' -import { RecordAssessmentDatas } from '@meta/data' +import { TableNames } from 'meta/assessment' +import { RecordAssessmentDatas } from 'meta/data' import { Context } from '../context' diff --git a/src/meta/expressionEvaluator/functions/validatorColSumNotGreaterThanForest.ts b/src/meta/expressionEvaluator/functions/validatorColSumNotGreaterThanForest.ts index 4e48d49358..ad157c218b 100644 --- a/src/meta/expressionEvaluator/functions/validatorColSumNotGreaterThanForest.ts +++ b/src/meta/expressionEvaluator/functions/validatorColSumNotGreaterThanForest.ts @@ -1,8 +1,8 @@ import { ExpressionFunction } from '@openforis/arena-core/dist/expression/function' -import { Numbers } from '@utils/numbers' +import { Numbers } from 'utils/numbers' -import { NodeValueValidation } from '@meta/assessment' -import { validatorSumNotGreaterThanForest } from '@meta/expressionEvaluator/functions/validatorSumNotGreaterThanForest' +import { NodeValueValidation } from 'meta/assessment' +import { validatorSumNotGreaterThanForest } from 'meta/expressionEvaluator/functions/validatorSumNotGreaterThanForest' import { Context } from '../context' diff --git a/src/meta/expressionEvaluator/functions/validatorEqualToForestExpansion.ts b/src/meta/expressionEvaluator/functions/validatorEqualToForestExpansion.ts index 0f48087e31..951060a9bb 100644 --- a/src/meta/expressionEvaluator/functions/validatorEqualToForestExpansion.ts +++ b/src/meta/expressionEvaluator/functions/validatorEqualToForestExpansion.ts @@ -1,8 +1,8 @@ import { ExpressionFunction } from '@openforis/arena-core/dist/expression/function' -import { Numbers } from '@utils/numbers' -import { Objects } from '@utils/objects' +import { Numbers } from 'utils/numbers' +import { Objects } from 'utils/objects' -import { NodeValueValidation, NodeValueValidationMessage } from '@meta/assessment' +import { NodeValueValidation, NodeValueValidationMessage } from 'meta/assessment' import { Context } from '../context' diff --git a/src/meta/expressionEvaluator/functions/validatorEqualToPlantedForest.ts b/src/meta/expressionEvaluator/functions/validatorEqualToPlantedForest.ts index f8fd1d1fdb..3942074831 100644 --- a/src/meta/expressionEvaluator/functions/validatorEqualToPlantedForest.ts +++ b/src/meta/expressionEvaluator/functions/validatorEqualToPlantedForest.ts @@ -1,7 +1,7 @@ import { ExpressionFunction } from '@openforis/arena-core/dist/expression/function' -import { Numbers } from '@utils/numbers' +import { Numbers } from 'utils/numbers' -import { NodeValueValidation, NodeValueValidationMessage } from '@meta/assessment' +import { NodeValueValidation, NodeValueValidationMessage } from 'meta/assessment' import { Context } from '../context' diff --git a/src/meta/expressionEvaluator/functions/validatorEqualToPrimaryForest.ts b/src/meta/expressionEvaluator/functions/validatorEqualToPrimaryForest.ts index 8805c73348..210a3b7be4 100644 --- a/src/meta/expressionEvaluator/functions/validatorEqualToPrimaryForest.ts +++ b/src/meta/expressionEvaluator/functions/validatorEqualToPrimaryForest.ts @@ -1,8 +1,8 @@ import { ExpressionFunction } from '@openforis/arena-core/dist/expression/function' -import { Numbers } from '@utils/numbers' -import { Objects } from '@utils/objects' +import { Numbers } from 'utils/numbers' +import { Objects } from 'utils/objects' -import { NodeValueValidation, NodeValueValidationMessage } from '@meta/assessment' +import { NodeValueValidation, NodeValueValidationMessage } from 'meta/assessment' import { Context } from '../context' diff --git a/src/meta/expressionEvaluator/functions/validatorEqualToPrivateForest.ts b/src/meta/expressionEvaluator/functions/validatorEqualToPrivateForest.ts index 1a32ccc865..dfccab72d3 100644 --- a/src/meta/expressionEvaluator/functions/validatorEqualToPrivateForest.ts +++ b/src/meta/expressionEvaluator/functions/validatorEqualToPrivateForest.ts @@ -1,8 +1,8 @@ import { ExpressionFunction } from '@openforis/arena-core/dist/expression/function' -import { Numbers } from '@utils/numbers' -import { Objects } from '@utils/objects' +import { Numbers } from 'utils/numbers' +import { Objects } from 'utils/objects' -import { NodeValueValidation, NodeValueValidationMessage } from '@meta/assessment' +import { NodeValueValidation, NodeValueValidationMessage } from 'meta/assessment' import { Context } from '../context' diff --git a/src/meta/expressionEvaluator/functions/validatorEqualToSum.ts b/src/meta/expressionEvaluator/functions/validatorEqualToSum.ts index 1e045ddc79..bae3f218fe 100644 --- a/src/meta/expressionEvaluator/functions/validatorEqualToSum.ts +++ b/src/meta/expressionEvaluator/functions/validatorEqualToSum.ts @@ -1,8 +1,8 @@ import { ExpressionFunction } from '@openforis/arena-core/dist/expression/function' -import { Numbers } from '@utils/numbers' -import { Objects } from '@utils/objects' +import { Numbers } from 'utils/numbers' +import { Objects } from 'utils/objects' -import { NodeValueValidation, NodeValueValidationMessage } from '@meta/assessment' +import { NodeValueValidation, NodeValueValidationMessage } from 'meta/assessment' import { Context } from '../context' diff --git a/src/meta/expressionEvaluator/functions/validatorEqualToTotalForest.ts b/src/meta/expressionEvaluator/functions/validatorEqualToTotalForest.ts index 6a15a35870..8db19876b9 100644 --- a/src/meta/expressionEvaluator/functions/validatorEqualToTotalForest.ts +++ b/src/meta/expressionEvaluator/functions/validatorEqualToTotalForest.ts @@ -1,8 +1,8 @@ import { ExpressionFunction } from '@openforis/arena-core/dist/expression/function' -import { Numbers } from '@utils/numbers' -import { Objects } from '@utils/objects' +import { Numbers } from 'utils/numbers' +import { Objects } from 'utils/objects' -import { NodeValueValidation, NodeValueValidationMessage } from '@meta/assessment' +import { NodeValueValidation, NodeValueValidationMessage } from 'meta/assessment' import { Context } from '../context' diff --git a/src/meta/expressionEvaluator/functions/validatorEqualToTotalGrowingStock.ts b/src/meta/expressionEvaluator/functions/validatorEqualToTotalGrowingStock.ts index 294e2e7d27..dceac5e6a9 100644 --- a/src/meta/expressionEvaluator/functions/validatorEqualToTotalGrowingStock.ts +++ b/src/meta/expressionEvaluator/functions/validatorEqualToTotalGrowingStock.ts @@ -1,8 +1,8 @@ import { ExpressionFunction } from '@openforis/arena-core/dist/expression/function' -import { Numbers } from '@utils/numbers' -import { Objects } from '@utils/objects' +import { Numbers } from 'utils/numbers' +import { Objects } from 'utils/objects' -import { NodeValueValidation, NodeValueValidationMessage } from '@meta/assessment' +import { NodeValueValidation, NodeValueValidationMessage } from 'meta/assessment' import { Context } from '../context' diff --git a/src/meta/expressionEvaluator/functions/validatorForestAreaComparedTo2015.ts b/src/meta/expressionEvaluator/functions/validatorForestAreaComparedTo2015.ts index 05258630e0..12cdd00b7a 100644 --- a/src/meta/expressionEvaluator/functions/validatorForestAreaComparedTo2015.ts +++ b/src/meta/expressionEvaluator/functions/validatorForestAreaComparedTo2015.ts @@ -1,8 +1,8 @@ import { ExpressionFunction } from '@openforis/arena-core/dist/expression/function' -import { Numbers } from '@utils/numbers' -import { Objects } from '@utils/objects' +import { Numbers } from 'utils/numbers' +import { Objects } from 'utils/objects' -import { NodeValueValidation, NodeValueValidationMessage } from '@meta/assessment' +import { NodeValueValidation, NodeValueValidationMessage } from 'meta/assessment' import { Context } from '../context' diff --git a/src/meta/expressionEvaluator/functions/validatorForestAreaComparedTo2020.ts b/src/meta/expressionEvaluator/functions/validatorForestAreaComparedTo2020.ts index 041945643f..1bb230991a 100644 --- a/src/meta/expressionEvaluator/functions/validatorForestAreaComparedTo2020.ts +++ b/src/meta/expressionEvaluator/functions/validatorForestAreaComparedTo2020.ts @@ -1,8 +1,8 @@ import { ExpressionFunction } from '@openforis/arena-core/dist/expression/function' -import { Numbers } from '@utils/numbers' -import { Objects } from '@utils/objects' +import { Numbers } from 'utils/numbers' +import { Objects } from 'utils/objects' -import { NodeValueValidation, NodeValueValidationMessage } from '@meta/assessment' +import { NodeValueValidation, NodeValueValidationMessage } from 'meta/assessment' import { Context } from '../context' diff --git a/src/meta/expressionEvaluator/functions/validatorForestAreaNetChange.ts b/src/meta/expressionEvaluator/functions/validatorForestAreaNetChange.ts index a1cd6a801e..ac31af52f8 100644 --- a/src/meta/expressionEvaluator/functions/validatorForestAreaNetChange.ts +++ b/src/meta/expressionEvaluator/functions/validatorForestAreaNetChange.ts @@ -1,8 +1,8 @@ import { ExpressionFunction } from '@openforis/arena-core/dist/expression/function' -import { Numbers } from '@utils/numbers' -import { Objects } from '@utils/objects' +import { Numbers } from 'utils/numbers' +import { Objects } from 'utils/objects' -import { NodeValueValidation, NodeValueValidationMessage } from '@meta/assessment' +import { NodeValueValidation, NodeValueValidationMessage } from 'meta/assessment' import { Context } from '../context' diff --git a/src/meta/expressionEvaluator/functions/validatorGreaterThanOrZero.ts b/src/meta/expressionEvaluator/functions/validatorGreaterThanOrZero.ts index 1606cb08f9..802d3efc85 100644 --- a/src/meta/expressionEvaluator/functions/validatorGreaterThanOrZero.ts +++ b/src/meta/expressionEvaluator/functions/validatorGreaterThanOrZero.ts @@ -1,8 +1,8 @@ import { ExpressionFunction } from '@openforis/arena-core/dist/expression/function' -import { Numbers } from '@utils/numbers' -import { Objects } from '@utils/objects' +import { Numbers } from 'utils/numbers' +import { Objects } from 'utils/objects' -import { NodeValueValidation, NodeValueValidationMessage } from '@meta/assessment' +import { NodeValueValidation, NodeValueValidationMessage } from 'meta/assessment' import { Context } from '../context' diff --git a/src/meta/expressionEvaluator/functions/validatorIsYear.ts b/src/meta/expressionEvaluator/functions/validatorIsYear.ts index 49c602eee9..d1476b803c 100644 --- a/src/meta/expressionEvaluator/functions/validatorIsYear.ts +++ b/src/meta/expressionEvaluator/functions/validatorIsYear.ts @@ -1,7 +1,7 @@ import { ExpressionFunction } from '@openforis/arena-core/dist/expression/function' -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { NodeValueValidation, NodeValueValidationMessage } from '@meta/assessment' +import { NodeValueValidation, NodeValueValidationMessage } from 'meta/assessment' import { Context } from '../context' diff --git a/src/meta/expressionEvaluator/functions/validatorNextCountryReportYear.ts b/src/meta/expressionEvaluator/functions/validatorNextCountryReportYear.ts index 00e25bdd26..f0685dda43 100644 --- a/src/meta/expressionEvaluator/functions/validatorNextCountryReportYear.ts +++ b/src/meta/expressionEvaluator/functions/validatorNextCountryReportYear.ts @@ -1,8 +1,8 @@ import { ExpressionFunction } from '@openforis/arena-core/dist/expression/function' -import { Numbers } from '@utils/numbers' -import { Objects } from '@utils/objects' +import { Numbers } from 'utils/numbers' +import { Objects } from 'utils/objects' -import { NodeValueValidation, NodeValueValidationMessage } from '@meta/assessment' +import { NodeValueValidation, NodeValueValidationMessage } from 'meta/assessment' import { Context } from '../context' diff --git a/src/meta/expressionEvaluator/functions/validatorNotEmpty.ts b/src/meta/expressionEvaluator/functions/validatorNotEmpty.ts index f9f66e44b7..bcabafa785 100644 --- a/src/meta/expressionEvaluator/functions/validatorNotEmpty.ts +++ b/src/meta/expressionEvaluator/functions/validatorNotEmpty.ts @@ -1,7 +1,7 @@ import { ExpressionFunction } from '@openforis/arena-core/dist/expression/function' -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { NodeValueValidation, NodeValueValidationMessage } from '@meta/assessment' +import { NodeValueValidation, NodeValueValidationMessage } from 'meta/assessment' import { Context } from '../context' diff --git a/src/meta/expressionEvaluator/functions/validatorNotGreaterThan.ts b/src/meta/expressionEvaluator/functions/validatorNotGreaterThan.ts index e2b0c586ec..7e170e0467 100644 --- a/src/meta/expressionEvaluator/functions/validatorNotGreaterThan.ts +++ b/src/meta/expressionEvaluator/functions/validatorNotGreaterThan.ts @@ -1,8 +1,8 @@ import { ExpressionFunction } from '@openforis/arena-core/dist/expression/function' -import { Numbers } from '@utils/numbers' -import { Objects } from '@utils/objects' +import { Numbers } from 'utils/numbers' +import { Objects } from 'utils/objects' -import { NodeValueValidation, NodeValueValidationMessage } from '@meta/assessment' +import { NodeValueValidation, NodeValueValidationMessage } from 'meta/assessment' import { Context } from '../context' diff --git a/src/meta/expressionEvaluator/functions/validatorNotGreaterThanForest.ts b/src/meta/expressionEvaluator/functions/validatorNotGreaterThanForest.ts index 6f33793136..c1fe81db3c 100644 --- a/src/meta/expressionEvaluator/functions/validatorNotGreaterThanForest.ts +++ b/src/meta/expressionEvaluator/functions/validatorNotGreaterThanForest.ts @@ -1,8 +1,8 @@ import { ExpressionFunction } from '@openforis/arena-core/dist/expression/function' -import { Numbers } from '@utils/numbers' -import { Objects } from '@utils/objects' +import { Numbers } from 'utils/numbers' +import { Objects } from 'utils/objects' -import { NodeValueValidation, NodeValueValidationMessage } from '@meta/assessment' +import { NodeValueValidation, NodeValueValidationMessage } from 'meta/assessment' import { Context } from '../context' diff --git a/src/meta/expressionEvaluator/functions/validatorNotGreaterThanForestOrMaxForest.ts b/src/meta/expressionEvaluator/functions/validatorNotGreaterThanForestOrMaxForest.ts index c4ec02cd72..97268ec2a9 100644 --- a/src/meta/expressionEvaluator/functions/validatorNotGreaterThanForestOrMaxForest.ts +++ b/src/meta/expressionEvaluator/functions/validatorNotGreaterThanForestOrMaxForest.ts @@ -1,7 +1,7 @@ import { ExpressionFunction } from '@openforis/arena-core/dist/expression/function' -import { NodeValueValidation } from '@meta/assessment' -import { validatorNotGreaterThanForest } from '@meta/expressionEvaluator/functions/validatorNotGreaterThanForest' +import { NodeValueValidation } from 'meta/assessment' +import { validatorNotGreaterThanForest } from 'meta/expressionEvaluator/functions/validatorNotGreaterThanForest' import { Context } from '../context' import { validatorNotGreaterThanMaxForest } from './validatorNotGreaterThanMaxForest' diff --git a/src/meta/expressionEvaluator/functions/validatorNotGreaterThanLandArea.ts b/src/meta/expressionEvaluator/functions/validatorNotGreaterThanLandArea.ts index 35c8b169fa..205888e011 100644 --- a/src/meta/expressionEvaluator/functions/validatorNotGreaterThanLandArea.ts +++ b/src/meta/expressionEvaluator/functions/validatorNotGreaterThanLandArea.ts @@ -1,8 +1,8 @@ import { ExpressionFunction } from '@openforis/arena-core/dist/expression/function' -import { Numbers } from '@utils/numbers' -import { Objects } from '@utils/objects' +import { Numbers } from 'utils/numbers' +import { Objects } from 'utils/objects' -import { NodeValueValidation, NodeValueValidationMessage } from '@meta/assessment' +import { NodeValueValidation, NodeValueValidationMessage } from 'meta/assessment' import { Context } from '../context' diff --git a/src/meta/expressionEvaluator/functions/validatorNotGreaterThanLandAreaOrMaxLandArea.ts b/src/meta/expressionEvaluator/functions/validatorNotGreaterThanLandAreaOrMaxLandArea.ts index 9ff20a2b82..0f1b061425 100644 --- a/src/meta/expressionEvaluator/functions/validatorNotGreaterThanLandAreaOrMaxLandArea.ts +++ b/src/meta/expressionEvaluator/functions/validatorNotGreaterThanLandAreaOrMaxLandArea.ts @@ -1,9 +1,9 @@ import { ExpressionFunction } from '@openforis/arena-core/dist/expression/function' -import { Numbers } from '@utils/numbers' -import { Objects } from '@utils/objects' +import { Numbers } from 'utils/numbers' +import { Objects } from 'utils/objects' -import { NodeValueValidation, NodeValueValidationMessage } from '@meta/assessment' -import { validatorNotGreaterThanLandArea } from '@meta/expressionEvaluator/functions/validatorNotGreaterThanLandArea' +import { NodeValueValidation, NodeValueValidationMessage } from 'meta/assessment' +import { validatorNotGreaterThanLandArea } from 'meta/expressionEvaluator/functions/validatorNotGreaterThanLandArea' import { Context } from '../context' diff --git a/src/meta/expressionEvaluator/functions/validatorNotGreaterThanMaxForest.ts b/src/meta/expressionEvaluator/functions/validatorNotGreaterThanMaxForest.ts index 9c8146f6f7..635ffbdb70 100644 --- a/src/meta/expressionEvaluator/functions/validatorNotGreaterThanMaxForest.ts +++ b/src/meta/expressionEvaluator/functions/validatorNotGreaterThanMaxForest.ts @@ -1,8 +1,8 @@ import { ExpressionFunction } from '@openforis/arena-core/dist/expression/function' -import { Numbers } from '@utils/numbers' -import { Objects } from '@utils/objects' +import { Numbers } from 'utils/numbers' +import { Objects } from 'utils/objects' -import { NodeValueValidation, NodeValueValidationMessage } from '@meta/assessment' +import { NodeValueValidation, NodeValueValidationMessage } from 'meta/assessment' import { Context } from '../context' diff --git a/src/meta/expressionEvaluator/functions/validatorOtherLand.ts b/src/meta/expressionEvaluator/functions/validatorOtherLand.ts index 9fc12d2c6c..0a881df61a 100644 --- a/src/meta/expressionEvaluator/functions/validatorOtherLand.ts +++ b/src/meta/expressionEvaluator/functions/validatorOtherLand.ts @@ -1,8 +1,8 @@ import { ExpressionFunction } from '@openforis/arena-core/dist/expression/function' -import { Numbers } from '@utils/numbers' -import { Objects } from '@utils/objects' +import { Numbers } from 'utils/numbers' +import { Objects } from 'utils/objects' -import { NodeValueValidation, NodeValueValidationMessage } from '@meta/assessment' +import { NodeValueValidation, NodeValueValidationMessage } from 'meta/assessment' import { Context } from '../context' diff --git a/src/meta/expressionEvaluator/functions/validatorOtherLandWithTreeCoverTotal.ts b/src/meta/expressionEvaluator/functions/validatorOtherLandWithTreeCoverTotal.ts index 8678563e13..2c0c77ca60 100644 --- a/src/meta/expressionEvaluator/functions/validatorOtherLandWithTreeCoverTotal.ts +++ b/src/meta/expressionEvaluator/functions/validatorOtherLandWithTreeCoverTotal.ts @@ -1,8 +1,8 @@ import { ExpressionFunction } from '@openforis/arena-core/dist/expression/function' -import { Numbers } from '@utils/numbers' -import { Objects } from '@utils/objects' +import { Numbers } from 'utils/numbers' +import { Objects } from 'utils/objects' -import { NodeValueValidation, NodeValueValidationMessage } from '@meta/assessment' +import { NodeValueValidation, NodeValueValidationMessage } from 'meta/assessment' import { Context } from '../context' diff --git a/src/meta/expressionEvaluator/functions/validatorPlantationForestIntroduced.ts b/src/meta/expressionEvaluator/functions/validatorPlantationForestIntroduced.ts index 50b1701635..3fa178118a 100644 --- a/src/meta/expressionEvaluator/functions/validatorPlantationForestIntroduced.ts +++ b/src/meta/expressionEvaluator/functions/validatorPlantationForestIntroduced.ts @@ -1,8 +1,8 @@ import { ExpressionFunction } from '@openforis/arena-core/dist/expression/function' -import { Numbers } from '@utils/numbers' -import { Objects } from '@utils/objects' +import { Numbers } from 'utils/numbers' +import { Objects } from 'utils/objects' -import { NodeValueValidation, NodeValueValidationMessage } from '@meta/assessment' +import { NodeValueValidation, NodeValueValidationMessage } from 'meta/assessment' import { Context } from '../context' diff --git a/src/meta/expressionEvaluator/functions/validatorPrimaryForest.ts b/src/meta/expressionEvaluator/functions/validatorPrimaryForest.ts index 5cd5b9b9da..a57a82fbba 100644 --- a/src/meta/expressionEvaluator/functions/validatorPrimaryForest.ts +++ b/src/meta/expressionEvaluator/functions/validatorPrimaryForest.ts @@ -1,8 +1,8 @@ import { ExpressionFunction } from '@openforis/arena-core/dist/expression/function' -import { Numbers } from '@utils/numbers' -import { Objects } from '@utils/objects' +import { Numbers } from 'utils/numbers' +import { Objects } from 'utils/objects' -import { NodeValueValidation, NodeValueValidationMessage } from '@meta/assessment' +import { NodeValueValidation, NodeValueValidationMessage } from 'meta/assessment' import { Context } from '../context' diff --git a/src/meta/expressionEvaluator/functions/validatorPrivateOwnership.ts b/src/meta/expressionEvaluator/functions/validatorPrivateOwnership.ts index 4f2274445b..eb953c8958 100644 --- a/src/meta/expressionEvaluator/functions/validatorPrivateOwnership.ts +++ b/src/meta/expressionEvaluator/functions/validatorPrivateOwnership.ts @@ -1,8 +1,8 @@ import { ExpressionFunction } from '@openforis/arena-core/dist/expression/function' -import { Numbers } from '@utils/numbers' -import { Objects } from '@utils/objects' +import { Numbers } from 'utils/numbers' +import { Objects } from 'utils/objects' -import { NodeValueValidation, NodeValueValidationMessage } from '@meta/assessment' +import { NodeValueValidation, NodeValueValidationMessage } from 'meta/assessment' import { Context } from '../context' diff --git a/src/meta/expressionEvaluator/functions/validatorRemainingLandWithTreeCoverTotal.ts b/src/meta/expressionEvaluator/functions/validatorRemainingLandWithTreeCoverTotal.ts index d8bfe19ccd..df693dd4cf 100644 --- a/src/meta/expressionEvaluator/functions/validatorRemainingLandWithTreeCoverTotal.ts +++ b/src/meta/expressionEvaluator/functions/validatorRemainingLandWithTreeCoverTotal.ts @@ -1,8 +1,8 @@ import { ExpressionFunction } from '@openforis/arena-core/dist/expression/function' -import { Numbers } from '@utils/numbers' -import { Objects } from '@utils/objects' +import { Numbers } from 'utils/numbers' +import { Objects } from 'utils/objects' -import { NodeValueValidation, NodeValueValidationMessage } from '@meta/assessment' +import { NodeValueValidation, NodeValueValidationMessage } from 'meta/assessment' import { Context } from '../context' diff --git a/src/meta/expressionEvaluator/functions/validatorSubCategory.ts b/src/meta/expressionEvaluator/functions/validatorSubCategory.ts index f922d53c16..205da231d0 100644 --- a/src/meta/expressionEvaluator/functions/validatorSubCategory.ts +++ b/src/meta/expressionEvaluator/functions/validatorSubCategory.ts @@ -1,8 +1,8 @@ import { ExpressionFunction } from '@openforis/arena-core/dist/expression/function' -import { Numbers } from '@utils/numbers' -import { Objects } from '@utils/objects' +import { Numbers } from 'utils/numbers' +import { Objects } from 'utils/objects' -import { NodeValueValidation, NodeValueValidationMessage } from '@meta/assessment' +import { NodeValueValidation, NodeValueValidationMessage } from 'meta/assessment' import { Context } from '../context' diff --git a/src/meta/expressionEvaluator/functions/validatorSumNotGreaterThan.ts b/src/meta/expressionEvaluator/functions/validatorSumNotGreaterThan.ts index cf53856623..0887051640 100644 --- a/src/meta/expressionEvaluator/functions/validatorSumNotGreaterThan.ts +++ b/src/meta/expressionEvaluator/functions/validatorSumNotGreaterThan.ts @@ -1,8 +1,8 @@ import { ExpressionFunction } from '@openforis/arena-core/dist/expression/function' -import { Numbers } from '@utils/numbers' -import { Objects } from '@utils/objects' +import { Numbers } from 'utils/numbers' +import { Objects } from 'utils/objects' -import { NodeValueValidation, NodeValueValidationMessage } from '@meta/assessment' +import { NodeValueValidation, NodeValueValidationMessage } from 'meta/assessment' import { Context } from '../context' diff --git a/src/meta/expressionEvaluator/functions/validatorSumNotGreaterThanForest.ts b/src/meta/expressionEvaluator/functions/validatorSumNotGreaterThanForest.ts index 2d82344072..68f486bb05 100644 --- a/src/meta/expressionEvaluator/functions/validatorSumNotGreaterThanForest.ts +++ b/src/meta/expressionEvaluator/functions/validatorSumNotGreaterThanForest.ts @@ -1,8 +1,8 @@ import { ExpressionFunction } from '@openforis/arena-core/dist/expression/function' -import { Numbers } from '@utils/numbers' -import { Objects } from '@utils/objects' +import { Numbers } from 'utils/numbers' +import { Objects } from 'utils/objects' -import { NodeValueValidation, NodeValueValidationMessage } from '@meta/assessment' +import { NodeValueValidation, NodeValueValidationMessage } from 'meta/assessment' import { Context } from '../context' diff --git a/src/meta/expressionEvaluator/functions/validatorTotalForest.ts b/src/meta/expressionEvaluator/functions/validatorTotalForest.ts index 2afb1a5d9a..287cfcb8fd 100644 --- a/src/meta/expressionEvaluator/functions/validatorTotalForest.ts +++ b/src/meta/expressionEvaluator/functions/validatorTotalForest.ts @@ -1,8 +1,8 @@ import { ExpressionFunction } from '@openforis/arena-core/dist/expression/function' -import { Numbers } from '@utils/numbers' -import { Objects } from '@utils/objects' +import { Numbers } from 'utils/numbers' +import { Objects } from 'utils/objects' -import { NodeValueValidation, NodeValueValidationMessage } from '@meta/assessment' +import { NodeValueValidation, NodeValueValidationMessage } from 'meta/assessment' import { Context } from '../context' diff --git a/src/meta/geo/bounds.ts b/src/meta/geo/bounds.ts index 8abdfbbcc4..48b01b32ee 100644 --- a/src/meta/geo/bounds.ts +++ b/src/meta/geo/bounds.ts @@ -1,4 +1,4 @@ -import { CountryIso } from '@meta/area' +import { CountryIso } from 'meta/area' export interface BoundsData { bounds: { south: number; west: number; north: number; east: number } diff --git a/src/meta/geo/forestEstimations.ts b/src/meta/geo/forestEstimations.ts index 1857a93062..fd0f170cd2 100644 --- a/src/meta/geo/forestEstimations.ts +++ b/src/meta/geo/forestEstimations.ts @@ -1,4 +1,4 @@ -import { CountryIso } from '@meta/area' +import { CountryIso } from 'meta/area' export interface ForestEstimationsData { faAgreementEsriEsaGloHansen10Gte1: number diff --git a/src/meta/geo/geoStatistics.ts b/src/meta/geo/geoStatistics.ts index 4ef57b5f81..c1bd5bcdad 100644 --- a/src/meta/geo/geoStatistics.ts +++ b/src/meta/geo/geoStatistics.ts @@ -1,4 +1,4 @@ -import { ForestEstimations } from '@meta/geo' +import { ForestEstimations } from 'meta/geo' export interface GeoStatisticsState { forestEstimations: ForestEstimations | null diff --git a/src/meta/messageCenter/message.ts b/src/meta/messageCenter/message.ts index 21a933dee1..1e432a6516 100644 --- a/src/meta/messageCenter/message.ts +++ b/src/meta/messageCenter/message.ts @@ -1,4 +1,4 @@ -import { User } from '@meta/user' +import { User } from 'meta/user' export interface Message { id: number diff --git a/src/meta/messageCenter/messageTopic.ts b/src/meta/messageCenter/messageTopic.ts index bfda4c01d0..90e3edafac 100644 --- a/src/meta/messageCenter/messageTopic.ts +++ b/src/meta/messageCenter/messageTopic.ts @@ -1,4 +1,4 @@ -import { CountryIso } from '@meta/area' +import { CountryIso } from 'meta/area' import { Message } from './message' diff --git a/src/meta/messageCenter/topics.ts b/src/meta/messageCenter/topics.ts index f6c0b9389f..f1d1fb2df0 100644 --- a/src/meta/messageCenter/topics.ts +++ b/src/meta/messageCenter/topics.ts @@ -1,6 +1,6 @@ -import { CountryIso } from '@meta/area' -import { Assessment, Cycle, Row } from '@meta/assessment' -import { User } from '@meta/user' +import { CountryIso } from 'meta/area' +import { Assessment, Cycle, Row } from 'meta/assessment' +import { User } from 'meta/user' const getDataReviewTopicKey = (row: Row): string => row.uuid diff --git a/src/meta/socket/sockets.ts b/src/meta/socket/sockets.ts index 59cbf0c5c6..48b98a9fb1 100644 --- a/src/meta/socket/sockets.ts +++ b/src/meta/socket/sockets.ts @@ -1,6 +1,6 @@ -import { CountryIso } from '@meta/area' -import { Assessment, AssessmentName, Cycle } from '@meta/assessment' -import { MessageTopic } from '@meta/messageCenter' +import { CountryIso } from 'meta/area' +import { Assessment, AssessmentName, Cycle } from 'meta/assessment' +import { MessageTopic } from 'meta/messageCenter' const getRequestReviewSummaryEvent = (props: { countryIso: CountryIso diff --git a/src/meta/user/authorizer.ts b/src/meta/user/authorizer.ts index 83cf37f5ad..d8d55c1eec 100644 --- a/src/meta/user/authorizer.ts +++ b/src/meta/user/authorizer.ts @@ -1,11 +1,11 @@ -import { Objects } from '@utils/objects' - -import { Areas, Country, CountryIso } from '@meta/area' -import { AssessmentStatus } from '@meta/area/country' -import { Cycle, Section, SubSection } from '@meta/assessment' -import { User } from '@meta/user/user' -import { Collaborator, CollaboratorEditPropertyType } from '@meta/user/userRole' -import { Users } from '@meta/user/users' +import { Objects } from 'utils/objects' + +import { Areas, Country, CountryIso } from 'meta/area' +import { AssessmentStatus } from 'meta/area/country' +import { Cycle, Section, SubSection } from 'meta/assessment' +import { User } from 'meta/user/user' +import { Collaborator, CollaboratorEditPropertyType } from 'meta/user/userRole' +import { Users } from 'meta/user/users' /** * CanView diff --git a/src/meta/user/userRole.ts b/src/meta/user/userRole.ts index b41e6e47dc..2811800c9a 100644 --- a/src/meta/user/userRole.ts +++ b/src/meta/user/userRole.ts @@ -1,4 +1,4 @@ -import { CountryIso } from '@meta/area' +import { CountryIso } from 'meta/area' export enum RoleName { ADMINISTRATOR = 'ADMINISTRATOR', diff --git a/src/meta/user/userRoles.ts b/src/meta/user/userRoles.ts index 2e93c1cc9e..98766d9972 100644 --- a/src/meta/user/userRoles.ts +++ b/src/meta/user/userRoles.ts @@ -1,8 +1,8 @@ import i18n from 'i18next' -import { Areas } from '@meta/area' -import { AssessmentStatus } from '@meta/area/country' -import { User } from '@meta/user/user' +import { Areas } from 'meta/area' +import { AssessmentStatus } from 'meta/area/country' +import { User } from 'meta/user/user' import { RoleName, UserRole } from './userRole' diff --git a/src/meta/user/users.test.ts b/src/meta/user/users.test.ts index 128a4bb6af..b783cbfba4 100644 --- a/src/meta/user/users.test.ts +++ b/src/meta/user/users.test.ts @@ -1,5 +1,5 @@ -import { CountryIso } from '@meta/area' -import { Cycle } from '@meta/assessment' +import { CountryIso } from 'meta/area' +import { Cycle } from 'meta/assessment' import { User } from './user' import { RoleName } from './userRole' diff --git a/src/meta/user/users.ts b/src/meta/user/users.ts index 7f62554943..2e7ad67310 100644 --- a/src/meta/user/users.ts +++ b/src/meta/user/users.ts @@ -1,8 +1,8 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { ApiEndPoint } from '@meta/api/endpoint' -import { CountryIso } from '@meta/area' -import { Cycle } from '@meta/assessment' +import { ApiEndPoint } from 'meta/api/endpoint' +import { CountryIso } from 'meta/area' +import { Cycle } from 'meta/assessment' import type { User, UserProps } from './user' import { diff --git a/src/server/api/admin/getUsers.ts b/src/server/api/admin/getUsers.ts index d9afc070f8..84d8d4192a 100644 --- a/src/server/api/admin/getUsers.ts +++ b/src/server/api/admin/getUsers.ts @@ -1,10 +1,10 @@ import { Response } from 'express' -import { UsersRequest } from '@meta/api/request' +import { UsersRequest } from 'meta/api/request' -import { AssessmentController } from '@server/controller/assessment' -import { UserController } from '@server/controller/user' -import Requests from '@server/utils/requests' +import { AssessmentController } from 'server/controller/assessment' +import { UserController } from 'server/controller/user' +import Requests from 'server/utils/requests' export const getUsers = async (req: UsersRequest, res: Response) => { try { diff --git a/src/server/api/admin/getUsersCount.ts b/src/server/api/admin/getUsersCount.ts index 82b16893fb..ed835334f6 100644 --- a/src/server/api/admin/getUsersCount.ts +++ b/src/server/api/admin/getUsersCount.ts @@ -1,10 +1,10 @@ import { Response } from 'express' -import { UsersRequest } from '@meta/api/request' +import { UsersRequest } from 'meta/api/request' -import { AssessmentController } from '@server/controller/assessment' -import { UserController } from '@server/controller/user' -import Requests from '@server/utils/requests' +import { AssessmentController } from 'server/controller/assessment' +import { UserController } from 'server/controller/user' +import Requests from 'server/utils/requests' export const getUsersCount = async (req: UsersRequest, res: Response) => { try { diff --git a/src/server/api/admin/index.ts b/src/server/api/admin/index.ts index 49dc7f9e56..ce0bef0f80 100644 --- a/src/server/api/admin/index.ts +++ b/src/server/api/admin/index.ts @@ -1,8 +1,8 @@ import { Express } from 'express' -import { ApiEndPoint } from '@meta/api/endpoint' +import { ApiEndPoint } from 'meta/api/endpoint' -import { AuthMiddleware } from '@server/middleware/auth' +import { AuthMiddleware } from 'server/middleware/auth' import { getUsers } from './getUsers' import { getUsersCount } from './getUsersCount' diff --git a/src/server/api/api.ts b/src/server/api/api.ts index bbf664a4bf..eefe382092 100644 --- a/src/server/api/api.ts +++ b/src/server/api/api.ts @@ -1,6 +1,6 @@ import { Express } from 'express' -import { ExtDataApi } from '@server/api/extData' +import { ExtDataApi } from 'server/api/extData' import { AdminApi } from './admin' import { AreaApi } from './area' diff --git a/src/server/api/area/getAreas.ts b/src/server/api/area/getAreas.ts index 52cc6b0ad5..9112c82dee 100644 --- a/src/server/api/area/getAreas.ts +++ b/src/server/api/area/getAreas.ts @@ -1,11 +1,11 @@ import { Response } from 'express' -import { InitRequest } from '@meta/api/request' +import { InitRequest } from 'meta/api/request' -import { AreaController } from '@server/controller/area' -import { AssessmentController } from '@server/controller/assessment' -import { SettingsController } from '@server/controller/settings' -import Requests from '@server/utils/requests' +import { AreaController } from 'server/controller/area' +import { AssessmentController } from 'server/controller/assessment' +import { SettingsController } from 'server/controller/settings' +import Requests from 'server/utils/requests' export const getAreas = async (req: InitRequest, res: Response) => { try { diff --git a/src/server/api/area/index.ts b/src/server/api/area/index.ts index 5c244584b7..dc190dae49 100644 --- a/src/server/api/area/index.ts +++ b/src/server/api/area/index.ts @@ -1,8 +1,8 @@ import { Express } from 'express' -import { ApiEndPoint } from '@meta/api/endpoint' +import { ApiEndPoint } from 'meta/api/endpoint' -import { AuthMiddleware } from '@server/middleware/auth' +import { AuthMiddleware } from 'server/middleware/auth' import { getAreas } from './getAreas' import { postCountry } from './postCountry' diff --git a/src/server/api/area/postCountry.ts b/src/server/api/area/postCountry.ts index d960bce85f..9e5bb349c5 100644 --- a/src/server/api/area/postCountry.ts +++ b/src/server/api/area/postCountry.ts @@ -1,12 +1,12 @@ import { Response } from 'express' -import { CycleRequest } from '@meta/api/request' -import { Country } from '@meta/area' +import { CycleRequest } from 'meta/api/request' +import { Country } from 'meta/area' -import { AreaController } from '@server/controller/area' -import { AssessmentController } from '@server/controller/assessment' -import { MailService } from '@server/service' -import Requests from '@server/utils/requests' +import { AreaController } from 'server/controller/area' +import { AssessmentController } from 'server/controller/assessment' +import { MailService } from 'server/service' +import Requests from 'server/utils/requests' export const postCountry = async ( req: CycleRequest<{ notifyUsers: string }, { country: Country; message: string }>, diff --git a/src/server/api/area/updateCountryProp.ts b/src/server/api/area/updateCountryProp.ts index 61dbf7db89..bbb932bb93 100644 --- a/src/server/api/area/updateCountryProp.ts +++ b/src/server/api/area/updateCountryProp.ts @@ -1,10 +1,10 @@ import { Response } from 'express' -import { CycleRequest } from '@meta/api/request' +import { CycleRequest } from 'meta/api/request' -import { AreaController } from '@server/controller/area' -import { AssessmentController } from '@server/controller/assessment' -import Requests from '@server/utils/requests' +import { AreaController } from 'server/controller/area' +import { AssessmentController } from 'server/controller/assessment' +import Requests from 'server/utils/requests' export const updateCountryProp = async ( req: CycleRequest, diff --git a/src/server/api/auth/config.ts b/src/server/api/auth/config.ts index ab569cdb56..4f5e621c4a 100644 --- a/src/server/api/auth/config.ts +++ b/src/server/api/auth/config.ts @@ -1,12 +1,12 @@ import { Express } from 'express' import * as passport from 'passport' -import { User } from '@meta/user' +import { User } from 'meta/user' -import { googleStrategy } from '@server/api/auth/strategy/google' -import { jwtStrategy } from '@server/api/auth/strategy/jwt' -import { localStrategy } from '@server/api/auth/strategy/local' -import { UserRepository } from '@server/repository/public/user' +import { googleStrategy } from 'server/api/auth/strategy/google' +import { jwtStrategy } from 'server/api/auth/strategy/jwt' +import { localStrategy } from 'server/api/auth/strategy/local' +import { UserRepository } from 'server/repository/public/user' export const AuthConfig = { init: (app: Express) => { diff --git a/src/server/api/auth/index.ts b/src/server/api/auth/index.ts index 98f2226cc5..3e246e8c3b 100644 --- a/src/server/api/auth/index.ts +++ b/src/server/api/auth/index.ts @@ -1,7 +1,7 @@ import { Express } from 'express' import * as passport from 'passport' -import { ApiEndPoint } from '@meta/api/endpoint' +import { ApiEndPoint } from 'meta/api/endpoint' import { AuthConfig } from './config' import { getGoogleCallback, getGoogleLogin, postLocalLogin } from './login' diff --git a/src/server/api/auth/login.ts b/src/server/api/auth/login.ts index 76bc83f2f0..9b75b61606 100644 --- a/src/server/api/auth/login.ts +++ b/src/server/api/auth/login.ts @@ -1,12 +1,12 @@ import { NextFunction, Request, Response } from 'express' import * as passport from 'passport' -import { LoginRequest } from '@meta/api/request' -import { ClientRoutes } from '@meta/app' -import { AuthToken } from '@meta/auth' -import { User } from '@meta/user' +import { LoginRequest } from 'meta/api/request' +import { ClientRoutes } from 'meta/app' +import { AuthToken } from 'meta/auth' +import { User } from 'meta/user' -import Requests, { appUri } from '@server/utils/requests' +import Requests, { appUri } from 'server/utils/requests' import { setAuthToken } from './utils/setAuthToken' diff --git a/src/server/api/auth/postChangePassword.ts b/src/server/api/auth/postChangePassword.ts index 65749ab0c2..cb21bac4c9 100644 --- a/src/server/api/auth/postChangePassword.ts +++ b/src/server/api/auth/postChangePassword.ts @@ -1,10 +1,10 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' import { Request, Response } from 'express' -import { passwordHash } from '@server/api/auth/utils/passwordUtils' -import { UserController } from '@server/controller/user' -import { Requests } from '@server/utils' -import { validPassword } from '@server/utils/validPassword' +import { passwordHash } from 'server/api/auth/utils/passwordUtils' +import { UserController } from 'server/controller/user' +import { Requests } from 'server/utils' +import { validPassword } from 'server/utils/validPassword' export const postChangePassword = async (req: Request, res: Response) => { try { diff --git a/src/server/api/auth/postLogout.ts b/src/server/api/auth/postLogout.ts index fa77fd2225..c65b199166 100644 --- a/src/server/api/auth/postLogout.ts +++ b/src/server/api/auth/postLogout.ts @@ -1,6 +1,6 @@ import { Request, Response } from 'express' -import { AuthToken } from '@meta/auth' +import { AuthToken } from 'meta/auth' export const postLogout = (_: Request, res: Response): void => { res.clearCookie(AuthToken.fraAuthToken) diff --git a/src/server/api/auth/postResetPassword.ts b/src/server/api/auth/postResetPassword.ts index 679753feb8..7f72f60187 100644 --- a/src/server/api/auth/postResetPassword.ts +++ b/src/server/api/auth/postResetPassword.ts @@ -1,11 +1,11 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' import { Request, Response } from 'express' -import { AuthProvider, Users, UserStatus } from '@meta/user' +import { AuthProvider, Users, UserStatus } from 'meta/user' -import { UserController } from '@server/controller/user' -import { UserProviderController } from '@server/controller/userProvider' -import { Requests } from '@server/utils' +import { UserController } from 'server/controller/user' +import { UserProviderController } from 'server/controller/userProvider' +import { Requests } from 'server/utils' export const postResetPassword = async (req: Request, res: Response) => { try { diff --git a/src/server/api/auth/strategy/google.ts b/src/server/api/auth/strategy/google.ts index 9fa19694c0..f45c51b7f2 100644 --- a/src/server/api/auth/strategy/google.ts +++ b/src/server/api/auth/strategy/google.ts @@ -3,13 +3,13 @@ import { PassportStatic } from 'passport' import * as GoogleStrategy from 'passport-google-oauth' import { Profile, VerifyFunction } from 'passport-google-oauth' -import { ApiEndPoint } from '@meta/api/endpoint' -import { AuthProvider } from '@meta/user' -import { AuthProviderGoogleProps } from '@meta/user/userAuth' +import { ApiEndPoint } from 'meta/api/endpoint' +import { AuthProvider } from 'meta/user' +import { AuthProviderGoogleProps } from 'meta/user/userAuth' -import { AssessmentController } from '@server/controller/assessment' -import { UserController } from '@server/controller/user' -import { UserProviderController } from '@server/controller/userProvider' +import { AssessmentController } from 'server/controller/assessment' +import { UserController } from 'server/controller/user' +import { UserProviderController } from 'server/controller/userProvider' const googleStrategyVerifyCallback = async ( req: Request, diff --git a/src/server/api/auth/strategy/jwt.ts b/src/server/api/auth/strategy/jwt.ts index 493a14f4b5..b7423fdd86 100644 --- a/src/server/api/auth/strategy/jwt.ts +++ b/src/server/api/auth/strategy/jwt.ts @@ -2,10 +2,10 @@ import { Request } from 'express' import { PassportStatic } from 'passport' import { Strategy, VerifiedCallback } from 'passport-jwt' -import { AuthToken } from '@meta/auth' -import { User } from '@meta/user' +import { AuthToken } from 'meta/auth' +import { User } from 'meta/user' -import { UserController } from '@server/controller/user' +import { UserController } from 'server/controller/user' const jwtFromRequest = (req: Request) => { let token = null diff --git a/src/server/api/auth/strategy/local.ts b/src/server/api/auth/strategy/local.ts index 13ca334523..581be645a6 100644 --- a/src/server/api/auth/strategy/local.ts +++ b/src/server/api/auth/strategy/local.ts @@ -1,16 +1,16 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' import { Request } from 'express' import { PassportStatic } from 'passport' import { VerifiedCallback } from 'passport-jwt' import * as passportLocal from 'passport-local' -import { AuthProvider, Users } from '@meta/user' -import { AuthProviderLocalProps } from '@meta/user/userAuth' +import { AuthProvider, Users } from 'meta/user' +import { AuthProviderLocalProps } from 'meta/user/userAuth' -import { passwordCompare, passwordHash } from '@server/api/auth/utils/passwordUtils' -import { AssessmentController } from '@server/controller/assessment' -import { UserController } from '@server/controller/user' -import { UserProviderController } from '@server/controller/userProvider' +import { passwordCompare, passwordHash } from 'server/api/auth/utils/passwordUtils' +import { AssessmentController } from 'server/controller/assessment' +import { UserController } from 'server/controller/user' +import { UserProviderController } from 'server/controller/userProvider' const localStrategyVerifyCallback = async (req: Request, email: string, password: string, done: VerifiedCallback) => { const sendErr = (message: string) => done(null, false, { message }) diff --git a/src/server/api/auth/utils/setAuthToken.ts b/src/server/api/auth/utils/setAuthToken.ts index 632c30b7d0..e2d562d2bd 100644 --- a/src/server/api/auth/utils/setAuthToken.ts +++ b/src/server/api/auth/utils/setAuthToken.ts @@ -1,9 +1,9 @@ -import { Dates } from '@utils/dates' +import { Dates } from 'utils/dates' import { Response } from 'express' import * as jwt from 'jsonwebtoken' -import { AuthToken } from '@meta/auth' -import { User } from '@meta/user' +import { AuthToken } from 'meta/auth' +import { User } from 'meta/user' export const setAuthToken = (res: Response, { roles: _roles, ...user }: User): void => { const token = jwt.sign({ ...user }, process.env.TOKEN_SECRET) diff --git a/src/server/api/cycleData/descriptions/getDataSources.ts b/src/server/api/cycleData/descriptions/getDataSources.ts index 32d4225448..0aca300023 100644 --- a/src/server/api/cycleData/descriptions/getDataSources.ts +++ b/src/server/api/cycleData/descriptions/getDataSources.ts @@ -1,10 +1,10 @@ import { Response } from 'express' -import { CycleDataRequest } from '@meta/api/request' +import { CycleDataRequest } from 'meta/api/request' -import { AssessmentController } from '@server/controller/assessment' -import { CycleDataController } from '@server/controller/cycleData' -import Requests from '@server/utils/requests' +import { AssessmentController } from 'server/controller/assessment' +import { CycleDataController } from 'server/controller/cycleData' +import Requests from 'server/utils/requests' export const getDataSources = async ( req: CycleDataRequest<{ tableName: string; variableName: string }>, diff --git a/src/server/api/cycleData/descriptions/getDescription.ts b/src/server/api/cycleData/descriptions/getDescription.ts index 6283bbe99c..a73ea98267 100644 --- a/src/server/api/cycleData/descriptions/getDescription.ts +++ b/src/server/api/cycleData/descriptions/getDescription.ts @@ -1,11 +1,11 @@ import { Response } from 'express' -import { CycleDataRequest } from '@meta/api/request' -import { CommentableDescriptionName } from '@meta/assessment' +import { CycleDataRequest } from 'meta/api/request' +import { CommentableDescriptionName } from 'meta/assessment' -import { AssessmentController } from '@server/controller/assessment' -import { CycleDataController } from '@server/controller/cycleData' -import Requests from '@server/utils/requests' +import { AssessmentController } from 'server/controller/assessment' +import { CycleDataController } from 'server/controller/cycleData' +import Requests from 'server/utils/requests' export const getDescription = async (req: CycleDataRequest<{ name: CommentableDescriptionName }>, res: Response) => { try { diff --git a/src/server/api/cycleData/descriptions/upsertDescription.ts b/src/server/api/cycleData/descriptions/upsertDescription.ts index fc07727402..cadae808a4 100644 --- a/src/server/api/cycleData/descriptions/upsertDescription.ts +++ b/src/server/api/cycleData/descriptions/upsertDescription.ts @@ -1,11 +1,11 @@ import { Response } from 'express' -import { CycleDataRequest } from '@meta/api/request' -import { CommentableDescriptionName, CommentableDescriptionValue } from '@meta/assessment' +import { CycleDataRequest } from 'meta/api/request' +import { CommentableDescriptionName, CommentableDescriptionValue } from 'meta/assessment' -import { AssessmentController } from '@server/controller/assessment' -import { CycleDataController } from '@server/controller/cycleData' -import Requests from '@server/utils/requests' +import { AssessmentController } from 'server/controller/assessment' +import { CycleDataController } from 'server/controller/cycleData' +import Requests from 'server/utils/requests' export const upsertDescription = async ( req: CycleDataRequest<{ name: CommentableDescriptionName }, { value: CommentableDescriptionValue }>, diff --git a/src/server/api/cycleData/getActivities.ts b/src/server/api/cycleData/getActivities.ts index 21b3348fa0..53c4ce3e39 100644 --- a/src/server/api/cycleData/getActivities.ts +++ b/src/server/api/cycleData/getActivities.ts @@ -1,10 +1,10 @@ import { Response } from 'express' -import { CycleDataRequest } from '@meta/api/request' +import { CycleDataRequest } from 'meta/api/request' -import { AssessmentController } from '@server/controller/assessment' -import { CycleDataController } from '@server/controller/cycleData' -import Requests from '@server/utils/requests' +import { AssessmentController } from 'server/controller/assessment' +import { CycleDataController } from 'server/controller/cycleData' +import Requests from 'server/utils/requests' export const getActivities = async (req: CycleDataRequest, res: Response) => { try { diff --git a/src/server/api/cycleData/index.ts b/src/server/api/cycleData/index.ts index 15537e418c..bcc39ec904 100644 --- a/src/server/api/cycleData/index.ts +++ b/src/server/api/cycleData/index.ts @@ -2,10 +2,10 @@ import { Express } from 'express' // @ts-ignore import * as queue from 'express-queue' -import { ApiEndPoint } from '@meta/api/endpoint' +import { ApiEndPoint } from 'meta/api/endpoint' -import { clearTable } from '@server/api/cycleData/table/clearTable' -import { AuthMiddleware } from '@server/middleware/auth' +import { clearTable } from 'server/api/cycleData/table/clearTable' +import { AuthMiddleware } from 'server/middleware/auth' import { getDataSources } from './descriptions/getDataSources' import { getDescription } from './descriptions/getDescription' diff --git a/src/server/api/cycleData/originalDataPoint/createOriginalDataPoint.ts b/src/server/api/cycleData/originalDataPoint/createOriginalDataPoint.ts index 86c4f02579..16e166c98b 100644 --- a/src/server/api/cycleData/originalDataPoint/createOriginalDataPoint.ts +++ b/src/server/api/cycleData/originalDataPoint/createOriginalDataPoint.ts @@ -1,11 +1,11 @@ import { Response } from 'express' -import { CycleRequest } from '@meta/api/request' -import { OriginalDataPoint } from '@meta/assessment' +import { CycleRequest } from 'meta/api/request' +import { OriginalDataPoint } from 'meta/assessment' -import { AssessmentController } from '@server/controller/assessment' -import { CycleDataController } from '@server/controller/cycleData' -import Requests from '@server/utils/requests' +import { AssessmentController } from 'server/controller/assessment' +import { CycleDataController } from 'server/controller/cycleData' +import Requests from 'server/utils/requests' export const createOriginalDataPoint = async ( req: CycleRequest, diff --git a/src/server/api/cycleData/originalDataPoint/deleteOriginalDataPoint.ts b/src/server/api/cycleData/originalDataPoint/deleteOriginalDataPoint.ts index 43d7d2c77a..fb7dd914fe 100644 --- a/src/server/api/cycleData/originalDataPoint/deleteOriginalDataPoint.ts +++ b/src/server/api/cycleData/originalDataPoint/deleteOriginalDataPoint.ts @@ -1,10 +1,10 @@ import { Response } from 'express' -import { CycleRequest } from '@meta/api/request' +import { CycleRequest } from 'meta/api/request' -import { AssessmentController } from '@server/controller/assessment' -import { CycleDataController } from '@server/controller/cycleData' -import Requests from '@server/utils/requests' +import { AssessmentController } from 'server/controller/assessment' +import { CycleDataController } from 'server/controller/cycleData' +import Requests from 'server/utils/requests' export const deleteOriginalDataPoint = async (req: CycleRequest<{ year: string }>, res: Response) => { try { diff --git a/src/server/api/cycleData/originalDataPoint/getOdp.ts b/src/server/api/cycleData/originalDataPoint/getOdp.ts index b2f83b736c..327246de03 100644 --- a/src/server/api/cycleData/originalDataPoint/getOdp.ts +++ b/src/server/api/cycleData/originalDataPoint/getOdp.ts @@ -1,9 +1,9 @@ import { Response } from 'express' -import { CycleRequest } from '@meta/api/request' +import { CycleRequest } from 'meta/api/request' -import { CycleDataController } from '@server/controller/cycleData' -import { Requests } from '@server/utils' +import { CycleDataController } from 'server/controller/cycleData' +import { Requests } from 'server/utils' export const getOriginalDataPoint = async (req: CycleRequest, res: Response) => { try { diff --git a/src/server/api/cycleData/originalDataPoint/getOriginalDataPointData.ts b/src/server/api/cycleData/originalDataPoint/getOriginalDataPointData.ts index 77e111975c..22cc41c9dd 100644 --- a/src/server/api/cycleData/originalDataPoint/getOriginalDataPointData.ts +++ b/src/server/api/cycleData/originalDataPoint/getOriginalDataPointData.ts @@ -1,10 +1,10 @@ import { Request, Response } from 'express' -import { CountryIso } from '@meta/area' +import { CountryIso } from 'meta/area' -import { AssessmentController } from '@server/controller/assessment' -import { CycleDataController } from '@server/controller/cycleData' -import Requests from '@server/utils/requests' +import { AssessmentController } from 'server/controller/assessment' +import { CycleDataController } from 'server/controller/cycleData' +import Requests from 'server/utils/requests' export const getOriginalDataPointData = async (req: Request, res: Response) => { try { diff --git a/src/server/api/cycleData/originalDataPoint/getOriginalDataPoints.ts b/src/server/api/cycleData/originalDataPoint/getOriginalDataPoints.ts index 584c05356d..9e8601448a 100644 --- a/src/server/api/cycleData/originalDataPoint/getOriginalDataPoints.ts +++ b/src/server/api/cycleData/originalDataPoint/getOriginalDataPoints.ts @@ -1,10 +1,10 @@ import { Response } from 'express' -import { CycleRequest } from '@meta/api/request' +import { CycleRequest } from 'meta/api/request' -import { AssessmentController } from '@server/controller/assessment' -import { CycleDataController } from '@server/controller/cycleData' -import { Requests } from '@server/utils' +import { AssessmentController } from 'server/controller/assessment' +import { CycleDataController } from 'server/controller/cycleData' +import { Requests } from 'server/utils' export const getOriginalDataPoints = async (req: CycleRequest, res: Response) => { try { diff --git a/src/server/api/cycleData/originalDataPoint/getReservedYears.ts b/src/server/api/cycleData/originalDataPoint/getReservedYears.ts index 2982fa09e3..70e7fbcca1 100644 --- a/src/server/api/cycleData/originalDataPoint/getReservedYears.ts +++ b/src/server/api/cycleData/originalDataPoint/getReservedYears.ts @@ -1,10 +1,10 @@ import { Response } from 'express' -import { CycleRequest } from '@meta/api/request' +import { CycleRequest } from 'meta/api/request' -import { AssessmentController } from '@server/controller/assessment' -import { CycleDataController } from '@server/controller/cycleData' -import { Requests } from '@server/utils' +import { AssessmentController } from 'server/controller/assessment' +import { CycleDataController } from 'server/controller/cycleData' +import { Requests } from 'server/utils' export const getReservedYears = async (req: CycleRequest, res: Response) => { try { diff --git a/src/server/api/cycleData/originalDataPoint/updateOriginalDataPoint.ts b/src/server/api/cycleData/originalDataPoint/updateOriginalDataPoint.ts index 72c201c2af..3cf118eec6 100644 --- a/src/server/api/cycleData/originalDataPoint/updateOriginalDataPoint.ts +++ b/src/server/api/cycleData/originalDataPoint/updateOriginalDataPoint.ts @@ -1,11 +1,11 @@ import { Response } from 'express' -import { CycleRequest } from '@meta/api/request' -import { OriginalDataPoint } from '@meta/assessment' +import { CycleRequest } from 'meta/api/request' +import { OriginalDataPoint } from 'meta/assessment' -import { AssessmentController } from '@server/controller/assessment' -import { CycleDataController } from '@server/controller/cycleData' -import Requests from '@server/utils/requests' +import { AssessmentController } from 'server/controller/assessment' +import { CycleDataController } from 'server/controller/cycleData' +import Requests from 'server/utils/requests' export const updateOriginalDataPoint = async ( req: CycleRequest, diff --git a/src/server/api/cycleData/review/getReviewStatus.ts b/src/server/api/cycleData/review/getReviewStatus.ts index b287da1775..eb39b0bc89 100644 --- a/src/server/api/cycleData/review/getReviewStatus.ts +++ b/src/server/api/cycleData/review/getReviewStatus.ts @@ -1,10 +1,10 @@ import { Response } from 'express' -import { CycleDataRequest } from '@meta/api/request' +import { CycleDataRequest } from 'meta/api/request' -import { AssessmentController } from '@server/controller/assessment' -import { CycleDataController } from '@server/controller/cycleData' -import Requests from '@server/utils/requests' +import { AssessmentController } from 'server/controller/assessment' +import { CycleDataController } from 'server/controller/cycleData' +import Requests from 'server/utils/requests' export const getReviewStatus = async (req: CycleDataRequest<{ odpId: string }>, res: Response) => { try { diff --git a/src/server/api/cycleData/review/getReviewSummary.ts b/src/server/api/cycleData/review/getReviewSummary.ts index 56e91c3453..b2e204d0af 100644 --- a/src/server/api/cycleData/review/getReviewSummary.ts +++ b/src/server/api/cycleData/review/getReviewSummary.ts @@ -1,10 +1,10 @@ import { Response } from 'express' -import { CycleRequest } from '@meta/api/request' +import { CycleRequest } from 'meta/api/request' -import { AssessmentController } from '@server/controller/assessment' -import { CycleDataController } from '@server/controller/cycleData' -import Requests from '@server/utils/requests' +import { AssessmentController } from 'server/controller/assessment' +import { CycleDataController } from 'server/controller/cycleData' +import Requests from 'server/utils/requests' export const getReviewSummary = async (req: CycleRequest, res: Response) => { try { diff --git a/src/server/api/cycleData/table/clearTable.ts b/src/server/api/cycleData/table/clearTable.ts index 6308814318..5665e1790a 100644 --- a/src/server/api/cycleData/table/clearTable.ts +++ b/src/server/api/cycleData/table/clearTable.ts @@ -1,10 +1,10 @@ import { Response } from 'express' -import { CycleDataRequest } from '@meta/api/request' +import { CycleDataRequest } from 'meta/api/request' -import { AssessmentController } from '@server/controller/assessment' -import { CycleDataController } from '@server/controller/cycleData' -import Requests from '@server/utils/requests' +import { AssessmentController } from 'server/controller/assessment' +import { CycleDataController } from 'server/controller/cycleData' +import Requests from 'server/utils/requests' export const clearTable = async (req: CycleDataRequest, res: Response) => { try { diff --git a/src/server/api/cycleData/table/estimateValues.ts b/src/server/api/cycleData/table/estimateValues.ts index 94b6f3f5e3..11db3d4f67 100644 --- a/src/server/api/cycleData/table/estimateValues.ts +++ b/src/server/api/cycleData/table/estimateValues.ts @@ -1,15 +1,15 @@ -import { UUIDs } from '@utils/uuids' +import { UUIDs } from 'utils/uuids' import { Response } from 'express' -import { CycleDataRequest, EstimateBody } from '@meta/api/request' -import { NodeValueEstimationMethod, NodeValuesEstimation, Table } from '@meta/assessment' -import { RecordAssessmentDatas } from '@meta/data' +import { CycleDataRequest, EstimateBody } from 'meta/api/request' +import { NodeValueEstimationMethod, NodeValuesEstimation, Table } from 'meta/assessment' +import { RecordAssessmentDatas } from 'meta/data' -import { AssessmentController } from '@server/controller/assessment' -import { CycleDataController } from '@server/controller/cycleData' -import { MetadataController } from '@server/controller/metadata' -import { EstimationEngine, GenerateSpec, GenerateSpecMethod } from '@server/service/estimates/estimationEngine' -import Requests from '@server/utils/requests' +import { AssessmentController } from 'server/controller/assessment' +import { CycleDataController } from 'server/controller/cycleData' +import { MetadataController } from 'server/controller/metadata' +import { EstimationEngine, GenerateSpec, GenerateSpecMethod } from 'server/service/estimates/estimationEngine' +import Requests from 'server/utils/requests' /** * @deprecated diff --git a/src/server/api/cycleData/table/getTableData.ts b/src/server/api/cycleData/table/getTableData.ts index de86020014..6304d959c4 100644 --- a/src/server/api/cycleData/table/getTableData.ts +++ b/src/server/api/cycleData/table/getTableData.ts @@ -1,11 +1,11 @@ import { Response } from 'express' -import { CycleDataRequest } from '@meta/api/request' -import { CountryIso } from '@meta/area' +import { CycleDataRequest } from 'meta/api/request' +import { CountryIso } from 'meta/area' -import { AssessmentController } from '@server/controller/assessment' -import { CycleDataController } from '@server/controller/cycleData' -import Requests from '@server/utils/requests' +import { AssessmentController } from 'server/controller/assessment' +import { CycleDataController } from 'server/controller/cycleData' +import Requests from 'server/utils/requests' export const getTableData = async ( req: CycleDataRequest<{ diff --git a/src/server/api/cycleData/table/persistNodeValues.ts b/src/server/api/cycleData/table/persistNodeValues.ts index 2d3b56c7ea..7c9c18c4d4 100644 --- a/src/server/api/cycleData/table/persistNodeValues.ts +++ b/src/server/api/cycleData/table/persistNodeValues.ts @@ -1,10 +1,10 @@ import { Response } from 'express' -import { CycleDataRequest, NodesBody } from '@meta/api/request' +import { CycleDataRequest, NodesBody } from 'meta/api/request' -import { AssessmentController } from '@server/controller/assessment' -import { CycleDataController } from '@server/controller/cycleData' -import Requests from '@server/utils/requests' +import { AssessmentController } from 'server/controller/assessment' +import { CycleDataController } from 'server/controller/cycleData' +import Requests from 'server/utils/requests' export const persistNodeValues = async (req: CycleDataRequest, res: Response) => { try { diff --git a/src/server/api/definitions/get.ts b/src/server/api/definitions/get.ts index 2e1b4e3041..baa39d0565 100644 --- a/src/server/api/definitions/get.ts +++ b/src/server/api/definitions/get.ts @@ -1,6 +1,6 @@ import { Request, Response } from 'express' -import { getHtml } from '@server/api/definitions/utils/getHtml' +import { getHtml } from 'server/api/definitions/utils/getHtml' import { readAllowedParameter, readParameterWithAllowedValues } from '../../utils/sanityChecks' diff --git a/src/server/api/definitions/index.ts b/src/server/api/definitions/index.ts index d4f67e263d..7572f062d3 100644 --- a/src/server/api/definitions/index.ts +++ b/src/server/api/definitions/index.ts @@ -1,6 +1,6 @@ import { Express } from 'express' -import { ApiEndPoint } from '@meta/api/endpoint' +import { ApiEndPoint } from 'meta/api/endpoint' import { getDefinition } from './get' diff --git a/src/server/api/extData/index.ts b/src/server/api/extData/index.ts index 1ccecc2740..1a6e7cef6d 100644 --- a/src/server/api/extData/index.ts +++ b/src/server/api/extData/index.ts @@ -1,8 +1,8 @@ import { Express } from 'express' -import { ApiEndPoint } from '@meta/api/endpoint' +import { ApiEndPoint } from 'meta/api/endpoint' -import { searchTaxa } from '@server/api/extData/searchTaxa' +import { searchTaxa } from 'server/api/extData/searchTaxa' export const ExtDataApi = { init: (express: Express): void => { diff --git a/src/server/api/extData/searchTaxa.ts b/src/server/api/extData/searchTaxa.ts index 4b64bbc471..bb0d17bc2e 100644 --- a/src/server/api/extData/searchTaxa.ts +++ b/src/server/api/extData/searchTaxa.ts @@ -1,9 +1,9 @@ import { Response } from 'express' -import { CycleRequest } from '@meta/api/request' +import { CycleRequest } from 'meta/api/request' -import { ExtDataController } from '@server/controller/extData' -import Requests from '@server/utils/requests' +import { ExtDataController } from 'server/controller/extData' +import Requests from 'server/utils/requests' type Query = { query: string; limit: string } diff --git a/src/server/api/file/createAssessmentFile.ts b/src/server/api/file/createAssessmentFile.ts index 63413b8eb6..0c1f14deb4 100644 --- a/src/server/api/file/createAssessmentFile.ts +++ b/src/server/api/file/createAssessmentFile.ts @@ -1,10 +1,10 @@ import { Response } from 'express' -import { AssessmentFileBody, CycleRequest } from '@meta/api/request' +import { AssessmentFileBody, CycleRequest } from 'meta/api/request' -import { AssessmentController } from '@server/controller/assessment' -import { FileController } from '@server/controller/file' -import { Requests } from '@server/utils' +import { AssessmentController } from 'server/controller/assessment' +import { FileController } from 'server/controller/file' +import { Requests } from 'server/utils' export const createAssessmentFile = async (req: CycleRequest, res: Response) => { try { diff --git a/src/server/api/file/get.ts b/src/server/api/file/get.ts index 9225d26c4f..61ce74a459 100644 --- a/src/server/api/file/get.ts +++ b/src/server/api/file/get.ts @@ -1,6 +1,6 @@ import { Request, Response } from 'express' -import { FileRepository, fileTypes } from '@server/service/file' +import { FileRepository, fileTypes } from 'server/service/file' type Query = { countryIso: string diff --git a/src/server/api/file/getAssessmentFile.ts b/src/server/api/file/getAssessmentFile.ts index 4d8e47d4af..79c879290b 100644 --- a/src/server/api/file/getAssessmentFile.ts +++ b/src/server/api/file/getAssessmentFile.ts @@ -1,10 +1,10 @@ import { Response } from 'express' -import { CycleRequest } from '@meta/api/request' +import { CycleRequest } from 'meta/api/request' -import { AssessmentController } from '@server/controller/assessment' -import { FileController } from '@server/controller/file' -import Requests from '@server/utils/requests' +import { AssessmentController } from 'server/controller/assessment' +import { FileController } from 'server/controller/file' +import Requests from 'server/utils/requests' export const getAssessmentFile = async (req: CycleRequest, res: Response) => { try { diff --git a/src/server/api/file/getAssessmentFiles.ts b/src/server/api/file/getAssessmentFiles.ts index af963e4831..36d41934a0 100644 --- a/src/server/api/file/getAssessmentFiles.ts +++ b/src/server/api/file/getAssessmentFiles.ts @@ -1,10 +1,10 @@ import { Response } from 'express' -import { CycleRequest } from '@meta/api/request' +import { CycleRequest } from 'meta/api/request' -import { AssessmentController } from '@server/controller/assessment' -import { FileController } from '@server/controller/file' -import { Requests } from '@server/utils' +import { AssessmentController } from 'server/controller/assessment' +import { FileController } from 'server/controller/file' +import { Requests } from 'server/utils' export const getAssessmentFiles = async (req: CycleRequest, res: Response) => { try { diff --git a/src/server/api/file/getBiomassStockFile.ts b/src/server/api/file/getBiomassStockFile.ts index c0eaf4b72e..be783f4482 100644 --- a/src/server/api/file/getBiomassStockFile.ts +++ b/src/server/api/file/getBiomassStockFile.ts @@ -1,9 +1,9 @@ import { Response } from 'express' -import { BiomassStockFileRequest } from '@meta/api/request' +import { BiomassStockFileRequest } from 'meta/api/request' -import { FileRepository, fileTypes } from '@server/service/file' -import { Requests } from '@server/utils' +import { FileRepository, fileTypes } from 'server/service/file' +import { Requests } from 'server/utils' export const getBiomassStockFile = async (req: BiomassStockFileRequest, res: Response) => { try { diff --git a/src/server/api/file/getBulkDownload.ts b/src/server/api/file/getBulkDownload.ts index f21a281c18..d89104b20d 100644 --- a/src/server/api/file/getBulkDownload.ts +++ b/src/server/api/file/getBulkDownload.ts @@ -1,11 +1,11 @@ import { Response } from 'express' import * as JSZip from 'jszip' -import { CycleRequest } from '@meta/api/request' +import { CycleRequest } from 'meta/api/request' -import { AssessmentController } from '@server/controller/assessment' -import { CycleDataController } from '@server/controller/cycleData' -import { Requests } from '@server/utils' +import { AssessmentController } from 'server/controller/assessment' +import { CycleDataController } from 'server/controller/cycleData' +import { Requests } from 'server/utils' // Zip contents: // FRA_Years_2022_09_07.csv diff --git a/src/server/api/file/getDataDownloadFile.ts b/src/server/api/file/getDataDownloadFile.ts index e9533f49d2..2800afed9e 100644 --- a/src/server/api/file/getDataDownloadFile.ts +++ b/src/server/api/file/getDataDownloadFile.ts @@ -1,6 +1,6 @@ import { Request, Response } from 'express' -import { FileRepository, fileTypes } from '@server/service/file' +import { FileRepository, fileTypes } from 'server/service/file' type Query = { fileName: string diff --git a/src/server/api/file/getSdgFocalPointsFile.ts b/src/server/api/file/getSdgFocalPointsFile.ts index dad45df0dd..5970a0b44b 100644 --- a/src/server/api/file/getSdgFocalPointsFile.ts +++ b/src/server/api/file/getSdgFocalPointsFile.ts @@ -1,6 +1,6 @@ import { Request, Response } from 'express' -import { FileRepository, fileTypes } from '@server/service/file' +import { FileRepository, fileTypes } from 'server/service/file' export const getSdgFocalPointsFile = async (_: Request, res: Response) => { try { diff --git a/src/server/api/file/getUserGuide.ts b/src/server/api/file/getUserGuide.ts index 083a4f8210..f266acb3bd 100644 --- a/src/server/api/file/getUserGuide.ts +++ b/src/server/api/file/getUserGuide.ts @@ -1,6 +1,6 @@ import { Request, Response } from 'express' -import { FileRepository, fileTypes } from '@server/service/file' +import { FileRepository, fileTypes } from 'server/service/file' type Query = { language: string diff --git a/src/server/api/file/index.ts b/src/server/api/file/index.ts index 04c07b4ea6..23a60539b6 100644 --- a/src/server/api/file/index.ts +++ b/src/server/api/file/index.ts @@ -1,10 +1,10 @@ import { Express } from 'express' -import { ApiEndPoint } from '@meta/api/endpoint' +import { ApiEndPoint } from 'meta/api/endpoint' -import { getBulkDownload } from '@server/api/file/getBulkDownload' -import { getUserGuideFile } from '@server/api/file/getUserGuide' -import { AuthMiddleware } from '@server/middleware/auth' +import { getBulkDownload } from 'server/api/file/getBulkDownload' +import { getUserGuideFile } from 'server/api/file/getUserGuide' +import { AuthMiddleware } from 'server/middleware/auth' import { createAssessmentFile } from './createAssessmentFile' import { getFile } from './get' @@ -13,8 +13,8 @@ import { getAssessmentFiles } from './getAssessmentFiles' import { getBiomassStockFile } from './getBiomassStockFile' import { getDataDownloadFile } from './getDataDownloadFile' import { removeAssessmentFile } from './removeAssessmentFile' -import multer = require('multer') import { getSdgFocalPointsFile } from './getSdgFocalPointsFile' +import multer = require('multer') export const FileApi = { init: (express: Express): void => { diff --git a/src/server/api/file/removeAssessmentFile.ts b/src/server/api/file/removeAssessmentFile.ts index cf9bbee92c..41ef542a58 100644 --- a/src/server/api/file/removeAssessmentFile.ts +++ b/src/server/api/file/removeAssessmentFile.ts @@ -1,10 +1,10 @@ import { Response } from 'express' -import { CycleRequest } from '@meta/api/request' +import { CycleRequest } from 'meta/api/request' -import { AssessmentController } from '@server/controller/assessment' -import { FileController } from '@server/controller/file' -import Requests from '@server/utils/requests' +import { AssessmentController } from 'server/controller/assessment' +import { FileController } from 'server/controller/file' +import Requests from 'server/utils/requests' export const removeAssessmentFile = async (req: CycleRequest, res: Response) => { try { diff --git a/src/server/api/geo/getBoundariesLayer.ts b/src/server/api/geo/getBoundariesLayer.ts index d4e8d33b8e..0ad9c13efd 100644 --- a/src/server/api/geo/getBoundariesLayer.ts +++ b/src/server/api/geo/getBoundariesLayer.ts @@ -1,9 +1,9 @@ import { Request, Response } from 'express' -import { CountryIso } from '@meta/area' +import { CountryIso } from 'meta/area' -import { GeoController } from '@server/controller/geo' -import Requests from '@server/utils/requests' +import { GeoController } from 'server/controller/geo' +import Requests from 'server/utils/requests' export const getBoundariesLayer = async ( req: Request, diff --git a/src/server/api/geo/getBounds.ts b/src/server/api/geo/getBounds.ts index 0a3cb5ffb2..0b2d60b3ca 100644 --- a/src/server/api/geo/getBounds.ts +++ b/src/server/api/geo/getBounds.ts @@ -1,9 +1,9 @@ import { Request, Response } from 'express' -import { CountryIso } from '@meta/area' +import { CountryIso } from 'meta/area' -import { GeoController } from '@server/controller/geo' -import Requests from '@server/utils/requests' +import { GeoController } from 'server/controller/geo' +import Requests from 'server/utils/requests' export const getBounds = async (req: Request, res: Response) => { try { diff --git a/src/server/api/geo/getBurnedAreaLayer.ts b/src/server/api/geo/getBurnedAreaLayer.ts index 01c8c3e021..72a0ccbbff 100644 --- a/src/server/api/geo/getBurnedAreaLayer.ts +++ b/src/server/api/geo/getBurnedAreaLayer.ts @@ -1,9 +1,9 @@ import { Response } from 'express' -import { LayerRequest } from '@meta/api/request' +import { LayerRequest } from 'meta/api/request' -import { GeoController } from '@server/controller/geo' -import Requests from '@server/utils/requests' +import { GeoController } from 'server/controller/geo' +import Requests from 'server/utils/requests' export const getBurnedAreaLayer = async (req: LayerRequest, res: Response) => { try { diff --git a/src/server/api/geo/getForestAgreementLayer.ts b/src/server/api/geo/getForestAgreementLayer.ts index 5e40bd8763..14a22a5586 100644 --- a/src/server/api/geo/getForestAgreementLayer.ts +++ b/src/server/api/geo/getForestAgreementLayer.ts @@ -1,10 +1,10 @@ import { Response } from 'express' -import { ForestAgreementLayerRequest } from '@meta/api/request' -import { ForestSource } from '@meta/geo' +import { ForestAgreementLayerRequest } from 'meta/api/request' +import { ForestSource } from 'meta/geo' -import { GeoController } from '@server/controller/geo' -import Requests from '@server/utils/requests' +import { GeoController } from 'server/controller/geo' +import Requests from 'server/utils/requests' export const getForestAgreementLayer = async (req: ForestAgreementLayerRequest, res: Response) => { try { diff --git a/src/server/api/geo/getForestEstimations.ts b/src/server/api/geo/getForestEstimations.ts index 988f26b502..57a148c0cc 100644 --- a/src/server/api/geo/getForestEstimations.ts +++ b/src/server/api/geo/getForestEstimations.ts @@ -1,11 +1,11 @@ import { Request, Response } from 'express' -import { ForestAgreementAreaEstimationRequest, ForestEstimationsRequest } from '@meta/api/request/geo/layer' -import { CountryIso } from '@meta/area' -import { ForestSource, LayerSource } from '@meta/geo' +import { ForestAgreementAreaEstimationRequest, ForestEstimationsRequest } from 'meta/api/request/geo/layer' +import { CountryIso } from 'meta/area' +import { ForestSource, LayerSource } from 'meta/geo' -import { GeoController } from '@server/controller/geo' -import Requests from '@server/utils/requests' +import { GeoController } from 'server/controller/geo' +import Requests from 'server/utils/requests' export const getForestEstimations = async (req: ForestEstimationsRequest, res: Response) => { try { diff --git a/src/server/api/geo/getForestLayer.ts b/src/server/api/geo/getForestLayer.ts index 813264a02d..1a46464245 100644 --- a/src/server/api/geo/getForestLayer.ts +++ b/src/server/api/geo/getForestLayer.ts @@ -1,9 +1,9 @@ import { Response } from 'express' -import { LayerRequest } from '@meta/api/request' +import { LayerRequest } from 'meta/api/request' -import { GeoController } from '@server/controller/geo' -import Requests from '@server/utils/requests' +import { GeoController } from 'server/controller/geo' +import Requests from 'server/utils/requests' export const getForestLayer = async (req: LayerRequest, res: Response) => { try { diff --git a/src/server/api/geo/getProtectedAreaLayer.ts b/src/server/api/geo/getProtectedAreaLayer.ts index a38e074676..d5f87af30a 100644 --- a/src/server/api/geo/getProtectedAreaLayer.ts +++ b/src/server/api/geo/getProtectedAreaLayer.ts @@ -1,9 +1,9 @@ import { Response } from 'express' -import { LayerRequest } from '@meta/api/request' +import { LayerRequest } from 'meta/api/request' -import { GeoController } from '@server/controller/geo' -import Requests from '@server/utils/requests' +import { GeoController } from 'server/controller/geo' +import Requests from 'server/utils/requests' export const getProtectedAreaLayer = async (req: LayerRequest, res: Response) => { try { diff --git a/src/server/api/geo/index.ts b/src/server/api/geo/index.ts index eb6c2406c0..544539f0c8 100644 --- a/src/server/api/geo/index.ts +++ b/src/server/api/geo/index.ts @@ -1,10 +1,10 @@ import { Express } from 'express' -import { ApiEndPoint } from '@meta/api/endpoint' +import { ApiEndPoint } from 'meta/api/endpoint' -import { GeeAuthMiddleware } from '@server/middleware/geeAuth' -import { ValidationMiddleware } from '@server/middleware/validation' -import { GeoSchemes } from '@server/middleware/validation/geoSchemes' +import { GeeAuthMiddleware } from 'server/middleware/geeAuth' +import { ValidationMiddleware } from 'server/middleware/validation' +import { GeoSchemes } from 'server/middleware/validation/geoSchemes' import { getBoundariesLayer } from './getBoundariesLayer' import { getBounds } from './getBounds' diff --git a/src/server/api/init/getAssessment.ts b/src/server/api/init/getAssessment.ts index 7d0fcb541b..e12338224c 100644 --- a/src/server/api/init/getAssessment.ts +++ b/src/server/api/init/getAssessment.ts @@ -1,10 +1,10 @@ import { Response } from 'express' -import { InitRequest } from '@meta/api/request' +import { InitRequest } from 'meta/api/request' -import { AssessmentController } from '@server/controller/assessment' -import { SettingsController } from '@server/controller/settings' -import Requests from '@server/utils/requests' +import { AssessmentController } from 'server/controller/assessment' +import { SettingsController } from 'server/controller/settings' +import Requests from 'server/utils/requests' export const getAssessment = async (req: InitRequest, res: Response) => { try { diff --git a/src/server/api/init/index.ts b/src/server/api/init/index.ts index 24b7b18c0e..db10a972ea 100644 --- a/src/server/api/init/index.ts +++ b/src/server/api/init/index.ts @@ -1,8 +1,8 @@ import { Express } from 'express' -import { ApiEndPoint } from '@meta/api/endpoint' +import { ApiEndPoint } from 'meta/api/endpoint' -import { init } from '@server/api/init/init' +import { init } from 'server/api/init/init' import { getAssessment } from './getAssessment' diff --git a/src/server/api/init/init.ts b/src/server/api/init/init.ts index 59a0934754..fcd99a3da5 100644 --- a/src/server/api/init/init.ts +++ b/src/server/api/init/init.ts @@ -1,6 +1,6 @@ import { Request, Response } from 'express' -import Requests from '@server/utils/requests' +import Requests from 'server/utils/requests' export const init = async (req: Request, res: Response) => { try { diff --git a/src/server/api/messageCenter/addMessage.ts b/src/server/api/messageCenter/addMessage.ts index 7ca1e1f587..000714698d 100644 --- a/src/server/api/messageCenter/addMessage.ts +++ b/src/server/api/messageCenter/addMessage.ts @@ -1,13 +1,13 @@ import { Response } from 'express' -import { CycleDataRequest } from '@meta/api/request' -import { MessageTopicStatus, MessageTopicType } from '@meta/messageCenter' -import { Sockets } from '@meta/socket' - -import { AssessmentController } from '@server/controller/assessment' -import { MessageCenterController } from '@server/controller/messageCenter' -import { SocketServer } from '@server/service/socket' -import Requests from '@server/utils/requests' +import { CycleDataRequest } from 'meta/api/request' +import { MessageTopicStatus, MessageTopicType } from 'meta/messageCenter' +import { Sockets } from 'meta/socket' + +import { AssessmentController } from 'server/controller/assessment' +import { MessageCenterController } from 'server/controller/messageCenter' +import { SocketServer } from 'server/service/socket' +import Requests from 'server/utils/requests' import { sendRequestReviewUpdateEvents } from './sendRequestReviewUpdateEvents' diff --git a/src/server/api/messageCenter/getTopic.ts b/src/server/api/messageCenter/getTopic.ts index 6d7168d75a..0c124b0ea5 100644 --- a/src/server/api/messageCenter/getTopic.ts +++ b/src/server/api/messageCenter/getTopic.ts @@ -1,10 +1,10 @@ import { Response } from 'express' -import { CycleDataRequest } from '@meta/api/request' +import { CycleDataRequest } from 'meta/api/request' -import { AssessmentController } from '@server/controller/assessment' -import { MessageCenterController } from '@server/controller/messageCenter' -import Requests from '@server/utils/requests' +import { AssessmentController } from 'server/controller/assessment' +import { MessageCenterController } from 'server/controller/messageCenter' +import Requests from 'server/utils/requests' import { sendRequestReviewUpdateEvents } from './sendRequestReviewUpdateEvents' diff --git a/src/server/api/messageCenter/getUnreadMessages.ts b/src/server/api/messageCenter/getUnreadMessages.ts index d2f374f0ac..3ea9609635 100644 --- a/src/server/api/messageCenter/getUnreadMessages.ts +++ b/src/server/api/messageCenter/getUnreadMessages.ts @@ -1,10 +1,10 @@ import { Response } from 'express' -import { CycleRequest } from '@meta/api/request' +import { CycleRequest } from 'meta/api/request' -import { AssessmentController } from '@server/controller/assessment' -import { MessageCenterController } from '@server/controller/messageCenter' -import Requests from '@server/utils/requests' +import { AssessmentController } from 'server/controller/assessment' +import { MessageCenterController } from 'server/controller/messageCenter' +import Requests from 'server/utils/requests' export const getUnreadMessages = async (req: CycleRequest<{ key: string }>, res: Response) => { try { diff --git a/src/server/api/messageCenter/index.ts b/src/server/api/messageCenter/index.ts index 5310bea18d..dddce7b36d 100644 --- a/src/server/api/messageCenter/index.ts +++ b/src/server/api/messageCenter/index.ts @@ -1,8 +1,8 @@ import { Express } from 'express' -import { ApiEndPoint } from '@meta/api/endpoint' +import { ApiEndPoint } from 'meta/api/endpoint' -import { AuthMiddleware } from '@server/middleware/auth' +import { AuthMiddleware } from 'server/middleware/auth' import { addMessage } from './addMessage' import { getTopic } from './getTopic' diff --git a/src/server/api/messageCenter/markMessageDeleted.ts b/src/server/api/messageCenter/markMessageDeleted.ts index 67e75c4f17..aea6a22636 100644 --- a/src/server/api/messageCenter/markMessageDeleted.ts +++ b/src/server/api/messageCenter/markMessageDeleted.ts @@ -1,12 +1,12 @@ import { Response } from 'express' -import { CycleDataRequest } from '@meta/api/request' -import { Sockets } from '@meta/socket' +import { CycleDataRequest } from 'meta/api/request' +import { Sockets } from 'meta/socket' -import { AssessmentController } from '@server/controller/assessment' -import { MessageCenterController } from '@server/controller/messageCenter' -import { SocketServer } from '@server/service/socket' -import Requests from '@server/utils/requests' +import { AssessmentController } from 'server/controller/assessment' +import { MessageCenterController } from 'server/controller/messageCenter' +import { SocketServer } from 'server/service/socket' +import Requests from 'server/utils/requests' import { sendRequestReviewUpdateEvents } from './sendRequestReviewUpdateEvents' diff --git a/src/server/api/messageCenter/resolveTopic.ts b/src/server/api/messageCenter/resolveTopic.ts index e2e98a9655..46705076e0 100644 --- a/src/server/api/messageCenter/resolveTopic.ts +++ b/src/server/api/messageCenter/resolveTopic.ts @@ -1,13 +1,13 @@ import { Request, Response } from 'express' -import { CountryIso } from '@meta/area' -import { MessageTopicStatus } from '@meta/messageCenter' -import { Sockets } from '@meta/socket' - -import { AssessmentController } from '@server/controller/assessment' -import { MessageCenterController } from '@server/controller/messageCenter' -import { SocketServer } from '@server/service/socket' -import Requests from '@server/utils/requests' +import { CountryIso } from 'meta/area' +import { MessageTopicStatus } from 'meta/messageCenter' +import { Sockets } from 'meta/socket' + +import { AssessmentController } from 'server/controller/assessment' +import { MessageCenterController } from 'server/controller/messageCenter' +import { SocketServer } from 'server/service/socket' +import Requests from 'server/utils/requests' import { sendRequestReviewUpdateEvents } from './sendRequestReviewUpdateEvents' diff --git a/src/server/api/messageCenter/sendRequestReviewUpdateEvents.ts b/src/server/api/messageCenter/sendRequestReviewUpdateEvents.ts index 3592d6496f..75812b12a7 100644 --- a/src/server/api/messageCenter/sendRequestReviewUpdateEvents.ts +++ b/src/server/api/messageCenter/sendRequestReviewUpdateEvents.ts @@ -1,8 +1,8 @@ -import { CountryIso } from '@meta/area' -import { MessageTopic, MessageTopicType } from '@meta/messageCenter' -import { Sockets } from '@meta/socket' +import { CountryIso } from 'meta/area' +import { MessageTopic, MessageTopicType } from 'meta/messageCenter' +import { Sockets } from 'meta/socket' -import { SocketServer } from '@server/service/socket' +import { SocketServer } from 'server/service/socket' export const sendRequestReviewUpdateEvents = (props: { topic: MessageTopic diff --git a/src/server/api/metadata/getSections.ts b/src/server/api/metadata/getSections.ts index 94cc172634..603a9d258f 100644 --- a/src/server/api/metadata/getSections.ts +++ b/src/server/api/metadata/getSections.ts @@ -1,10 +1,10 @@ import { Response } from 'express' -import { CycleRequest } from '@meta/api/request' +import { CycleRequest } from 'meta/api/request' -import { AssessmentController } from '@server/controller/assessment' -import { MetadataController } from '@server/controller/metadata' -import Requests from '@server/utils/requests' +import { AssessmentController } from 'server/controller/assessment' +import { MetadataController } from 'server/controller/metadata' +import Requests from 'server/utils/requests' export const getSections = async (req: CycleRequest, res: Response) => { const { assessmentName, cycleName } = req.query diff --git a/src/server/api/metadata/getSectionsMetadata.ts b/src/server/api/metadata/getSectionsMetadata.ts index f58d71423d..3e9135032a 100644 --- a/src/server/api/metadata/getSectionsMetadata.ts +++ b/src/server/api/metadata/getSectionsMetadata.ts @@ -1,10 +1,10 @@ import { Response } from 'express' -import { CycleRequest } from '@meta/api/request' +import { CycleRequest } from 'meta/api/request' -import { AssessmentController } from '@server/controller/assessment' -import { MetadataController } from '@server/controller/metadata' -import Requests from '@server/utils/requests' +import { AssessmentController } from 'server/controller/assessment' +import { MetadataController } from 'server/controller/metadata' +import Requests from 'server/utils/requests' export const getSectionsMetadata = async (req: CycleRequest<{ sectionNames: Array }>, res: Response) => { try { diff --git a/src/server/api/metadata/index.ts b/src/server/api/metadata/index.ts index ec58d0f92f..3db6dd5f54 100644 --- a/src/server/api/metadata/index.ts +++ b/src/server/api/metadata/index.ts @@ -1,8 +1,8 @@ import { Express } from 'express' -import { ApiEndPoint } from '@meta/api/endpoint' +import { ApiEndPoint } from 'meta/api/endpoint' -import { AuthMiddleware } from '@server/middleware/auth' +import { AuthMiddleware } from 'server/middleware/auth' import { getSections } from './getSections' import { getSectionsMetadata } from './getSectionsMetadata' diff --git a/src/server/api/user/acceptInvitation.ts b/src/server/api/user/acceptInvitation.ts index 885979981e..4ff47625d5 100644 --- a/src/server/api/user/acceptInvitation.ts +++ b/src/server/api/user/acceptInvitation.ts @@ -1,10 +1,10 @@ import { Response } from 'express' -import { CycleRequest } from '@meta/api/request' +import { CycleRequest } from 'meta/api/request' -import { AssessmentController } from '@server/controller/assessment' -import { UserController } from '@server/controller/user' -import { Requests } from '@server/utils' +import { AssessmentController } from 'server/controller/assessment' +import { UserController } from 'server/controller/user' +import { Requests } from 'server/utils' export const acceptInvitation = async (req: CycleRequest<{ invitationUuid: string }>, res: Response) => { try { diff --git a/src/server/api/user/getInvitation.ts b/src/server/api/user/getInvitation.ts index 5a8b956f14..d14e0df8e9 100644 --- a/src/server/api/user/getInvitation.ts +++ b/src/server/api/user/getInvitation.ts @@ -1,9 +1,9 @@ import { Response } from 'express' -import { CycleRequest } from '@meta/api/request' +import { CycleRequest } from 'meta/api/request' -import { UserController } from '@server/controller/user' -import { Requests } from '@server/utils' +import { UserController } from 'server/controller/user' +import { Requests } from 'server/utils' export const getInvitation = async (req: CycleRequest<{ invitationUuid: string }>, res: Response) => { try { diff --git a/src/server/api/user/getMany.ts b/src/server/api/user/getMany.ts index 924aef10d9..808f35c9f6 100644 --- a/src/server/api/user/getMany.ts +++ b/src/server/api/user/getMany.ts @@ -1,11 +1,11 @@ import { Response } from 'express' -import { CycleRequest } from '@meta/api/request' +import { CycleRequest } from 'meta/api/request' -import { AssessmentController } from '@server/controller/assessment' -import { UserController } from '@server/controller/user' -import { ProcessEnv } from '@server/utils' -import Requests from '@server/utils/requests' +import { AssessmentController } from 'server/controller/assessment' +import { UserController } from 'server/controller/user' +import { ProcessEnv } from 'server/utils' +import Requests from 'server/utils/requests' export const getMany = async (req: CycleRequest<{ print: string }>, res: Response) => { try { diff --git a/src/server/api/user/getProfilePicture.ts b/src/server/api/user/getProfilePicture.ts index 70f220e6f4..8ec91efb6c 100644 --- a/src/server/api/user/getProfilePicture.ts +++ b/src/server/api/user/getProfilePicture.ts @@ -1,7 +1,7 @@ import { Request, Response } from 'express' import * as path from 'path' -import Requests from '@server/utils/requests' -import { UserController } from '@server/controller/user' +import Requests from 'server/utils/requests' +import { UserController } from 'server/controller/user' export const getProfilePicture = async (req: Request, res: Response) => { const { id } = req.params diff --git a/src/server/api/user/getResetPassword.ts b/src/server/api/user/getResetPassword.ts index 924fb50ecc..dbe8d1d0db 100644 --- a/src/server/api/user/getResetPassword.ts +++ b/src/server/api/user/getResetPassword.ts @@ -1,7 +1,7 @@ import { Request, Response } from 'express' -import { UserController } from '@server/controller/user' -import { Requests } from '@server/utils' +import { UserController } from 'server/controller/user' +import { Requests } from 'server/utils' export const getResetPassword = async ( req: Request, diff --git a/src/server/api/user/getUser.ts b/src/server/api/user/getUser.ts index f05739a6ae..2f34ba987a 100644 --- a/src/server/api/user/getUser.ts +++ b/src/server/api/user/getUser.ts @@ -1,10 +1,10 @@ import { Response } from 'express' -import { CycleRequest } from '@meta/api/request' +import { CycleRequest } from 'meta/api/request' -import { AssessmentController } from '@server/controller/assessment' -import { UserController } from '@server/controller/user' -import Requests from '@server/utils/requests' +import { AssessmentController } from 'server/controller/assessment' +import { UserController } from 'server/controller/user' +import Requests from 'server/utils/requests' export const getUser = async (req: CycleRequest<{ id: string }>, res: Response) => { try { diff --git a/src/server/api/user/index.ts b/src/server/api/user/index.ts index 5ee508b21a..622d1d2ea1 100644 --- a/src/server/api/user/index.ts +++ b/src/server/api/user/index.ts @@ -1,9 +1,9 @@ import { Express } from 'express' import * as multer from 'multer' -import { ApiEndPoint } from '@meta/api/endpoint' +import { ApiEndPoint } from 'meta/api/endpoint' -import { AuthMiddleware } from '@server/middleware/auth' +import { AuthMiddleware } from 'server/middleware/auth' import { acceptInvitation } from './acceptInvitation' import { getInvitation } from './getInvitation' diff --git a/src/server/api/user/invite.ts b/src/server/api/user/invite.ts index 9a38fa5836..8967579c15 100644 --- a/src/server/api/user/invite.ts +++ b/src/server/api/user/invite.ts @@ -1,11 +1,11 @@ import { Response } from 'express' -import { CycleRequest } from '@meta/api/request' -import { RoleName } from '@meta/user' +import { CycleRequest } from 'meta/api/request' +import { RoleName } from 'meta/user' -import { AssessmentController } from '@server/controller/assessment' -import { UserController } from '@server/controller/user' -import { Requests } from '@server/utils' +import { AssessmentController } from 'server/controller/assessment' +import { UserController } from 'server/controller/user' +import { Requests } from 'server/utils' export const invite = async ( req: CycleRequest<{ diff --git a/src/server/api/user/removeInvitation.ts b/src/server/api/user/removeInvitation.ts index c904d18400..cb3fed9778 100644 --- a/src/server/api/user/removeInvitation.ts +++ b/src/server/api/user/removeInvitation.ts @@ -1,10 +1,10 @@ import { Response } from 'express' -import { CycleRequest } from '@meta/api/request' +import { CycleRequest } from 'meta/api/request' -import { AssessmentController } from '@server/controller/assessment' -import { UserController } from '@server/controller/user' -import { Requests } from '@server/utils' +import { AssessmentController } from 'server/controller/assessment' +import { UserController } from 'server/controller/user' +import { Requests } from 'server/utils' export const removeInvitation = async (req: CycleRequest<{ invitationUuid: string }>, res: Response) => { try { diff --git a/src/server/api/user/sendInvitationEmail.ts b/src/server/api/user/sendInvitationEmail.ts index c4594b5891..0b68b73885 100644 --- a/src/server/api/user/sendInvitationEmail.ts +++ b/src/server/api/user/sendInvitationEmail.ts @@ -1,9 +1,9 @@ import { Response } from 'express' -import { CycleRequest } from '@meta/api/request' +import { CycleRequest } from 'meta/api/request' -import { UserController } from '@server/controller/user' -import { Requests } from '@server/utils' +import { UserController } from 'server/controller/user' +import { Requests } from 'server/utils' export const sendInvitationEmail = async (req: CycleRequest<{ invitationUuid: string }>, res: Response) => { try { diff --git a/src/server/api/user/updateRoleProps.ts b/src/server/api/user/updateRoleProps.ts index 0c32e65678..c2e6d871a8 100644 --- a/src/server/api/user/updateRoleProps.ts +++ b/src/server/api/user/updateRoleProps.ts @@ -1,7 +1,7 @@ import { Request, Response } from 'express' -import { UserController } from '@server/controller/user' -import { Requests } from '@server/utils' +import { UserController } from 'server/controller/user' +import { Requests } from 'server/utils' export const updateRoleProps = async (req: Request, res: Response) => { try { diff --git a/src/server/api/user/updateSectionAuth.ts b/src/server/api/user/updateSectionAuth.ts index aa5e56cd1b..5b3d00243a 100644 --- a/src/server/api/user/updateSectionAuth.ts +++ b/src/server/api/user/updateSectionAuth.ts @@ -1,7 +1,7 @@ import { Request, Response } from 'express' -import { UserController } from '@server/controller/user' -import { Requests } from '@server/utils' +import { UserController } from 'server/controller/user' +import { Requests } from 'server/utils' export const updateSectionAuth = async (req: Request, res: Response) => { try { diff --git a/src/server/api/user/updateUser.ts b/src/server/api/user/updateUser.ts index 208a3f366c..0df90d9e21 100644 --- a/src/server/api/user/updateUser.ts +++ b/src/server/api/user/updateUser.ts @@ -1,9 +1,9 @@ import { Request, Response } from 'express' -import { Users } from '@meta/user' +import { Users } from 'meta/user' -import { UserController } from '@server/controller/user' -import { Requests } from '@server/utils' +import { UserController } from 'server/controller/user' +import { Requests } from 'server/utils' export const updateUser = async (req: Request, res: Response) => { try { diff --git a/src/server/api/user/updateUserAdminRole.ts b/src/server/api/user/updateUserAdminRole.ts index 4e261f83cc..2df0db8e1c 100644 --- a/src/server/api/user/updateUserAdminRole.ts +++ b/src/server/api/user/updateUserAdminRole.ts @@ -1,9 +1,9 @@ import { Request, Response } from 'express' -import { RoleName, Users } from '@meta/user' +import { RoleName, Users } from 'meta/user' -import { UserController } from '@server/controller/user' -import { Requests } from '@server/utils' +import { UserController } from 'server/controller/user' +import { Requests } from 'server/utils' export const updateUserAdminRole = async (req: Request<{ userId: string }>, res: Response) => { try { diff --git a/src/server/api/user/updateUserRoles.ts b/src/server/api/user/updateUserRoles.ts index 250f6dd5c5..6594db6b89 100644 --- a/src/server/api/user/updateUserRoles.ts +++ b/src/server/api/user/updateUserRoles.ts @@ -1,10 +1,10 @@ import { Request, Response } from 'express' -import { AssessmentName } from '@meta/assessment' +import { AssessmentName } from 'meta/assessment' -import { AssessmentController } from '@server/controller/assessment' -import { UserController } from '@server/controller/user' -import { Requests } from '@server/utils' +import { AssessmentController } from 'server/controller/assessment' +import { UserController } from 'server/controller/user' +import { Requests } from 'server/utils' export const updateUserRoles = async ( req: Request<{ assessmentName: AssessmentName; cycleName: string; id: string }>, diff --git a/src/server/controller/area/index.ts b/src/server/controller/area/index.ts index 093a01fe81..7163bc6e78 100644 --- a/src/server/controller/area/index.ts +++ b/src/server/controller/area/index.ts @@ -1,5 +1,5 @@ -import { CountryRepository } from '@server/repository/assessmentCycle/country' -import { RegionRepository } from '@server/repository/assessmentCycle/region' +import { CountryRepository } from 'server/repository/assessmentCycle/country' +import { RegionRepository } from 'server/repository/assessmentCycle/region' import { updateCountry } from './updateCountry' diff --git a/src/server/controller/area/updateCountry.ts b/src/server/controller/area/updateCountry.ts index c5d5fa7c2a..201f881fd5 100644 --- a/src/server/controller/area/updateCountry.ts +++ b/src/server/controller/area/updateCountry.ts @@ -1,10 +1,10 @@ -import { Country, CountryIso } from '@meta/area' -import { ActivityLogMessage, Assessment, Cycle } from '@meta/assessment' -import { User } from '@meta/user' +import { Country, CountryIso } from 'meta/area' +import { ActivityLogMessage, Assessment, Cycle } from 'meta/assessment' +import { User } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { CountryRepository } from '@server/repository/assessmentCycle/country' -import { ActivityLogRepository } from '@server/repository/public/activityLog' +import { BaseProtocol, DB } from 'server/db' +import { CountryRepository } from 'server/repository/assessmentCycle/country' +import { ActivityLogRepository } from 'server/repository/public/activityLog' export const updateCountry = async ( props: { diff --git a/src/server/controller/assessment/create.ts b/src/server/controller/assessment/create.ts index ae71e728ca..496195c846 100644 --- a/src/server/controller/assessment/create.ts +++ b/src/server/controller/assessment/create.ts @@ -1,9 +1,9 @@ -import { ActivityLogMessage, Assessment } from '@meta/assessment' -import { User } from '@meta/user' +import { ActivityLogMessage, Assessment } from 'meta/assessment' +import { User } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { AssessmentRepository } from '@server/repository/assessment/assessment' -import { ActivityLogRepository } from '@server/repository/public/activityLog' +import { BaseProtocol, DB } from 'server/db' +import { AssessmentRepository } from 'server/repository/assessment/assessment' +import { ActivityLogRepository } from 'server/repository/public/activityLog' export const create = async ( props: { user: User; assessment: Pick }, diff --git a/src/server/controller/assessment/createCycle.ts b/src/server/controller/assessment/createCycle.ts index b1d27e13d8..4a267d69a0 100644 --- a/src/server/controller/assessment/createCycle.ts +++ b/src/server/controller/assessment/createCycle.ts @@ -1,9 +1,9 @@ -import { ActivityLogMessage, Assessment } from '@meta/assessment' -import { User } from '@meta/user' +import { ActivityLogMessage, Assessment } from 'meta/assessment' +import { User } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { CycleRepository } from '@server/repository/assessmentCycle/cycle' -import { ActivityLogRepository } from '@server/repository/public/activityLog' +import { BaseProtocol, DB } from 'server/db' +import { CycleRepository } from 'server/repository/assessmentCycle/cycle' +import { ActivityLogRepository } from 'server/repository/public/activityLog' export const createCycle = async ( props: { user: User; assessment: Assessment; name: string }, diff --git a/src/server/controller/assessment/generateMetaCache/dependencyEvaluator/evalDependencies/context.ts b/src/server/controller/assessment/generateMetaCache/dependencyEvaluator/evalDependencies/context.ts index 7c5a7c4271..e2071d6c53 100644 --- a/src/server/controller/assessment/generateMetaCache/dependencyEvaluator/evalDependencies/context.ts +++ b/src/server/controller/assessment/generateMetaCache/dependencyEvaluator/evalDependencies/context.ts @@ -1,6 +1,6 @@ import { ExpressionContext } from '@openforis/arena-core' -import { AssessmentMetaCache, Row } from '@meta/assessment' +import { AssessmentMetaCache, Row } from 'meta/assessment' export interface Context extends ExpressionContext { assessmentMetaCache: AssessmentMetaCache diff --git a/src/server/controller/assessment/generateMetaCache/dependencyEvaluator/evalDependencies/member.ts b/src/server/controller/assessment/generateMetaCache/dependencyEvaluator/evalDependencies/member.ts index b939495070..0bad740b8d 100755 --- a/src/server/controller/assessment/generateMetaCache/dependencyEvaluator/evalDependencies/member.ts +++ b/src/server/controller/assessment/generateMetaCache/dependencyEvaluator/evalDependencies/member.ts @@ -1,6 +1,6 @@ import { ExpressionNodeEvaluator, MemberExpression } from '@openforis/arena-core' -import { Row, VariableCache } from '@meta/assessment' +import { Row, VariableCache } from 'meta/assessment' import { Context } from './context' diff --git a/src/server/controller/assessment/generateMetaCache/index.ts b/src/server/controller/assessment/generateMetaCache/index.ts index 411e6e9430..f09dcd09d6 100644 --- a/src/server/controller/assessment/generateMetaCache/index.ts +++ b/src/server/controller/assessment/generateMetaCache/index.ts @@ -1,9 +1,9 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Assessment, AssessmentMetaCache, Col, Cycle, Row, TableNames } from '@meta/assessment' -import { VariablesByTableCache } from '@meta/assessment/assessmentMetaCache' +import { Assessment, AssessmentMetaCache, Col, Cycle, Row, TableNames } from 'meta/assessment' +import { VariablesByTableCache } from 'meta/assessment/assessmentMetaCache' -import { BaseProtocol, Schemas } from '@server/db' +import { BaseProtocol, Schemas } from 'server/db' import { DependencyEvaluator } from './dependencyEvaluator' diff --git a/src/server/controller/assessment/getAll.ts b/src/server/controller/assessment/getAll.ts index 54ed0d72d9..bb86e57f13 100644 --- a/src/server/controller/assessment/getAll.ts +++ b/src/server/controller/assessment/getAll.ts @@ -1,7 +1,7 @@ -import { Assessment } from '@meta/assessment' +import { Assessment } from 'meta/assessment' -import { BaseProtocol, DB } from '@server/db' -import { AssessmentRepository } from '@server/repository/assessment/assessment' +import { BaseProtocol, DB } from 'server/db' +import { AssessmentRepository } from 'server/repository/assessment/assessment' type Props = { metaCache?: boolean } diff --git a/src/server/controller/assessment/getOne.ts b/src/server/controller/assessment/getOne.ts index a994c53f65..e7871b62cd 100644 --- a/src/server/controller/assessment/getOne.ts +++ b/src/server/controller/assessment/getOne.ts @@ -1,7 +1,7 @@ -import { Assessment, Cycle } from '@meta/assessment' +import { Assessment, Cycle } from 'meta/assessment' -import { BaseProtocol, DB } from '@server/db' -import { AssessmentRepository } from '@server/repository/assessment/assessment' +import { BaseProtocol, DB } from 'server/db' +import { AssessmentRepository } from 'server/repository/assessment/assessment' type Props = { assessmentName: string; metaCache?: boolean } | { id: number; metaCache?: boolean } diff --git a/src/server/controller/assessment/remove.ts b/src/server/controller/assessment/remove.ts index a035313075..eafafab8c0 100644 --- a/src/server/controller/assessment/remove.ts +++ b/src/server/controller/assessment/remove.ts @@ -1,7 +1,7 @@ -import { Assessment } from '@meta/assessment' -import { BaseProtocol, DB } from '@server/db' -import { AssessmentRepository } from '@server/repository/assessment/assessment' -import { CycleRepository } from '@server/repository/assessmentCycle/cycle' +import { Assessment } from 'meta/assessment' +import { BaseProtocol, DB } from 'server/db' +import { AssessmentRepository } from 'server/repository/assessment/assessment' +import { CycleRepository } from 'server/repository/assessmentCycle/cycle' export const remove = async ( props: { assessment: Assessment }, diff --git a/src/server/controller/assessment/update.ts b/src/server/controller/assessment/update.ts index ac795c854a..d01d4e13f5 100644 --- a/src/server/controller/assessment/update.ts +++ b/src/server/controller/assessment/update.ts @@ -1,9 +1,9 @@ -import { ActivityLogMessage, Assessment, Cycle } from '@meta/assessment' -import { User } from '@meta/user' +import { ActivityLogMessage, Assessment, Cycle } from 'meta/assessment' +import { User } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { AssessmentRepository } from '@server/repository/assessment/assessment' -import { ActivityLogRepository } from '@server/repository/public/activityLog' +import { BaseProtocol, DB } from 'server/db' +import { AssessmentRepository } from 'server/repository/assessment/assessment' +import { ActivityLogRepository } from 'server/repository/public/activityLog' export const updateDefaultCycle = async ( props: { user: User; assessment: Assessment; cycle: Cycle }, diff --git a/src/server/controller/cycleData/clearTableData.ts b/src/server/controller/cycleData/clearTableData.ts index ab7b6340c4..59df434eeb 100644 --- a/src/server/controller/cycleData/clearTableData.ts +++ b/src/server/controller/cycleData/clearTableData.ts @@ -1,14 +1,14 @@ -import { CountryIso } from '@meta/area' -import { ActivityLogMessage, Assessment, Cycle } from '@meta/assessment' -import { NodeUpdate } from '@meta/data' -import { Sockets } from '@meta/socket' -import { User } from '@meta/user' - -import { scheduleUpdateDependencies } from '@server/controller/cycleData/updateDependencies' -import { BaseProtocol, DB } from '@server/db' -import { DataRepository } from '@server/repository/assessmentCycle/data' -import { ActivityLogRepository } from '@server/repository/public/activityLog' -import { SocketServer } from '@server/service/socket' +import { CountryIso } from 'meta/area' +import { ActivityLogMessage, Assessment, Cycle } from 'meta/assessment' +import { NodeUpdate } from 'meta/data' +import { Sockets } from 'meta/socket' +import { User } from 'meta/user' + +import { scheduleUpdateDependencies } from 'server/controller/cycleData/updateDependencies' +import { BaseProtocol, DB } from 'server/db' +import { DataRepository } from 'server/repository/assessmentCycle/data' +import { ActivityLogRepository } from 'server/repository/public/activityLog' +import { SocketServer } from 'server/service/socket' type Props = { assessment: Assessment diff --git a/src/server/controller/cycleData/createOriginalDataPoint.ts b/src/server/controller/cycleData/createOriginalDataPoint.ts index e9f7682c32..e18e7cfacc 100644 --- a/src/server/controller/cycleData/createOriginalDataPoint.ts +++ b/src/server/controller/cycleData/createOriginalDataPoint.ts @@ -1,9 +1,9 @@ -import { ActivityLogMessage, Assessment, Cycle, OriginalDataPoint } from '@meta/assessment' -import { User } from '@meta/user' +import { ActivityLogMessage, Assessment, Cycle, OriginalDataPoint } from 'meta/assessment' +import { User } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { OriginalDataPointRepository } from '@server/repository/assessmentCycle/originalDataPoint' -import { ActivityLogRepository } from '@server/repository/public/activityLog' +import { BaseProtocol, DB } from 'server/db' +import { OriginalDataPointRepository } from 'server/repository/assessmentCycle/originalDataPoint' +import { ActivityLogRepository } from 'server/repository/public/activityLog' export const createOriginalDataPoint = async ( props: { diff --git a/src/server/controller/cycleData/getBulkDownload/entries/FRAYears.ts b/src/server/controller/cycleData/getBulkDownload/entries/FRAYears.ts index b721ec238b..a878c0a038 100644 --- a/src/server/controller/cycleData/getBulkDownload/entries/FRAYears.ts +++ b/src/server/controller/cycleData/getBulkDownload/entries/FRAYears.ts @@ -1,4 +1,4 @@ -import { TableNames } from '@meta/assessment' +import { TableNames } from 'meta/assessment' export const entries = [ { diff --git a/src/server/controller/cycleData/getBulkDownload/getClimaticValue.ts b/src/server/controller/cycleData/getBulkDownload/getClimaticValue.ts index f3801cab13..242157bea1 100644 --- a/src/server/controller/cycleData/getBulkDownload/getClimaticValue.ts +++ b/src/server/controller/cycleData/getBulkDownload/getClimaticValue.ts @@ -1,5 +1,5 @@ -import { CountryIso } from '@meta/area' -import { RecordCountryData } from '@meta/data' +import { CountryIso } from 'meta/area' +import { RecordCountryData } from 'meta/data' export const getClimaticValue = (name: string, countryIso: CountryIso, climaticData: RecordCountryData) => { const { climaticDomain } = climaticData[countryIso] diff --git a/src/server/controller/cycleData/getBulkDownload/getContent.ts b/src/server/controller/cycleData/getBulkDownload/getContent.ts index 4521bedc5b..d3f1c39866 100644 --- a/src/server/controller/cycleData/getBulkDownload/getContent.ts +++ b/src/server/controller/cycleData/getBulkDownload/getContent.ts @@ -1,10 +1,10 @@ -import { RecordAssessmentDatas } from '@meta/data' +import { RecordAssessmentDatas } from 'meta/data' -import { climaticDomain } from '@server/controller/cycleData/getBulkDownload/climaticDomain' -import { getClimaticValue } from '@server/controller/cycleData/getBulkDownload/getClimaticValue' -import { getData } from '@server/controller/cycleData/getBulkDownload/getData' -import { getYears } from '@server/controller/cycleData/getBulkDownload/getYears' -import { Props } from '@server/controller/cycleData/getBulkDownload/props' +import { climaticDomain } from 'server/controller/cycleData/getBulkDownload/climaticDomain' +import { getClimaticValue } from 'server/controller/cycleData/getBulkDownload/getClimaticValue' +import { getData } from 'server/controller/cycleData/getBulkDownload/getData' +import { getYears } from 'server/controller/cycleData/getBulkDownload/getYears' +import { Props } from 'server/controller/cycleData/getBulkDownload/props' export const getContent = async ( props: Props & { entries: { tableName: string; variables: { csvColumn: string; variableName: string }[] }[] } diff --git a/src/server/controller/cycleData/getBulkDownload/getFRAYearsData.ts b/src/server/controller/cycleData/getBulkDownload/getFRAYearsData.ts index 90061003ca..c51031cfbf 100644 --- a/src/server/controller/cycleData/getBulkDownload/getFRAYearsData.ts +++ b/src/server/controller/cycleData/getBulkDownload/getFRAYearsData.ts @@ -1,10 +1,10 @@ -import { RecordAssessmentDatas } from '@meta/data' +import { RecordAssessmentDatas } from 'meta/data' -import { entries } from '@server/controller/cycleData/getBulkDownload/entries/FRAYears' -import { genders } from '@server/controller/cycleData/getBulkDownload/genders' -import { getClimaticValue } from '@server/controller/cycleData/getBulkDownload/getClimaticValue' -import { getData } from '@server/controller/cycleData/getBulkDownload/getData' -import { getYears } from '@server/controller/cycleData/getBulkDownload/getYears' +import { entries } from 'server/controller/cycleData/getBulkDownload/entries/FRAYears' +import { genders } from 'server/controller/cycleData/getBulkDownload/genders' +import { getClimaticValue } from 'server/controller/cycleData/getBulkDownload/getClimaticValue' +import { getData } from 'server/controller/cycleData/getBulkDownload/getData' +import { getYears } from 'server/controller/cycleData/getBulkDownload/getYears' import { climaticDomain } from './climaticDomain' import { Props } from './props' diff --git a/src/server/controller/cycleData/getBulkDownload/getYears.ts b/src/server/controller/cycleData/getBulkDownload/getYears.ts index c350c65fe4..0e42d0d8ee 100644 --- a/src/server/controller/cycleData/getBulkDownload/getYears.ts +++ b/src/server/controller/cycleData/getBulkDownload/getYears.ts @@ -1,5 +1,5 @@ -import { Country } from '@meta/area' -import { RecordCountryData } from '@meta/data' +import { Country } from 'meta/area' +import { RecordCountryData } from 'meta/data' export const getYears = (props: { countries: Country[]; tableNames: string[]; data: RecordCountryData }) => { const { tableNames, data, countries } = props diff --git a/src/server/controller/cycleData/getBulkDownload/index.ts b/src/server/controller/cycleData/getBulkDownload/index.ts index 9c0546e4c9..4d7997c96f 100644 --- a/src/server/controller/cycleData/getBulkDownload/index.ts +++ b/src/server/controller/cycleData/getBulkDownload/index.ts @@ -1,12 +1,12 @@ -import { createI18nPromise } from '@i18n/i18nFactory' +import { createI18nPromise } from 'i18n/i18nFactory' import { i18n as i18nType } from 'i18next' -import { Areas, CountryIso, RegionCode } from '@meta/area' -import { Assessment, Cycle } from '@meta/assessment' +import { Areas, CountryIso, RegionCode } from 'meta/area' +import { Assessment, Cycle } from 'meta/assessment' -import { getContent } from '@server/controller/cycleData/getBulkDownload/getContent' -import { getFraYearsData } from '@server/controller/cycleData/getBulkDownload/getFRAYearsData' -import { CountryRepository } from '@server/repository/assessmentCycle/country' +import { getContent } from 'server/controller/cycleData/getBulkDownload/getContent' +import { getFraYearsData } from 'server/controller/cycleData/getBulkDownload/getFRAYearsData' +import { CountryRepository } from 'server/repository/assessmentCycle/country' import { entries as annualEntries } from './entries/AnnualData' import { entries as intervalEntries } from './entries/Intervals' diff --git a/src/server/controller/cycleData/getBulkDownload/props.ts b/src/server/controller/cycleData/getBulkDownload/props.ts index 9eae66bf32..6ab4a8692b 100644 --- a/src/server/controller/cycleData/getBulkDownload/props.ts +++ b/src/server/controller/cycleData/getBulkDownload/props.ts @@ -1,4 +1,4 @@ -import { Country } from '@meta/area' -import { Assessment, Cycle } from '@meta/assessment' +import { Country } from 'meta/area' +import { Assessment, Cycle } from 'meta/assessment' export type Props = { assessment: Assessment; cycle: Cycle; countries: Array } diff --git a/src/server/controller/cycleData/getOriginalDataPoint.ts b/src/server/controller/cycleData/getOriginalDataPoint.ts index 4a4a051a22..83446796a8 100644 --- a/src/server/controller/cycleData/getOriginalDataPoint.ts +++ b/src/server/controller/cycleData/getOriginalDataPoint.ts @@ -1,9 +1,9 @@ -import { CountryIso } from '@meta/area' -import { OriginalDataPoint } from '@meta/assessment' +import { CountryIso } from 'meta/area' +import { OriginalDataPoint } from 'meta/assessment' -import { BaseProtocol, DB } from '@server/db' -import { AssessmentRepository } from '@server/repository/assessment/assessment' -import { OriginalDataPointRepository } from '@server/repository/assessmentCycle/originalDataPoint' +import { BaseProtocol, DB } from 'server/db' +import { AssessmentRepository } from 'server/repository/assessment/assessment' +import { OriginalDataPointRepository } from 'server/repository/assessmentCycle/originalDataPoint' export const getOriginalDataPoint = async ( props: { assessmentName: string; cycleName: string; year: string; countryIso: CountryIso }, diff --git a/src/server/controller/cycleData/getOriginalDataPointData.ts b/src/server/controller/cycleData/getOriginalDataPointData.ts index 8c81a4c43a..5499bad6bf 100644 --- a/src/server/controller/cycleData/getOriginalDataPointData.ts +++ b/src/server/controller/cycleData/getOriginalDataPointData.ts @@ -1,9 +1,9 @@ -import { CountryIso } from '@meta/area' -import { Assessment, Cycle } from '@meta/assessment' -import { RecordAssessmentData } from '@meta/data' +import { CountryIso } from 'meta/area' +import { Assessment, Cycle } from 'meta/assessment' +import { RecordAssessmentData } from 'meta/data' -import { BaseProtocol, DB } from '@server/db' -import { DataRepository } from '@server/repository/assessmentCycle/data' +import { BaseProtocol, DB } from 'server/db' +import { DataRepository } from 'server/repository/assessmentCycle/data' export const getOriginalDataPointData = async ( props: { diff --git a/src/server/controller/cycleData/getOriginalDataPointVariables.ts b/src/server/controller/cycleData/getOriginalDataPointVariables.ts index 3bcd24b185..7e39081b2b 100644 --- a/src/server/controller/cycleData/getOriginalDataPointVariables.ts +++ b/src/server/controller/cycleData/getOriginalDataPointVariables.ts @@ -1,5 +1,5 @@ // To further expand -import { Cycle, TableNames, VariableCache } from '@meta/assessment' +import { Cycle, TableNames, VariableCache } from 'meta/assessment' type Variable = { // metadata properties diff --git a/src/server/controller/cycleData/getReviewStatus.ts b/src/server/controller/cycleData/getReviewStatus.ts index 25a68d3044..33f16ff81a 100644 --- a/src/server/controller/cycleData/getReviewStatus.ts +++ b/src/server/controller/cycleData/getReviewStatus.ts @@ -1,9 +1,9 @@ -import { CountryIso } from '@meta/area' -import { Assessment, Cycle, ReviewStatus } from '@meta/assessment' -import { User } from '@meta/user' +import { CountryIso } from 'meta/area' +import { Assessment, Cycle, ReviewStatus } from 'meta/assessment' +import { User } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { MessageTopicUserRepository } from '@server/repository/assessmentCycle/messageTopicUser' +import { BaseProtocol, DB } from 'server/db' +import { MessageTopicUserRepository } from 'server/repository/assessmentCycle/messageTopicUser' export const getReviewStatus = async ( props: { diff --git a/src/server/controller/cycleData/getTableData.ts b/src/server/controller/cycleData/getTableData.ts index dc2b4bbf51..ffc6374612 100644 --- a/src/server/controller/cycleData/getTableData.ts +++ b/src/server/controller/cycleData/getTableData.ts @@ -1,12 +1,12 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Country, CountryIso } from '@meta/area' -import { Assessment, Cycle, TableNames, VariableCache } from '@meta/assessment' -import { RecordAssessmentData } from '@meta/data' +import { Country, CountryIso } from 'meta/area' +import { Assessment, Cycle, TableNames, VariableCache } from 'meta/assessment' +import { RecordAssessmentData } from 'meta/data' -import { BaseProtocol, DB } from '@server/db' -import { CountryRepository } from '@server/repository/assessmentCycle/country' -import { DataRepository } from '@server/repository/assessmentCycle/data' +import { BaseProtocol, DB } from 'server/db' +import { CountryRepository } from 'server/repository/assessmentCycle/country' +import { DataRepository } from 'server/repository/assessmentCycle/data' export const getTableData = async ( props: { diff --git a/src/server/controller/cycleData/index.ts b/src/server/controller/cycleData/index.ts index 764b796dc1..63b17dcac0 100644 --- a/src/server/controller/cycleData/index.ts +++ b/src/server/controller/cycleData/index.ts @@ -1,7 +1,7 @@ -import { DescriptionRepository } from '@server/repository/assessmentCycle/descriptions' -import { MessageTopicUserRepository } from '@server/repository/assessmentCycle/messageTopicUser' -import { OriginalDataPointRepository } from '@server/repository/assessmentCycle/originalDataPoint' -import { ActivityLogRepository } from '@server/repository/public/activityLog' +import { DescriptionRepository } from 'server/repository/assessmentCycle/descriptions' +import { MessageTopicUserRepository } from 'server/repository/assessmentCycle/messageTopicUser' +import { OriginalDataPointRepository } from 'server/repository/assessmentCycle/originalDataPoint' +import { ActivityLogRepository } from 'server/repository/public/activityLog' import { clearTableData } from './clearTableData' import { createOriginalDataPoint } from './createOriginalDataPoint' diff --git a/src/server/controller/cycleData/persistNodeValues/persistNode/persistNode.ts b/src/server/controller/cycleData/persistNodeValues/persistNode/persistNode.ts index 6c15560cea..1ab3c68c43 100644 --- a/src/server/controller/cycleData/persistNodeValues/persistNode/persistNode.ts +++ b/src/server/controller/cycleData/persistNodeValues/persistNode/persistNode.ts @@ -1,8 +1,8 @@ -import { ActivityLog, ActivityLogMessage, Node } from '@meta/assessment' +import { ActivityLog, ActivityLogMessage, Node } from 'meta/assessment' -import { BaseProtocol } from '@server/db' -import { NodeRepository } from '@server/repository/assessmentCycle/node' -import { ActivityLogRepository } from '@server/repository/public/activityLog' +import { BaseProtocol } from 'server/db' +import { NodeRepository } from 'server/repository/assessmentCycle/node' +import { ActivityLogRepository } from 'server/repository/public/activityLog' import { PersistNodeValueProps } from '../props' diff --git a/src/server/controller/cycleData/persistNodeValues/persistNodeValue.test.ts__ b/src/server/controller/cycleData/persistNodeValues/persistNodeValue.test.ts__ index 6c9e2dba99..4897a07a7a 100644 --- a/src/server/controller/cycleData/persistNodeValues/persistNodeValue.test.ts__ +++ b/src/server/controller/cycleData/persistNodeValues/persistNodeValue.test.ts__ @@ -1,7 +1,7 @@ -import { DB } from '@server/db' -import { AssessmentController } from '@server/controller/assessment' -import { CycleDataController } from '@server/controller/cycleData' -import { UserController } from '@server/controller/user' +import { DB } from 'server/db' +import { AssessmentController } from 'server/controller/assessment' +import { CycleDataController } from 'server/controller/cycleData' +import { UserController } from 'server/controller/user' afterAll(async () => { await DB.$pool.end() diff --git a/src/server/controller/cycleData/persistNodeValues/persistNodeValues.ts b/src/server/controller/cycleData/persistNodeValues/persistNodeValues.ts index 0159bcd6e8..8cb4c959b1 100644 --- a/src/server/controller/cycleData/persistNodeValues/persistNodeValues.ts +++ b/src/server/controller/cycleData/persistNodeValues/persistNodeValues.ts @@ -1,11 +1,11 @@ -import { ActivityLogMessage } from '@meta/assessment' -import { NodeUpdate } from '@meta/data' -import { Sockets } from '@meta/socket' +import { ActivityLogMessage } from 'meta/assessment' +import { NodeUpdate } from 'meta/data' +import { Sockets } from 'meta/socket' -import { scheduleUpdateDependencies } from '@server/controller/cycleData/updateDependencies' -import { BaseProtocol, DB } from '@server/db' -import { SocketServer } from '@server/service/socket' -import { Logger } from '@server/utils/logger' +import { scheduleUpdateDependencies } from 'server/controller/cycleData/updateDependencies' +import { BaseProtocol, DB } from 'server/db' +import { SocketServer } from 'server/service/socket' +import { Logger } from 'server/utils/logger' import { persistNode } from './persistNode' import { PersistNodeValuesProps } from './props' diff --git a/src/server/controller/cycleData/persistNodeValues/persistNodeValuesEstimated.ts b/src/server/controller/cycleData/persistNodeValues/persistNodeValuesEstimated.ts index 3cc8a4098f..4b8c1c48ae 100644 --- a/src/server/controller/cycleData/persistNodeValues/persistNodeValuesEstimated.ts +++ b/src/server/controller/cycleData/persistNodeValues/persistNodeValuesEstimated.ts @@ -1,12 +1,12 @@ -import { CountryIso } from '@meta/area' -import { ActivityLog, ActivityLogMessage, Assessment, Cycle } from '@meta/assessment' -import { NodeValuesEstimation } from '@meta/assessment/nodeValuesEstimation' -import { NodeUpdate } from '@meta/data' -import { User } from '@meta/user' - -import { DB } from '@server/db' -import { NodeValueEstimationRepository } from '@server/repository/assessmentCycle/nodeValueEstimationRepository' -import { ActivityLogRepository } from '@server/repository/public/activityLog' +import { CountryIso } from 'meta/area' +import { ActivityLog, ActivityLogMessage, Assessment, Cycle } from 'meta/assessment' +import { NodeValuesEstimation } from 'meta/assessment/nodeValuesEstimation' +import { NodeUpdate } from 'meta/data' +import { User } from 'meta/user' + +import { DB } from 'server/db' +import { NodeValueEstimationRepository } from 'server/repository/assessmentCycle/nodeValueEstimationRepository' +import { ActivityLogRepository } from 'server/repository/public/activityLog' import { persistNodeValues } from './persistNodeValues' diff --git a/src/server/controller/cycleData/persistNodeValues/props.ts b/src/server/controller/cycleData/persistNodeValues/props.ts index 4644d3ecd0..24379ad0e9 100644 --- a/src/server/controller/cycleData/persistNodeValues/props.ts +++ b/src/server/controller/cycleData/persistNodeValues/props.ts @@ -1,7 +1,7 @@ -import { CountryIso } from '@meta/area' -import { Assessment, Cycle } from '@meta/assessment' -import { NodeUpdate, NodeUpdates } from '@meta/data' -import { User } from '@meta/user' +import { CountryIso } from 'meta/area' +import { Assessment, Cycle } from 'meta/assessment' +import { NodeUpdate, NodeUpdates } from 'meta/data' +import { User } from 'meta/user' export type PersistNodeValueProps = { countryIso: CountryIso diff --git a/src/server/controller/cycleData/removeOriginalDataPoint.ts b/src/server/controller/cycleData/removeOriginalDataPoint.ts index 681ccac1d5..6036f1b7e0 100644 --- a/src/server/controller/cycleData/removeOriginalDataPoint.ts +++ b/src/server/controller/cycleData/removeOriginalDataPoint.ts @@ -1,11 +1,11 @@ -import { ActivityLogMessage, Assessment, Cycle, OriginalDataPoint } from '@meta/assessment' -import { Sockets } from '@meta/socket' -import { User } from '@meta/user' - -import { BaseProtocol, DB } from '@server/db' -import { OriginalDataPointRepository } from '@server/repository/assessmentCycle/originalDataPoint' -import { ActivityLogRepository } from '@server/repository/public/activityLog' -import { SocketServer } from '@server/service/socket' +import { ActivityLogMessage, Assessment, Cycle, OriginalDataPoint } from 'meta/assessment' +import { Sockets } from 'meta/socket' +import { User } from 'meta/user' + +import { BaseProtocol, DB } from 'server/db' +import { OriginalDataPointRepository } from 'server/repository/assessmentCycle/originalDataPoint' +import { ActivityLogRepository } from 'server/repository/public/activityLog' +import { SocketServer } from 'server/service/socket' import { updateOriginalDataPointDependentNodes } from './updateOriginalDataPointDependentNodes' diff --git a/src/server/controller/cycleData/updateDependencies/props.ts b/src/server/controller/cycleData/updateDependencies/props.ts index 6adf301fef..2cd1670850 100644 --- a/src/server/controller/cycleData/updateDependencies/props.ts +++ b/src/server/controller/cycleData/updateDependencies/props.ts @@ -1,3 +1,3 @@ -import { PersistNodeValuesProps } from '@server/controller/cycleData/persistNodeValues' +import { PersistNodeValuesProps } from 'server/controller/cycleData/persistNodeValues' export type UpdateDependenciesProps = PersistNodeValuesProps & { isODP?: boolean } diff --git a/src/server/controller/cycleData/updateDependencies/queueFactory.ts b/src/server/controller/cycleData/updateDependencies/queueFactory.ts index d3d1a98931..da303ff8fe 100644 --- a/src/server/controller/cycleData/updateDependencies/queueFactory.ts +++ b/src/server/controller/cycleData/updateDependencies/queueFactory.ts @@ -1,11 +1,11 @@ import { Queue, QueueOptions, Worker } from 'bullmq' import IORedis from 'ioredis' -import { CountryIso } from '@meta/area' -import { Assessment, Cycle } from '@meta/assessment' +import { CountryIso } from 'meta/area' +import { Assessment, Cycle } from 'meta/assessment' -import { ProcessEnv } from '@server/utils' -import { Logger } from '@server/utils/logger' +import { ProcessEnv } from 'server/utils' +import { Logger } from 'server/utils/logger' import { UpdateDependenciesProps } from './props' import { WorkerFactory } from './workerFactory' @@ -13,7 +13,7 @@ import { WorkerFactory } from './workerFactory' const queues: Record> = {} const workers: Record> = {} -export const connection = new IORedis(ProcessEnv.redisUrl) +const connection = new IORedis(ProcessEnv.redisUrl) const getInstance = (props: { assessment: Assessment @@ -45,5 +45,6 @@ process.on('SIGTERM', async () => { }) export const UpdateDependenciesQueueFactory = { + connection, getInstance, } diff --git a/src/server/controller/cycleData/updateDependencies/scheduleUpdateDependencies.ts b/src/server/controller/cycleData/updateDependencies/scheduleUpdateDependencies.ts index db2b01f3d8..736cd586ca 100644 --- a/src/server/controller/cycleData/updateDependencies/scheduleUpdateDependencies.ts +++ b/src/server/controller/cycleData/updateDependencies/scheduleUpdateDependencies.ts @@ -1,6 +1,6 @@ import { Job } from 'bullmq' -import { Logger } from '@server/utils/logger' +import { Logger } from 'server/utils/logger' import { UpdateDependenciesProps } from './props' import { UpdateDependenciesQueueFactory } from './queueFactory' diff --git a/src/server/controller/cycleData/updateDependencies/updateCalculationDependencies/calculateNode.ts b/src/server/controller/cycleData/updateDependencies/updateCalculationDependencies/calculateNode.ts index 1c06552bc7..dbef390bca 100644 --- a/src/server/controller/cycleData/updateDependencies/updateCalculationDependencies/calculateNode.ts +++ b/src/server/controller/cycleData/updateDependencies/updateCalculationDependencies/calculateNode.ts @@ -1,11 +1,11 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { ActivityLogMessage, AssessmentMetaCaches, NodeValue, Row } from '@meta/assessment' -import { NodeUpdates } from '@meta/data' -import { ExpressionEvaluator } from '@meta/expressionEvaluator' +import { ActivityLogMessage, AssessmentMetaCaches, NodeValue, Row } from 'meta/assessment' +import { NodeUpdates } from 'meta/data' +import { ExpressionEvaluator } from 'meta/expressionEvaluator' -import { getTableData } from '@server/controller/cycleData/getTableData' -import { BaseProtocol } from '@server/db' +import { getTableData } from 'server/controller/cycleData/getTableData' +import { BaseProtocol } from 'server/db' import { persistNode } from '../../persistNodeValues/persistNode' import { PersistNodeValueProps } from '../../persistNodeValues/props' diff --git a/src/server/controller/cycleData/updateDependencies/updateCalculationDependencies/updateCalculationDependencies.ts b/src/server/controller/cycleData/updateDependencies/updateCalculationDependencies/updateCalculationDependencies.ts index 2e7453bae8..eab3cd834c 100644 --- a/src/server/controller/cycleData/updateDependencies/updateCalculationDependencies/updateCalculationDependencies.ts +++ b/src/server/controller/cycleData/updateDependencies/updateCalculationDependencies/updateCalculationDependencies.ts @@ -1,10 +1,10 @@ -import { Row, VariableCache } from '@meta/assessment' -import { NodeUpdates } from '@meta/data' +import { Row, VariableCache } from 'meta/assessment' +import { NodeUpdates } from 'meta/data' -import { PersistNodeValueProps } from '@server/controller/cycleData/persistNodeValues/props' -import { BaseProtocol } from '@server/db' -import { RowRepository } from '@server/repository/assessment/row' -import { Logger } from '@server/utils/logger' +import { PersistNodeValueProps } from 'server/controller/cycleData/persistNodeValues/props' +import { BaseProtocol } from 'server/db' +import { RowRepository } from 'server/repository/assessment/row' +import { Logger } from 'server/utils/logger' import { getDependants } from '../utils/getDependants' import { isODPCell } from '../utils/isODPCell' diff --git a/src/server/controller/cycleData/updateDependencies/updateNodeDependencies.ts b/src/server/controller/cycleData/updateDependencies/updateNodeDependencies.ts index 4d245fe761..6a8b04c268 100644 --- a/src/server/controller/cycleData/updateDependencies/updateNodeDependencies.ts +++ b/src/server/controller/cycleData/updateDependencies/updateNodeDependencies.ts @@ -1,6 +1,6 @@ -import { NodeUpdate, NodeUpdates } from '@meta/data' +import { NodeUpdate, NodeUpdates } from 'meta/data' -import { BaseProtocol } from '@server/db' +import { BaseProtocol } from 'server/db' import { PersistNodeValueProps } from '../persistNodeValues/props' import { updateCalculationDependencies } from './updateCalculationDependencies' diff --git a/src/server/controller/cycleData/updateDependencies/updateValidationDependencies/updateValidationDependencies.ts b/src/server/controller/cycleData/updateDependencies/updateValidationDependencies/updateValidationDependencies.ts index edd51aa8da..8c536d2c92 100644 --- a/src/server/controller/cycleData/updateDependencies/updateValidationDependencies/updateValidationDependencies.ts +++ b/src/server/controller/cycleData/updateDependencies/updateValidationDependencies/updateValidationDependencies.ts @@ -1,9 +1,9 @@ -import { NodeValue, Row, TableNames } from '@meta/assessment' -import { NodeUpdate, NodeUpdates } from '@meta/data' +import { NodeValue, Row, TableNames } from 'meta/assessment' +import { NodeUpdate, NodeUpdates } from 'meta/data' -import { BaseProtocol } from '@server/db' -import { RowRepository } from '@server/repository/assessment/row' -import { NodeRepository } from '@server/repository/assessmentCycle/node' +import { BaseProtocol } from 'server/db' +import { RowRepository } from 'server/repository/assessment/row' +import { NodeRepository } from 'server/repository/assessmentCycle/node' import { getDependants } from '../utils/getDependants' import { validateNode } from './validateNode' diff --git a/src/server/controller/cycleData/updateDependencies/updateValidationDependencies/validateNode.ts b/src/server/controller/cycleData/updateDependencies/updateValidationDependencies/validateNode.ts index b238b52bd5..359ed4c299 100644 --- a/src/server/controller/cycleData/updateDependencies/updateValidationDependencies/validateNode.ts +++ b/src/server/controller/cycleData/updateDependencies/updateValidationDependencies/validateNode.ts @@ -1,10 +1,10 @@ -import { AssessmentMetaCaches, NodeValueValidation, NodeValueValidations, Row } from '@meta/assessment' -import { RecordAssessmentData } from '@meta/data' -import { ExpressionEvaluator } from '@meta/expressionEvaluator' +import { AssessmentMetaCaches, NodeValueValidation, NodeValueValidations, Row } from 'meta/assessment' +import { RecordAssessmentData } from 'meta/data' +import { ExpressionEvaluator } from 'meta/expressionEvaluator' -import { getTableData } from '@server/controller/cycleData/getTableData' -import { PersistNodeValueProps } from '@server/controller/cycleData/persistNodeValues/props' -import { BaseProtocol } from '@server/db' +import { getTableData } from 'server/controller/cycleData/getTableData' +import { PersistNodeValueProps } from 'server/controller/cycleData/persistNodeValues/props' +import { BaseProtocol } from 'server/db' export const validateNode = async ( props: Omit & { diff --git a/src/server/controller/cycleData/updateDependencies/utils/getDependants.ts b/src/server/controller/cycleData/updateDependencies/utils/getDependants.ts index 60b4281940..f2251d2eae 100644 --- a/src/server/controller/cycleData/updateDependencies/utils/getDependants.ts +++ b/src/server/controller/cycleData/updateDependencies/utils/getDependants.ts @@ -1,12 +1,12 @@ -import { CountryIso } from '@meta/area' -import { AssessmentMetaCaches } from '@meta/assessment' -import { Assessment } from '@meta/assessment/assessment' -import { VariableCache } from '@meta/assessment/assessmentMetaCache' -import { Cycle } from '@meta/assessment/cycle' -import { TableNames } from '@meta/assessment/table' - -import { isODPVariable } from '@server/controller/cycleData/getOriginalDataPointVariables' -import { BaseProtocol } from '@server/db' +import { CountryIso } from 'meta/area' +import { AssessmentMetaCaches } from 'meta/assessment' +import { Assessment } from 'meta/assessment/assessment' +import { VariableCache } from 'meta/assessment/assessmentMetaCache' +import { Cycle } from 'meta/assessment/cycle' +import { TableNames } from 'meta/assessment/table' + +import { isODPVariable } from 'server/controller/cycleData/getOriginalDataPointVariables' +import { BaseProtocol } from 'server/db' import { isODPCell } from './isODPCell' diff --git a/src/server/controller/cycleData/updateDependencies/utils/isODPCell.ts b/src/server/controller/cycleData/updateDependencies/utils/isODPCell.ts index 3a8fe25a91..b8edcbee0e 100644 --- a/src/server/controller/cycleData/updateDependencies/utils/isODPCell.ts +++ b/src/server/controller/cycleData/updateDependencies/utils/isODPCell.ts @@ -1,9 +1,9 @@ -import { CountryIso } from '@meta/area' -import { Assessment, Cycle, TableNames } from '@meta/assessment' +import { CountryIso } from 'meta/area' +import { Assessment, Cycle, TableNames } from 'meta/assessment' -import { AreaController } from '@server/controller/area' -import { BaseProtocol } from '@server/db' -import { OriginalDataPointRepository } from '@server/repository/assessmentCycle/originalDataPoint' +import { AreaController } from 'server/controller/area' +import { BaseProtocol } from 'server/db' +import { OriginalDataPointRepository } from 'server/repository/assessmentCycle/originalDataPoint' type Props = { assessment: Assessment diff --git a/src/server/controller/cycleData/updateDependencies/worker.ts b/src/server/controller/cycleData/updateDependencies/worker.ts index 11b4ac0707..f3bb3607ab 100644 --- a/src/server/controller/cycleData/updateDependencies/worker.ts +++ b/src/server/controller/cycleData/updateDependencies/worker.ts @@ -1,9 +1,9 @@ import { Job } from 'bullmq' -import { NodeUpdates } from '@meta/data' +import { NodeUpdates } from 'meta/data' -import { DB } from '@server/db' -import { Logger } from '@server/utils/logger' +import { DB } from 'server/db' +import { Logger } from 'server/utils/logger' import { UpdateDependenciesProps } from './props' import { updateNodeDependencies } from './updateNodeDependencies' diff --git a/src/server/controller/cycleData/updateDependencies/workerFactory.ts b/src/server/controller/cycleData/updateDependencies/workerFactory.ts index afd2e81090..6d62623338 100644 --- a/src/server/controller/cycleData/updateDependencies/workerFactory.ts +++ b/src/server/controller/cycleData/updateDependencies/workerFactory.ts @@ -1,17 +1,17 @@ import { Worker } from 'bullmq' import IORedis from 'ioredis' -import { NodeUpdates } from '@meta/data' -import { Sockets } from '@meta/socket' +import { NodeUpdates } from 'meta/data' +import { Sockets } from 'meta/socket' -import { SocketServer } from '@server/service/socket' -import { ProcessEnv } from '@server/utils' -import { Logger } from '@server/utils/logger' -import { NodeEnv } from '@server/utils/processEnv' +import { SocketServer } from 'server/service/socket' +import { ProcessEnv } from 'server/utils' +import { Logger } from 'server/utils/logger' +import { NodeEnv } from 'server/utils/processEnv' import workerProcessor from './worker' -export const connection = new IORedis(ProcessEnv.redisUrl) +const connection = new IORedis(ProcessEnv.redisUrl) const newInstance = (props: { key: string }) => { const { key } = props @@ -51,5 +51,6 @@ const newInstance = (props: { key: string }) => { } export const WorkerFactory = { + connection, newInstance, } diff --git a/src/server/controller/cycleData/updateOriginalDataPoint.ts b/src/server/controller/cycleData/updateOriginalDataPoint.ts index 297c1af33f..c095ff53e5 100644 --- a/src/server/controller/cycleData/updateOriginalDataPoint.ts +++ b/src/server/controller/cycleData/updateOriginalDataPoint.ts @@ -1,9 +1,9 @@ -import { ActivityLogMessage, Assessment, Cycle, OriginalDataPoint } from '@meta/assessment' -import { User } from '@meta/user' +import { ActivityLogMessage, Assessment, Cycle, OriginalDataPoint } from 'meta/assessment' +import { User } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { OriginalDataPointRepository } from '@server/repository/assessmentCycle/originalDataPoint' -import { ActivityLogRepository } from '@server/repository/public/activityLog' +import { BaseProtocol, DB } from 'server/db' +import { OriginalDataPointRepository } from 'server/repository/assessmentCycle/originalDataPoint' +import { ActivityLogRepository } from 'server/repository/public/activityLog' import { updateOriginalDataPointDependentNodes } from './updateOriginalDataPointDependentNodes' diff --git a/src/server/controller/cycleData/updateOriginalDataPointDependentNodes.ts b/src/server/controller/cycleData/updateOriginalDataPointDependentNodes.ts index 96bb86b9f7..45ff96d008 100644 --- a/src/server/controller/cycleData/updateOriginalDataPointDependentNodes.ts +++ b/src/server/controller/cycleData/updateOriginalDataPointDependentNodes.ts @@ -1,12 +1,12 @@ -import { Assessment, Cycle, OriginalDataPoint, TableNames } from '@meta/assessment' -import { NodeUpdate, NodeUpdates, RecordAssessmentDatas } from '@meta/data' -import { Sockets } from '@meta/socket' -import { User } from '@meta/user' +import { Assessment, Cycle, OriginalDataPoint, TableNames } from 'meta/assessment' +import { NodeUpdate, NodeUpdates, RecordAssessmentDatas } from 'meta/data' +import { Sockets } from 'meta/socket' +import { User } from 'meta/user' -import { getTableData } from '@server/controller/cycleData/getTableData' -import { scheduleUpdateDependencies } from '@server/controller/cycleData/updateDependencies' -import { BaseProtocol } from '@server/db' -import { SocketServer } from '@server/service/socket' +import { getTableData } from 'server/controller/cycleData/getTableData' +import { scheduleUpdateDependencies } from 'server/controller/cycleData/updateDependencies' +import { BaseProtocol } from 'server/db' +import { SocketServer } from 'server/service/socket' import { getOriginalDataPointVariables } from './getOriginalDataPointVariables' diff --git a/src/server/controller/cycleData/upsertDescription.ts b/src/server/controller/cycleData/upsertDescription.ts index 8ee5dbb0fc..0f031b3882 100644 --- a/src/server/controller/cycleData/upsertDescription.ts +++ b/src/server/controller/cycleData/upsertDescription.ts @@ -1,16 +1,16 @@ -import { CountryIso } from '@meta/area' +import { CountryIso } from 'meta/area' import { ActivityLogMessage, Assessment, CommentableDescriptionName, CommentableDescriptionValue, Cycle, -} from '@meta/assessment' -import { User } from '@meta/user' +} from 'meta/assessment' +import { User } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { DescriptionRepository } from '@server/repository/assessmentCycle/descriptions' -import { ActivityLogRepository } from '@server/repository/public/activityLog' +import { BaseProtocol, DB } from 'server/db' +import { DescriptionRepository } from 'server/repository/assessmentCycle/descriptions' +import { ActivityLogRepository } from 'server/repository/public/activityLog' export const upsertDescription = async ( props: { diff --git a/src/server/controller/extData/index.ts b/src/server/controller/extData/index.ts index af348cf7b3..d4b474ca66 100644 --- a/src/server/controller/extData/index.ts +++ b/src/server/controller/extData/index.ts @@ -1,4 +1,4 @@ -import { TaxonRepository } from '@server/repository/extData' +import { TaxonRepository } from 'server/repository/extData' export const ExtDataController = { searchTaxa: TaxonRepository.search, diff --git a/src/server/controller/file/createAssessmentFile.ts b/src/server/controller/file/createAssessmentFile.ts index c7814b292b..6eaf115892 100644 --- a/src/server/controller/file/createAssessmentFile.ts +++ b/src/server/controller/file/createAssessmentFile.ts @@ -1,10 +1,10 @@ -import { CountryIso } from '@meta/area' -import { ActivityLogMessage, Assessment, AssessmentFile } from '@meta/assessment' -import { User } from '@meta/user' +import { CountryIso } from 'meta/area' +import { ActivityLogMessage, Assessment, AssessmentFile } from 'meta/assessment' +import { User } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { AssessmentFileRepository } from '@server/repository/assessment/file' -import { ActivityLogRepository } from '@server/repository/public/activityLog' +import { BaseProtocol, DB } from 'server/db' +import { AssessmentFileRepository } from 'server/repository/assessment/file' +import { ActivityLogRepository } from 'server/repository/public/activityLog' export const createAssessmentFile = async ( props: { diff --git a/src/server/controller/file/index.ts b/src/server/controller/file/index.ts index 89fd655fa8..14cc600387 100644 --- a/src/server/controller/file/index.ts +++ b/src/server/controller/file/index.ts @@ -1,4 +1,4 @@ -import { AssessmentFileRepository } from '@server/repository/assessment/file' +import { AssessmentFileRepository } from 'server/repository/assessment/file' import { createAssessmentFile } from './createAssessmentFile' import { removeAssessmentFile } from './removeAssessmentFile' diff --git a/src/server/controller/file/removeAssessmentFile.ts b/src/server/controller/file/removeAssessmentFile.ts index 3994ef401e..dacbaebbbd 100644 --- a/src/server/controller/file/removeAssessmentFile.ts +++ b/src/server/controller/file/removeAssessmentFile.ts @@ -1,9 +1,9 @@ -import { ActivityLogMessage, Assessment } from '@meta/assessment' -import { User } from '@meta/user' +import { ActivityLogMessage, Assessment } from 'meta/assessment' +import { User } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { AssessmentFileRepository } from '@server/repository/assessment/file' -import { ActivityLogRepository } from '@server/repository/public/activityLog' +import { BaseProtocol, DB } from 'server/db' +import { AssessmentFileRepository } from 'server/repository/assessment/file' +import { ActivityLogRepository } from 'server/repository/public/activityLog' export const removeAssessmentFile = async ( props: { diff --git a/src/server/controller/geo/assets/getBurnedAreaAssetData.ts b/src/server/controller/geo/assets/getBurnedAreaAssetData.ts index 7d1766b956..b8cc1b3022 100644 --- a/src/server/controller/geo/assets/getBurnedAreaAssetData.ts +++ b/src/server/controller/geo/assets/getBurnedAreaAssetData.ts @@ -1,7 +1,7 @@ // @ts-ignore import { Filter, Image, ImageCollection, Reducer } from '@google/earthengine' -import { BurnedAreaKey, burnedAreaSourcesMetadata, LayerSource } from '@meta/geo' +import { BurnedAreaKey, burnedAreaSourcesMetadata, LayerSource } from 'meta/geo' export const getBurnedAreaAssetData = (layer: LayerSource): { year?: number; img: Image; metadata: any } => { let asset = {} as { year?: number; img: Image; metadata: any } diff --git a/src/server/controller/geo/assets/getCountryBoundaries.ts b/src/server/controller/geo/assets/getCountryBoundaries.ts index c1bfbcf06b..48d7f5b1e8 100644 --- a/src/server/controller/geo/assets/getCountryBoundaries.ts +++ b/src/server/controller/geo/assets/getCountryBoundaries.ts @@ -1,7 +1,7 @@ // @ts-ignore import { FeatureCollection, Filter } from '@google/earthengine' -import { CountryIso } from '@meta/area' +import { CountryIso } from 'meta/area' export const getCountryBoundaries = (countryIso: CountryIso) => { const ftcCountries = FeatureCollection('users/geofra/boundaries/UN_Res0_ADM0_BNDA_CTY_FRA_v1') diff --git a/src/server/controller/geo/assets/getForestAssetData.ts b/src/server/controller/geo/assets/getForestAssetData.ts index f3217c2484..beea0b53d0 100644 --- a/src/server/controller/geo/assets/getForestAssetData.ts +++ b/src/server/controller/geo/assets/getForestAssetData.ts @@ -1,7 +1,7 @@ // @ts-ignore import { Image, ImageCollection } from '@google/earthengine' -import { ForestSource, LayerSource, sourcesMetadata } from '@meta/geo' +import { ForestSource, LayerSource, sourcesMetadata } from 'meta/geo' export const getForestAssetData = (layer: LayerSource): { year?: number; img: Image; metadata: any } => { let asset = {} as { year?: number; img: Image; metadata: any } diff --git a/src/server/controller/geo/assets/getProtectedAreaAssetData.ts b/src/server/controller/geo/assets/getProtectedAreaAssetData.ts index b243cb3747..65b4ce1d2e 100644 --- a/src/server/controller/geo/assets/getProtectedAreaAssetData.ts +++ b/src/server/controller/geo/assets/getProtectedAreaAssetData.ts @@ -1,7 +1,7 @@ // @ts-ignore import { FeatureCollection, Image } from '@google/earthengine' -import { LayerSource, ProtectedAreaKey, protectedAreaSourcesMetadata } from '@meta/geo' +import { LayerSource, ProtectedAreaKey, protectedAreaSourcesMetadata } from 'meta/geo' export const getProtectedAreaAssetData = (layer: LayerSource): { year?: number; img: Image; metadata: any } => { let asset = {} as { year?: number; img: Image; metadata: any } diff --git a/src/server/controller/geo/assets/index.ts b/src/server/controller/geo/assets/index.ts index fc2caafa1a..0510623d45 100644 --- a/src/server/controller/geo/assets/index.ts +++ b/src/server/controller/geo/assets/index.ts @@ -1,7 +1,7 @@ // @ts-ignore import { Image } from '@google/earthengine' -import { BurnedAreaKey, ForestSource, LayerSource, ProtectedAreaKey } from '@meta/geo' +import { BurnedAreaKey, ForestSource, LayerSource, ProtectedAreaKey } from 'meta/geo' import { getBurnedAreaAssetData } from './getBurnedAreaAssetData' import { getCountryBoundaries } from './getCountryBoundaries' diff --git a/src/server/controller/geo/getBoundariesLayer.ts b/src/server/controller/geo/getBoundariesLayer.ts index ac1fe0c13b..7ef7edbd79 100644 --- a/src/server/controller/geo/getBoundariesLayer.ts +++ b/src/server/controller/geo/getBoundariesLayer.ts @@ -1,7 +1,7 @@ -import { CountryIso } from '@meta/area' -import { Layer } from '@meta/geo' +import { CountryIso } from 'meta/area' +import { Layer } from 'meta/geo' -import { AssetsController } from '@server/controller/geo/assets' +import { AssetsController } from 'server/controller/geo/assets' type Props = { countryIso: CountryIso diff --git a/src/server/controller/geo/getBounds.ts b/src/server/controller/geo/getBounds.ts index 52bdc4e9d7..aae1fabffa 100644 --- a/src/server/controller/geo/getBounds.ts +++ b/src/server/controller/geo/getBounds.ts @@ -1,8 +1,8 @@ -import { CountryIso } from '@meta/area' -import { Bounds } from '@meta/geo' +import { CountryIso } from 'meta/area' +import { Bounds } from 'meta/geo' -import { BaseProtocol, DB } from '@server/db' -import { BoundsRepository } from '@server/repository/geo/bounds' +import { BaseProtocol, DB } from 'server/db' +import { BoundsRepository } from 'server/repository/geo/bounds' type Props = { countryIso: CountryIso } diff --git a/src/server/controller/geo/getBurnedAreaLayer.ts b/src/server/controller/geo/getBurnedAreaLayer.ts index 57bb2c9d29..983a60b631 100644 --- a/src/server/controller/geo/getBurnedAreaLayer.ts +++ b/src/server/controller/geo/getBurnedAreaLayer.ts @@ -1,7 +1,7 @@ -import { CountryIso } from '@meta/area' -import { Layer, LayerSource } from '@meta/geo' +import { CountryIso } from 'meta/area' +import { Layer, LayerSource } from 'meta/geo' -import { AssetsController } from '@server/controller/geo/assets' +import { AssetsController } from 'server/controller/geo/assets' import { getMap } from './getMap' diff --git a/src/server/controller/geo/getForestEstimations.ts b/src/server/controller/geo/getForestEstimations.ts index 58b5b65ca9..0f6c5129ff 100644 --- a/src/server/controller/geo/getForestEstimations.ts +++ b/src/server/controller/geo/getForestEstimations.ts @@ -1,11 +1,11 @@ // @ts-ignore import { Image, Reducer } from '@google/earthengine' -import { CountryIso } from '@meta/area' -import { ForestEstimations, LayerSource } from '@meta/geo' +import { CountryIso } from 'meta/area' +import { ForestEstimations, LayerSource } from 'meta/geo' -import { BaseProtocol, DB } from '@server/db' -import { ForestEstimationsRepository } from '@server/repository/geo/forestEstimations' +import { BaseProtocol, DB } from 'server/db' +import { ForestEstimationsRepository } from 'server/repository/geo/forestEstimations' import { AssetsController } from './assets' diff --git a/src/server/controller/geo/getForestLayer.ts b/src/server/controller/geo/getForestLayer.ts index 43825adacd..d2aad264e3 100644 --- a/src/server/controller/geo/getForestLayer.ts +++ b/src/server/controller/geo/getForestLayer.ts @@ -1,7 +1,7 @@ -import { CountryIso } from '@meta/area' -import { ForestSource, Layer, LayerSource } from '@meta/geo' +import { CountryIso } from 'meta/area' +import { ForestSource, Layer, LayerSource } from 'meta/geo' -import { AssetsController } from '@server/controller/geo/assets' +import { AssetsController } from 'server/controller/geo/assets' import { getMap } from './getMap' diff --git a/src/server/controller/geo/getMap.ts b/src/server/controller/geo/getMap.ts index 83ec78a59a..53fb84d0a9 100644 --- a/src/server/controller/geo/getMap.ts +++ b/src/server/controller/geo/getMap.ts @@ -1,9 +1,9 @@ // @ts-ignore import { Image } from '@google/earthengine' -import { CountryIso } from '@meta/area' +import { CountryIso } from 'meta/area' -import { AssetsController } from '@server/controller/geo/assets' +import { AssetsController } from 'server/controller/geo/assets' type Props = { image: Image diff --git a/src/server/controller/geo/getProtectedAreaLayer.ts b/src/server/controller/geo/getProtectedAreaLayer.ts index 25665082ba..bbc32348f8 100644 --- a/src/server/controller/geo/getProtectedAreaLayer.ts +++ b/src/server/controller/geo/getProtectedAreaLayer.ts @@ -1,7 +1,7 @@ -import { CountryIso } from '@meta/area' -import { Layer, LayerSource, ProtectedAreaKey } from '@meta/geo' +import { CountryIso } from 'meta/area' +import { Layer, LayerSource, ProtectedAreaKey } from 'meta/geo' -import { AssetsController } from '@server/controller/geo/assets' +import { AssetsController } from 'server/controller/geo/assets' import { getMap } from './getMap' diff --git a/src/server/controller/messageCenter/addMessage.ts b/src/server/controller/messageCenter/addMessage.ts index e446a02441..df8b548261 100644 --- a/src/server/controller/messageCenter/addMessage.ts +++ b/src/server/controller/messageCenter/addMessage.ts @@ -1,13 +1,13 @@ -import { CountryIso } from '@meta/area' -import { ActivityLogMessage, Assessment, Cycle } from '@meta/assessment' -import { Message, MessageTopic, MessageTopicType } from '@meta/messageCenter' -import { User } from '@meta/user' +import { CountryIso } from 'meta/area' +import { ActivityLogMessage, Assessment, Cycle } from 'meta/assessment' +import { Message, MessageTopic, MessageTopicType } from 'meta/messageCenter' +import { User } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { SectionRepository } from '@server/repository/assessment/section' -import { MessageRepository } from '@server/repository/assessmentCycle/message' -import { MessageTopicRepository } from '@server/repository/assessmentCycle/messageTopic' -import { ActivityLogRepository } from '@server/repository/public/activityLog' +import { BaseProtocol, DB } from 'server/db' +import { SectionRepository } from 'server/repository/assessment/section' +import { MessageRepository } from 'server/repository/assessmentCycle/message' +import { MessageTopicRepository } from 'server/repository/assessmentCycle/messageTopic' +import { ActivityLogRepository } from 'server/repository/public/activityLog' import { updateTopicReadTime } from './updateTopicReadTime' diff --git a/src/server/controller/messageCenter/getTopic.ts b/src/server/controller/messageCenter/getTopic.ts index 3c0bfb7f01..89a11597b8 100644 --- a/src/server/controller/messageCenter/getTopic.ts +++ b/src/server/controller/messageCenter/getTopic.ts @@ -1,10 +1,10 @@ -import { CountryIso } from '@meta/area' -import { Assessment, Cycle } from '@meta/assessment' -import { MessageTopic } from '@meta/messageCenter' -import { User } from '@meta/user' +import { CountryIso } from 'meta/area' +import { Assessment, Cycle } from 'meta/assessment' +import { MessageTopic } from 'meta/messageCenter' +import { User } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { MessageTopicRepository } from '@server/repository/assessmentCycle/messageTopic' +import { BaseProtocol, DB } from 'server/db' +import { MessageTopicRepository } from 'server/repository/assessmentCycle/messageTopic' import { updateTopicReadTime } from './updateTopicReadTime' diff --git a/src/server/controller/messageCenter/index.ts b/src/server/controller/messageCenter/index.ts index 710c416836..b2c06b90a1 100644 --- a/src/server/controller/messageCenter/index.ts +++ b/src/server/controller/messageCenter/index.ts @@ -1,4 +1,4 @@ -import { MessageTopicUserRepository } from '@server/repository/assessmentCycle/messageTopicUser' +import { MessageTopicUserRepository } from 'server/repository/assessmentCycle/messageTopicUser' import { addMessage } from './addMessage' import { getTopic } from './getTopic' diff --git a/src/server/controller/messageCenter/markMessageDeleted.ts b/src/server/controller/messageCenter/markMessageDeleted.ts index 53e6d82cb5..d9befa88c8 100644 --- a/src/server/controller/messageCenter/markMessageDeleted.ts +++ b/src/server/controller/messageCenter/markMessageDeleted.ts @@ -1,10 +1,10 @@ -import { CountryIso } from '@meta/area' -import { ActivityLogMessage, Assessment, Cycle } from '@meta/assessment' -import { User } from '@meta/user' +import { CountryIso } from 'meta/area' +import { ActivityLogMessage, Assessment, Cycle } from 'meta/assessment' +import { User } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { MessageRepository } from '@server/repository/assessmentCycle/message' -import { ActivityLogRepository } from '@server/repository/public/activityLog' +import { BaseProtocol, DB } from 'server/db' +import { MessageRepository } from 'server/repository/assessmentCycle/message' +import { ActivityLogRepository } from 'server/repository/public/activityLog' export const markMessageDeleted = async ( props: { diff --git a/src/server/controller/messageCenter/updateTopicReadTime.ts b/src/server/controller/messageCenter/updateTopicReadTime.ts index cc48f60d56..58b1024491 100644 --- a/src/server/controller/messageCenter/updateTopicReadTime.ts +++ b/src/server/controller/messageCenter/updateTopicReadTime.ts @@ -1,9 +1,9 @@ -import { Assessment, Cycle } from '@meta/assessment' -import { MessageTopic } from '@meta/messageCenter' -import { User } from '@meta/user' +import { Assessment, Cycle } from 'meta/assessment' +import { MessageTopic } from 'meta/messageCenter' +import { User } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { MessageTopicUserRepository } from '@server/repository/assessmentCycle/messageTopicUser' +import { BaseProtocol, DB } from 'server/db' +import { MessageTopicUserRepository } from 'server/repository/assessmentCycle/messageTopicUser' export const updateTopicReadTime = async ( props: { diff --git a/src/server/controller/messageCenter/updateTopicStatus.ts b/src/server/controller/messageCenter/updateTopicStatus.ts index 8986026260..51d8bf556a 100644 --- a/src/server/controller/messageCenter/updateTopicStatus.ts +++ b/src/server/controller/messageCenter/updateTopicStatus.ts @@ -1,11 +1,11 @@ -import { CountryIso } from '@meta/area' -import { ActivityLogMessage, Assessment, Cycle } from '@meta/assessment' -import { MessageTopic, MessageTopicStatus } from '@meta/messageCenter' -import { User } from '@meta/user' +import { CountryIso } from 'meta/area' +import { ActivityLogMessage, Assessment, Cycle } from 'meta/assessment' +import { MessageTopic, MessageTopicStatus } from 'meta/messageCenter' +import { User } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { MessageTopicRepository } from '@server/repository/assessmentCycle/messageTopic' -import { ActivityLogRepository } from '@server/repository/public/activityLog' +import { BaseProtocol, DB } from 'server/db' +import { MessageTopicRepository } from 'server/repository/assessmentCycle/messageTopic' +import { ActivityLogRepository } from 'server/repository/public/activityLog' export const updateTopicStatus = async ( props: { diff --git a/src/server/controller/metadata/createSection.ts b/src/server/controller/metadata/createSection.ts index cf98702dc4..188b064a83 100644 --- a/src/server/controller/metadata/createSection.ts +++ b/src/server/controller/metadata/createSection.ts @@ -1,9 +1,9 @@ -import { ActivityLogMessage, Assessment, Section } from '@meta/assessment' -import { User } from '@meta/user' +import { ActivityLogMessage, Assessment, Section } from 'meta/assessment' +import { User } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { SectionRepository } from '@server/repository/assessment/section' -import { ActivityLogRepository } from '@server/repository/public/activityLog' +import { BaseProtocol, DB } from 'server/db' +import { SectionRepository } from 'server/repository/assessment/section' +import { ActivityLogRepository } from 'server/repository/public/activityLog' export const createSection = async ( props: { user: User; assessment: Assessment; section: Pick }, diff --git a/src/server/controller/metadata/createSubSection.ts b/src/server/controller/metadata/createSubSection.ts index 5a7dd83240..95b69b0997 100644 --- a/src/server/controller/metadata/createSubSection.ts +++ b/src/server/controller/metadata/createSubSection.ts @@ -1,9 +1,9 @@ -import { ActivityLogMessage, Assessment, SubSection } from '@meta/assessment' -import { User } from '@meta/user' +import { ActivityLogMessage, Assessment, SubSection } from 'meta/assessment' +import { User } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { SectionRepository } from '@server/repository/assessment/section' -import { ActivityLogRepository } from '@server/repository/public/activityLog' +import { BaseProtocol, DB } from 'server/db' +import { SectionRepository } from 'server/repository/assessment/section' +import { ActivityLogRepository } from 'server/repository/public/activityLog' export const createSubSection = async ( props: { user: User; assessment: Assessment; section: Pick; parentSectionId: number }, diff --git a/src/server/controller/metadata/createTable.ts b/src/server/controller/metadata/createTable.ts index 0a313c56d9..0f085046a5 100644 --- a/src/server/controller/metadata/createTable.ts +++ b/src/server/controller/metadata/createTable.ts @@ -1,9 +1,9 @@ -import { ActivityLogMessage, Assessment, Table } from '@meta/assessment' -import { User } from '@meta/user' +import { ActivityLogMessage, Assessment, Table } from 'meta/assessment' +import { User } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { TableRepository } from '@server/repository/assessment/table' -import { ActivityLogRepository } from '@server/repository/public/activityLog' +import { BaseProtocol, DB } from 'server/db' +import { TableRepository } from 'server/repository/assessment/table' +import { ActivityLogRepository } from 'server/repository/public/activityLog' // Controller to create Table that belongs to a TableSection export const createTable = async ( diff --git a/src/server/controller/metadata/createTableSection.ts b/src/server/controller/metadata/createTableSection.ts index a8b12b4249..3477f81813 100644 --- a/src/server/controller/metadata/createTableSection.ts +++ b/src/server/controller/metadata/createTableSection.ts @@ -1,9 +1,9 @@ -import { ActivityLogMessage, Assessment, TableSection } from '@meta/assessment' -import { User } from '@meta/user' +import { ActivityLogMessage, Assessment, TableSection } from 'meta/assessment' +import { User } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { TableSectionRepository } from '@server/repository/assessment/tableSection' -import { ActivityLogRepository } from '@server/repository/public/activityLog' +import { BaseProtocol, DB } from 'server/db' +import { TableSectionRepository } from 'server/repository/assessment/tableSection' +import { ActivityLogRepository } from 'server/repository/public/activityLog' // Controller to create TableSection export const createTableSection = async ( diff --git a/src/server/controller/metadata/index.ts b/src/server/controller/metadata/index.ts index b5668a52ff..7156f99f91 100644 --- a/src/server/controller/metadata/index.ts +++ b/src/server/controller/metadata/index.ts @@ -1,6 +1,6 @@ -import { SectionRepository } from '@server/repository/assessment/section' -import { TableRepository } from '@server/repository/assessment/table' -import { TableSectionRepository } from '@server/repository/assessment/tableSection' +import { SectionRepository } from 'server/repository/assessment/section' +import { TableRepository } from 'server/repository/assessment/table' +import { TableSectionRepository } from 'server/repository/assessment/tableSection' import { createSection } from './createSection' import { createSubSection } from './createSubSection' diff --git a/src/server/controller/metadata/removeSection.ts b/src/server/controller/metadata/removeSection.ts index 27ccaa0470..b8a70fe0b6 100644 --- a/src/server/controller/metadata/removeSection.ts +++ b/src/server/controller/metadata/removeSection.ts @@ -1,9 +1,9 @@ -import { ActivityLogMessage, Assessment, Section } from '@meta/assessment' -import { User } from '@meta/user' +import { ActivityLogMessage, Assessment, Section } from 'meta/assessment' +import { User } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { SectionRepository } from '@server/repository/assessment/section' -import { ActivityLogRepository } from '@server/repository/public/activityLog' +import { BaseProtocol, DB } from 'server/db' +import { SectionRepository } from 'server/repository/assessment/section' +import { ActivityLogRepository } from 'server/repository/public/activityLog' export const removeSection = async ( props: { assessment: Assessment; section: Section; user?: User }, diff --git a/src/server/controller/metadata/removeTable.ts b/src/server/controller/metadata/removeTable.ts index a128d7cf69..565ad972b3 100644 --- a/src/server/controller/metadata/removeTable.ts +++ b/src/server/controller/metadata/removeTable.ts @@ -1,9 +1,9 @@ -import { ActivityLogMessage, Assessment, Table } from '@meta/assessment' -import { User } from '@meta/user' +import { ActivityLogMessage, Assessment, Table } from 'meta/assessment' +import { User } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { TableRepository } from '@server/repository/assessment/table' -import { ActivityLogRepository } from '@server/repository/public/activityLog' +import { BaseProtocol, DB } from 'server/db' +import { TableRepository } from 'server/repository/assessment/table' +import { ActivityLogRepository } from 'server/repository/public/activityLog' // Controller to remove Table export const removeTable = async ( diff --git a/src/server/controller/metadata/removeTableSection.ts b/src/server/controller/metadata/removeTableSection.ts index 69e38eb461..e8624d2b7f 100644 --- a/src/server/controller/metadata/removeTableSection.ts +++ b/src/server/controller/metadata/removeTableSection.ts @@ -1,9 +1,9 @@ -import { ActivityLogMessage, Assessment, TableSection } from '@meta/assessment' -import { User } from '@meta/user' +import { ActivityLogMessage, Assessment, TableSection } from 'meta/assessment' +import { User } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { TableSectionRepository } from '@server/repository/assessment/tableSection' -import { ActivityLogRepository } from '@server/repository/public/activityLog' +import { BaseProtocol, DB } from 'server/db' +import { TableSectionRepository } from 'server/repository/assessment/tableSection' +import { ActivityLogRepository } from 'server/repository/public/activityLog' // Controller to remove TableSection export const removeTableSection = async ( diff --git a/src/server/controller/metadata/updateSection.ts b/src/server/controller/metadata/updateSection.ts index 0c2fb90391..46f2af8e79 100644 --- a/src/server/controller/metadata/updateSection.ts +++ b/src/server/controller/metadata/updateSection.ts @@ -1,9 +1,9 @@ -import { ActivityLogMessage, Assessment, Section } from '@meta/assessment' -import { User } from '@meta/user' +import { ActivityLogMessage, Assessment, Section } from 'meta/assessment' +import { User } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { SectionRepository } from '@server/repository/assessment/section' -import { ActivityLogRepository } from '@server/repository/public/activityLog' +import { BaseProtocol, DB } from 'server/db' +import { SectionRepository } from 'server/repository/assessment/section' +import { ActivityLogRepository } from 'server/repository/public/activityLog' export const updateSection = async ( props: { user: User; assessment: Assessment; section: Section }, diff --git a/src/server/controller/metadata/updateSubSection.ts b/src/server/controller/metadata/updateSubSection.ts index adf2b6cc7d..c7d56a30d7 100644 --- a/src/server/controller/metadata/updateSubSection.ts +++ b/src/server/controller/metadata/updateSubSection.ts @@ -1,9 +1,9 @@ -import { ActivityLogMessage, Assessment, SubSection } from '@meta/assessment' -import { User } from '@meta/user' +import { ActivityLogMessage, Assessment, SubSection } from 'meta/assessment' +import { User } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { SectionRepository } from '@server/repository/assessment/section' -import { ActivityLogRepository } from '@server/repository/public/activityLog' +import { BaseProtocol, DB } from 'server/db' +import { SectionRepository } from 'server/repository/assessment/section' +import { ActivityLogRepository } from 'server/repository/public/activityLog' export const updateSubSection = async ( props: { user: User; assessment: Assessment; section: SubSection; parentSectionId?: number }, diff --git a/src/server/controller/metadata/updateTable.ts b/src/server/controller/metadata/updateTable.ts index fd82004fd3..7d5c9f87c3 100644 --- a/src/server/controller/metadata/updateTable.ts +++ b/src/server/controller/metadata/updateTable.ts @@ -1,9 +1,9 @@ -import { ActivityLogMessage, Assessment, Table } from '@meta/assessment' -import { User } from '@meta/user' +import { ActivityLogMessage, Assessment, Table } from 'meta/assessment' +import { User } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { TableRepository } from '@server/repository/assessment/table' -import { ActivityLogRepository } from '@server/repository/public/activityLog' +import { BaseProtocol, DB } from 'server/db' +import { TableRepository } from 'server/repository/assessment/table' +import { ActivityLogRepository } from 'server/repository/public/activityLog' // Controller to update Table export const updateTable = async ( diff --git a/src/server/controller/metadata/updateTableSection.ts b/src/server/controller/metadata/updateTableSection.ts index 65649bf040..c644f767d9 100644 --- a/src/server/controller/metadata/updateTableSection.ts +++ b/src/server/controller/metadata/updateTableSection.ts @@ -1,9 +1,9 @@ -import { ActivityLogMessage, Assessment, TableSection } from '@meta/assessment' -import { User } from '@meta/user' +import { ActivityLogMessage, Assessment, TableSection } from 'meta/assessment' +import { User } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { TableSectionRepository } from '@server/repository/assessment/tableSection' -import { ActivityLogRepository } from '@server/repository/public/activityLog' +import { BaseProtocol, DB } from 'server/db' +import { TableSectionRepository } from 'server/repository/assessment/tableSection' +import { ActivityLogRepository } from 'server/repository/public/activityLog' // Controller to update TableSection export const updateTableSection = async ( diff --git a/src/server/controller/settings/read.ts b/src/server/controller/settings/read.ts index 88fff8992e..118618c637 100644 --- a/src/server/controller/settings/read.ts +++ b/src/server/controller/settings/read.ts @@ -1,6 +1,6 @@ -import { Settings } from '@meta/assessment' -import { BaseProtocol, DB } from '@server/db' -import { SettingsRepository } from '@server/repository/public/settings' +import { Settings } from 'meta/assessment' +import { BaseProtocol, DB } from 'server/db' +import { SettingsRepository } from 'server/repository/public/settings' export const read = async (client: BaseProtocol = DB): Promise => { return SettingsRepository.read(client) diff --git a/src/server/controller/settings/update.ts b/src/server/controller/settings/update.ts index d6147ea4ee..d29d9f85b1 100644 --- a/src/server/controller/settings/update.ts +++ b/src/server/controller/settings/update.ts @@ -1,6 +1,6 @@ -import { Settings } from '@meta/assessment/settings' -import { BaseProtocol, DB } from '@server/db' -import { SettingsRepository } from '@server/repository/public/settings' +import { Settings } from 'meta/assessment/settings' +import { BaseProtocol, DB } from 'server/db' +import { SettingsRepository } from 'server/repository/public/settings' export const update = async ( props: { diff --git a/src/server/controller/user/acceptInvitation.ts b/src/server/controller/user/acceptInvitation.ts index 0918f7f251..0e6edca3ea 100644 --- a/src/server/controller/user/acceptInvitation.ts +++ b/src/server/controller/user/acceptInvitation.ts @@ -1,11 +1,11 @@ -import { ActivityLogMessage, Assessment, Cycle } from '@meta/assessment' -import { RoleName, User, UserRole, UserStatus } from '@meta/user' -import { UserRoles } from '@meta/user/userRoles' - -import { BaseProtocol, DB } from '@server/db' -import { ActivityLogRepository } from '@server/repository/public/activityLog' -import { UserRepository } from '@server/repository/public/user' -import { UserRoleRepository } from '@server/repository/public/userRole' +import { ActivityLogMessage, Assessment, Cycle } from 'meta/assessment' +import { RoleName, User, UserRole, UserStatus } from 'meta/user' +import { UserRoles } from 'meta/user/userRoles' + +import { BaseProtocol, DB } from 'server/db' +import { ActivityLogRepository } from 'server/repository/public/activityLog' +import { UserRepository } from 'server/repository/public/user' +import { UserRoleRepository } from 'server/repository/public/userRole' export const acceptInvitation = async ( props: { diff --git a/src/server/controller/user/changePassword.ts b/src/server/controller/user/changePassword.ts index 81d95fa5d2..bde55fdf6b 100644 --- a/src/server/controller/user/changePassword.ts +++ b/src/server/controller/user/changePassword.ts @@ -1,9 +1,9 @@ -import { UserResetPassword } from '@meta/user' +import { UserResetPassword } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { UserRepository } from '@server/repository/public/user' -import { UserProviderRepository } from '@server/repository/public/userProvider' -import { UserResetPasswordRepository } from '@server/repository/public/userResetPassword' +import { BaseProtocol, DB } from 'server/db' +import { UserRepository } from 'server/repository/public/user' +import { UserProviderRepository } from 'server/repository/public/userProvider' +import { UserResetPasswordRepository } from 'server/repository/public/userResetPassword' export const changePassword = async ( props: { diff --git a/src/server/controller/user/create.ts b/src/server/controller/user/create.ts index 525c2e310d..5ddb6e8e28 100644 --- a/src/server/controller/user/create.ts +++ b/src/server/controller/user/create.ts @@ -1,10 +1,10 @@ -import { User, UserAuthProvider } from '@meta/user' -import { UserProps } from '@meta/user/user' -import { AuthProviderGoogleProps, AuthProviderLocalProps } from '@meta/user/userAuth' +import { User, UserAuthProvider } from 'meta/user' +import { UserProps } from 'meta/user/user' +import { AuthProviderGoogleProps, AuthProviderLocalProps } from 'meta/user/userAuth' -import { BaseProtocol, DB } from '@server/db' -import { UserRepository } from '@server/repository/public/user' -import { UserProviderRepository } from '@server/repository/public/userProvider' +import { BaseProtocol, DB } from 'server/db' +import { UserRepository } from 'server/repository/public/user' +import { UserProviderRepository } from 'server/repository/public/userProvider' export const create = async ( props: { diff --git a/src/server/controller/user/createResetPassword.ts b/src/server/controller/user/createResetPassword.ts index 8ec09937b2..7d17b992eb 100644 --- a/src/server/controller/user/createResetPassword.ts +++ b/src/server/controller/user/createResetPassword.ts @@ -1,9 +1,9 @@ -import { AssessmentName } from '@meta/assessment' -import { User, UserResetPassword } from '@meta/user' +import { AssessmentName } from 'meta/assessment' +import { User, UserResetPassword } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { UserResetPasswordRepository } from '@server/repository/public/userResetPassword' -import { MailService } from '@server/service' +import { BaseProtocol, DB } from 'server/db' +import { UserResetPasswordRepository } from 'server/repository/public/userResetPassword' +import { MailService } from 'server/service' export const createResetPassword = async ( props: { assessmentName: AssessmentName; cycleName: string; user: User }, diff --git a/src/server/controller/user/findByInvitation.ts b/src/server/controller/user/findByInvitation.ts index ca4e4432cd..13da9af9ac 100644 --- a/src/server/controller/user/findByInvitation.ts +++ b/src/server/controller/user/findByInvitation.ts @@ -1,11 +1,11 @@ -import { Assessment } from '@meta/assessment' -import { AuthProvider, RoleName, User, UserRole } from '@meta/user' +import { Assessment } from 'meta/assessment' +import { AuthProvider, RoleName, User, UserRole } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { AssessmentRepository } from '@server/repository/assessment/assessment' -import { UserRepository } from '@server/repository/public/user' -import { UserProviderRepository } from '@server/repository/public/userProvider' -import { UserRoleRepository } from '@server/repository/public/userRole' +import { BaseProtocol, DB } from 'server/db' +import { AssessmentRepository } from 'server/repository/assessment/assessment' +import { UserRepository } from 'server/repository/public/user' +import { UserProviderRepository } from 'server/repository/public/userProvider' +import { UserRoleRepository } from 'server/repository/public/userRole' export const findByInvitation = async ( props: { invitationUuid: string }, diff --git a/src/server/controller/user/findByResetPassword.ts b/src/server/controller/user/findByResetPassword.ts index 9d87a8eb8d..64d54dc6ff 100644 --- a/src/server/controller/user/findByResetPassword.ts +++ b/src/server/controller/user/findByResetPassword.ts @@ -1,8 +1,8 @@ -import { User, UserResetPassword } from '@meta/user' +import { User, UserResetPassword } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { UserRepository } from '@server/repository/public/user' -import { UserResetPasswordRepository } from '@server/repository/public/userResetPassword' +import { BaseProtocol, DB } from 'server/db' +import { UserRepository } from 'server/repository/public/user' +import { UserResetPasswordRepository } from 'server/repository/public/userResetPassword' export const findByResetPassword = async ( props: { resetPasswordUuid: string }, diff --git a/src/server/controller/user/index.ts b/src/server/controller/user/index.ts index f99cc727be..6fa1092dfc 100644 --- a/src/server/controller/user/index.ts +++ b/src/server/controller/user/index.ts @@ -1,5 +1,5 @@ -import { UserRepository } from '@server/repository/public/user' -import { UserRoleRepository } from '@server/repository/public/userRole' +import { UserRepository } from 'server/repository/public/user' +import { UserRoleRepository } from 'server/repository/public/userRole' import { acceptInvitation } from './acceptInvitation' import { changePassword } from './changePassword' diff --git a/src/server/controller/user/invite.ts b/src/server/controller/user/invite.ts index e8165700ae..09b18534de 100644 --- a/src/server/controller/user/invite.ts +++ b/src/server/controller/user/invite.ts @@ -1,12 +1,12 @@ -import { CountryIso } from '@meta/area' -import { ActivityLogMessage, Assessment, Cycle } from '@meta/assessment' -import { RoleName, User, UserRole } from '@meta/user' +import { CountryIso } from 'meta/area' +import { ActivityLogMessage, Assessment, Cycle } from 'meta/assessment' +import { RoleName, User, UserRole } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { ActivityLogRepository } from '@server/repository/public/activityLog' -import { UserRepository } from '@server/repository/public/user' -import { UserRoleRepository } from '@server/repository/public/userRole' -import { MailService } from '@server/service' +import { BaseProtocol, DB } from 'server/db' +import { ActivityLogRepository } from 'server/repository/public/activityLog' +import { UserRepository } from 'server/repository/public/user' +import { UserRoleRepository } from 'server/repository/public/userRole' +import { MailService } from 'server/service' export const invite = async ( props: { diff --git a/src/server/controller/user/remove.ts b/src/server/controller/user/remove.ts index 6c51e93a41..562ce00a22 100644 --- a/src/server/controller/user/remove.ts +++ b/src/server/controller/user/remove.ts @@ -1,9 +1,9 @@ -import { ActivityLogMessage } from '@meta/assessment' -import { User } from '@meta/user' +import { ActivityLogMessage } from 'meta/assessment' +import { User } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { ActivityLogRepository } from '@server/repository/public/activityLog' -import { UserRepository } from '@server/repository/public/user' +import { BaseProtocol, DB } from 'server/db' +import { ActivityLogRepository } from 'server/repository/public/activityLog' +import { UserRepository } from 'server/repository/public/user' export const remove = async ( props: { diff --git a/src/server/controller/user/removeInvitation.ts b/src/server/controller/user/removeInvitation.ts index 9be22c8fb9..26c405b564 100644 --- a/src/server/controller/user/removeInvitation.ts +++ b/src/server/controller/user/removeInvitation.ts @@ -1,11 +1,11 @@ -import { CountryIso } from '@meta/area' -import { ActivityLogMessage, Assessment, Cycle } from '@meta/assessment' -import { RoleName, User, UserRole } from '@meta/user' +import { CountryIso } from 'meta/area' +import { ActivityLogMessage, Assessment, Cycle } from 'meta/assessment' +import { RoleName, User, UserRole } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { ActivityLogRepository } from '@server/repository/public/activityLog' -import { UserRepository } from '@server/repository/public/user' -import { UserRoleRepository } from '@server/repository/public/userRole' +import { BaseProtocol, DB } from 'server/db' +import { ActivityLogRepository } from 'server/repository/public/activityLog' +import { UserRepository } from 'server/repository/public/user' +import { UserRoleRepository } from 'server/repository/public/userRole' export const removeInvitation = async ( props: { diff --git a/src/server/controller/user/sendInvitationEmail.ts b/src/server/controller/user/sendInvitationEmail.ts index f11c928f2c..0baed71f98 100644 --- a/src/server/controller/user/sendInvitationEmail.ts +++ b/src/server/controller/user/sendInvitationEmail.ts @@ -1,10 +1,10 @@ -import { RoleName, UserRole } from '@meta/user' -import { UserRoles } from '@meta/user/userRoles' +import { RoleName, UserRole } from 'meta/user' +import { UserRoles } from 'meta/user/userRoles' -import { BaseProtocol, DB } from '@server/db' -import { UserRepository } from '@server/repository/public/user' -import { UserRoleRepository } from '@server/repository/public/userRole' -import { MailService } from '@server/service' +import { BaseProtocol, DB } from 'server/db' +import { UserRepository } from 'server/repository/public/user' +import { UserRoleRepository } from 'server/repository/public/userRole' +import { MailService } from 'server/service' import { AssessmentController } from '../assessment' diff --git a/src/server/controller/user/update.ts b/src/server/controller/user/update.ts index 935240a0dd..2245673326 100644 --- a/src/server/controller/user/update.ts +++ b/src/server/controller/user/update.ts @@ -1,9 +1,9 @@ -import { ActivityLogMessage } from '@meta/assessment' -import { User } from '@meta/user' +import { ActivityLogMessage } from 'meta/assessment' +import { User } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { ActivityLogRepository } from '@server/repository/public/activityLog' -import { UserRepository } from '@server/repository/public/user' +import { BaseProtocol, DB } from 'server/db' +import { ActivityLogRepository } from 'server/repository/public/activityLog' +import { UserRepository } from 'server/repository/public/user' export const update = async ( props: { diff --git a/src/server/controller/user/updateUserRoles.ts b/src/server/controller/user/updateUserRoles.ts index c7eed86cca..52a4188c55 100644 --- a/src/server/controller/user/updateUserRoles.ts +++ b/src/server/controller/user/updateUserRoles.ts @@ -1,10 +1,10 @@ -import { ActivityLogMessage } from '@meta/assessment' -import { RoleName, User, UserRole } from '@meta/user' +import { ActivityLogMessage } from 'meta/assessment' +import { RoleName, User, UserRole } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { ActivityLogRepository } from '@server/repository/public/activityLog' -import { UserRepository } from '@server/repository/public/user' -import { UserRoleRepository } from '@server/repository/public/userRole' +import { BaseProtocol, DB } from 'server/db' +import { ActivityLogRepository } from 'server/repository/public/activityLog' +import { UserRepository } from 'server/repository/public/user' +import { UserRoleRepository } from 'server/repository/public/userRole' export const updateUserRoles = async ( props: { diff --git a/src/server/controller/userProvider/create.ts b/src/server/controller/userProvider/create.ts index a6e1b6521d..d6015afeb4 100644 --- a/src/server/controller/userProvider/create.ts +++ b/src/server/controller/userProvider/create.ts @@ -1,7 +1,7 @@ -import { User, UserAuthProvider } from '@meta/user' +import { User, UserAuthProvider } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { UserProviderRepository } from '@server/repository/public/userProvider' +import { BaseProtocol, DB } from 'server/db' +import { UserProviderRepository } from 'server/repository/public/userProvider' export const create = async

( props: { diff --git a/src/server/controller/userProvider/index.ts b/src/server/controller/userProvider/index.ts index 59c9bf2a80..0a8ab1ef64 100644 --- a/src/server/controller/userProvider/index.ts +++ b/src/server/controller/userProvider/index.ts @@ -1,4 +1,4 @@ -import { UserProviderRepository } from '@server/repository/public/userProvider' +import { UserProviderRepository } from 'server/repository/public/userProvider' import { create } from './create' import { read } from './read' diff --git a/src/server/controller/userProvider/read.ts b/src/server/controller/userProvider/read.ts index 4979523cfe..9ce5a57ec7 100644 --- a/src/server/controller/userProvider/read.ts +++ b/src/server/controller/userProvider/read.ts @@ -1,7 +1,7 @@ -import { AuthProvider, User, UserAuthProvider } from '@meta/user' +import { AuthProvider, User, UserAuthProvider } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { UserProviderRepository } from '@server/repository/public/userProvider' +import { BaseProtocol, DB } from 'server/db' +import { UserProviderRepository } from 'server/repository/public/userProvider' export const read = async

( props: { diff --git a/src/server/db/schemas.ts b/src/server/db/schemas.ts index f3993c2434..f2528b3b92 100644 --- a/src/server/db/schemas.ts +++ b/src/server/db/schemas.ts @@ -1,4 +1,4 @@ -import { Assessment, Cycle } from '@meta/assessment' +import { Assessment, Cycle } from 'meta/assessment' const getName = (assessment: Pick): string => { return `assessment_${assessment.props.name}`.toLowerCase() diff --git a/src/server/middleware/auth.ts b/src/server/middleware/auth.ts index 68b248f227..e655617c83 100644 --- a/src/server/middleware/auth.ts +++ b/src/server/middleware/auth.ts @@ -1,16 +1,16 @@ import { NextFunction, Request, Response } from 'express' -import { CycleDataParams, CycleParams } from '@meta/api/request' -import { CountryIso } from '@meta/area' -import { MessageTopicStatus } from '@meta/messageCenter' -import { Authorizer, CollaboratorEditPropertyType, Users } from '@meta/user' - -import { AreaController } from '@server/controller/area' -import { AssessmentController } from '@server/controller/assessment' -import { MessageCenterController } from '@server/controller/messageCenter' -import { MetadataController } from '@server/controller/metadata' -import { tryCatch } from '@server/middleware/tryCatch' -import { Requests } from '@server/utils' +import { CycleDataParams, CycleParams } from 'meta/api/request' +import { CountryIso } from 'meta/area' +import { MessageTopicStatus } from 'meta/messageCenter' +import { Authorizer, CollaboratorEditPropertyType, Users } from 'meta/user' + +import { AreaController } from 'server/controller/area' +import { AssessmentController } from 'server/controller/assessment' +import { MessageCenterController } from 'server/controller/messageCenter' +import { MetadataController } from 'server/controller/metadata' +import { tryCatch } from 'server/middleware/tryCatch' +import { Requests } from 'server/utils' const _next = (allowed: boolean, next: NextFunction): void => { if (allowed) return next() diff --git a/src/server/middleware/validation/geoSchemes.ts b/src/server/middleware/validation/geoSchemes.ts index f0d438e243..ec2ae17dba 100644 --- a/src/server/middleware/validation/geoSchemes.ts +++ b/src/server/middleware/validation/geoSchemes.ts @@ -1,6 +1,6 @@ import { body, query } from 'express-validator' -import { BurnedAreaKey, ForestSource, LayerSource, ProtectedAreaKey } from '@meta/geo' +import { BurnedAreaKey, ForestSource, LayerSource, ProtectedAreaKey } from 'meta/geo' const sourceKeys = Object.keys(ForestSource).concat(Object.keys(ProtectedAreaKey)).concat(Object.keys(BurnedAreaKey)) diff --git a/src/server/proxy/proxy.ts b/src/server/proxy/proxy.ts index 8c7d53f12c..079bebdc55 100644 --- a/src/server/proxy/proxy.ts +++ b/src/server/proxy/proxy.ts @@ -1,6 +1,6 @@ import { Express } from 'express' -import { ApiEndPoint } from '@meta/api/endpoint' -import { sepalProxy } from '@server/proxy/sepalProxy' +import { ApiEndPoint } from 'meta/api/endpoint' +import { sepalProxy } from 'server/proxy/sepalProxy' export const Proxy = { init: (express: Express): void => { diff --git a/src/server/proxy/sepalProxy.ts b/src/server/proxy/sepalProxy.ts index 99c9dc5781..043b8296f8 100644 --- a/src/server/proxy/sepalProxy.ts +++ b/src/server/proxy/sepalProxy.ts @@ -1,7 +1,7 @@ import { createProxyMiddleware } from 'http-proxy-middleware' import { Request, Response } from 'express' -import { ApiEndPoint } from '@meta/api/endpoint' +import { ApiEndPoint } from 'meta/api/endpoint' const authString = `Basic ${Buffer.from(`${process.env.SEPAL_USER}:${process.env.SEPAL_PASSWORD}`).toString('base64')}` diff --git a/src/server/repository/adapter/assessment.ts b/src/server/repository/adapter/assessment.ts index 26a678588e..0ceaebbf7a 100644 --- a/src/server/repository/adapter/assessment.ts +++ b/src/server/repository/adapter/assessment.ts @@ -1,6 +1,6 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Assessment, AssessmentMetaCache, AssessmentProps } from '@meta/assessment' +import { Assessment, AssessmentMetaCache, AssessmentProps } from 'meta/assessment' interface AssessmentDB { id: number diff --git a/src/server/repository/adapter/col.ts b/src/server/repository/adapter/col.ts index 5ab6f6dcb4..9bebad5050 100644 --- a/src/server/repository/adapter/col.ts +++ b/src/server/repository/adapter/col.ts @@ -1,6 +1,6 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Col, ColProps } from '@meta/assessment' +import { Col, ColProps } from 'meta/assessment' export interface ColDB { id: number diff --git a/src/server/repository/adapter/row.ts b/src/server/repository/adapter/row.ts index 6b63bd67fa..e717345fb4 100644 --- a/src/server/repository/adapter/row.ts +++ b/src/server/repository/adapter/row.ts @@ -1,8 +1,8 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Row, RowProps } from '@meta/assessment' +import { Row, RowProps } from 'meta/assessment' -import { ColAdapter, ColDB } from '@server/repository/adapter/col' +import { ColAdapter, ColDB } from 'server/repository/adapter/col' export interface RowDB { id: number diff --git a/src/server/repository/adapter/section.ts b/src/server/repository/adapter/section.ts index acbd068101..01ff739d77 100644 --- a/src/server/repository/adapter/section.ts +++ b/src/server/repository/adapter/section.ts @@ -1,6 +1,6 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Section, SectionProps, SubSection, SubSectionProps } from '@meta/assessment' +import { Section, SectionProps, SubSection, SubSectionProps } from 'meta/assessment' interface SectionDB { id: number diff --git a/src/server/repository/adapter/table.ts b/src/server/repository/adapter/table.ts index 87d6fcf9b0..793c4fd35a 100644 --- a/src/server/repository/adapter/table.ts +++ b/src/server/repository/adapter/table.ts @@ -1,8 +1,8 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Table, TableProps } from '@meta/assessment' +import { Table, TableProps } from 'meta/assessment' -import { RowAdapter, RowDB } from '@server/repository/adapter/row' +import { RowAdapter, RowDB } from 'server/repository/adapter/row' export interface TableDB { id: number diff --git a/src/server/repository/adapter/tableSection.ts b/src/server/repository/adapter/tableSection.ts index 3a43194c5d..0173e853d0 100644 --- a/src/server/repository/adapter/tableSection.ts +++ b/src/server/repository/adapter/tableSection.ts @@ -1,8 +1,8 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { TableSection, TableSectionProps } from '@meta/assessment' +import { TableSection, TableSectionProps } from 'meta/assessment' -import { TableAdapter, TableDB } from '@server/repository/adapter/table' +import { TableAdapter, TableDB } from 'server/repository/adapter/table' export interface TableSectionDB { id: number diff --git a/src/server/repository/adapter/userRole.ts b/src/server/repository/adapter/userRole.ts index 990760039d..66d30f1cab 100644 --- a/src/server/repository/adapter/userRole.ts +++ b/src/server/repository/adapter/userRole.ts @@ -1,6 +1,6 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { CollaboratorPermissions, RoleName, UserRole } from '@meta/user' +import { CollaboratorPermissions, RoleName, UserRole } from 'meta/user' export const UserRoleAdapter = ({ permissions, ...role }: any): UserRole => ({ ...Objects.camelize(role), diff --git a/src/server/repository/assessment/assessment/createAssessment.ts b/src/server/repository/assessment/assessment/createAssessment.ts index a7c3e28643..8e381157c3 100644 --- a/src/server/repository/assessment/assessment/createAssessment.ts +++ b/src/server/repository/assessment/assessment/createAssessment.ts @@ -1,9 +1,9 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Assessment } from '@meta/assessment' +import { Assessment } from 'meta/assessment' -import { BaseProtocol, DB } from '@server/db' -import { getOne } from '@server/repository/assessment/assessment/getOne' +import { BaseProtocol, DB } from 'server/db' +import { getOne } from 'server/repository/assessment/assessment/getOne' export const createAssessment = async ( params: { diff --git a/src/server/repository/assessment/assessment/createAssessmentSchema.ts b/src/server/repository/assessment/assessment/createAssessmentSchema.ts index fd0d089d14..3d9dc42403 100644 --- a/src/server/repository/assessment/assessment/createAssessmentSchema.ts +++ b/src/server/repository/assessment/assessment/createAssessmentSchema.ts @@ -1,6 +1,6 @@ -import { Assessment } from '@meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' -import { getCreateSchemaDDL } from '@server/repository/assessment/assessment/getCreateSchemaDDL' +import { Assessment } from 'meta/assessment' +import { BaseProtocol, DB, Schemas } from 'server/db' +import { getCreateSchemaDDL } from 'server/repository/assessment/assessment/getCreateSchemaDDL' export const createAssessmentSchema = async ( params: { diff --git a/src/server/repository/assessment/assessment/getAll.ts b/src/server/repository/assessment/assessment/getAll.ts index 411b9cffa0..ecb52d5676 100644 --- a/src/server/repository/assessment/assessment/getAll.ts +++ b/src/server/repository/assessment/assessment/getAll.ts @@ -1,7 +1,7 @@ -import { Assessment } from '@meta/assessment' +import { Assessment } from 'meta/assessment' -import { BaseProtocol, DB } from '@server/db' -import { AssessmentAdapter } from '@server/repository/adapter' +import { BaseProtocol, DB } from 'server/db' +import { AssessmentAdapter } from 'server/repository/adapter' import { selectFields } from './selectFields' diff --git a/src/server/repository/assessment/assessment/getOne.ts b/src/server/repository/assessment/assessment/getOne.ts index a2060b4635..7b90540678 100644 --- a/src/server/repository/assessment/assessment/getOne.ts +++ b/src/server/repository/assessment/assessment/getOne.ts @@ -1,7 +1,7 @@ -import { Assessment } from '@meta/assessment' +import { Assessment } from 'meta/assessment' -import { BaseProtocol, DB } from '@server/db' -import { AssessmentAdapter } from '@server/repository/adapter' +import { BaseProtocol, DB } from 'server/db' +import { AssessmentAdapter } from 'server/repository/adapter' import { selectFields } from './selectFields' diff --git a/src/server/repository/assessment/assessment/removeAssessment.ts b/src/server/repository/assessment/assessment/removeAssessment.ts index d169a90e7d..c862a1c6a4 100644 --- a/src/server/repository/assessment/assessment/removeAssessment.ts +++ b/src/server/repository/assessment/assessment/removeAssessment.ts @@ -1,5 +1,5 @@ -import { Assessment } from '@meta/assessment' -import { BaseProtocol, DB } from '@server/db' +import { Assessment } from 'meta/assessment' +import { BaseProtocol, DB } from 'server/db' export const removeAssessment = async ( params: { diff --git a/src/server/repository/assessment/assessment/removeAssessmentSchema.ts b/src/server/repository/assessment/assessment/removeAssessmentSchema.ts index 1d36dd44ba..a0c2e15053 100644 --- a/src/server/repository/assessment/assessment/removeAssessmentSchema.ts +++ b/src/server/repository/assessment/assessment/removeAssessmentSchema.ts @@ -1,5 +1,5 @@ -import { Assessment } from '@meta/assessment' -import { DB, Schemas } from '@server/db' +import { Assessment } from 'meta/assessment' +import { DB, Schemas } from 'server/db' export const removeAssessmentSchema = async (props: { assessment: Assessment }): Promise => { const { assessment } = props diff --git a/src/server/repository/assessment/assessment/updateAssessment.ts b/src/server/repository/assessment/assessment/updateAssessment.ts index 65cae9bffa..9728dd5555 100644 --- a/src/server/repository/assessment/assessment/updateAssessment.ts +++ b/src/server/repository/assessment/assessment/updateAssessment.ts @@ -1,7 +1,7 @@ -import { Assessment, Cycle } from '@meta/assessment' +import { Assessment, Cycle } from 'meta/assessment' -import { BaseProtocol, DB } from '@server/db' -import { getOne } from '@server/repository/assessment/assessment/getOne' +import { BaseProtocol, DB } from 'server/db' +import { getOne } from 'server/repository/assessment/assessment/getOne' export const updateDefaultCycle = async ( params: { diff --git a/src/server/repository/assessment/col/getMany.ts b/src/server/repository/assessment/col/getMany.ts index ec5a52cb28..42203bea48 100644 --- a/src/server/repository/assessment/col/getMany.ts +++ b/src/server/repository/assessment/col/getMany.ts @@ -1,7 +1,7 @@ -import { Assessment, Col, ColType } from '@meta/assessment' +import { Assessment, Col, ColType } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' -import { ColAdapter } from '@server/repository/adapter/col' +import { BaseProtocol, DB, Schemas } from 'server/db' +import { ColAdapter } from 'server/repository/adapter/col' export const getMany = ( props: { assessment: Assessment; tableId?: number; rowId?: number }, diff --git a/src/server/repository/assessment/file/create.ts b/src/server/repository/assessment/file/create.ts index 948558edc4..34ea7ed3aa 100644 --- a/src/server/repository/assessment/file/create.ts +++ b/src/server/repository/assessment/file/create.ts @@ -1,9 +1,9 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { CountryIso } from '@meta/area' -import { Assessment, AssessmentFile } from '@meta/assessment' +import { CountryIso } from 'meta/area' +import { Assessment, AssessmentFile } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' export const create = async ( props: { assessment: Assessment; countryIso?: CountryIso; file: Express.Multer.File }, diff --git a/src/server/repository/assessment/file/getMany.ts b/src/server/repository/assessment/file/getMany.ts index 8a5e12d757..7eb3c4f0eb 100644 --- a/src/server/repository/assessment/file/getMany.ts +++ b/src/server/repository/assessment/file/getMany.ts @@ -1,9 +1,9 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { CountryIso } from '@meta/area' -import { Assessment, AssessmentFile } from '@meta/assessment' +import { CountryIso } from 'meta/area' +import { Assessment, AssessmentFile } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' const fields: Array = ['id', 'uuid', 'country_iso', 'file_name'] diff --git a/src/server/repository/assessment/file/getOne.ts b/src/server/repository/assessment/file/getOne.ts index d77d380251..79367f3742 100644 --- a/src/server/repository/assessment/file/getOne.ts +++ b/src/server/repository/assessment/file/getOne.ts @@ -1,6 +1,6 @@ -import { Assessment, AssessmentFile } from '@meta/assessment' +import { Assessment, AssessmentFile } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' export const getOne = async ( props: { assessment: Assessment; uuid: string }, diff --git a/src/server/repository/assessment/file/remove.ts b/src/server/repository/assessment/file/remove.ts index 578b8300f7..f207815b48 100644 --- a/src/server/repository/assessment/file/remove.ts +++ b/src/server/repository/assessment/file/remove.ts @@ -1,8 +1,8 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Assessment, AssessmentFile } from '@meta/assessment' +import { Assessment, AssessmentFile } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' export const remove = async ( props: { assessment: Assessment; uuid: string }, diff --git a/src/server/repository/assessment/row/getOne.ts b/src/server/repository/assessment/row/getOne.ts index ec83a683e4..5e7951201e 100644 --- a/src/server/repository/assessment/row/getOne.ts +++ b/src/server/repository/assessment/row/getOne.ts @@ -1,9 +1,9 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Assessment, Row } from '@meta/assessment' +import { Assessment, Row } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' -import { ColAdapter } from '@server/repository/adapter/col' +import { BaseProtocol, DB, Schemas } from 'server/db' +import { ColAdapter } from 'server/repository/adapter/col' type Props = { assessment: Assessment diff --git a/src/server/repository/assessment/section/create.ts b/src/server/repository/assessment/section/create.ts index 500fa27f14..10f59f5559 100644 --- a/src/server/repository/assessment/section/create.ts +++ b/src/server/repository/assessment/section/create.ts @@ -1,7 +1,7 @@ -import { Assessment, Section, SubSection } from '@meta/assessment' +import { Assessment, Section, SubSection } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' -import { SectionAdapter, SubSectionAdapter } from '@server/repository/adapter' +import { BaseProtocol, DB, Schemas } from 'server/db' +import { SectionAdapter, SubSectionAdapter } from 'server/repository/adapter' export const create = async ( params: { diff --git a/src/server/repository/assessment/section/getMany.ts b/src/server/repository/assessment/section/getMany.ts index 2bce7d1fec..9177c75a80 100644 --- a/src/server/repository/assessment/section/getMany.ts +++ b/src/server/repository/assessment/section/getMany.ts @@ -1,7 +1,7 @@ -import { Assessment, Cycle, Section } from '@meta/assessment' +import { Assessment, Cycle, Section } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' -import { SectionAdapter } from '@server/repository/adapter' +import { BaseProtocol, DB, Schemas } from 'server/db' +import { SectionAdapter } from 'server/repository/adapter' export const getMany = async ( props: { assessment: Assessment; cycle: Cycle; showHidden?: boolean }, diff --git a/src/server/repository/assessment/section/getManyMetadata.ts b/src/server/repository/assessment/section/getManyMetadata.ts index 39cfbb80b6..d1038574a7 100644 --- a/src/server/repository/assessment/section/getManyMetadata.ts +++ b/src/server/repository/assessment/section/getManyMetadata.ts @@ -1,7 +1,7 @@ -import { Assessment, Cycle, TableSection } from '@meta/assessment' +import { Assessment, Cycle, TableSection } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' -import { TableSectionAdapter } from '@server/repository/adapter' +import { BaseProtocol, DB, Schemas } from 'server/db' +import { TableSectionAdapter } from 'server/repository/adapter' export const getManyMetadata = async ( props: { diff --git a/src/server/repository/assessment/section/getOne.ts b/src/server/repository/assessment/section/getOne.ts index 810292ab2a..3c4d89967f 100644 --- a/src/server/repository/assessment/section/getOne.ts +++ b/src/server/repository/assessment/section/getOne.ts @@ -1,7 +1,7 @@ -import { Assessment, Cycle, Section } from '@meta/assessment' +import { Assessment, Cycle, Section } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' -import { SectionAdapter } from '@server/repository/adapter' +import { BaseProtocol, DB, Schemas } from 'server/db' +import { SectionAdapter } from 'server/repository/adapter' export const getOne = async ( props: diff --git a/src/server/repository/assessment/section/remove.ts b/src/server/repository/assessment/section/remove.ts index 199dc6fcd8..3509405194 100644 --- a/src/server/repository/assessment/section/remove.ts +++ b/src/server/repository/assessment/section/remove.ts @@ -1,7 +1,7 @@ -import { Assessment, Section } from '@meta/assessment' +import { Assessment, Section } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' -import { SectionAdapter } from '@server/repository/adapter' +import { BaseProtocol, DB, Schemas } from 'server/db' +import { SectionAdapter } from 'server/repository/adapter' export const remove = async ( params: { diff --git a/src/server/repository/assessment/section/update.ts b/src/server/repository/assessment/section/update.ts index 5f4850980f..84f5eef75d 100644 --- a/src/server/repository/assessment/section/update.ts +++ b/src/server/repository/assessment/section/update.ts @@ -1,7 +1,7 @@ -import { Assessment, Section, SubSection } from '@meta/assessment' +import { Assessment, Section, SubSection } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' -import { SectionAdapter, SubSectionAdapter } from '@server/repository/adapter' +import { BaseProtocol, DB, Schemas } from 'server/db' +import { SectionAdapter, SubSectionAdapter } from 'server/repository/adapter' export const update = async ( params: { diff --git a/src/server/repository/assessment/table/create.ts b/src/server/repository/assessment/table/create.ts index 5266e6e99f..5f29942c66 100644 --- a/src/server/repository/assessment/table/create.ts +++ b/src/server/repository/assessment/table/create.ts @@ -1,8 +1,8 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Assessment, Table } from '@meta/assessment' +import { Assessment, Table } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' // create Table export const create = async ( diff --git a/src/server/repository/assessment/table/getOne.ts b/src/server/repository/assessment/table/getOne.ts index 6aaea85e31..87a9d20b03 100644 --- a/src/server/repository/assessment/table/getOne.ts +++ b/src/server/repository/assessment/table/getOne.ts @@ -1,8 +1,8 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Assessment, Cycle, Table } from '@meta/assessment' +import { Assessment, Cycle, Table } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' export const getOne = async ( props: { assessment: Assessment; cycle: Cycle; tableName: string }, diff --git a/src/server/repository/assessment/table/remove.ts b/src/server/repository/assessment/table/remove.ts index af5d9e18d3..2166792945 100644 --- a/src/server/repository/assessment/table/remove.ts +++ b/src/server/repository/assessment/table/remove.ts @@ -1,8 +1,8 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Assessment, Table } from '@meta/assessment' +import { Assessment, Table } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' // remove item from table table export const remove = async ( diff --git a/src/server/repository/assessment/table/update.ts b/src/server/repository/assessment/table/update.ts index a9bd8fcc80..897fcf4005 100644 --- a/src/server/repository/assessment/table/update.ts +++ b/src/server/repository/assessment/table/update.ts @@ -1,8 +1,8 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Assessment, Table } from '@meta/assessment' +import { Assessment, Table } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' // Update table in database export const update = async ( diff --git a/src/server/repository/assessment/tableSection/create.ts b/src/server/repository/assessment/tableSection/create.ts index 9eceb25955..794c36fa8a 100644 --- a/src/server/repository/assessment/tableSection/create.ts +++ b/src/server/repository/assessment/tableSection/create.ts @@ -1,8 +1,8 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Assessment, TableSection } from '@meta/assessment' +import { Assessment, TableSection } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' // create TableSection export const create = async ( diff --git a/src/server/repository/assessment/tableSection/getOne.ts b/src/server/repository/assessment/tableSection/getOne.ts index 9da568ec0b..8a33bdf976 100644 --- a/src/server/repository/assessment/tableSection/getOne.ts +++ b/src/server/repository/assessment/tableSection/getOne.ts @@ -1,8 +1,8 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Assessment, Cycle, TableSection } from '@meta/assessment' +import { Assessment, Cycle, TableSection } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' // get One element from table_section table in database export const getOne = async ( diff --git a/src/server/repository/assessment/tableSection/remove.ts b/src/server/repository/assessment/tableSection/remove.ts index b047aa0790..9227f68668 100644 --- a/src/server/repository/assessment/tableSection/remove.ts +++ b/src/server/repository/assessment/tableSection/remove.ts @@ -1,8 +1,8 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Assessment, TableSection } from '@meta/assessment' +import { Assessment, TableSection } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' // remove item from table_section table export const remove = async ( diff --git a/src/server/repository/assessment/tableSection/update.ts b/src/server/repository/assessment/tableSection/update.ts index e42961967d..7a60059e0d 100644 --- a/src/server/repository/assessment/tableSection/update.ts +++ b/src/server/repository/assessment/tableSection/update.ts @@ -1,8 +1,8 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Assessment, TableSection } from '@meta/assessment' +import { Assessment, TableSection } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' // Update table_section in database export const update = async ( diff --git a/src/server/repository/assessmentCycle/country/getMany.ts b/src/server/repository/assessmentCycle/country/getMany.ts index c50afa473c..9c3b3a8244 100644 --- a/src/server/repository/assessmentCycle/country/getMany.ts +++ b/src/server/repository/assessmentCycle/country/getMany.ts @@ -1,10 +1,10 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Country } from '@meta/area' -import { ActivityLogMessage, Assessment, Cycle } from '@meta/assessment' +import { Country } from 'meta/area' +import { ActivityLogMessage, Assessment, Cycle } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' -import { isAtlantisAllowed } from '@server/repository/assessmentCycle/country/isAtlantisAllowed' +import { BaseProtocol, DB, Schemas } from 'server/db' +import { isAtlantisAllowed } from 'server/repository/assessmentCycle/country/isAtlantisAllowed' const activityLogMessageUpdates = [ ActivityLogMessage.nodeValueUpdate, diff --git a/src/server/repository/assessmentCycle/country/getOne.ts b/src/server/repository/assessmentCycle/country/getOne.ts index 3b9e8551ca..0d31d96f67 100644 --- a/src/server/repository/assessmentCycle/country/getOne.ts +++ b/src/server/repository/assessmentCycle/country/getOne.ts @@ -1,9 +1,9 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Country, CountryIso } from '@meta/area' -import { Assessment, Cycle } from '@meta/assessment' +import { Country, CountryIso } from 'meta/area' +import { Assessment, Cycle } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' export const getOne = async ( props: { countryIso: CountryIso; assessment: Assessment; cycle: Cycle }, diff --git a/src/server/repository/assessmentCycle/country/isAtlantisAllowed.ts b/src/server/repository/assessmentCycle/country/isAtlantisAllowed.ts index 6138ce9649..70d61fa891 100644 --- a/src/server/repository/assessmentCycle/country/isAtlantisAllowed.ts +++ b/src/server/repository/assessmentCycle/country/isAtlantisAllowed.ts @@ -1,6 +1,6 @@ -import { Assessment, Cycle } from '@meta/assessment' +import { Assessment, Cycle } from 'meta/assessment' -import { ProcessEnv } from '@server/utils' +import { ProcessEnv } from 'server/utils' export const isAtlantisAllowed = (assessment: Assessment, cycle: Cycle) => ProcessEnv.fraAtlantisAllowed.find( diff --git a/src/server/repository/assessmentCycle/country/update.ts b/src/server/repository/assessmentCycle/country/update.ts index db33b15f18..ff52b84a69 100644 --- a/src/server/repository/assessmentCycle/country/update.ts +++ b/src/server/repository/assessmentCycle/country/update.ts @@ -1,9 +1,9 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Country, CountryIso } from '@meta/area' -import { Assessment, Cycle } from '@meta/assessment' +import { Country, CountryIso } from 'meta/area' +import { Assessment, Cycle } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' export const update = async ( props: { country: Country; countryIso: CountryIso; assessment: Assessment; cycle: Cycle }, diff --git a/src/server/repository/assessmentCycle/cycle/create.ts b/src/server/repository/assessmentCycle/cycle/create.ts index 7ff976b8c1..3df9d5c47a 100644 --- a/src/server/repository/assessmentCycle/cycle/create.ts +++ b/src/server/repository/assessmentCycle/cycle/create.ts @@ -1,7 +1,7 @@ -import { Assessment, AssessmentMetaCache, Cycle } from '@meta/assessment' +import { Assessment, AssessmentMetaCache, Cycle } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' -import { AssessmentRepository } from '@server/repository/assessment/assessment' +import { BaseProtocol, DB, Schemas } from 'server/db' +import { AssessmentRepository } from 'server/repository/assessment/assessment' const defaultMetaCache: AssessmentMetaCache = { calculations: { dependants: {}, dependencies: {} }, diff --git a/src/server/repository/assessmentCycle/cycle/removeSchema.ts b/src/server/repository/assessmentCycle/cycle/removeSchema.ts index c5f4ab6898..95782e8ac7 100644 --- a/src/server/repository/assessmentCycle/cycle/removeSchema.ts +++ b/src/server/repository/assessmentCycle/cycle/removeSchema.ts @@ -1,5 +1,5 @@ -import { Assessment, Cycle } from '@meta/assessment' -import { DB, Schemas } from '@server/db' +import { Assessment, Cycle } from 'meta/assessment' +import { DB, Schemas } from 'server/db' export const removeSchema = async (params: { assessment: Assessment; cycle: Cycle }): Promise => { const { assessment, cycle } = params diff --git a/src/server/repository/assessmentCycle/data/clearTableData.ts b/src/server/repository/assessmentCycle/data/clearTableData.ts index eda680e7b4..f41a1e1e0e 100644 --- a/src/server/repository/assessmentCycle/data/clearTableData.ts +++ b/src/server/repository/assessmentCycle/data/clearTableData.ts @@ -1,10 +1,10 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { CountryIso } from '@meta/area' -import { Assessment, Cycle } from '@meta/assessment' -import { NodeUpdate } from '@meta/data' +import { CountryIso } from 'meta/area' +import { Assessment, Cycle } from 'meta/assessment' +import { NodeUpdate } from 'meta/data' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' type Props = { assessment: Assessment diff --git a/src/server/repository/assessmentCycle/data/ddl/getTableDataWithODPCreateViewDDL.ts b/src/server/repository/assessmentCycle/data/ddl/getTableDataWithODPCreateViewDDL.ts index a67cdba279..2155cd529d 100644 --- a/src/server/repository/assessmentCycle/data/ddl/getTableDataWithODPCreateViewDDL.ts +++ b/src/server/repository/assessmentCycle/data/ddl/getTableDataWithODPCreateViewDDL.ts @@ -1,7 +1,7 @@ -import { Assessment, Cycle, Table, TableNames } from '@meta/assessment' +import { Assessment, Cycle, Table, TableNames } from 'meta/assessment' -import { getOriginalDataPointVariables } from '@server/controller/cycleData/getOriginalDataPointVariables' -import { Schemas, Tables } from '@server/db' +import { getOriginalDataPointVariables } from 'server/controller/cycleData/getOriginalDataPointVariables' +import { Schemas, Tables } from 'server/db' type Props = { assessment: Assessment diff --git a/src/server/repository/assessmentCycle/data/getAggregatedTableData.ts b/src/server/repository/assessmentCycle/data/getAggregatedTableData.ts index 4c99f675b4..29fa32ac78 100644 --- a/src/server/repository/assessmentCycle/data/getAggregatedTableData.ts +++ b/src/server/repository/assessmentCycle/data/getAggregatedTableData.ts @@ -1,8 +1,8 @@ -import { Areas, CountryIso } from '@meta/area' -import { Assessment, Cycle } from '@meta/assessment' -import { RecordCountryData } from '@meta/data' +import { Areas, CountryIso } from 'meta/area' +import { Assessment, Cycle } from 'meta/assessment' +import { RecordCountryData } from 'meta/data' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' type Props = { assessment: Assessment diff --git a/src/server/repository/assessmentCycle/data/getOriginalDataPointData.ts b/src/server/repository/assessmentCycle/data/getOriginalDataPointData.ts index 7a37cb705a..672b2295da 100644 --- a/src/server/repository/assessmentCycle/data/getOriginalDataPointData.ts +++ b/src/server/repository/assessmentCycle/data/getOriginalDataPointData.ts @@ -1,10 +1,10 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { CountryIso } from '@meta/area' -import { Assessment, Cycle } from '@meta/assessment' -import { RecordCountryData } from '@meta/data' +import { CountryIso } from 'meta/area' +import { Assessment, Cycle } from 'meta/assessment' +import { RecordCountryData } from 'meta/data' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' type Props = { assessment: Assessment diff --git a/src/server/repository/assessmentCycle/data/getTableData.ts b/src/server/repository/assessmentCycle/data/getTableData.ts index e95dfe5425..c6f45c01e1 100644 --- a/src/server/repository/assessmentCycle/data/getTableData.ts +++ b/src/server/repository/assessmentCycle/data/getTableData.ts @@ -1,8 +1,8 @@ -import { CountryIso } from '@meta/area' -import { Assessment, Cycle, VariableCache } from '@meta/assessment' -import { RecordCountryData } from '@meta/data' +import { CountryIso } from 'meta/area' +import { Assessment, Cycle, VariableCache } from 'meta/assessment' +import { RecordCountryData } from 'meta/data' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' export type TablesCondition = Record; columns?: Array }> diff --git a/src/server/repository/assessmentCycle/descriptions/getDataSources.ts b/src/server/repository/assessmentCycle/descriptions/getDataSources.ts index ec18489fa3..7fd6a65b92 100644 --- a/src/server/repository/assessmentCycle/descriptions/getDataSources.ts +++ b/src/server/repository/assessmentCycle/descriptions/getDataSources.ts @@ -1,7 +1,7 @@ -import { CountryIso } from '@meta/area' -import { Assessment, Cycle, DataSourceLinked } from '@meta/assessment' +import { CountryIso } from 'meta/area' +import { Assessment, Cycle, DataSourceLinked } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' type Props = { countryIso: CountryIso diff --git a/src/server/repository/assessmentCycle/descriptions/getOneOrNone.ts b/src/server/repository/assessmentCycle/descriptions/getOneOrNone.ts index e132e03126..037f530bf1 100644 --- a/src/server/repository/assessmentCycle/descriptions/getOneOrNone.ts +++ b/src/server/repository/assessmentCycle/descriptions/getOneOrNone.ts @@ -1,9 +1,9 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { CountryIso } from '@meta/area' -import { Assessment, CommentableDescriptionName, CommentableDescriptionValue, Cycle } from '@meta/assessment' +import { CountryIso } from 'meta/area' +import { Assessment, CommentableDescriptionName, CommentableDescriptionValue, Cycle } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' export const getOneOrNone = async ( props: { diff --git a/src/server/repository/assessmentCycle/descriptions/upsert.ts b/src/server/repository/assessmentCycle/descriptions/upsert.ts index 2a89a0f119..4dfb6343d2 100644 --- a/src/server/repository/assessmentCycle/descriptions/upsert.ts +++ b/src/server/repository/assessmentCycle/descriptions/upsert.ts @@ -1,9 +1,9 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { CountryIso } from '@meta/area' -import { Assessment, CommentableDescriptionName, CommentableDescriptionValue, Cycle } from '@meta/assessment' +import { CountryIso } from 'meta/area' +import { Assessment, CommentableDescriptionName, CommentableDescriptionValue, Cycle } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' export const upsert = async ( props: { diff --git a/src/server/repository/assessmentCycle/message/create.ts b/src/server/repository/assessmentCycle/message/create.ts index fe249e8803..de56823118 100644 --- a/src/server/repository/assessmentCycle/message/create.ts +++ b/src/server/repository/assessmentCycle/message/create.ts @@ -1,10 +1,10 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Assessment, Cycle } from '@meta/assessment' -import { Message, MessageTopic } from '@meta/messageCenter' -import { User } from '@meta/user' +import { Assessment, Cycle } from 'meta/assessment' +import { Message, MessageTopic } from 'meta/messageCenter' +import { User } from 'meta/user' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' export const create = async ( props: { assessment: Assessment; cycle: Cycle; message: string; topic: MessageTopic; user: User }, diff --git a/src/server/repository/assessmentCycle/message/markDeleted.ts b/src/server/repository/assessmentCycle/message/markDeleted.ts index 981575622f..ab06ae1094 100644 --- a/src/server/repository/assessmentCycle/message/markDeleted.ts +++ b/src/server/repository/assessmentCycle/message/markDeleted.ts @@ -1,6 +1,6 @@ -import { Assessment, Cycle } from '@meta/assessment' +import { Assessment, Cycle } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' export const markDeleted = async ( props: { diff --git a/src/server/repository/assessmentCycle/messageTopic/create.ts b/src/server/repository/assessmentCycle/messageTopic/create.ts index e9819a16c0..b4a6066068 100644 --- a/src/server/repository/assessmentCycle/messageTopic/create.ts +++ b/src/server/repository/assessmentCycle/messageTopic/create.ts @@ -1,10 +1,10 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { CountryIso } from '@meta/area' -import { Assessment, Cycle, Section } from '@meta/assessment' -import { MessageTopic, MessageTopicType } from '@meta/messageCenter' +import { CountryIso } from 'meta/area' +import { Assessment, Cycle, Section } from 'meta/assessment' +import { MessageTopic, MessageTopicType } from 'meta/messageCenter' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' export const create = async ( props: { diff --git a/src/server/repository/assessmentCycle/messageTopic/getOneOrNone.ts b/src/server/repository/assessmentCycle/messageTopic/getOneOrNone.ts index 02fa53d79a..66536b1837 100644 --- a/src/server/repository/assessmentCycle/messageTopic/getOneOrNone.ts +++ b/src/server/repository/assessmentCycle/messageTopic/getOneOrNone.ts @@ -1,10 +1,10 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { CountryIso } from '@meta/area' -import { Assessment, Cycle } from '@meta/assessment' -import { MessageTopic } from '@meta/messageCenter' +import { CountryIso } from 'meta/area' +import { Assessment, Cycle } from 'meta/assessment' +import { MessageTopic } from 'meta/messageCenter' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' export const getOneOrNone = async ( props: { countryIso: CountryIso; assessment: Assessment; cycle: Cycle; key: string; includeMessages: boolean }, diff --git a/src/server/repository/assessmentCycle/messageTopic/updateStatus.ts b/src/server/repository/assessmentCycle/messageTopic/updateStatus.ts index d63cbbe1a5..a7ea0d83e7 100644 --- a/src/server/repository/assessmentCycle/messageTopic/updateStatus.ts +++ b/src/server/repository/assessmentCycle/messageTopic/updateStatus.ts @@ -1,8 +1,8 @@ -import { CountryIso } from '@meta/area' -import { Assessment, Cycle } from '@meta/assessment' -import { MessageTopic, MessageTopicStatus } from '@meta/messageCenter' +import { CountryIso } from 'meta/area' +import { Assessment, Cycle } from 'meta/assessment' +import { MessageTopic, MessageTopicStatus } from 'meta/messageCenter' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' import { getOneOrNone } from './getOneOrNone' diff --git a/src/server/repository/assessmentCycle/messageTopicUser/create.ts b/src/server/repository/assessmentCycle/messageTopicUser/create.ts index 2867951ee5..eaea182a0b 100644 --- a/src/server/repository/assessmentCycle/messageTopicUser/create.ts +++ b/src/server/repository/assessmentCycle/messageTopicUser/create.ts @@ -1,10 +1,10 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Assessment, Cycle } from '@meta/assessment' -import { MessageTopic } from '@meta/messageCenter' -import { User } from '@meta/user' +import { Assessment, Cycle } from 'meta/assessment' +import { MessageTopic } from 'meta/messageCenter' +import { User } from 'meta/user' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' export const create = async ( props: { assessment: Assessment; cycle: Cycle; topic: MessageTopic; user: User }, diff --git a/src/server/repository/assessmentCycle/messageTopicUser/getOdpReviewStatus.ts b/src/server/repository/assessmentCycle/messageTopicUser/getOdpReviewStatus.ts index 9be23f9440..1f09432e67 100644 --- a/src/server/repository/assessmentCycle/messageTopicUser/getOdpReviewStatus.ts +++ b/src/server/repository/assessmentCycle/messageTopicUser/getOdpReviewStatus.ts @@ -1,10 +1,10 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { CountryIso } from '@meta/area' -import { Assessment, Cycle, ReviewStatus } from '@meta/assessment' -import { User } from '@meta/user' +import { CountryIso } from 'meta/area' +import { Assessment, Cycle, ReviewStatus } from 'meta/assessment' +import { User } from 'meta/user' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' export const getOdpReviewStatus = async ( props: { countryIso: CountryIso; assessment: Assessment; cycle: Cycle; odpId?: string; user: User }, diff --git a/src/server/repository/assessmentCycle/messageTopicUser/getOneOrNone.ts b/src/server/repository/assessmentCycle/messageTopicUser/getOneOrNone.ts index 8f7bc38bad..6f714e290b 100644 --- a/src/server/repository/assessmentCycle/messageTopicUser/getOneOrNone.ts +++ b/src/server/repository/assessmentCycle/messageTopicUser/getOneOrNone.ts @@ -1,10 +1,10 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Assessment, Cycle } from '@meta/assessment' -import { MessageTopic } from '@meta/messageCenter' -import { User } from '@meta/user' +import { Assessment, Cycle } from 'meta/assessment' +import { MessageTopic } from 'meta/messageCenter' +import { User } from 'meta/user' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' export const getOneOrNone = async ( props: { assessment: Assessment; cycle: Cycle; topic: MessageTopic; user: User }, diff --git a/src/server/repository/assessmentCycle/messageTopicUser/getReviewStatus.ts b/src/server/repository/assessmentCycle/messageTopicUser/getReviewStatus.ts index 8013f94540..fd22f388cf 100644 --- a/src/server/repository/assessmentCycle/messageTopicUser/getReviewStatus.ts +++ b/src/server/repository/assessmentCycle/messageTopicUser/getReviewStatus.ts @@ -1,10 +1,10 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { CountryIso } from '@meta/area' -import { Assessment, Cycle, ReviewStatus } from '@meta/assessment' -import { User } from '@meta/user' +import { CountryIso } from 'meta/area' +import { Assessment, Cycle, ReviewStatus } from 'meta/assessment' +import { User } from 'meta/user' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' export const getReviewStatus = async ( props: { countryIso: CountryIso; assessment: Assessment; cycle: Cycle; sectionName: string; user: User }, diff --git a/src/server/repository/assessmentCycle/messageTopicUser/getReviewSummary.ts b/src/server/repository/assessmentCycle/messageTopicUser/getReviewSummary.ts index a5cab0248a..d53be306f8 100644 --- a/src/server/repository/assessmentCycle/messageTopicUser/getReviewSummary.ts +++ b/src/server/repository/assessmentCycle/messageTopicUser/getReviewSummary.ts @@ -1,10 +1,10 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { CountryIso } from '@meta/area' -import { Assessment, Cycle, ReviewSummary } from '@meta/assessment' -import { User } from '@meta/user' +import { CountryIso } from 'meta/area' +import { Assessment, Cycle, ReviewSummary } from 'meta/assessment' +import { User } from 'meta/user' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' export const getReviewSummary = async ( props: { countryIso: CountryIso; assessment: Assessment; cycle: Cycle; user: User }, diff --git a/src/server/repository/assessmentCycle/messageTopicUser/getUnreadMessages.ts b/src/server/repository/assessmentCycle/messageTopicUser/getUnreadMessages.ts index 43852cee7f..c801f8bec9 100644 --- a/src/server/repository/assessmentCycle/messageTopicUser/getUnreadMessages.ts +++ b/src/server/repository/assessmentCycle/messageTopicUser/getUnreadMessages.ts @@ -1,10 +1,10 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { CountryIso } from '@meta/area' -import { Assessment, Cycle } from '@meta/assessment' -import { User } from '@meta/user' +import { CountryIso } from 'meta/area' +import { Assessment, Cycle } from 'meta/assessment' +import { User } from 'meta/user' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' export const getUnreadMessages = async ( props: { countryIso: CountryIso; assessment: Assessment; cycle: Cycle; key: string; user: User }, diff --git a/src/server/repository/assessmentCycle/messageTopicUser/update.ts b/src/server/repository/assessmentCycle/messageTopicUser/update.ts index f81451ce7c..a71a4fc62f 100644 --- a/src/server/repository/assessmentCycle/messageTopicUser/update.ts +++ b/src/server/repository/assessmentCycle/messageTopicUser/update.ts @@ -1,10 +1,10 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Assessment, Cycle } from '@meta/assessment' -import { MessageTopic } from '@meta/messageCenter' -import { User } from '@meta/user' +import { Assessment, Cycle } from 'meta/assessment' +import { MessageTopic } from 'meta/messageCenter' +import { User } from 'meta/user' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' export const update = async ( props: { assessment: Assessment; cycle: Cycle; topic: MessageTopic; user: User }, diff --git a/src/server/repository/assessmentCycle/node/create.ts b/src/server/repository/assessmentCycle/node/create.ts index a28d999c6d..2c0a81f005 100644 --- a/src/server/repository/assessmentCycle/node/create.ts +++ b/src/server/repository/assessmentCycle/node/create.ts @@ -1,8 +1,8 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Assessment, Cycle, Node, NodeValue } from '@meta/assessment' +import { Assessment, Cycle, Node, NodeValue } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' type Props = { assessment: Assessment diff --git a/src/server/repository/assessmentCycle/node/getOneOrNone.ts b/src/server/repository/assessmentCycle/node/getOneOrNone.ts index 82459b522a..50822a2997 100644 --- a/src/server/repository/assessmentCycle/node/getOneOrNone.ts +++ b/src/server/repository/assessmentCycle/node/getOneOrNone.ts @@ -1,8 +1,8 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Assessment, Cycle, Node } from '@meta/assessment' +import { Assessment, Cycle, Node } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' type Props = { assessment: Assessment diff --git a/src/server/repository/assessmentCycle/node/update.ts b/src/server/repository/assessmentCycle/node/update.ts index c8dd924c35..c279d6578c 100644 --- a/src/server/repository/assessmentCycle/node/update.ts +++ b/src/server/repository/assessmentCycle/node/update.ts @@ -1,8 +1,8 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Assessment, Cycle, Node, NodeValue } from '@meta/assessment' +import { Assessment, Cycle, Node, NodeValue } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' type Props = { assessment: Assessment diff --git a/src/server/repository/assessmentCycle/node/updateValidation.ts b/src/server/repository/assessmentCycle/node/updateValidation.ts index 0404a8da42..460c94e538 100644 --- a/src/server/repository/assessmentCycle/node/updateValidation.ts +++ b/src/server/repository/assessmentCycle/node/updateValidation.ts @@ -1,8 +1,8 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Assessment, Cycle, Node } from '@meta/assessment' +import { Assessment, Cycle, Node } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' type Props = { assessment: Assessment diff --git a/src/server/repository/assessmentCycle/nodeValueEstimationRepository/create.ts b/src/server/repository/assessmentCycle/nodeValueEstimationRepository/create.ts index 44c5cc8f2c..882bc0d774 100644 --- a/src/server/repository/assessmentCycle/nodeValueEstimationRepository/create.ts +++ b/src/server/repository/assessmentCycle/nodeValueEstimationRepository/create.ts @@ -1,10 +1,10 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { CountryIso } from '@meta/area' -import { Assessment, Cycle } from '@meta/assessment' -import { NodeValuesEstimation } from '@meta/assessment/nodeValuesEstimation' +import { CountryIso } from 'meta/area' +import { Assessment, Cycle } from 'meta/assessment' +import { NodeValuesEstimation } from 'meta/assessment/nodeValuesEstimation' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' type Props = { assessment: Assessment diff --git a/src/server/repository/assessmentCycle/originalDataPoint/create.ts b/src/server/repository/assessmentCycle/originalDataPoint/create.ts index 6d884aabc6..03e114f013 100644 --- a/src/server/repository/assessmentCycle/originalDataPoint/create.ts +++ b/src/server/repository/assessmentCycle/originalDataPoint/create.ts @@ -1,8 +1,8 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Assessment, Cycle, OriginalDataPoint } from '@meta/assessment' +import { Assessment, Cycle, OriginalDataPoint } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' export const create = async ( params: { diff --git a/src/server/repository/assessmentCycle/originalDataPoint/getMany.ts b/src/server/repository/assessmentCycle/originalDataPoint/getMany.ts index 911667aabc..38c6ecfe9e 100644 --- a/src/server/repository/assessmentCycle/originalDataPoint/getMany.ts +++ b/src/server/repository/assessmentCycle/originalDataPoint/getMany.ts @@ -1,9 +1,9 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { CountryIso } from '@meta/area' -import { Assessment, Cycle, OriginalDataPoint } from '@meta/assessment' +import { CountryIso } from 'meta/area' +import { Assessment, Cycle, OriginalDataPoint } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' export const getMany = async ( props: { assessment: Assessment; cycle: Cycle; countryIso: CountryIso }, diff --git a/src/server/repository/assessmentCycle/originalDataPoint/getOne.ts b/src/server/repository/assessmentCycle/originalDataPoint/getOne.ts index 1c79437544..53a55e678d 100644 --- a/src/server/repository/assessmentCycle/originalDataPoint/getOne.ts +++ b/src/server/repository/assessmentCycle/originalDataPoint/getOne.ts @@ -1,9 +1,9 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { CountryIso } from '@meta/area' -import { Assessment, Cycle, OriginalDataPoint } from '@meta/assessment' +import { CountryIso } from 'meta/area' +import { Assessment, Cycle, OriginalDataPoint } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' export const getOne = async ( props: { assessment: Assessment; cycle: Cycle; countryIso: CountryIso; year: string }, diff --git a/src/server/repository/assessmentCycle/originalDataPoint/getReservedYears.ts b/src/server/repository/assessmentCycle/originalDataPoint/getReservedYears.ts index e571121bc8..c268cba34c 100644 --- a/src/server/repository/assessmentCycle/originalDataPoint/getReservedYears.ts +++ b/src/server/repository/assessmentCycle/originalDataPoint/getReservedYears.ts @@ -1,9 +1,9 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { CountryIso } from '@meta/area' -import { Assessment, Cycle, ODPReservedYear } from '@meta/assessment' +import { CountryIso } from 'meta/area' +import { Assessment, Cycle, ODPReservedYear } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' export const getReservedYears = async ( params: { diff --git a/src/server/repository/assessmentCycle/originalDataPoint/remove.ts b/src/server/repository/assessmentCycle/originalDataPoint/remove.ts index e430e72917..97065187e0 100644 --- a/src/server/repository/assessmentCycle/originalDataPoint/remove.ts +++ b/src/server/repository/assessmentCycle/originalDataPoint/remove.ts @@ -1,8 +1,8 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Assessment, Cycle, OriginalDataPoint } from '@meta/assessment' +import { Assessment, Cycle, OriginalDataPoint } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' export const remove = async ( props: { assessment: Assessment; cycle: Cycle; originalDataPoint: OriginalDataPoint }, diff --git a/src/server/repository/assessmentCycle/originalDataPoint/update.ts b/src/server/repository/assessmentCycle/originalDataPoint/update.ts index e310d4811b..e2a1e619a1 100644 --- a/src/server/repository/assessmentCycle/originalDataPoint/update.ts +++ b/src/server/repository/assessmentCycle/originalDataPoint/update.ts @@ -1,6 +1,6 @@ -import { Assessment, Cycle, OriginalDataPoint } from '@meta/assessment' +import { Assessment, Cycle, OriginalDataPoint } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' import { getOne } from './getOne' diff --git a/src/server/repository/assessmentCycle/region/getRegionGroups.ts b/src/server/repository/assessmentCycle/region/getRegionGroups.ts index d3ddaf6c56..759c7fbb5f 100644 --- a/src/server/repository/assessmentCycle/region/getRegionGroups.ts +++ b/src/server/repository/assessmentCycle/region/getRegionGroups.ts @@ -1,10 +1,10 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { RegionCode, RegionGroup } from '@meta/area' -import { Assessment, Cycle } from '@meta/assessment' +import { RegionCode, RegionGroup } from 'meta/area' +import { Assessment, Cycle } from 'meta/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' -import { isAtlantisAllowed } from '@server/repository/assessmentCycle/country/isAtlantisAllowed' +import { BaseProtocol, DB, Schemas } from 'server/db' +import { isAtlantisAllowed } from 'server/repository/assessmentCycle/country/isAtlantisAllowed' export const getRegionGroups = async ( props: { assessment: Assessment; cycle: Cycle }, diff --git a/src/server/repository/extData/index.ts b/src/server/repository/extData/index.ts index f04a324124..fce042c47d 100644 --- a/src/server/repository/extData/index.ts +++ b/src/server/repository/extData/index.ts @@ -1,4 +1,4 @@ -import { search } from '@server/repository/extData/search' +import { search } from 'server/repository/extData/search' export const TaxonRepository = { search, diff --git a/src/server/repository/extData/search.ts b/src/server/repository/extData/search.ts index 38893b198f..bedbf15ac0 100644 --- a/src/server/repository/extData/search.ts +++ b/src/server/repository/extData/search.ts @@ -1,8 +1,8 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Taxon } from '@meta/extData' +import { Taxon } from 'meta/extData' -import { BaseProtocol, DB } from '@server/db' +import { BaseProtocol, DB } from 'server/db' export const search = async ( props: { query: string; limit: string }, diff --git a/src/server/repository/geo/bounds/getOne.ts b/src/server/repository/geo/bounds/getOne.ts index 87b95d9e44..552b3d2dc9 100644 --- a/src/server/repository/geo/bounds/getOne.ts +++ b/src/server/repository/geo/bounds/getOne.ts @@ -1,9 +1,9 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { CountryIso } from '@meta/area' -import { Bounds } from '@meta/geo' +import { CountryIso } from 'meta/area' +import { Bounds } from 'meta/geo' -import { BaseProtocol, DB } from '@server/db' +import { BaseProtocol, DB } from 'server/db' export const getOne = async (props: { countryIso: CountryIso }, client: BaseProtocol = DB): Promise => { const { countryIso } = props diff --git a/src/server/repository/geo/bounds/index.ts b/src/server/repository/geo/bounds/index.ts index 8e82cb128e..c614851812 100644 --- a/src/server/repository/geo/bounds/index.ts +++ b/src/server/repository/geo/bounds/index.ts @@ -1,4 +1,4 @@ -import { getOne } from '@server/repository/geo/bounds/getOne' +import { getOne } from 'server/repository/geo/bounds/getOne' export const BoundsRepository = { getOne, diff --git a/src/server/repository/geo/forestEstimations/getOne.ts b/src/server/repository/geo/forestEstimations/getOne.ts index 496ae8aa59..aa4597dda2 100644 --- a/src/server/repository/geo/forestEstimations/getOne.ts +++ b/src/server/repository/geo/forestEstimations/getOne.ts @@ -1,9 +1,9 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { CountryIso } from '@meta/area' -import { ForestEstimations } from '@meta/geo' +import { CountryIso } from 'meta/area' +import { ForestEstimations } from 'meta/geo' -import { BaseProtocol, DB } from '@server/db' +import { BaseProtocol, DB } from 'server/db' export const getOne = async ( props: { countryIso: CountryIso; year: number }, diff --git a/src/server/repository/geo/forestEstimations/index.ts b/src/server/repository/geo/forestEstimations/index.ts index e96046628f..33c1e462aa 100644 --- a/src/server/repository/geo/forestEstimations/index.ts +++ b/src/server/repository/geo/forestEstimations/index.ts @@ -1,5 +1,5 @@ -import { getOne } from '@server/repository/geo/forestEstimations/getOne' -import { upsert } from '@server/repository/geo/forestEstimations/upsert' +import { getOne } from 'server/repository/geo/forestEstimations/getOne' +import { upsert } from 'server/repository/geo/forestEstimations/upsert' export const ForestEstimationsRepository = { upsert, diff --git a/src/server/repository/geo/forestEstimations/upsert.ts b/src/server/repository/geo/forestEstimations/upsert.ts index 68d684495a..fdf9becfad 100644 --- a/src/server/repository/geo/forestEstimations/upsert.ts +++ b/src/server/repository/geo/forestEstimations/upsert.ts @@ -1,8 +1,8 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { ForestEstimations } from '@meta/geo' +import { ForestEstimations } from 'meta/geo' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { BaseProtocol, DB, Schemas } from 'server/db' export const upsert = async ( props: { diff --git a/src/server/repository/public/activityLog/getCycleDataActivities.ts b/src/server/repository/public/activityLog/getCycleDataActivities.ts index 42c53966e7..8d60e35239 100644 --- a/src/server/repository/public/activityLog/getCycleDataActivities.ts +++ b/src/server/repository/public/activityLog/getCycleDataActivities.ts @@ -1,9 +1,9 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { CountryIso } from '@meta/area' -import { ActivityLog, ActivityLogMessage, Assessment, Cycle } from '@meta/assessment' +import { CountryIso } from 'meta/area' +import { ActivityLog, ActivityLogMessage, Assessment, Cycle } from 'meta/assessment' -import { BaseProtocol, DB } from '@server/db' +import { BaseProtocol, DB } from 'server/db' const acceptedMessages = [ ActivityLogMessage.invitationAccept, diff --git a/src/server/repository/public/activityLog/insertActivityLog.ts b/src/server/repository/public/activityLog/insertActivityLog.ts index 218719ff11..147414a514 100644 --- a/src/server/repository/public/activityLog/insertActivityLog.ts +++ b/src/server/repository/public/activityLog/insertActivityLog.ts @@ -1,8 +1,8 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { ActivityLog, Assessment, Cycle } from '@meta/assessment' +import { ActivityLog, Assessment, Cycle } from 'meta/assessment' -import { BaseProtocol, DB } from '@server/db' +import { BaseProtocol, DB } from 'server/db' export const insertActivityLog = async ( params: { diff --git a/src/server/repository/public/settings/read.ts b/src/server/repository/public/settings/read.ts index 89d7e0bcf1..b113f1690e 100644 --- a/src/server/repository/public/settings/read.ts +++ b/src/server/repository/public/settings/read.ts @@ -1,8 +1,8 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Settings } from '@meta/assessment' +import { Settings } from 'meta/assessment' -import { BaseProtocol, DB } from '@server/db' +import { BaseProtocol, DB } from 'server/db' export const read = async (client: BaseProtocol = DB): Promise => { return client.one( diff --git a/src/server/repository/public/settings/update.ts b/src/server/repository/public/settings/update.ts index b65d65842f..dc91caaa50 100644 --- a/src/server/repository/public/settings/update.ts +++ b/src/server/repository/public/settings/update.ts @@ -1,8 +1,8 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Settings } from '@meta/assessment' +import { Settings } from 'meta/assessment' -import { BaseProtocol, DB } from '@server/db' +import { BaseProtocol, DB } from 'server/db' export const update = async (props: { settings: Settings }, client: BaseProtocol = DB): Promise => { const { settings } = props diff --git a/src/server/repository/public/user/count.ts b/src/server/repository/public/user/count.ts index 021853dfe7..ae99780d7b 100644 --- a/src/server/repository/public/user/count.ts +++ b/src/server/repository/public/user/count.ts @@ -1,8 +1,8 @@ -import { CountryIso } from '@meta/area' -import { Assessment, Cycle } from '@meta/assessment' -import { RoleName } from '@meta/user' +import { CountryIso } from 'meta/area' +import { Assessment, Cycle } from 'meta/assessment' +import { RoleName } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' +import { BaseProtocol, DB } from 'server/db' export const count = async ( props: { diff --git a/src/server/repository/public/user/create.ts b/src/server/repository/public/user/create.ts index 5042cd19bc..9bea652edc 100644 --- a/src/server/repository/public/user/create.ts +++ b/src/server/repository/public/user/create.ts @@ -1,10 +1,10 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { User } from '@meta/user' -import { UserProps } from '@meta/user/user' +import { User } from 'meta/user' +import { UserProps } from 'meta/user/user' -import { BaseProtocol, DB } from '@server/db' -import { getOne } from '@server/repository/public/user/getOne' +import { BaseProtocol, DB } from 'server/db' +import { getOne } from 'server/repository/public/user/getOne' export const create = async ( props: { user: { email: string; props: Partial } }, diff --git a/src/server/repository/public/user/getMany.ts b/src/server/repository/public/user/getMany.ts index e0a0f7a2bd..4dccaff620 100644 --- a/src/server/repository/public/user/getMany.ts +++ b/src/server/repository/public/user/getMany.ts @@ -1,11 +1,11 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { CountryIso } from '@meta/area' -import { Assessment, Cycle } from '@meta/assessment' -import { RoleName, User } from '@meta/user' +import { CountryIso } from 'meta/area' +import { Assessment, Cycle } from 'meta/assessment' +import { RoleName, User } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { UserRoleAdapter } from '@server/repository/adapter' +import { BaseProtocol, DB } from 'server/db' +import { UserRoleAdapter } from 'server/repository/adapter' import { fields } from './fields' diff --git a/src/server/repository/public/user/getOne.ts b/src/server/repository/public/user/getOne.ts index 3b58c9a10d..e71506b16b 100644 --- a/src/server/repository/public/user/getOne.ts +++ b/src/server/repository/public/user/getOne.ts @@ -1,9 +1,9 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { User } from '@meta/user' +import { User } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { UserRoleAdapter } from '@server/repository/adapter' +import { BaseProtocol, DB } from 'server/db' +import { UserRoleAdapter } from 'server/repository/adapter' import { fields } from './fields' diff --git a/src/server/repository/public/user/getProfilePicture.ts b/src/server/repository/public/user/getProfilePicture.ts index 1760bf53f6..a899531442 100644 --- a/src/server/repository/public/user/getProfilePicture.ts +++ b/src/server/repository/public/user/getProfilePicture.ts @@ -1,5 +1,5 @@ -import { UserProfilePicture } from '@meta/user/userProfilePicture' -import { BaseProtocol, DB } from '@server/db' +import { UserProfilePicture } from 'meta/user/userProfilePicture' +import { BaseProtocol, DB } from 'server/db' export const getProfilePicture = async ( props: { id: number } | { email: string } | { emailGoogle: string }, diff --git a/src/server/repository/public/user/readCountryUsersByRole.ts b/src/server/repository/public/user/readCountryUsersByRole.ts index f2e9de76a6..6c04a06f72 100644 --- a/src/server/repository/public/user/readCountryUsersByRole.ts +++ b/src/server/repository/public/user/readCountryUsersByRole.ts @@ -1,10 +1,10 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { CountryIso } from '@meta/area' -import { Cycle } from '@meta/assessment' -import { RoleName, User } from '@meta/user' +import { CountryIso } from 'meta/area' +import { Cycle } from 'meta/assessment' +import { RoleName, User } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' +import { BaseProtocol, DB } from 'server/db' import { fields } from './fields' diff --git a/src/server/repository/public/user/remove.ts b/src/server/repository/public/user/remove.ts index 6c77da9a90..81748c5d2f 100644 --- a/src/server/repository/public/user/remove.ts +++ b/src/server/repository/public/user/remove.ts @@ -1,8 +1,8 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { User } from '@meta/user' +import { User } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' +import { BaseProtocol, DB } from 'server/db' // TODO: handle selection by id export const remove = async (props: { user: Pick }, client: BaseProtocol = DB): Promise => { diff --git a/src/server/repository/public/user/update.ts b/src/server/repository/public/user/update.ts index aa6989f0d5..2bec683aab 100644 --- a/src/server/repository/public/user/update.ts +++ b/src/server/repository/public/user/update.ts @@ -1,6 +1,6 @@ -import { User } from '@meta/user' +import { User } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' +import { BaseProtocol, DB } from 'server/db' import { getOne } from './getOne' diff --git a/src/server/repository/public/userProvider/create.ts b/src/server/repository/public/userProvider/create.ts index 67de0962e2..e08c86b8ff 100644 --- a/src/server/repository/public/userProvider/create.ts +++ b/src/server/repository/public/userProvider/create.ts @@ -1,8 +1,8 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { UserAuthProvider } from '@meta/user' +import { UserAuthProvider } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' +import { BaseProtocol, DB } from 'server/db' export const create = async

( props: { diff --git a/src/server/repository/public/userProvider/getUserProviders.ts b/src/server/repository/public/userProvider/getUserProviders.ts index d95f01fbd9..7284ba1ce1 100644 --- a/src/server/repository/public/userProvider/getUserProviders.ts +++ b/src/server/repository/public/userProvider/getUserProviders.ts @@ -1,6 +1,6 @@ -import { AuthProvider, User } from '@meta/user' +import { AuthProvider, User } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' +import { BaseProtocol, DB } from 'server/db' export const getUserProviders = async ( props: { user: User }, diff --git a/src/server/repository/public/userProvider/read.ts b/src/server/repository/public/userProvider/read.ts index 8d797be3b4..28298e989e 100644 --- a/src/server/repository/public/userProvider/read.ts +++ b/src/server/repository/public/userProvider/read.ts @@ -1,8 +1,8 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { AuthProvider, User, UserAuthProvider } from '@meta/user' +import { AuthProvider, User, UserAuthProvider } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' +import { BaseProtocol, DB } from 'server/db' export const read = async

( props: { user: User; provider: AuthProvider }, diff --git a/src/server/repository/public/userProvider/update.ts b/src/server/repository/public/userProvider/update.ts index 16ae540f2f..aafb6e45cc 100644 --- a/src/server/repository/public/userProvider/update.ts +++ b/src/server/repository/public/userProvider/update.ts @@ -1,9 +1,9 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { User, UserAuthProvider } from '@meta/user' -import { AuthProvider, AuthProviderLocalProps } from '@meta/user/userAuth' +import { User, UserAuthProvider } from 'meta/user' +import { AuthProvider, AuthProviderLocalProps } from 'meta/user/userAuth' -import { BaseProtocol, DB } from '@server/db' +import { BaseProtocol, DB } from 'server/db' export const update = async ( props: { user: Pick; password: string }, diff --git a/src/server/repository/public/userResetPassword/create.ts b/src/server/repository/public/userResetPassword/create.ts index 048a3af8b0..7e484b21a6 100644 --- a/src/server/repository/public/userResetPassword/create.ts +++ b/src/server/repository/public/userResetPassword/create.ts @@ -1,8 +1,8 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { User, UserResetPassword } from '@meta/user' +import { User, UserResetPassword } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' +import { BaseProtocol, DB } from 'server/db' export const create = async ( props: { diff --git a/src/server/repository/public/userResetPassword/getLastByUser.ts b/src/server/repository/public/userResetPassword/getLastByUser.ts index 786e934584..73b841d083 100644 --- a/src/server/repository/public/userResetPassword/getLastByUser.ts +++ b/src/server/repository/public/userResetPassword/getLastByUser.ts @@ -1,8 +1,8 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { User, UserResetPassword } from '@meta/user' +import { User, UserResetPassword } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' +import { BaseProtocol, DB } from 'server/db' export const getLastByUser = async ( props: { diff --git a/src/server/repository/public/userResetPassword/read.ts b/src/server/repository/public/userResetPassword/read.ts index 34fdb69b8a..c407f86ba7 100644 --- a/src/server/repository/public/userResetPassword/read.ts +++ b/src/server/repository/public/userResetPassword/read.ts @@ -1,8 +1,8 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { UserResetPassword } from '@meta/user' +import { UserResetPassword } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' +import { BaseProtocol, DB } from 'server/db' export const read = async ( props: { diff --git a/src/server/repository/public/userResetPassword/update.ts b/src/server/repository/public/userResetPassword/update.ts index 675e88d483..1b9ca64ab8 100644 --- a/src/server/repository/public/userResetPassword/update.ts +++ b/src/server/repository/public/userResetPassword/update.ts @@ -1,8 +1,8 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { UserResetPassword } from '@meta/user' +import { UserResetPassword } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' +import { BaseProtocol, DB } from 'server/db' export const update = async ( props: { diff --git a/src/server/repository/public/userRole/acceptInvitation.ts b/src/server/repository/public/userRole/acceptInvitation.ts index 21d8a01c51..678bfd89a3 100644 --- a/src/server/repository/public/userRole/acceptInvitation.ts +++ b/src/server/repository/public/userRole/acceptInvitation.ts @@ -1,8 +1,8 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { RoleName, UserRole } from '@meta/user' +import { RoleName, UserRole } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' +import { BaseProtocol, DB } from 'server/db' export const acceptInvitation = async ( props: { userRole: UserRole }, diff --git a/src/server/repository/public/userRole/create.ts b/src/server/repository/public/userRole/create.ts index fa0c712382..9b265f783e 100644 --- a/src/server/repository/public/userRole/create.ts +++ b/src/server/repository/public/userRole/create.ts @@ -1,11 +1,11 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { CountryIso } from '@meta/area' -import { Assessment, Cycle } from '@meta/assessment' -import { RoleName, User, UserRole } from '@meta/user' -import { UserRoleBaseProps, UserRoleExtendedProps } from '@meta/user/userRole' +import { CountryIso } from 'meta/area' +import { Assessment, Cycle } from 'meta/assessment' +import { RoleName, User, UserRole } from 'meta/user' +import { UserRoleBaseProps, UserRoleExtendedProps } from 'meta/user/userRole' -import { BaseProtocol, DB } from '@server/db' +import { BaseProtocol, DB } from 'server/db' export const create = async ( props: { diff --git a/src/server/repository/public/userRole/read.ts b/src/server/repository/public/userRole/read.ts index a6215962af..96f2244acd 100644 --- a/src/server/repository/public/userRole/read.ts +++ b/src/server/repository/public/userRole/read.ts @@ -1,8 +1,8 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { RoleName, UserRole } from '@meta/user' +import { RoleName, UserRole } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' +import { BaseProtocol, DB } from 'server/db' export const read = async ( props: { invitationUuid: string }, diff --git a/src/server/repository/public/userRole/remove.ts b/src/server/repository/public/userRole/remove.ts index 675907a7ae..cac6e846ef 100644 --- a/src/server/repository/public/userRole/remove.ts +++ b/src/server/repository/public/userRole/remove.ts @@ -1,8 +1,8 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { RoleName, UserRole } from '@meta/user' +import { RoleName, UserRole } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' +import { BaseProtocol, DB } from 'server/db' export const remove = async ( props: { invitationUuid: string }, diff --git a/src/server/repository/public/userRole/renewInvitation.ts b/src/server/repository/public/userRole/renewInvitation.ts index 3219f26e7a..8ce70aca1e 100644 --- a/src/server/repository/public/userRole/renewInvitation.ts +++ b/src/server/repository/public/userRole/renewInvitation.ts @@ -1,8 +1,8 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { RoleName, UserRole } from '@meta/user' +import { RoleName, UserRole } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' +import { BaseProtocol, DB } from 'server/db' export const renewInvitation = async ( props: { userRole: UserRole }, diff --git a/src/server/repository/public/userRole/update.ts b/src/server/repository/public/userRole/update.ts index 5239239334..3659748e1f 100644 --- a/src/server/repository/public/userRole/update.ts +++ b/src/server/repository/public/userRole/update.ts @@ -1,7 +1,7 @@ -import { CountryIso } from '@meta/area' -import { RoleName, UserRole } from '@meta/user' +import { CountryIso } from 'meta/area' +import { RoleName, UserRole } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' +import { BaseProtocol, DB } from 'server/db' export const update = async ( props: { cycleUuid?: string; roles: Array>>; userId: number }, diff --git a/src/server/repository/public/userRole/updateProps.ts b/src/server/repository/public/userRole/updateProps.ts index f451a0280d..d082977cc2 100644 --- a/src/server/repository/public/userRole/updateProps.ts +++ b/src/server/repository/public/userRole/updateProps.ts @@ -1,8 +1,8 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { RoleName, UserRole, UserRoleBaseProps, UserRoleExtendedProps } from '@meta/user/userRole' +import { RoleName, UserRole, UserRoleBaseProps, UserRoleExtendedProps } from 'meta/user/userRole' -import { BaseProtocol, DB } from '@server/db' +import { BaseProtocol, DB } from 'server/db' export const updateProps = async ( props: { diff --git a/src/server/repository/public/userRole/updateSectionAuth.ts b/src/server/repository/public/userRole/updateSectionAuth.ts index acecc19453..a2dda1971a 100644 --- a/src/server/repository/public/userRole/updateSectionAuth.ts +++ b/src/server/repository/public/userRole/updateSectionAuth.ts @@ -1,7 +1,7 @@ -import { CollaboratorSectionsPermission, RoleName, UserRole } from '@meta/user' +import { CollaboratorSectionsPermission, RoleName, UserRole } from 'meta/user' -import { BaseProtocol, DB } from '@server/db' -import { UserRoleAdapter } from '@server/repository/adapter' +import { BaseProtocol, DB } from 'server/db' +import { UserRoleAdapter } from 'server/repository/adapter' export const updateSectionAuth = async ( props: { diff --git a/src/server/serverInit.ts b/src/server/serverInit.ts index e17f710ae8..f8249e9de6 100644 --- a/src/server/serverInit.ts +++ b/src/server/serverInit.ts @@ -6,9 +6,9 @@ import * as cookieParser from 'cookie-parser' import * as express from 'express' import * as morgan from 'morgan' -import { Api } from '@server/api' -import { Proxy } from '@server/proxy/proxy' -import { SocketServer } from '@server/service/socket' +import { Api } from 'server/api' +import { Proxy } from 'server/proxy/proxy' +import { SocketServer } from 'server/service/socket' import { sendErr } from './utils/requests' import * as resourceCacheControl from './resourceCacheControl' @@ -48,7 +48,7 @@ export const serverInit = () => { // sending the uncaught errors as json instead of HTML // http://expressjs.com/en/guide/error-handling.html // NB: This must not be an arrow function to make express detect this as an error handler. - app.use(function (err: any, _req: any, res: any, _: any) { + app.use((err: any, _req: any, res: any, _: any) => { if (err) sendErr(res, err) }) diff --git a/src/server/serverLocal.ts b/src/server/serverLocal.ts deleted file mode 100644 index 46cd98cb12..0000000000 --- a/src/server/serverLocal.ts +++ /dev/null @@ -1,7 +0,0 @@ -import * as init from './serverInit' - -// @ts-ignore -// eslint-disable-next-line @typescript-eslint/no-var-requires -require('dotenv').config() - -init.serverInit() diff --git a/src/server/service/estimates/datasets/dataset3.ts b/src/server/service/estimates/datasets/dataset3.ts index a2a8e675ce..8e9d376c73 100644 --- a/src/server/service/estimates/datasets/dataset3.ts +++ b/src/server/service/estimates/datasets/dataset3.ts @@ -1,4 +1,4 @@ -import { getODP } from '@server/service/estimates/getODP' +import { getODP } from 'server/service/estimates/getODP' export const dataset3 = { ITA: { diff --git a/src/server/service/estimates/datasets/dataset4.ts b/src/server/service/estimates/datasets/dataset4.ts index 862766474f..8f20240281 100644 --- a/src/server/service/estimates/datasets/dataset4.ts +++ b/src/server/service/estimates/datasets/dataset4.ts @@ -1,4 +1,4 @@ -import { getODP } from '@server/service/estimates/getODP' +import { getODP } from 'server/service/estimates/getODP' export const dataset4 = { ITA: { diff --git a/src/server/service/estimates/datasets/dataset5.ts b/src/server/service/estimates/datasets/dataset5.ts index 03c4ba8455..fbb606efe9 100644 --- a/src/server/service/estimates/datasets/dataset5.ts +++ b/src/server/service/estimates/datasets/dataset5.ts @@ -1,4 +1,4 @@ -import { getODP } from '@server/service/estimates/getODP' +import { getODP } from 'server/service/estimates/getODP' export const dataset5 = { ITA: { diff --git a/src/server/service/estimates/datasets/dataset6.ts b/src/server/service/estimates/datasets/dataset6.ts index 5b5a416608..5a1bbe723f 100644 --- a/src/server/service/estimates/datasets/dataset6.ts +++ b/src/server/service/estimates/datasets/dataset6.ts @@ -1,4 +1,4 @@ -import { getODP } from '@server/service/estimates/getODP' +import { getODP } from 'server/service/estimates/getODP' export const dataset6 = { ITA: { diff --git a/src/server/service/estimates/estimationEngine.test.ts b/src/server/service/estimates/estimationEngine.test.ts index 0d2c164daf..f15565968f 100644 --- a/src/server/service/estimates/estimationEngine.test.ts +++ b/src/server/service/estimates/estimationEngine.test.ts @@ -1,15 +1,15 @@ -import { UUIDs } from '@utils/uuids' - -import { NodeValueEstimationMethod, NodeValuesEstimation } from '@meta/assessment' -import { NodeUpdate } from '@meta/data' - -import { dataset1, dataset1Expected } from '@server/service/estimates/datasets/dataset1' -import { dataset2, dataset2Expected } from '@server/service/estimates/datasets/dataset2' -import { dataset3, dataset3Expected } from '@server/service/estimates/datasets/dataset3' -import { dataset4, dataset4Expected } from '@server/service/estimates/datasets/dataset4' -import { dataset5, dataset5Expected } from '@server/service/estimates/datasets/dataset5' -import { dataset6, dataset6Expected } from '@server/service/estimates/datasets/dataset6' -import { dataset7, dataset7Expected } from '@server/service/estimates/datasets/dataset7' +import { UUIDs } from 'utils/uuids' + +import { NodeValueEstimationMethod, NodeValuesEstimation } from 'meta/assessment' +import { NodeUpdate } from 'meta/data' + +import { dataset1, dataset1Expected } from 'server/service/estimates/datasets/dataset1' +import { dataset2, dataset2Expected } from 'server/service/estimates/datasets/dataset2' +import { dataset3, dataset3Expected } from 'server/service/estimates/datasets/dataset3' +import { dataset4, dataset4Expected } from 'server/service/estimates/datasets/dataset4' +import { dataset5, dataset5Expected } from 'server/service/estimates/datasets/dataset5' +import { dataset6, dataset6Expected } from 'server/service/estimates/datasets/dataset6' +import { dataset7, dataset7Expected } from 'server/service/estimates/datasets/dataset7' import { EstimationEngine, GenerateSpec, GenerateSpecMethod } from './estimationEngine' diff --git a/src/server/service/estimates/estimationEngine.ts b/src/server/service/estimates/estimationEngine.ts index 8007dcc63b..50a62dc138 100644 --- a/src/server/service/estimates/estimationEngine.ts +++ b/src/server/service/estimates/estimationEngine.ts @@ -1,9 +1,9 @@ -import { BigNumberInput, Numbers } from '@utils/numbers' -import { Objects } from '@utils/objects' +import { BigNumberInput, Numbers } from 'utils/numbers' +import { Objects } from 'utils/objects' import BigNumber from 'bignumber.js' -import { NodeValuesEstimation } from '@meta/assessment' -import { NodeUpdate, RecordCountryData } from '@meta/data' +import { NodeValuesEstimation } from 'meta/assessment' +import { NodeUpdate, RecordCountryData } from 'meta/data' // TODO: refactor everything diff --git a/src/server/service/mail/assessmentNotifyUsers.ts b/src/server/service/mail/assessmentNotifyUsers.ts index c1c22d670f..df373fb589 100644 --- a/src/server/service/mail/assessmentNotifyUsers.ts +++ b/src/server/service/mail/assessmentNotifyUsers.ts @@ -1,13 +1,13 @@ -import { createI18nPromise } from '@i18n/i18nFactory' +import { createI18nPromise } from 'i18n/i18nFactory' -import { ClientRoutes } from '@meta/app' -import { Country, CountryIso } from '@meta/area' -import { AssessmentStatus } from '@meta/area/country' -import { AssessmentName, Cycle } from '@meta/assessment' -import { RoleName, User, Users } from '@meta/user' -import { UserRoles } from '@meta/user/userRoles' +import { ClientRoutes } from 'meta/app' +import { Country, CountryIso } from 'meta/area' +import { AssessmentStatus } from 'meta/area/country' +import { AssessmentName, Cycle } from 'meta/assessment' +import { RoleName, User, Users } from 'meta/user' +import { UserRoles } from 'meta/user/userRoles' -import { UserRepository } from '@server/repository/public/user' +import { UserRepository } from 'server/repository/public/user' import { sendMail } from './mail' diff --git a/src/server/service/mail/mail.ts b/src/server/service/mail/mail.ts index 3dced4b423..b9bce98ac8 100644 --- a/src/server/service/mail/mail.ts +++ b/src/server/service/mail/mail.ts @@ -1,7 +1,7 @@ import * as nodemailer from 'nodemailer' -import { ProcessEnv } from '@server/utils' -import { Logger } from '@server/utils/logger' +import { ProcessEnv } from 'server/utils' +import { Logger } from 'server/utils/logger' import { assessmentNotifyUsers } from './assessmentNotifyUsers' import { resetPassword } from './resetPassword' diff --git a/src/server/service/mail/resetPassword.ts b/src/server/service/mail/resetPassword.ts index 7e889b8563..7a40c891f3 100644 --- a/src/server/service/mail/resetPassword.ts +++ b/src/server/service/mail/resetPassword.ts @@ -1,8 +1,8 @@ -import { createI18nPromise } from '@i18n/i18nFactory' +import { createI18nPromise } from 'i18n/i18nFactory' -import { ClientRoutes } from '@meta/app' -import { AssessmentName } from '@meta/assessment' -import { User, UserResetPassword, Users } from '@meta/user' +import { ClientRoutes } from 'meta/app' +import { AssessmentName } from 'meta/assessment' +import { User, UserResetPassword, Users } from 'meta/user' import { sendMail } from './mail' diff --git a/src/server/service/mail/userInvite.ts b/src/server/service/mail/userInvite.ts index aa1e5030c1..6805f1a3c0 100644 --- a/src/server/service/mail/userInvite.ts +++ b/src/server/service/mail/userInvite.ts @@ -1,9 +1,9 @@ -import { createI18nPromise } from '@i18n/i18nFactory' +import { createI18nPromise } from 'i18n/i18nFactory' -import { ClientRoutes } from '@meta/app' -import { CountryIso } from '@meta/area' -import { AssessmentName, Assessments } from '@meta/assessment' -import { RoleName, User, UserRole, Users } from '@meta/user' +import { ClientRoutes } from 'meta/app' +import { CountryIso } from 'meta/area' +import { AssessmentName, Assessments } from 'meta/assessment' +import { RoleName, User, UserRole, Users } from 'meta/user' import { sendMail } from './mail' diff --git a/src/server/sessionInit.ts b/src/server/sessionInit.ts index 2d3e5375c7..37826f0c48 100644 --- a/src/server/sessionInit.ts +++ b/src/server/sessionInit.ts @@ -1,7 +1,7 @@ import { Express } from 'express' import * as session from 'express-session' import * as connectPgSimple from 'connect-pg-simple' -import { DB } from '@server/db' +import { DB } from 'server/db' export const init = (app: Express): void => { const PgSession = connectPgSimple(session) diff --git a/src/server/index.ts b/src/server/start.ts similarity index 100% rename from src/server/index.ts rename to src/server/start.ts diff --git a/src/server/utils/accessControl.ts b/src/server/utils/accessControl.ts index 7e13f3d1a8..2f7a17dded 100644 --- a/src/server/utils/accessControl.ts +++ b/src/server/utils/accessControl.ts @@ -1,5 +1,7 @@ export function AccessControlException(key: any, values: any) { + // @ts-ignore this.error = { key, values } + // @ts-ignore Error.captureStackTrace(this, AccessControlException) } diff --git a/src/server/utils/requests.ts b/src/server/utils/requests.ts index 5281c55aac..0505deb7aa 100644 --- a/src/server/utils/requests.ts +++ b/src/server/utils/requests.ts @@ -1,7 +1,7 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' import { Request, Response } from 'express' -import { User } from '@meta/user' +import { User } from 'meta/user' import { AccessControlException } from './accessControl' diff --git a/src/server/utils/sanityChecks.ts b/src/server/utils/sanityChecks.ts index 70358b4e76..39036f1e14 100644 --- a/src/server/utils/sanityChecks.ts +++ b/src/server/utils/sanityChecks.ts @@ -1,4 +1,4 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' import { Request } from 'express' function InvalidParameterException(key: string, values: Array) { diff --git a/src/test/bulkDownloadComparison/compareFiles.ts b/src/test/bulkDownloadComparison/compareFiles.ts index a7f28bae0a..eabf7b53df 100644 --- a/src/test/bulkDownloadComparison/compareFiles.ts +++ b/src/test/bulkDownloadComparison/compareFiles.ts @@ -1,9 +1,9 @@ -import { CountryIso } from '@meta/area' +import { CountryIso } from 'meta/area' -import { getFileName } from '@test/bulkDownloadComparison/getFileName' -import { readCSV } from '@test/bulkDownloadComparison/readCSV' -import { RawFile, RawFileRow, Value, ValueDiff } from '@test/bulkDownloadComparison/types' -import { parseValue } from '@test/dataExportComparison/parseValue' +import { getFileName } from 'test/bulkDownloadComparison/getFileName' +import { readCSV } from 'test/bulkDownloadComparison/readCSV' +import { RawFile, RawFileRow, Value, ValueDiff } from 'test/bulkDownloadComparison/types' +import { parseValue } from 'test/dataExportComparison/parseValue' const skip: Array = ['regions', 'name', '4a_fo_unknown', '3a_prim_no_unknown'] diff --git a/src/test/bulkDownloadComparison/index.ts b/src/test/bulkDownloadComparison/index.ts index 1efe7b6e9b..405e3e1619 100644 --- a/src/test/bulkDownloadComparison/index.ts +++ b/src/test/bulkDownloadComparison/index.ts @@ -3,9 +3,9 @@ import * as fs from 'fs/promises' import * as extract from 'extract-zip' import * as JSON2CSV from 'json2csv' -import { compareFiles } from '@test/bulkDownloadComparison/compareFiles' -import { downloadFile } from '@test/bulkDownloadComparison/downloadFile' -import { getFileName } from '@test/bulkDownloadComparison/getFileName' +import { compareFiles } from 'test/bulkDownloadComparison/compareFiles' +import { downloadFile } from 'test/bulkDownloadComparison/downloadFile' +import { getFileName } from 'test/bulkDownloadComparison/getFileName' const fileNames = ['Annual', 'FRA_Years', 'Intervals'] diff --git a/src/test/bulkDownloadComparison/readCSV.ts b/src/test/bulkDownloadComparison/readCSV.ts index 52f2896718..9e420104f7 100644 --- a/src/test/bulkDownloadComparison/readCSV.ts +++ b/src/test/bulkDownloadComparison/readCSV.ts @@ -1,7 +1,7 @@ import * as fs from 'fs' import * as fastCsv from 'fast-csv' -import { RawFile, RawFileRow } from '@test/bulkDownloadComparison/types' +import { RawFile, RawFileRow } from 'test/bulkDownloadComparison/types' export const readCSV = async (fileName: string, options?: fastCsv.ParserOptions): Promise => { const opts = { diff --git a/src/test/bulkDownloadComparison/types.ts b/src/test/bulkDownloadComparison/types.ts index b5bdd43354..5753cc2e15 100644 --- a/src/test/bulkDownloadComparison/types.ts +++ b/src/test/bulkDownloadComparison/types.ts @@ -1,4 +1,4 @@ -import { CountryIso } from '@meta/area' +import { CountryIso } from 'meta/area' type VariableName = string type Year = string diff --git a/src/test/dataMigration/jest.config.panEu.js b/src/test/dataMigration/jest.config.panEu.js deleted file mode 100644 index 8e83a8923e..0000000000 --- a/src/test/dataMigration/jest.config.panEu.js +++ /dev/null @@ -1,11 +0,0 @@ -// eslint-disable-next-line @typescript-eslint/no-var-requires -const path = require('path') -// eslint-disable-next-line @typescript-eslint/no-var-requires -const sharedConfig = require('../../../jest.config') - -module.exports = { - ...sharedConfig, - rootDir: path.resolve(__dirname, '..', '..', '..'), - testMatch: ['/src/test/dataMigration/panEuPostDataMigration.ts'], - testTimeout: 3_000_000, -} diff --git a/src/test/dataMigration/panEuPostDataMigration.ts b/src/test/dataMigration/panEuPostDataMigration.ts index edf24118de..8007b44489 100644 --- a/src/test/dataMigration/panEuPostDataMigration.ts +++ b/src/test/dataMigration/panEuPostDataMigration.ts @@ -1,46 +1,50 @@ -import { AssessmentController } from '@server/controller/assessment' -import { DB } from '@server/db' -import { Logger } from '@server/utils/logger' +import 'tsconfig-paths/register' +import 'dotenv/config' -import { updateCalculatedNodes } from '@test/dataMigration/steps/updateCalculatedNodes/updateCalculatedNodes' -import { migrateCountryComments } from '@test/dataMigration/stepsPanEuropean/countryComments/migrateCountryComments' +import { AssessmentController } from 'server/controller/assessment' +import { UpdateDependenciesQueueFactory } from 'server/controller/cycleData/updateDependencies' +import { WorkerFactory } from 'server/controller/cycleData/updateDependencies/workerFactory' +import { DB } from 'server/db' +import { Logger } from 'server/utils/logger' + +import { updateCalculatedNodes } from 'test/dataMigration/steps/updateCalculatedNodes/updateCalculatedNodes' +import { migrateCountryComments } from 'test/dataMigration/stepsPanEuropean/countryComments/migrateCountryComments' const assessmentName = `panEuropean` const client = DB let index = 0 const start = new Date().getTime() -afterAll(async () => { +const close = async () => { + // quick and dirty workaround to close redis connection after running integration tests + // TODO: find a better strategy to handle Redis connections + UpdateDependenciesQueueFactory.connection.quit() + WorkerFactory.connection.quit() await DB.$pool.end() -}) +} -const migrateCycle = (cycleName: string) => - test(`Cycle ${cycleName} migration`, async () => { - const { assessment, cycle } = await AssessmentController.getOneWithCycle( - { assessmentName, cycleName, metaCache: true }, - client - ) +const migrateCycle = async (cycleName: string) => { + const { assessment, cycle } = await AssessmentController.getOneWithCycle({ assessmentName, cycleName, metaCache: true }, client) - index += 1 - Logger.debug(` ========== ${index} updateCalculatedNodes ${cycle.name}`) - await updateCalculatedNodes({ assessment, cycle }, client) + index += 1 + Logger.debug(` ========== ${index} updateCalculatedNodes ${cycle.name}`) + await updateCalculatedNodes({ assessment, cycle }, client) - index += 1 - Logger.debug(` ========== ${index} migrateCountryComments ${cycle.name}`) - await migrateCountryComments({ assessment, cycle }, client) - }) + index += 1 + Logger.debug(` ========== ${index} migrateCountryComments ${cycle.name}`) + await migrateCountryComments({ assessment, cycle }, client) +} -describe(`Post Data migration`, () => { - test(`LogStart`, async () => { - Logger.debug(`========== START POST DATA MIGRATION `, start) - }) +const exec = async () => { + Logger.debug(`========== START POST DATA MIGRATION `, start) // migrateCycle('2020') - migrateCycle('2025') + await migrateCycle('2025') + + await close() +} - test(`LogEnd`, () => { - const end = new Date().getTime() - Logger.debug(`========== END `, end, `ELAPSED (s)`, (end - start) / 1000) - process.exit(0) - }) +exec().then(() => { + const end = new Date().getTime() + Logger.info(`========== panEuropean post data migration executed in ${(end - start) / 1000} (s)`) }) diff --git a/src/test/dataMigration/postDataMigration.ts b/src/test/dataMigration/postDataMigration.ts index fe3f4db610..6fc0c1e148 100644 --- a/src/test/dataMigration/postDataMigration.ts +++ b/src/test/dataMigration/postDataMigration.ts @@ -1,20 +1,20 @@ -import { AssessmentController } from '@server/controller/assessment' -import { DB } from '@server/db' -import { Logger } from '@server/utils/logger' - -import { add2025Columns } from '@test/dataMigration/steps/add2025Columns/add2025Columns' -import { cleanupCountryProps } from '@test/dataMigration/steps/cleanupCountryProps' -import { deleteAtlantisData } from '@test/dataMigration/steps/deleteAtlantisData/deleteAtlantisData' -import { deleteInvalid2025Nodes } from '@test/dataMigration/steps/deleteInvalid2025Nodes/deleteInvalid2025Nodes' -import { deleteWrongCalculatedNodes } from '@test/dataMigration/steps/deleteWrongCalculatedNodes' -import { metadataFix } from '@test/dataMigration/steps/metadataFix/metadataFix' -import { migrateBiomassAndCarbonStockData } from '@test/dataMigration/steps/migrateBiomassAndCarbonStockData' -import { migrateDescriptions } from '@test/dataMigration/steps/migrateDescriptions' -import { migrateMessageBoard } from '@test/dataMigration/steps/migrateMessageBoard' -import { migrateNodeExt } from '@test/dataMigration/steps/migrateNodeExt/migrateNodeExt' -import { migratePrimaryForestData } from '@test/dataMigration/steps/migratePrimaryForestData' -import { postMetadataFix } from '@test/dataMigration/steps/postMetadataFix/postMetadataFix' -import { updateCalculatedNodes } from '@test/dataMigration/steps/updateCalculatedNodes/updateCalculatedNodes' +import { AssessmentController } from 'server/controller/assessment' +import { DB } from 'server/db' +import { Logger } from 'server/utils/logger' + +import { add2025Columns } from 'test/dataMigration/steps/add2025Columns/add2025Columns' +import { cleanupCountryProps } from 'test/dataMigration/steps/cleanupCountryProps' +import { deleteAtlantisData } from 'test/dataMigration/steps/deleteAtlantisData/deleteAtlantisData' +import { deleteInvalid2025Nodes } from 'test/dataMigration/steps/deleteInvalid2025Nodes/deleteInvalid2025Nodes' +import { deleteWrongCalculatedNodes } from 'test/dataMigration/steps/deleteWrongCalculatedNodes' +import { metadataFix } from 'test/dataMigration/steps/metadataFix/metadataFix' +import { migrateBiomassAndCarbonStockData } from 'test/dataMigration/steps/migrateBiomassAndCarbonStockData' +import { migrateDescriptions } from 'test/dataMigration/steps/migrateDescriptions' +import { migrateMessageBoard } from 'test/dataMigration/steps/migrateMessageBoard' +import { migrateNodeExt } from 'test/dataMigration/steps/migrateNodeExt/migrateNodeExt' +import { migratePrimaryForestData } from 'test/dataMigration/steps/migratePrimaryForestData' +import { postMetadataFix } from 'test/dataMigration/steps/postMetadataFix/postMetadataFix' +import { updateCalculatedNodes } from 'test/dataMigration/steps/updateCalculatedNodes/updateCalculatedNodes' const assessmentName = `fra` const client = DB diff --git a/src/test/dataMigration/steps/add2025Columns/add2025Columns.ts b/src/test/dataMigration/steps/add2025Columns/add2025Columns.ts index e5c5090043..575f4ce667 100644 --- a/src/test/dataMigration/steps/add2025Columns/add2025Columns.ts +++ b/src/test/dataMigration/steps/add2025Columns/add2025Columns.ts @@ -1,9 +1,9 @@ -import { Objects } from '@utils/objects' import * as pgPromise from 'pg-promise' +import { Objects } from 'utils/objects' -import { Assessment, ColProps, ColType, Row, RowType } from '@meta/assessment' +import { Assessment, ColProps, ColType, Row, RowType } from 'meta/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { BaseProtocol, Schemas } from 'server/db' type Props = { assessment: Assessment diff --git a/src/test/dataMigration/steps/cleanupCountryProps.ts b/src/test/dataMigration/steps/cleanupCountryProps.ts index 56ea8eee4c..b35853889f 100644 --- a/src/test/dataMigration/steps/cleanupCountryProps.ts +++ b/src/test/dataMigration/steps/cleanupCountryProps.ts @@ -1,6 +1,6 @@ -import { Assessment, Cycle } from '@meta/assessment' +import { Assessment, Cycle } from 'meta/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { BaseProtocol, Schemas } from 'server/db' export const cleanupCountryProps = async (props: { assessment: Assessment; cycle: Cycle }, client: BaseProtocol) => { const { assessment, cycle } = props diff --git a/src/test/dataMigration/steps/deleteAtlantisData/deleteAtlantisData.ts b/src/test/dataMigration/steps/deleteAtlantisData/deleteAtlantisData.ts index ba559a9424..7223c15287 100644 --- a/src/test/dataMigration/steps/deleteAtlantisData/deleteAtlantisData.ts +++ b/src/test/dataMigration/steps/deleteAtlantisData/deleteAtlantisData.ts @@ -1,6 +1,6 @@ -import { Assessment } from '@meta/assessment' +import { Assessment } from 'meta/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { BaseProtocol, Schemas } from 'server/db' type Props = { assessment: Assessment diff --git a/src/test/dataMigration/steps/deleteInvalid2025Nodes/deleteInvalid2025Nodes.ts b/src/test/dataMigration/steps/deleteInvalid2025Nodes/deleteInvalid2025Nodes.ts index 710449a111..e740c79a4f 100644 --- a/src/test/dataMigration/steps/deleteInvalid2025Nodes/deleteInvalid2025Nodes.ts +++ b/src/test/dataMigration/steps/deleteInvalid2025Nodes/deleteInvalid2025Nodes.ts @@ -1,6 +1,6 @@ -import { Assessment } from '@meta/assessment' +import { Assessment } from 'meta/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { BaseProtocol, Schemas } from 'server/db' type Props = { assessment: Assessment diff --git a/src/test/dataMigration/steps/deleteWrongCalculatedNodes.ts b/src/test/dataMigration/steps/deleteWrongCalculatedNodes.ts index 095b94ba8b..589906aa82 100644 --- a/src/test/dataMigration/steps/deleteWrongCalculatedNodes.ts +++ b/src/test/dataMigration/steps/deleteWrongCalculatedNodes.ts @@ -1,6 +1,6 @@ -import { Assessment, Cycle } from '@meta/assessment' +import { Assessment, Cycle } from 'meta/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { BaseProtocol, Schemas } from 'server/db' export const deleteWrongCalculatedNodes = async ( props: { assessment: Assessment; cycle: Cycle }, diff --git a/src/test/dataMigration/steps/metadataFix/metadataFix.ts b/src/test/dataMigration/steps/metadataFix/metadataFix.ts index 28f47bbd00..511fa28abc 100644 --- a/src/test/dataMigration/steps/metadataFix/metadataFix.ts +++ b/src/test/dataMigration/steps/metadataFix/metadataFix.ts @@ -1,6 +1,6 @@ -import { Assessment } from '@meta/assessment' +import { Assessment } from 'meta/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { BaseProtocol, Schemas } from 'server/db' type Props = { assessment: Assessment diff --git a/src/test/dataMigration/steps/migrateBiomassAndCarbonStockData.ts b/src/test/dataMigration/steps/migrateBiomassAndCarbonStockData.ts index 91cad8ed87..ee5948b74d 100644 --- a/src/test/dataMigration/steps/migrateBiomassAndCarbonStockData.ts +++ b/src/test/dataMigration/steps/migrateBiomassAndCarbonStockData.ts @@ -1,6 +1,6 @@ -import { Assessment } from '@meta/assessment' +import { Assessment } from 'meta/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { BaseProtocol, Schemas } from 'server/db' type Props = { assessment: Assessment diff --git a/src/test/dataMigration/steps/migrateDescriptions.ts b/src/test/dataMigration/steps/migrateDescriptions.ts index 2586436734..9f60200d43 100644 --- a/src/test/dataMigration/steps/migrateDescriptions.ts +++ b/src/test/dataMigration/steps/migrateDescriptions.ts @@ -1,6 +1,6 @@ -import { Assessment, Cycle } from '@meta/assessment' +import { Assessment, Cycle } from 'meta/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { BaseProtocol, Schemas } from 'server/db' export const migrateDescriptions = async ( props: { assessment: Assessment; cycle: Cycle }, diff --git a/src/test/dataMigration/steps/migrateMessageBoard.ts b/src/test/dataMigration/steps/migrateMessageBoard.ts index b2d56a3eae..f93517d395 100644 --- a/src/test/dataMigration/steps/migrateMessageBoard.ts +++ b/src/test/dataMigration/steps/migrateMessageBoard.ts @@ -1,6 +1,6 @@ -import { Assessment } from '@meta/assessment' +import { Assessment } from 'meta/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { BaseProtocol, Schemas } from 'server/db' type Props = { assessment: Assessment diff --git a/src/test/dataMigration/steps/migrateNodeExt/migrateNodeExt.ts b/src/test/dataMigration/steps/migrateNodeExt/migrateNodeExt.ts index 60d4ec764f..522bd71c20 100644 --- a/src/test/dataMigration/steps/migrateNodeExt/migrateNodeExt.ts +++ b/src/test/dataMigration/steps/migrateNodeExt/migrateNodeExt.ts @@ -1,10 +1,10 @@ import * as pgPromise from 'pg-promise' -import { Assessment, Cycle } from '@meta/assessment' +import { Assessment, Cycle } from 'meta/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { BaseProtocol, Schemas } from 'server/db' -import landArea from '@test/dataMigration/steps/updateCalculatedNodes/landArea' +import landArea from 'test/dataMigration/steps/updateCalculatedNodes/landArea' export const migrateNodeExt = async ( props: { assessment: Assessment; cycle: Cycle }, diff --git a/src/test/dataMigration/steps/migratePrimaryForestData.ts b/src/test/dataMigration/steps/migratePrimaryForestData.ts index 8b0a13175a..c5bf0afa94 100644 --- a/src/test/dataMigration/steps/migratePrimaryForestData.ts +++ b/src/test/dataMigration/steps/migratePrimaryForestData.ts @@ -1,6 +1,6 @@ -import { Assessment } from '@meta/assessment' +import { Assessment } from 'meta/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { BaseProtocol, Schemas } from 'server/db' type Props = { assessment: Assessment diff --git a/src/test/dataMigration/steps/postMetadataFix/postMetadataFix.ts b/src/test/dataMigration/steps/postMetadataFix/postMetadataFix.ts index 399ed90f5d..97e5896a90 100644 --- a/src/test/dataMigration/steps/postMetadataFix/postMetadataFix.ts +++ b/src/test/dataMigration/steps/postMetadataFix/postMetadataFix.ts @@ -1,6 +1,6 @@ -import { Assessment } from '@meta/assessment' +import { Assessment } from 'meta/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { BaseProtocol, Schemas } from 'server/db' type Props = { assessment: Assessment diff --git a/src/test/dataMigration/steps/updateCalculatedNodes/calculateRow.ts b/src/test/dataMigration/steps/updateCalculatedNodes/calculateRow.ts index a070b8039e..fcfac40933 100644 --- a/src/test/dataMigration/steps/updateCalculatedNodes/calculateRow.ts +++ b/src/test/dataMigration/steps/updateCalculatedNodes/calculateRow.ts @@ -1,12 +1,12 @@ -import { CountryIso } from '@meta/area' -import { Assessment, AssessmentMetaCaches, Cycle, Row, VariableCache } from '@meta/assessment' -import { ExpressionEvaluator } from '@meta/expressionEvaluator' +import { CountryIso } from 'meta/area' +import { Assessment, AssessmentMetaCaches, Cycle, Row, VariableCache } from 'meta/assessment' +import { ExpressionEvaluator } from 'meta/expressionEvaluator' -import { CycleDataController } from '@server/controller/cycleData' -import { MetadataController } from '@server/controller/metadata' -import { BaseProtocol } from '@server/db' +import { CycleDataController } from 'server/controller/cycleData' +import { MetadataController } from 'server/controller/metadata' +import { BaseProtocol } from 'server/db' -import { NodeRow } from '@test/dataMigration/types' +import { NodeRow } from 'test/dataMigration/types' const hasBeenCalculated = (props: { variable: VariableCache diff --git a/src/test/dataMigration/steps/updateCalculatedNodes/getCertifiedAreaValues.ts b/src/test/dataMigration/steps/updateCalculatedNodes/getCertifiedAreaValues.ts index f6f954d25e..38f6e83f2c 100644 --- a/src/test/dataMigration/steps/updateCalculatedNodes/getCertifiedAreaValues.ts +++ b/src/test/dataMigration/steps/updateCalculatedNodes/getCertifiedAreaValues.ts @@ -1,8 +1,8 @@ -import { Cycle } from '@meta/assessment' +import { Cycle } from 'meta/assessment' -import { BaseProtocol } from '@server/db' +import { BaseProtocol } from 'server/db' -import { NodeRow } from '@test/dataMigration/types' +import { NodeRow } from 'test/dataMigration/types' export const getCertifiedAreaValues = async ( props: { cycle: Cycle }, diff --git a/src/test/dataMigration/steps/updateCalculatedNodes/getClimaticDomainValues.ts b/src/test/dataMigration/steps/updateCalculatedNodes/getClimaticDomainValues.ts index ab110c3686..5157b8b3d5 100644 --- a/src/test/dataMigration/steps/updateCalculatedNodes/getClimaticDomainValues.ts +++ b/src/test/dataMigration/steps/updateCalculatedNodes/getClimaticDomainValues.ts @@ -1,8 +1,8 @@ -import { Cycle } from '@meta/assessment' +import { Cycle } from 'meta/assessment' -import { BaseProtocol } from '@server/db' +import { BaseProtocol } from 'server/db' -import { NodeRow } from '@test/dataMigration/types' +import { NodeRow } from 'test/dataMigration/types' export const getClimaticDomainValues = async ( props: { cycle: Cycle }, diff --git a/src/test/dataMigration/steps/updateCalculatedNodes/getTotalLandAreaValues.ts b/src/test/dataMigration/steps/updateCalculatedNodes/getTotalLandAreaValues.ts index b9f973f167..c6c50eac14 100644 --- a/src/test/dataMigration/steps/updateCalculatedNodes/getTotalLandAreaValues.ts +++ b/src/test/dataMigration/steps/updateCalculatedNodes/getTotalLandAreaValues.ts @@ -1,8 +1,8 @@ -import { Cycle } from '@meta/assessment' +import { Cycle } from 'meta/assessment' -import { BaseProtocol } from '@server/db' +import { BaseProtocol } from 'server/db' -import { NodeRow } from '@test/dataMigration/types' +import { NodeRow } from 'test/dataMigration/types' import landArea from './landArea' diff --git a/src/test/dataMigration/steps/updateCalculatedNodes/updateCalculatedNodes.ts b/src/test/dataMigration/steps/updateCalculatedNodes/updateCalculatedNodes.ts index f1d74b5433..22de2de362 100644 --- a/src/test/dataMigration/steps/updateCalculatedNodes/updateCalculatedNodes.ts +++ b/src/test/dataMigration/steps/updateCalculatedNodes/updateCalculatedNodes.ts @@ -1,16 +1,16 @@ -import { Objects } from '@utils/objects' import * as pgPromise from 'pg-promise' +import { Objects } from 'utils/objects' -import { Assessment, AssessmentNames, Cycle, Row, VariableCache } from '@meta/assessment' +import { Assessment, AssessmentNames, Cycle, Row, VariableCache } from 'meta/assessment' -import { AreaController } from '@server/controller/area' -import { BaseProtocol, Schemas } from '@server/db' -import { ColAdapter } from '@server/repository/adapter' +import { AreaController } from 'server/controller/area' +import { BaseProtocol, Schemas } from 'server/db' +import { ColAdapter } from 'server/repository/adapter' -import { calculateRow } from '@test/dataMigration/steps/updateCalculatedNodes/calculateRow' -import { getCertifiedAreaValues } from '@test/dataMigration/steps/updateCalculatedNodes/getCertifiedAreaValues' -import { getClimaticDomainValues } from '@test/dataMigration/steps/updateCalculatedNodes/getClimaticDomainValues' -import { getTotalLandAreaValues } from '@test/dataMigration/steps/updateCalculatedNodes/getTotalLandAreaValues' +import { calculateRow } from 'test/dataMigration/steps/updateCalculatedNodes/calculateRow' +import { getCertifiedAreaValues } from 'test/dataMigration/steps/updateCalculatedNodes/getCertifiedAreaValues' +import { getClimaticDomainValues } from 'test/dataMigration/steps/updateCalculatedNodes/getClimaticDomainValues' +import { getTotalLandAreaValues } from 'test/dataMigration/steps/updateCalculatedNodes/getTotalLandAreaValues' export const updateCalculatedNodes = async ( props: { assessment: Assessment; cycle: Cycle }, diff --git a/src/test/dataMigration/steps/validateNodes/validateNodes.ts b/src/test/dataMigration/steps/validateNodes/validateNodes.ts index b55f5b3bd5..c10e24db90 100644 --- a/src/test/dataMigration/steps/validateNodes/validateNodes.ts +++ b/src/test/dataMigration/steps/validateNodes/validateNodes.ts @@ -1,15 +1,15 @@ -import { Objects } from '@utils/objects' import * as pgPromise from 'pg-promise' +import { Objects } from 'utils/objects' -import { Assessment, Col, Cycle, Node, Row, TableNames } from '@meta/assessment' +import { Assessment, Col, Cycle, Node, Row, TableNames } from 'meta/assessment' -import { CycleDataController } from '@server/controller/cycleData' -import { validateNode } from '@server/controller/cycleData/updateDependencies/updateValidationDependencies/validateNode' -import { BaseProtocol, Schemas } from '@server/db' -import { ColAdapter } from '@server/repository/adapter' -import { CountryRepository } from '@server/repository/assessmentCycle/country' +import { CycleDataController } from 'server/controller/cycleData' +import { validateNode } from 'server/controller/cycleData/updateDependencies/updateValidationDependencies/validateNode' +import { BaseProtocol, Schemas } from 'server/db' +import { ColAdapter } from 'server/repository/adapter' +import { CountryRepository } from 'server/repository/assessmentCycle/country' -import { NodeRow } from '@test/dataMigration/types' +import { NodeRow } from 'test/dataMigration/types' export const validateNodes = async ( props: { assessment: Assessment; cycle: Cycle }, diff --git a/src/test/dataMigration/stepsPanEuropean/countryComments/migrateCountryComments.ts b/src/test/dataMigration/stepsPanEuropean/countryComments/migrateCountryComments.ts index 6922222102..668923e55b 100644 --- a/src/test/dataMigration/stepsPanEuropean/countryComments/migrateCountryComments.ts +++ b/src/test/dataMigration/stepsPanEuropean/countryComments/migrateCountryComments.ts @@ -1,16 +1,16 @@ import * as fs from 'fs/promises' import * as path from 'path' -import { Numbers } from '@utils/numbers' import * as pgPromise from 'pg-promise' +import { Numbers } from 'utils/numbers' -import { Assessment, Cycle, RowType, Table } from '@meta/assessment' +import { Assessment, Cycle, RowType, Table } from 'meta/assessment' -import { MetadataController } from '@server/controller/metadata' -import { BaseProtocol, Schemas } from '@server/db' -import { FileCSV } from '@server/utils/fileCSV' -import { Logger } from '@server/utils/logger' +import { MetadataController } from 'server/controller/metadata' +import { BaseProtocol, Schemas } from 'server/db' +import { FileCSV } from 'server/utils/fileCSV' +import { Logger } from 'server/utils/logger' -import { NodeRow } from '@test/dataMigration/types' +import { NodeRow } from 'test/dataMigration/types' type Props = { assessment: Assessment diff --git a/src/test/dataMigration/types.ts b/src/test/dataMigration/types.ts index 32221a5526..9676864fc6 100644 --- a/src/test/dataMigration/types.ts +++ b/src/test/dataMigration/types.ts @@ -1,3 +1,3 @@ -import { NodeValue } from '@meta/assessment' +import { NodeValue } from 'meta/assessment' export type NodeRow = { country_iso: string; row_uuid: string; col_uuid: string; value: NodeValue } diff --git a/src/test/generateMetaCache/index.ts b/src/test/generateMetaCache/index.ts index a51901b659..13955e2ace 100644 --- a/src/test/generateMetaCache/index.ts +++ b/src/test/generateMetaCache/index.ts @@ -1,10 +1,10 @@ -import { Objects } from '@utils/index' +import { Objects } from 'utils/objects' -import { Assessment, Cycle } from '@meta/assessment' +import { Assessment, Cycle } from 'meta/assessment' -import { AssessmentController } from '@server/controller/assessment' -import { DB } from '@server/db' -import { Logger } from '@server/utils/logger' +import { AssessmentController } from 'server/controller/assessment' +import { DB } from 'server/db' +import { Logger } from 'server/utils/logger' const client = DB @@ -23,9 +23,7 @@ describe(`Generate:`, () => { const assessment = assessments[i] Logger.debug(`\t---- Generating meta cache for assessment ${assessment.props.name}`) // eslint-disable-next-line no-await-in-loop - const cycles = await client.many(`select * from assessment_cycle ac where ac.assessment_id = $1`, [ - assessment.id, - ]) + const cycles = await client.many(`select * from assessment_cycle ac where ac.assessment_id = $1`, [assessment.id]) for (let i = 0; i < cycles.length; i += 1) { const cycle = cycles[i] diff --git a/src/test/integration/assessment/createAssessment.ts b/src/test/integration/assessment/createAssessment.ts index fdb7f75ac6..b622a50ec5 100644 --- a/src/test/integration/assessment/createAssessment.ts +++ b/src/test/integration/assessment/createAssessment.ts @@ -1,8 +1,8 @@ -import { AssessmentController } from '@server/controller/assessment' -import { UserController } from '@server/controller/user' +import { AssessmentController } from 'server/controller/assessment' +import { UserController } from 'server/controller/user' -import { assessmentCycleName, assessmentParams } from '@test/integration/mock/assessment' -import { userMockTest } from '@test/integration/mock/user' +import { assessmentCycleName, assessmentParams } from 'test/integration/mock/assessment' +import { userMockTest } from 'test/integration/mock/user' export default () => test('Expect assessment to be created', async () => { diff --git a/src/test/integration/assessment/originalDataPoint.ts b/src/test/integration/assessment/originalDataPoint.ts index 1834279275..20f3594015 100644 --- a/src/test/integration/assessment/originalDataPoint.ts +++ b/src/test/integration/assessment/originalDataPoint.ts @@ -1,12 +1,12 @@ -import { Assessment, Cycle, OriginalDataPoint } from '@meta/assessment' -import { User } from '@meta/user' +import { Assessment, Cycle, OriginalDataPoint } from 'meta/assessment' +import { User } from 'meta/user' -import { AssessmentController } from '@server/controller/assessment' -import { CycleDataController } from '@server/controller/cycleData' -import { UserController } from '@server/controller/user' +import { AssessmentController } from 'server/controller/assessment' +import { CycleDataController } from 'server/controller/cycleData' +import { UserController } from 'server/controller/user' -import { assessmentCycleName, assessmentParams, originalDataPoint } from '@test/integration/mock/assessment' -import { userMockTest } from '@test/integration/mock/user' +import { assessmentCycleName, assessmentParams, originalDataPoint } from 'test/integration/mock/assessment' +import { userMockTest } from 'test/integration/mock/user' export default (): void => describe('Original data point', () => { diff --git a/src/test/integration/assessment/removeAssessment.ts b/src/test/integration/assessment/removeAssessment.ts index 21e5ec3b3c..8310e811b4 100644 --- a/src/test/integration/assessment/removeAssessment.ts +++ b/src/test/integration/assessment/removeAssessment.ts @@ -1,6 +1,6 @@ -import { assessmentParams } from '@test/integration/mock/assessment' +import { AssessmentController } from 'server/controller/assessment' -import { AssessmentController } from '@server/controller/assessment' +import { assessmentParams } from 'test/integration/mock/assessment' export default () => test('Expect assessment to be removed', async () => { diff --git a/src/test/integration/assessment/updateAssessmentDefaultCycle.ts b/src/test/integration/assessment/updateAssessmentDefaultCycle.ts index ae055f0be3..61c5b48a65 100644 --- a/src/test/integration/assessment/updateAssessmentDefaultCycle.ts +++ b/src/test/integration/assessment/updateAssessmentDefaultCycle.ts @@ -1,8 +1,8 @@ -import { AssessmentController } from '@server/controller/assessment' -import { UserController } from '@server/controller/user' +import { AssessmentController } from 'server/controller/assessment' +import { UserController } from 'server/controller/user' -import { assessmentCycleName, assessmentParams } from '@test/integration/mock/assessment' -import { userMockTest } from '@test/integration/mock/user' +import { assessmentCycleName, assessmentParams } from 'test/integration/mock/assessment' +import { userMockTest } from 'test/integration/mock/user' export default (): void => test('Update Assessment Default Cycle', async () => { diff --git a/src/test/integration/integration.test.ts b/src/test/integration/integration.test.ts index c5f34940c1..1c078bcade 100644 --- a/src/test/integration/integration.test.ts +++ b/src/test/integration/integration.test.ts @@ -1,27 +1,29 @@ -import * as QueueFactory from '@server/controller/cycleData/updateDependencies/queueFactory' -import * as WorkerFactory from '@server/controller/cycleData/updateDependencies/workerFactory' -import { DB } from '@server/db' +import 'dotenv/config' -import assessmentCreate from '@test/integration/assessment/createAssessment' -import originalDataPoint from '@test/integration/assessment/originalDataPoint' -import assessmentRemove from '@test/integration/assessment/removeAssessment' -import updateAssessmentDefaultCycle from '@test/integration/assessment/updateAssessmentDefaultCycle' -import messageCenter from '@test/integration/messageCenter/messageCenter' -import sectionCreateChild from '@test/integration/section/createChildSection' -import sectionCreate from '@test/integration/section/createSection' -import sectionRemove from '@test/integration/section/removeSection' -import sectionUpdate from '@test/integration/section/updateSection' -import sectionUpdateChild from '@test/integration/section/updateSubSection' -import settingsDefaultAssessment from '@test/integration/settings/defaultAssessment' -import tableCreate from '@test/integration/table/createTable' -import tableRemove from '@test/integration/table/removeTable' -import tableUpdate from '@test/integration/table/updateTable' -import tableSectionCreate from '@test/integration/tableSection/createTableSection' -import tableSectionRemove from '@test/integration/tableSection/removeTableSection' -import tableSectionUpdate from '@test/integration/tableSection/updateTableSection' -import userInvite from '@test/integration/user/userInvite' -import userRemove from '@test/integration/user/userRemove' -import userResetPassword from '@test/integration/user/userResetPassword' +import { UpdateDependenciesQueueFactory } from 'server/controller/cycleData/updateDependencies/queueFactory' +import { WorkerFactory } from 'server/controller/cycleData/updateDependencies/workerFactory' +import { DB } from 'server/db' + +import assessmentCreate from 'test/integration/assessment/createAssessment' +import originalDataPoint from 'test/integration/assessment/originalDataPoint' +import assessmentRemove from 'test/integration/assessment/removeAssessment' +import updateAssessmentDefaultCycle from 'test/integration/assessment/updateAssessmentDefaultCycle' +import messageCenter from 'test/integration/messageCenter/messageCenter' +import sectionCreateChild from 'test/integration/section/createChildSection' +import sectionCreate from 'test/integration/section/createSection' +import sectionRemove from 'test/integration/section/removeSection' +import sectionUpdate from 'test/integration/section/updateSection' +import sectionUpdateChild from 'test/integration/section/updateSubSection' +import settingsDefaultAssessment from 'test/integration/settings/defaultAssessment' +import tableCreate from 'test/integration/table/createTable' +import tableRemove from 'test/integration/table/removeTable' +import tableUpdate from 'test/integration/table/updateTable' +import tableSectionCreate from 'test/integration/tableSection/createTableSection' +import tableSectionRemove from 'test/integration/tableSection/removeTableSection' +import tableSectionUpdate from 'test/integration/tableSection/updateTableSection' +import userInvite from 'test/integration/user/userInvite' +import userRemove from 'test/integration/user/userRemove' +import userResetPassword from 'test/integration/user/userResetPassword' import userCreate from './user/userCreate' @@ -29,7 +31,7 @@ afterAll(async () => { await DB.$pool.end() // quick and dirty workaround to close redis connection after running integration tests // TODO: find a better strategy to handle Redis connections - QueueFactory.connection.quit() + UpdateDependenciesQueueFactory.connection.quit() WorkerFactory.connection.quit() }) diff --git a/src/test/integration/messageCenter/messageCenter.ts b/src/test/integration/messageCenter/messageCenter.ts index 3f5e647ad8..0e409b5607 100644 --- a/src/test/integration/messageCenter/messageCenter.ts +++ b/src/test/integration/messageCenter/messageCenter.ts @@ -1,14 +1,14 @@ -import { CountryIso } from '@meta/area' -import { Assessment, Cycle } from '@meta/assessment' -import { MessageTopicType } from '@meta/messageCenter' -import { User } from '@meta/user' +import { CountryIso } from 'meta/area' +import { Assessment, Cycle } from 'meta/assessment' +import { MessageTopicType } from 'meta/messageCenter' +import { User } from 'meta/user' -import { AssessmentController } from '@server/controller/assessment' -import { MessageCenterController } from '@server/controller/messageCenter' -import { UserController } from '@server/controller/user' +import { AssessmentController } from 'server/controller/assessment' +import { MessageCenterController } from 'server/controller/messageCenter' +import { UserController } from 'server/controller/user' -import { assessmentCycleName, assessmentParams } from '@test/integration/mock/assessment' -import { userMockTest } from '@test/integration/mock/user' +import { assessmentCycleName, assessmentParams } from 'test/integration/mock/assessment' +import { userMockTest } from 'test/integration/mock/user' export default (): void => describe('Message topic tests', () => { diff --git a/src/test/integration/mock/assessment.ts b/src/test/integration/mock/assessment.ts index b1e3b7eeb2..926fbd88a8 100644 --- a/src/test/integration/mock/assessment.ts +++ b/src/test/integration/mock/assessment.ts @@ -1,5 +1,5 @@ -import { OriginalDataPoint } from '@meta/assessment' -import { AssessmentNames } from '@meta/assessment/assessmentName' +import { OriginalDataPoint } from 'meta/assessment' +import { AssessmentNames } from 'meta/assessment/assessmentName' export const assessmentParams = { props: { diff --git a/src/test/integration/mock/user.ts b/src/test/integration/mock/user.ts index b8e4f4ddaa..f1f65c5716 100644 --- a/src/test/integration/mock/user.ts +++ b/src/test/integration/mock/user.ts @@ -1,4 +1,4 @@ -import { User } from '@meta/user' +import { User } from 'meta/user' export const userMockTest: Pick = { email: 'test@fra-platform.com', diff --git a/src/test/integration/section/createChildSection.ts b/src/test/integration/section/createChildSection.ts index de6543f126..014ac1e543 100644 --- a/src/test/integration/section/createChildSection.ts +++ b/src/test/integration/section/createChildSection.ts @@ -1,10 +1,10 @@ -import { AssessmentController } from '@server/controller/assessment' -import { MetadataController } from '@server/controller/metadata' -import { UserController } from '@server/controller/user' +import { AssessmentController } from 'server/controller/assessment' +import { MetadataController } from 'server/controller/metadata' +import { UserController } from 'server/controller/user' -import { assessmentParams } from '@test/integration/mock/assessment' -import { subSectionParams } from '@test/integration/mock/section' -import { userMockTest } from '@test/integration/mock/user' +import { assessmentParams } from 'test/integration/mock/assessment' +import { subSectionParams } from 'test/integration/mock/section' +import { userMockTest } from 'test/integration/mock/user' export default () => test('Expect Child section to be created', async () => { diff --git a/src/test/integration/section/createSection.ts b/src/test/integration/section/createSection.ts index c188dbdb22..dde17a5065 100644 --- a/src/test/integration/section/createSection.ts +++ b/src/test/integration/section/createSection.ts @@ -1,10 +1,10 @@ -import { AssessmentController } from '@server/controller/assessment' -import { MetadataController } from '@server/controller/metadata' -import { UserController } from '@server/controller/user' +import { AssessmentController } from 'server/controller/assessment' +import { MetadataController } from 'server/controller/metadata' +import { UserController } from 'server/controller/user' -import { assessmentParams } from '@test/integration/mock/assessment' -import { sectionParams } from '@test/integration/mock/section' -import { userMockTest } from '@test/integration/mock/user' +import { assessmentParams } from 'test/integration/mock/assessment' +import { sectionParams } from 'test/integration/mock/section' +import { userMockTest } from 'test/integration/mock/user' export default () => test('Expect section to be created', async () => { diff --git a/src/test/integration/section/removeSection.ts b/src/test/integration/section/removeSection.ts index dbc0a23cd8..9923778e81 100644 --- a/src/test/integration/section/removeSection.ts +++ b/src/test/integration/section/removeSection.ts @@ -1,10 +1,10 @@ -import { AssessmentController } from '@server/controller/assessment' -import { MetadataController } from '@server/controller/metadata' -import { UserController } from '@server/controller/user' +import { AssessmentController } from 'server/controller/assessment' +import { MetadataController } from 'server/controller/metadata' +import { UserController } from 'server/controller/user' -import { assessmentParams } from '@test/integration/mock/assessment' -import { sectionParams } from '@test/integration/mock/section' -import { userMockTest } from '@test/integration/mock/user' +import { assessmentParams } from 'test/integration/mock/assessment' +import { sectionParams } from 'test/integration/mock/section' +import { userMockTest } from 'test/integration/mock/user' export default () => { return test('Expect section to be removed', async () => { diff --git a/src/test/integration/section/updateSection.ts b/src/test/integration/section/updateSection.ts index c69d6d6234..24d1f5fc3a 100644 --- a/src/test/integration/section/updateSection.ts +++ b/src/test/integration/section/updateSection.ts @@ -1,10 +1,10 @@ -import { AssessmentController } from '@server/controller/assessment' -import { MetadataController } from '@server/controller/metadata' -import { UserController } from '@server/controller/user' +import { AssessmentController } from 'server/controller/assessment' +import { MetadataController } from 'server/controller/metadata' +import { UserController } from 'server/controller/user' -import { assessmentParams } from '@test/integration/mock/assessment' -import { sectionParams } from '@test/integration/mock/section' -import { userMockTest } from '@test/integration/mock/user' +import { assessmentParams } from 'test/integration/mock/assessment' +import { sectionParams } from 'test/integration/mock/section' +import { userMockTest } from 'test/integration/mock/user' export default () => { return test('Expect section to be updated', async () => { diff --git a/src/test/integration/section/updateSubSection.ts b/src/test/integration/section/updateSubSection.ts index 5fab898f34..deec0bae9c 100644 --- a/src/test/integration/section/updateSubSection.ts +++ b/src/test/integration/section/updateSubSection.ts @@ -1,10 +1,10 @@ -import { AssessmentController } from '@server/controller/assessment' -import { MetadataController } from '@server/controller/metadata' -import { UserController } from '@server/controller/user' +import { AssessmentController } from 'server/controller/assessment' +import { MetadataController } from 'server/controller/metadata' +import { UserController } from 'server/controller/user' -import { assessmentParams } from '@test/integration/mock/assessment' -import { subSectionParams } from '@test/integration/mock/section' -import { userMockTest } from '@test/integration/mock/user' +import { assessmentParams } from 'test/integration/mock/assessment' +import { subSectionParams } from 'test/integration/mock/section' +import { userMockTest } from 'test/integration/mock/user' export default () => { return test('Expect section to be updated', async () => { diff --git a/src/test/integration/settings/defaultAssessment.ts b/src/test/integration/settings/defaultAssessment.ts index 854ea043b2..3d8fc8ba6e 100644 --- a/src/test/integration/settings/defaultAssessment.ts +++ b/src/test/integration/settings/defaultAssessment.ts @@ -1,7 +1,7 @@ -import { assessmentParams } from '@test/integration/mock/assessment' +import { AssessmentController } from 'server/controller/assessment' +import { SettingsController } from 'server/controller/settings' -import { AssessmentController } from '@server/controller/assessment' -import { SettingsController } from '@server/controller/settings' +import { assessmentParams } from 'test/integration/mock/assessment' export default (): void => test('Default assessment', async () => { diff --git a/src/test/integration/table/createTable.ts b/src/test/integration/table/createTable.ts index 4de1b4f0b1..59505e43e0 100644 --- a/src/test/integration/table/createTable.ts +++ b/src/test/integration/table/createTable.ts @@ -1,10 +1,10 @@ -import { AssessmentController } from '@server/controller/assessment' -import { MetadataController } from '@server/controller/metadata' -import { UserController } from '@server/controller/user' +import { AssessmentController } from 'server/controller/assessment' +import { MetadataController } from 'server/controller/metadata' +import { UserController } from 'server/controller/user' -import { assessmentParams } from '@test/integration/mock/assessment' -import { tableParams } from '@test/integration/mock/table' -import { userMockTest } from '@test/integration/mock/user' +import { assessmentParams } from 'test/integration/mock/assessment' +import { tableParams } from 'test/integration/mock/table' +import { userMockTest } from 'test/integration/mock/user' // test create table export default () => diff --git a/src/test/integration/table/removeTable.ts b/src/test/integration/table/removeTable.ts index d4ff05abbd..27b46d1b6b 100644 --- a/src/test/integration/table/removeTable.ts +++ b/src/test/integration/table/removeTable.ts @@ -1,10 +1,10 @@ -import { AssessmentController } from '@server/controller/assessment' -import { MetadataController } from '@server/controller/metadata' -import { UserController } from '@server/controller/user' +import { AssessmentController } from 'server/controller/assessment' +import { MetadataController } from 'server/controller/metadata' +import { UserController } from 'server/controller/user' -import { assessmentParams } from '@test/integration/mock/assessment' -import { tableParams } from '@test/integration/mock/table' -import { userMockTest } from '@test/integration/mock/user' +import { assessmentParams } from 'test/integration/mock/assessment' +import { tableParams } from 'test/integration/mock/table' +import { userMockTest } from 'test/integration/mock/user' // test to remove table export default () => diff --git a/src/test/integration/table/updateTable.ts b/src/test/integration/table/updateTable.ts index 2fe6381311..ef7195bbd0 100644 --- a/src/test/integration/table/updateTable.ts +++ b/src/test/integration/table/updateTable.ts @@ -1,10 +1,10 @@ -import { AssessmentController } from '@server/controller/assessment' -import { MetadataController } from '@server/controller/metadata' -import { UserController } from '@server/controller/user' +import { AssessmentController } from 'server/controller/assessment' +import { MetadataController } from 'server/controller/metadata' +import { UserController } from 'server/controller/user' -import { assessmentParams } from '@test/integration/mock/assessment' -import { tableParams } from '@test/integration/mock/table' -import { userMockTest } from '@test/integration/mock/user' +import { assessmentParams } from 'test/integration/mock/assessment' +import { tableParams } from 'test/integration/mock/table' +import { userMockTest } from 'test/integration/mock/user' // test to update table export default () => diff --git a/src/test/integration/tableSection/createTableSection.ts b/src/test/integration/tableSection/createTableSection.ts index b2b7257fbd..a8d986d4c1 100644 --- a/src/test/integration/tableSection/createTableSection.ts +++ b/src/test/integration/tableSection/createTableSection.ts @@ -1,10 +1,10 @@ -import { AssessmentController } from '@server/controller/assessment' -import { MetadataController } from '@server/controller/metadata' -import { UserController } from '@server/controller/user' +import { AssessmentController } from 'server/controller/assessment' +import { MetadataController } from 'server/controller/metadata' +import { UserController } from 'server/controller/user' -import { assessmentParams } from '@test/integration/mock/assessment' -import { tableSectionParams } from '@test/integration/mock/tableSection' -import { userMockTest } from '@test/integration/mock/user' +import { assessmentParams } from 'test/integration/mock/assessment' +import { tableSectionParams } from 'test/integration/mock/tableSection' +import { userMockTest } from 'test/integration/mock/user' // test create table section export default () => diff --git a/src/test/integration/tableSection/removeTableSection.ts b/src/test/integration/tableSection/removeTableSection.ts index 877356ee83..ab51aacce5 100644 --- a/src/test/integration/tableSection/removeTableSection.ts +++ b/src/test/integration/tableSection/removeTableSection.ts @@ -1,10 +1,10 @@ -import { AssessmentController } from '@server/controller/assessment' -import { MetadataController } from '@server/controller/metadata' -import { UserController } from '@server/controller/user' +import { AssessmentController } from 'server/controller/assessment' +import { MetadataController } from 'server/controller/metadata' +import { UserController } from 'server/controller/user' -import { assessmentParams } from '@test/integration/mock/assessment' -import { tableSectionParams } from '@test/integration/mock/tableSection' -import { userMockTest } from '@test/integration/mock/user' +import { assessmentParams } from 'test/integration/mock/assessment' +import { tableSectionParams } from 'test/integration/mock/tableSection' +import { userMockTest } from 'test/integration/mock/user' // test remove table section export default () => diff --git a/src/test/integration/tableSection/updateTableSection.ts b/src/test/integration/tableSection/updateTableSection.ts index 825cbab1a9..9756e110ee 100644 --- a/src/test/integration/tableSection/updateTableSection.ts +++ b/src/test/integration/tableSection/updateTableSection.ts @@ -1,10 +1,10 @@ -import { AssessmentController } from '@server/controller/assessment' -import { MetadataController } from '@server/controller/metadata' -import { UserController } from '@server/controller/user' +import { AssessmentController } from 'server/controller/assessment' +import { MetadataController } from 'server/controller/metadata' +import { UserController } from 'server/controller/user' -import { assessmentParams } from '@test/integration/mock/assessment' -import { tableSectionParams } from '@test/integration/mock/tableSection' -import { userMockTest } from '@test/integration/mock/user' +import { assessmentParams } from 'test/integration/mock/assessment' +import { tableSectionParams } from 'test/integration/mock/tableSection' +import { userMockTest } from 'test/integration/mock/user' // test to update table section export default () => diff --git a/src/test/integration/user/userCreate.ts b/src/test/integration/user/userCreate.ts index 5dfb7142a2..638f2c08fa 100644 --- a/src/test/integration/user/userCreate.ts +++ b/src/test/integration/user/userCreate.ts @@ -1,9 +1,9 @@ -import { AuthProvider, UserStatus } from '@meta/user' -import { AuthProviderLocalProps } from '@meta/user/userAuth' +import { AuthProvider, UserStatus } from 'meta/user' +import { AuthProviderLocalProps } from 'meta/user/userAuth' -import { UserController } from '@server/controller/user' +import { UserController } from 'server/controller/user' -import { userMockTest, userMockTestPassword } from '@test/integration/mock/user' +import { userMockTest, userMockTestPassword } from 'test/integration/mock/user' export default () => test('Expect user to be created', async () => { diff --git a/src/test/integration/user/userInvite.ts b/src/test/integration/user/userInvite.ts index e53a3a1495..126192a093 100644 --- a/src/test/integration/user/userInvite.ts +++ b/src/test/integration/user/userInvite.ts @@ -1,11 +1,11 @@ -import { Assessment, Cycle } from '@meta/assessment' -import { RoleName, User, UserRole, UserStatus } from '@meta/user' +import { Assessment, Cycle } from 'meta/assessment' +import { RoleName, User, UserRole, UserStatus } from 'meta/user' -import { AssessmentController } from '@server/controller/assessment' -import { UserController } from '@server/controller/user' +import { AssessmentController } from 'server/controller/assessment' +import { UserController } from 'server/controller/user' -import { assessmentParams } from '@test/integration/mock/assessment' -import { userMockTest, userMockUnknown } from '@test/integration/mock/user' +import { assessmentParams } from 'test/integration/mock/assessment' +import { userMockTest, userMockUnknown } from 'test/integration/mock/user' export default (): void => describe('User Invite', () => { diff --git a/src/test/integration/user/userRemove.ts b/src/test/integration/user/userRemove.ts index 3313ea1e39..ae751df503 100644 --- a/src/test/integration/user/userRemove.ts +++ b/src/test/integration/user/userRemove.ts @@ -1,6 +1,6 @@ -import { UserRepository } from '@server/repository/public/user' +import { UserRepository } from 'server/repository/public/user' -import { userMockTest } from '@test/integration/mock/user' +import { userMockTest } from 'test/integration/mock/user' export default () => test('Expect user to be removed', async () => { diff --git a/src/test/integration/user/userResetPassword.ts b/src/test/integration/user/userResetPassword.ts index 184b03f3b7..f63691c860 100644 --- a/src/test/integration/user/userResetPassword.ts +++ b/src/test/integration/user/userResetPassword.ts @@ -1,12 +1,12 @@ -import { Assessment, Cycle } from '@meta/assessment' -import { AuthProvider, User } from '@meta/user' -import { AuthProviderLocalProps } from '@meta/user/userAuth' +import { Assessment, Cycle } from 'meta/assessment' +import { AuthProvider, User } from 'meta/user' +import { AuthProviderLocalProps } from 'meta/user/userAuth' -import { AssessmentController } from '@server/controller/assessment' -import { UserController } from '@server/controller/user' -import { UserProviderController } from '@server/controller/userProvider' +import { AssessmentController } from 'server/controller/assessment' +import { UserController } from 'server/controller/user' +import { UserProviderController } from 'server/controller/userProvider' -import { userMockTest, userMockTestPassword } from '@test/integration/mock/user' +import { userMockTest, userMockTestPassword } from 'test/integration/mock/user' import { assessmentParams } from '../mock/assessment' diff --git a/src/test/migrations/index.ts b/src/test/migrations/index.ts index 8721d3acd7..b63623b8b8 100644 --- a/src/test/migrations/index.ts +++ b/src/test/migrations/index.ts @@ -1,60 +1,62 @@ +import 'tsconfig-paths/register' +import 'dotenv/config' + import * as fs from 'fs' import * as path from 'path' -import { config } from 'dotenv' - -import * as QueueFactory from '@server/controller/cycleData/updateDependencies/queueFactory' -import * as WorkerFactory from '@server/controller/cycleData/updateDependencies/workerFactory' -import { DB } from '@server/db' - -config({ path: path.resolve(__dirname, '..', '..', '..', '.env') }) -// eslint-disable-next-line -import { Logger } from '@server/utils/logger' +import { UpdateDependenciesQueueFactory } from 'server/controller/cycleData/updateDependencies/queueFactory' +import { WorkerFactory } from 'server/controller/cycleData/updateDependencies/workerFactory' +import { DB } from 'server/db' +import { Logger } from 'server/utils/logger' const client = DB let migrationSteps: Array let previousMigrations: Array = [] const executedMigrations: Array = [] -beforeAll(async () => { +const init = async () => { previousMigrations = await client.map('select * from migration_steps', [], (row) => row.name) migrationSteps = fs .readdirSync(path.join(__dirname, `steps`)) .filter((file) => file !== 'template.ts' && file.endsWith('.ts') && !previousMigrations.includes(file)) -}) +} -afterAll(async () => { +const close = async () => { // quick and dirty workaround to close redis connection after running integration tests // TODO: find a better strategy to handle Redis connections - QueueFactory.connection.quit() + UpdateDependenciesQueueFactory.connection.quit() WorkerFactory.connection.quit() await DB.$pool.end() -}) - -describe(`Migrations:`, () => { - test(`steps`, async () => { - await client.tx(async (t) => { - // eslint-disable-next-line no-restricted-syntax - for await (const file of migrationSteps) { - try { - Logger.info(`Running migration ${file}`) - // eslint-disable-next-line @typescript-eslint/no-var-requires,global-require,import/no-dynamic-require - await require(`./steps/${file}`).default(t) - executedMigrations.push(file) - } catch (e) { - Logger.error(e) - } +} + +const exec = async () => { + await init() + + await client.tx(async (t) => { + // eslint-disable-next-line no-restricted-syntax + for await (const file of migrationSteps) { + try { + Logger.info(`Running migration ${file}`) + // eslint-disable-next-line @typescript-eslint/no-var-requires,global-require,import/no-dynamic-require + await require(`./steps/${file}`).default(t) + executedMigrations.push(file) + } catch (e) { + Logger.error(e) } - }) + } }) - if (!process.argv.includes('--watch')) { - test('insert ran migrations to db', async () => { - // eslint-disable-next-line no-restricted-syntax - for (const file of executedMigrations) { - // eslint-disable-next-line no-await-in-loop - await client.query('insert into migration_steps (name) values ($1)', [file]) - } - }) + // eslint-disable-next-line no-restricted-syntax + for (const file of executedMigrations) { + // eslint-disable-next-line no-await-in-loop + await client.query('insert into migration_steps (name) values ($1)', [file]) + } } + + await close() +} + +Logger.info('Migrations starting') +exec().then(() => { + Logger.info('Migrations executed') }) diff --git a/src/test/migrations/steps/20230222121020-step-ext_node-sustainableDevelopment15_2_1_5_forestAreaVerifiedForestManagement.ts b/src/test/migrations/steps/20230222121020-step-ext_node-sustainableDevelopment15_2_1_5_forestAreaVerifiedForestManagement.ts index f23344d56a..4ab6b55e4e 100644 --- a/src/test/migrations/steps/20230222121020-step-ext_node-sustainableDevelopment15_2_1_5_forestAreaVerifiedForestManagement.ts +++ b/src/test/migrations/steps/20230222121020-step-ext_node-sustainableDevelopment15_2_1_5_forestAreaVerifiedForestManagement.ts @@ -1,6 +1,6 @@ import * as pgPromise from 'pg-promise' -import { BaseProtocol } from '@server/db' +import { BaseProtocol } from 'server/db' // eslint-disable-next-line @typescript-eslint/no-var-requires const values = require('./data/certifiedArea.json') diff --git a/src/test/migrations/steps/20230223093323-step-recalculate-forest-ownership.ts b/src/test/migrations/steps/20230223093323-step-recalculate-forest-ownership.ts index ea5b57cf72..35c4d4f6ef 100644 --- a/src/test/migrations/steps/20230223093323-step-recalculate-forest-ownership.ts +++ b/src/test/migrations/steps/20230223093323-step-recalculate-forest-ownership.ts @@ -1,10 +1,10 @@ import * as pgPromise from 'pg-promise' -import { AreaController } from '@server/controller/area' -import { AssessmentController } from '@server/controller/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { AreaController } from 'server/controller/area' +import { AssessmentController } from 'server/controller/assessment' +import { BaseProtocol, Schemas } from 'server/db' -import { getRow } from '@test/migrations/steps/utils/getRow' +import { getRow } from 'test/migrations/steps/utils/getRow' import { calculateRow } from './utils/calculateRow' diff --git a/src/test/migrations/steps/20230223155728-step-odp-missing-methods.ts b/src/test/migrations/steps/20230223155728-step-odp-missing-methods.ts index a97979005c..eae9d0bc0a 100644 --- a/src/test/migrations/steps/20230223155728-step-odp-missing-methods.ts +++ b/src/test/migrations/steps/20230223155728-step-odp-missing-methods.ts @@ -1,4 +1,4 @@ -import { BaseProtocol } from '@server/db' +import { BaseProtocol } from 'server/db' export default async (client: BaseProtocol) => { await client.query(` diff --git a/src/test/migrations/steps/20230223184533-step-fix-mirror-tables-calc-formula.ts b/src/test/migrations/steps/20230223184533-step-fix-mirror-tables-calc-formula.ts index b52d537f44..387fc4d3ac 100644 --- a/src/test/migrations/steps/20230223184533-step-fix-mirror-tables-calc-formula.ts +++ b/src/test/migrations/steps/20230223184533-step-fix-mirror-tables-calc-formula.ts @@ -1,5 +1,5 @@ -import { AssessmentController } from '@server/controller/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { AssessmentController } from 'server/controller/assessment' +import { BaseProtocol, Schemas } from 'server/db' export default async (client: BaseProtocol) => { const { assessment, cycle } = await AssessmentController.getOneWithCycle( diff --git a/src/test/migrations/steps/20230224111303-step-ext_node-extentOfForest-totalLandArea.ts b/src/test/migrations/steps/20230224111303-step-ext_node-extentOfForest-totalLandArea.ts index 3f5b111813..530ef953c1 100644 --- a/src/test/migrations/steps/20230224111303-step-ext_node-extentOfForest-totalLandArea.ts +++ b/src/test/migrations/steps/20230224111303-step-ext_node-extentOfForest-totalLandArea.ts @@ -1,6 +1,6 @@ import * as pgPromise from 'pg-promise' -import { BaseProtocol } from '@server/db' +import { BaseProtocol } from 'server/db' // eslint-disable-next-line @typescript-eslint/no-var-requires const values = require('./data/totalLandAreas_1950-2020.json') diff --git a/src/test/migrations/steps/20230224150316-step-fix-fix-mirror-tables-calc-formula.ts b/src/test/migrations/steps/20230224150316-step-fix-fix-mirror-tables-calc-formula.ts index b52d537f44..387fc4d3ac 100644 --- a/src/test/migrations/steps/20230224150316-step-fix-fix-mirror-tables-calc-formula.ts +++ b/src/test/migrations/steps/20230224150316-step-fix-fix-mirror-tables-calc-formula.ts @@ -1,5 +1,5 @@ -import { AssessmentController } from '@server/controller/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { AssessmentController } from 'server/controller/assessment' +import { BaseProtocol, Schemas } from 'server/db' export default async (client: BaseProtocol) => { const { assessment, cycle } = await AssessmentController.getOneWithCycle( diff --git a/src/test/migrations/steps/20230228194944-step-update-sdg-validations.ts b/src/test/migrations/steps/20230228194944-step-update-sdg-validations.ts index 4e92a84848..06c2e49c58 100644 --- a/src/test/migrations/steps/20230228194944-step-update-sdg-validations.ts +++ b/src/test/migrations/steps/20230228194944-step-update-sdg-validations.ts @@ -1,5 +1,5 @@ -import { AssessmentController } from '@server/controller/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { AssessmentController } from 'server/controller/assessment' +import { BaseProtocol, Schemas } from 'server/db' export default async (client: BaseProtocol) => { const { assessment, cycle } = await AssessmentController.getOneWithCycle( diff --git a/src/test/migrations/steps/20230306142342-step-status-trend-footnote.ts b/src/test/migrations/steps/20230306142342-step-status-trend-footnote.ts index 7de384db65..45e9e2b60c 100644 --- a/src/test/migrations/steps/20230306142342-step-status-trend-footnote.ts +++ b/src/test/migrations/steps/20230306142342-step-status-trend-footnote.ts @@ -1,7 +1,7 @@ -import { Cycle } from '@meta/assessment' +import { Cycle } from 'meta/assessment' -import { AssessmentController } from '@server/controller/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { AssessmentController } from 'server/controller/assessment' +import { BaseProtocol, Schemas } from 'server/db' const _getMaxRowIndex = (tableName: string, client: BaseProtocol) => client.one( diff --git a/src/test/migrations/steps/20230307123210-step-2b-most-recent-year.ts b/src/test/migrations/steps/20230307123210-step-2b-most-recent-year.ts index 14b17fcfb0..18a3deac80 100644 --- a/src/test/migrations/steps/20230307123210-step-2b-most-recent-year.ts +++ b/src/test/migrations/steps/20230307123210-step-2b-most-recent-year.ts @@ -1,5 +1,5 @@ -import { AssessmentController } from '@server/controller/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { AssessmentController } from 'server/controller/assessment' +import { BaseProtocol, Schemas } from 'server/db' export default async (client: BaseProtocol) => { const { assessment } = await AssessmentController.getOneWithCycle( diff --git a/src/test/migrations/steps/20230308113221-step-fix-2b-remianing-introduced-tree-species.ts b/src/test/migrations/steps/20230308113221-step-fix-2b-remianing-introduced-tree-species.ts index 34b0e01365..c9e8636092 100644 --- a/src/test/migrations/steps/20230308113221-step-fix-2b-remianing-introduced-tree-species.ts +++ b/src/test/migrations/steps/20230308113221-step-fix-2b-remianing-introduced-tree-species.ts @@ -1,5 +1,5 @@ -import { AssessmentController } from '@server/controller/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { AssessmentController } from 'server/controller/assessment' +import { BaseProtocol, Schemas } from 'server/db' export default async (client: BaseProtocol) => { const { assessment, cycle } = await AssessmentController.getOneWithCycle( diff --git a/src/test/migrations/steps/20230310121611-step-sdg15_1_1_use_odp_for_calculations.ts b/src/test/migrations/steps/20230310121611-step-sdg15_1_1_use_odp_for_calculations.ts index 9609019d79..45bea79d93 100644 --- a/src/test/migrations/steps/20230310121611-step-sdg15_1_1_use_odp_for_calculations.ts +++ b/src/test/migrations/steps/20230310121611-step-sdg15_1_1_use_odp_for_calculations.ts @@ -1,5 +1,5 @@ -import { AssessmentController } from '@server/controller/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { AssessmentController } from 'server/controller/assessment' +import { BaseProtocol, Schemas } from 'server/db' export default async (client: BaseProtocol) => { const { assessment, cycle } = await AssessmentController.getOneWithCycle( diff --git a/src/test/migrations/steps/20230310132247-step-1d-additional-column.ts b/src/test/migrations/steps/20230310132247-step-1d-additional-column.ts index e3aaf5a9a0..3a8c3d0dd8 100644 --- a/src/test/migrations/steps/20230310132247-step-1d-additional-column.ts +++ b/src/test/migrations/steps/20230310132247-step-1d-additional-column.ts @@ -1,7 +1,7 @@ -import { Row, Section, Table, TableSection } from '@meta/assessment' +import { Row, Section, Table, TableSection } from 'meta/assessment' -import { AssessmentController } from '@server/controller/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { AssessmentController } from 'server/controller/assessment' +import { BaseProtocol, Schemas } from 'server/db' export default async (client: BaseProtocol) => { const { assessment, cycle } = await AssessmentController.getOneWithCycle( diff --git a/src/test/migrations/steps/20230310141009-step-recalculate-forest-area-change.ts b/src/test/migrations/steps/20230310141009-step-recalculate-forest-area-change.ts index 2be4590140..d656eb02c7 100644 --- a/src/test/migrations/steps/20230310141009-step-recalculate-forest-area-change.ts +++ b/src/test/migrations/steps/20230310141009-step-recalculate-forest-area-change.ts @@ -1,10 +1,10 @@ import * as pgPromise from 'pg-promise' -import { AreaController } from '@server/controller/area' -import { AssessmentController } from '@server/controller/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { AreaController } from 'server/controller/area' +import { AssessmentController } from 'server/controller/assessment' +import { BaseProtocol, Schemas } from 'server/db' -import { getRow } from '@test/migrations/steps/utils/getRow' +import { getRow } from 'test/migrations/steps/utils/getRow' import { calculateRow } from './utils/calculateRow' diff --git a/src/test/migrations/steps/20230311141945-step-cycle-based-link-to-section.ts b/src/test/migrations/steps/20230311141945-step-cycle-based-link-to-section.ts index 49b1d490fe..d62235fe45 100644 --- a/src/test/migrations/steps/20230311141945-step-cycle-based-link-to-section.ts +++ b/src/test/migrations/steps/20230311141945-step-cycle-based-link-to-section.ts @@ -1,7 +1,7 @@ -import { Row } from '@meta/assessment' +import { Row } from 'meta/assessment' -import { AssessmentController } from '@server/controller/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { AssessmentController } from 'server/controller/assessment' +import { BaseProtocol, Schemas } from 'server/db' export default async (client: BaseProtocol) => { const assessment = await AssessmentController.getOne({ assessmentName: 'fra' }, client) diff --git a/src/test/migrations/steps/20230313134107-step-migrate_missing_values_degradedForest.ts b/src/test/migrations/steps/20230313134107-step-migrate_missing_values_degradedForest.ts index 69346e6ed2..dc30e2eb52 100644 --- a/src/test/migrations/steps/20230313134107-step-migrate_missing_values_degradedForest.ts +++ b/src/test/migrations/steps/20230313134107-step-migrate_missing_values_degradedForest.ts @@ -1,5 +1,5 @@ -import { AssessmentController } from '@server/controller/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { AssessmentController } from 'server/controller/assessment' +import { BaseProtocol, Schemas } from 'server/db' export default async (client: BaseProtocol) => { const { assessment, cycle } = await AssessmentController.getOneWithCycle( diff --git a/src/test/migrations/steps/20230313180614-step-1d-2025-remove-link-to-section.ts b/src/test/migrations/steps/20230313180614-step-1d-2025-remove-link-to-section.ts index d022a557b9..e970b1bf14 100644 --- a/src/test/migrations/steps/20230313180614-step-1d-2025-remove-link-to-section.ts +++ b/src/test/migrations/steps/20230313180614-step-1d-2025-remove-link-to-section.ts @@ -1,7 +1,7 @@ -import { Section, Table, TableSection } from '@meta/assessment' +import { Section, Table, TableSection } from 'meta/assessment' -import { AssessmentController } from '@server/controller/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { AssessmentController } from 'server/controller/assessment' +import { BaseProtocol, Schemas } from 'server/db' export default async (client: BaseProtocol) => { const { assessment, cycle } = await AssessmentController.getOneWithCycle( diff --git a/src/test/migrations/steps/20230314124042-step-notice-message-rowspan-1.ts b/src/test/migrations/steps/20230314124042-step-notice-message-rowspan-1.ts index 15cd9bc0b6..3c4af036bb 100644 --- a/src/test/migrations/steps/20230314124042-step-notice-message-rowspan-1.ts +++ b/src/test/migrations/steps/20230314124042-step-notice-message-rowspan-1.ts @@ -1,5 +1,5 @@ -import { AssessmentController } from '@server/controller/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { AssessmentController } from 'server/controller/assessment' +import { BaseProtocol, Schemas } from 'server/db' export default async (client: BaseProtocol) => { const assessment = await AssessmentController.getOne({ assessmentName: 'fra' }, client) diff --git a/src/test/migrations/steps/20230315113503-step-message_topic-section_uuid.ts b/src/test/migrations/steps/20230315113503-step-message_topic-section_uuid.ts index b6e0ee8eef..6b7c342f1e 100644 --- a/src/test/migrations/steps/20230315113503-step-message_topic-section_uuid.ts +++ b/src/test/migrations/steps/20230315113503-step-message_topic-section_uuid.ts @@ -1,5 +1,5 @@ -import { AssessmentController } from '@server/controller/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { AssessmentController } from 'server/controller/assessment' +import { BaseProtocol, DB, Schemas } from 'server/db' export default async (client: BaseProtocol) => { const assessments = await AssessmentController.getAll({}, client) diff --git a/src/test/migrations/steps/20230315141829-step-fix-1d-columns-export.ts b/src/test/migrations/steps/20230315141829-step-fix-1d-columns-export.ts index f758bf9e5f..986ec16ceb 100644 --- a/src/test/migrations/steps/20230315141829-step-fix-1d-columns-export.ts +++ b/src/test/migrations/steps/20230315141829-step-fix-1d-columns-export.ts @@ -1,5 +1,5 @@ -import { AssessmentController } from '@server/controller/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { AssessmentController } from 'server/controller/assessment' +import { BaseProtocol, Schemas } from 'server/db' export default async (client: BaseProtocol) => { const { assessment, cycle: cycle2020 } = await AssessmentController.getOneWithCycle( diff --git a/src/test/migrations/steps/20230320154058-step-add-translation-keys-2025.ts b/src/test/migrations/steps/20230320154058-step-add-translation-keys-2025.ts index 378b67d127..5d9a31ac94 100644 --- a/src/test/migrations/steps/20230320154058-step-add-translation-keys-2025.ts +++ b/src/test/migrations/steps/20230320154058-step-add-translation-keys-2025.ts @@ -1,5 +1,5 @@ -import { AssessmentController } from '@server/controller/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { AssessmentController } from 'server/controller/assessment' +import { BaseProtocol, Schemas } from 'server/db' export default async (client: BaseProtocol) => { const { assessment, cycle } = await AssessmentController.getOneWithCycle( diff --git a/src/test/migrations/steps/20230322125534-step-fix-forestOwnership-total-2020-col-type.ts b/src/test/migrations/steps/20230322125534-step-fix-forestOwnership-total-2020-col-type.ts index a0bb8e6e08..c87bca0a2e 100644 --- a/src/test/migrations/steps/20230322125534-step-fix-forestOwnership-total-2020-col-type.ts +++ b/src/test/migrations/steps/20230322125534-step-fix-forestOwnership-total-2020-col-type.ts @@ -1,5 +1,5 @@ -import { AssessmentController } from '@server/controller/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { AssessmentController } from 'server/controller/assessment' +import { BaseProtocol, Schemas } from 'server/db' export default async (client: BaseProtocol) => { const assessment = await AssessmentController.getOne({ assessmentName: 'fra' }, client) diff --git a/src/test/migrations/steps/20230322140338-step-update-sections-datasource-props.ts b/src/test/migrations/steps/20230322140338-step-update-sections-datasource-props.ts index 84ff322a16..64a91d6c00 100644 --- a/src/test/migrations/steps/20230322140338-step-update-sections-datasource-props.ts +++ b/src/test/migrations/steps/20230322140338-step-update-sections-datasource-props.ts @@ -1,5 +1,5 @@ -import { AssessmentController } from '@server/controller/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { AssessmentController } from 'server/controller/assessment' +import { BaseProtocol, Schemas } from 'server/db' export default async (client: BaseProtocol) => { const { assessment, cycle } = await AssessmentController.getOneWithCycle( diff --git a/src/test/migrations/steps/20230323102001-step-atlantis-total-land-area.ts b/src/test/migrations/steps/20230323102001-step-atlantis-total-land-area.ts index 8e631f306a..79a0a06746 100644 --- a/src/test/migrations/steps/20230323102001-step-atlantis-total-land-area.ts +++ b/src/test/migrations/steps/20230323102001-step-atlantis-total-land-area.ts @@ -1,7 +1,7 @@ import * as pgPromise from 'pg-promise' -import { AssessmentController } from '@server/controller/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { AssessmentController } from 'server/controller/assessment' +import { BaseProtocol, Schemas } from 'server/db' export default async (client: BaseProtocol) => { const years = Array.from({ length: 2025 - 1950 + 1 }, (_, i) => i + 1950) diff --git a/src/test/migrations/steps/20230328170643-step-add-readonly-fields.ts b/src/test/migrations/steps/20230328170643-step-add-readonly-fields.ts index ea99496646..6fa8bb27fc 100644 --- a/src/test/migrations/steps/20230328170643-step-add-readonly-fields.ts +++ b/src/test/migrations/steps/20230328170643-step-add-readonly-fields.ts @@ -1,4 +1,4 @@ -import { BaseProtocol } from '@server/db' +import { BaseProtocol } from 'server/db' export default async (client: BaseProtocol) => { // tables diff --git a/src/test/migrations/steps/20230330113616-step-remove-columns-sustainable-development-5.ts b/src/test/migrations/steps/20230330113616-step-remove-columns-sustainable-development-5.ts index 7b2c7d37ce..4d3ac92726 100644 --- a/src/test/migrations/steps/20230330113616-step-remove-columns-sustainable-development-5.ts +++ b/src/test/migrations/steps/20230330113616-step-remove-columns-sustainable-development-5.ts @@ -1,7 +1,7 @@ -import { Row, Table } from '@meta/assessment' +import { Row, Table } from 'meta/assessment' -import { AssessmentController } from '@server/controller/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { AssessmentController } from 'server/controller/assessment' +import { BaseProtocol, Schemas } from 'server/db' export default async (client: BaseProtocol) => { const { assessment, cycle } = await AssessmentController.getOneWithCycle( diff --git a/src/test/migrations/steps/20230403165717-step-map-datasource-freetext-to-constant.ts b/src/test/migrations/steps/20230403165717-step-map-datasource-freetext-to-constant.ts index 97be539a82..ecfeb294b0 100644 --- a/src/test/migrations/steps/20230403165717-step-map-datasource-freetext-to-constant.ts +++ b/src/test/migrations/steps/20230403165717-step-map-datasource-freetext-to-constant.ts @@ -1,14 +1,14 @@ -import { createI18nPromise } from '@i18n/i18nFactory' -import { Objects } from '@utils/objects' +import { createI18nPromise } from 'i18n/i18nFactory' import { i18n as i18nType } from 'i18next' import * as pgPromise from 'pg-promise' +import { Objects } from 'utils/objects' -import { Cols, ColType, CommentableDescription, DataSource, Row, RowType, Table } from '@meta/assessment' +import { Cols, ColType, CommentableDescription, DataSource, Row, RowType, Table } from 'meta/assessment' -import { MetadataController } from '@server/controller/metadata' -import { BaseProtocol, Schemas } from '@server/db' +import { MetadataController } from 'server/controller/metadata' +import { BaseProtocol, Schemas } from 'server/db' -import { AssessmentCycleUtil } from '@test/migrations/steps/utils/getAssessmentCycle' +import { AssessmentCycleUtil } from 'test/migrations/steps/utils/getAssessmentCycle' import * as dataSourceTypeTranslations from '../../../i18n/resources/en/dataSource' diff --git a/src/test/migrations/steps/20230404095754-step-remaining-land-formula.ts b/src/test/migrations/steps/20230404095754-step-remaining-land-formula.ts index 20b0aa4d90..cbd62a3d84 100644 --- a/src/test/migrations/steps/20230404095754-step-remaining-land-formula.ts +++ b/src/test/migrations/steps/20230404095754-step-remaining-land-formula.ts @@ -1,7 +1,7 @@ -import { Row, Table } from '@meta/assessment' +import { Row, Table } from 'meta/assessment' -import { AssessmentController } from '@server/controller/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { AssessmentController } from 'server/controller/assessment' +import { BaseProtocol, Schemas } from 'server/db' import { runCalculations } from './utils/runCalculations' diff --git a/src/test/migrations/steps/20230404103916-step-remove-validation-sub-indicator-4.ts b/src/test/migrations/steps/20230404103916-step-remove-validation-sub-indicator-4.ts index 3c39e90278..968390d7cd 100644 --- a/src/test/migrations/steps/20230404103916-step-remove-validation-sub-indicator-4.ts +++ b/src/test/migrations/steps/20230404103916-step-remove-validation-sub-indicator-4.ts @@ -1,7 +1,7 @@ -import { Row, Table } from '@meta/assessment' +import { Row, Table } from 'meta/assessment' -import { AssessmentController } from '@server/controller/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { AssessmentController } from 'server/controller/assessment' +import { BaseProtocol, Schemas } from 'server/db' export default async (client: BaseProtocol) => { const { assessment, cycle } = await AssessmentController.getOneWithCycle( diff --git a/src/test/migrations/steps/20230411163053-step-2b-data-source-prefixes.ts b/src/test/migrations/steps/20230411163053-step-2b-data-source-prefixes.ts index 4544ddb6ba..b38103e601 100644 --- a/src/test/migrations/steps/20230411163053-step-2b-data-source-prefixes.ts +++ b/src/test/migrations/steps/20230411163053-step-2b-data-source-prefixes.ts @@ -1,6 +1,6 @@ -import { BaseProtocol, Schemas } from '@server/db' +import { BaseProtocol, Schemas } from 'server/db' -import { AssessmentCycleUtil } from '@test/migrations/steps/utils/getAssessmentCycle' +import { AssessmentCycleUtil } from 'test/migrations/steps/utils/getAssessmentCycle' export default async (client: BaseProtocol) => { const { assessment, cycle } = await AssessmentCycleUtil.getFra2025(client) diff --git a/src/test/migrations/steps/20230413122159-step-5a-5b-update-validations.ts b/src/test/migrations/steps/20230413122159-step-5a-5b-update-validations.ts index fae6d480f9..9670be3bb1 100644 --- a/src/test/migrations/steps/20230413122159-step-5a-5b-update-validations.ts +++ b/src/test/migrations/steps/20230413122159-step-5a-5b-update-validations.ts @@ -1,6 +1,6 @@ -import { BaseProtocol, Schemas } from '@server/db' +import { BaseProtocol, Schemas } from 'server/db' -import { AssessmentCycleUtil } from '@test/migrations/steps/utils/getAssessmentCycle' +import { AssessmentCycleUtil } from 'test/migrations/steps/utils/getAssessmentCycle' export default async (client: BaseProtocol) => { const { assessment, cycle } = await AssessmentCycleUtil.getFra2025(client) diff --git a/src/test/migrations/steps/20230417093931-step-fix-8a-2005-use-odp.ts b/src/test/migrations/steps/20230417093931-step-fix-8a-2005-use-odp.ts index b70e7de29f..f6ff6caf1d 100644 --- a/src/test/migrations/steps/20230417093931-step-fix-8a-2005-use-odp.ts +++ b/src/test/migrations/steps/20230417093931-step-fix-8a-2005-use-odp.ts @@ -1,6 +1,6 @@ -import { BaseProtocol, Schemas } from '@server/db' +import { BaseProtocol, Schemas } from 'server/db' -import { AssessmentCycleUtil } from '@test/migrations/steps/utils/getAssessmentCycle' +import { AssessmentCycleUtil } from 'test/migrations/steps/utils/getAssessmentCycle' export default async (client: BaseProtocol) => { const { assessment, cycle } = await AssessmentCycleUtil.getFra2025(client) diff --git a/src/test/migrations/steps/20230419193218-step-add-classnames-to-most-recent-year-cell.ts b/src/test/migrations/steps/20230419193218-step-add-classnames-to-most-recent-year-cell.ts index 0adf25d097..5ada3e6acd 100644 --- a/src/test/migrations/steps/20230419193218-step-add-classnames-to-most-recent-year-cell.ts +++ b/src/test/migrations/steps/20230419193218-step-add-classnames-to-most-recent-year-cell.ts @@ -1,7 +1,7 @@ -import { Row, Table } from '@meta/assessment' +import { Row, Table } from 'meta/assessment' -import { AssessmentController } from '@server/controller/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { AssessmentController } from 'server/controller/assessment' +import { BaseProtocol, Schemas } from 'server/db' export default async (client: BaseProtocol) => { const { assessment, cycle } = await AssessmentController.getOneWithCycle( diff --git a/src/test/migrations/steps/20230420142832-step-sdg-sub-3-validators.ts b/src/test/migrations/steps/20230420142832-step-sdg-sub-3-validators.ts index ecaba41444..33ebbe15dc 100644 --- a/src/test/migrations/steps/20230420142832-step-sdg-sub-3-validators.ts +++ b/src/test/migrations/steps/20230420142832-step-sdg-sub-3-validators.ts @@ -1,7 +1,7 @@ -import { Row, Table } from '@meta/assessment' +import { Row, Table } from 'meta/assessment' -import { AssessmentController } from '@server/controller/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { AssessmentController } from 'server/controller/assessment' +import { BaseProtocol, Schemas } from 'server/db' export default async (client: BaseProtocol) => { const { assessment, cycle } = await AssessmentController.getOneWithCycle( diff --git a/src/test/migrations/steps/20230420142833-step-sdg-sub-4-validators.ts b/src/test/migrations/steps/20230420142833-step-sdg-sub-4-validators.ts index 8db2b667b9..0eb24ac3a0 100644 --- a/src/test/migrations/steps/20230420142833-step-sdg-sub-4-validators.ts +++ b/src/test/migrations/steps/20230420142833-step-sdg-sub-4-validators.ts @@ -1,7 +1,7 @@ -import { Row, Table } from '@meta/assessment' +import { Row, Table } from 'meta/assessment' -import { AssessmentController } from '@server/controller/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { AssessmentController } from 'server/controller/assessment' +import { BaseProtocol, Schemas } from 'server/db' export default async (client: BaseProtocol) => { const { assessment, cycle } = await AssessmentController.getOneWithCycle( diff --git a/src/test/migrations/steps/20230425100207-step-total-primary-forest-validator.ts b/src/test/migrations/steps/20230425100207-step-total-primary-forest-validator.ts index db749c6ceb..0e454c6b96 100644 --- a/src/test/migrations/steps/20230425100207-step-total-primary-forest-validator.ts +++ b/src/test/migrations/steps/20230425100207-step-total-primary-forest-validator.ts @@ -1,7 +1,7 @@ -import { Row, Table } from '@meta/assessment' +import { Row, Table } from 'meta/assessment' -import { AssessmentController } from '@server/controller/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { AssessmentController } from 'server/controller/assessment' +import { BaseProtocol, Schemas } from 'server/db' export default async (client: BaseProtocol) => { const { assessment, cycle } = await AssessmentController.getOneWithCycle( diff --git a/src/test/migrations/steps/20230427094458-step-datasource-include-variable-label.ts b/src/test/migrations/steps/20230427094458-step-datasource-include-variable-label.ts index b1ed9904df..a2c48dc1f6 100644 --- a/src/test/migrations/steps/20230427094458-step-datasource-include-variable-label.ts +++ b/src/test/migrations/steps/20230427094458-step-datasource-include-variable-label.ts @@ -11,11 +11,11 @@ import { RowType, SubSection, VariableName, -} from '@meta/assessment' +} from 'meta/assessment' -import { AssessmentController } from '@server/controller/assessment' -import { MetadataController } from '@server/controller/metadata' -import { BaseProtocol, Schemas } from '@server/db' +import { AssessmentController } from 'server/controller/assessment' +import { MetadataController } from 'server/controller/metadata' +import { BaseProtocol, Schemas } from 'server/db' interface DataSourceVariablesDeprecated { // Custom i18n keys to include diff --git a/src/test/migrations/steps/20230502120206-step-growingStockComposition-fix-calculations.ts b/src/test/migrations/steps/20230502120206-step-growingStockComposition-fix-calculations.ts index 2e7bb4ab01..94b2da04af 100644 --- a/src/test/migrations/steps/20230502120206-step-growingStockComposition-fix-calculations.ts +++ b/src/test/migrations/steps/20230502120206-step-growingStockComposition-fix-calculations.ts @@ -1,8 +1,8 @@ -import { AssessmentController } from '@server/controller/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { AssessmentController } from 'server/controller/assessment' +import { BaseProtocol, Schemas } from 'server/db' -import { AssessmentCycleUtil } from '@test/migrations/steps/utils/getAssessmentCycle' -import { getRow } from '@test/migrations/steps/utils/getRow' +import { AssessmentCycleUtil } from 'test/migrations/steps/utils/getAssessmentCycle' +import { getRow } from 'test/migrations/steps/utils/getRow' import { runCalculations } from './utils/runCalculations' diff --git a/src/test/migrations/steps/20230503150613-step-fix-datasource-uuid-and-empty.ts b/src/test/migrations/steps/20230503150613-step-fix-datasource-uuid-and-empty.ts index e4b2bbda00..dbc11a8199 100644 --- a/src/test/migrations/steps/20230503150613-step-fix-datasource-uuid-and-empty.ts +++ b/src/test/migrations/steps/20230503150613-step-fix-datasource-uuid-and-empty.ts @@ -1,9 +1,9 @@ -import { UUIDs } from '@utils/uuids' import * as pgPromise from 'pg-promise' +import { UUIDs } from 'utils/uuids' -import { CommentableDescription, DataSource } from '@meta/assessment' +import { CommentableDescription, DataSource } from 'meta/assessment' -import { BaseProtocol } from '@server/db' +import { BaseProtocol } from 'server/db' const _fixEmptyDataSources = async (client: BaseProtocol) => { await client.query(`update assessment_fra_2025.descriptions diff --git a/src/test/migrations/steps/20230505081103-step-datasource-remove-extra-variables.ts b/src/test/migrations/steps/20230505081103-step-datasource-remove-extra-variables.ts index e7754ec982..91aea15335 100644 --- a/src/test/migrations/steps/20230505081103-step-datasource-remove-extra-variables.ts +++ b/src/test/migrations/steps/20230505081103-step-datasource-remove-extra-variables.ts @@ -1,6 +1,6 @@ -import { Assessment, Cycle, SubSection } from '@meta/assessment' +import { Assessment, Cycle, SubSection } from 'meta/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { BaseProtocol, Schemas } from 'server/db' import { AssessmentCycleUtil } from './utils/getAssessmentCycle' diff --git a/src/test/migrations/steps/20230507154018-step-create-table-data-with-dop-views.ts b/src/test/migrations/steps/20230507154018-step-create-table-data-with-dop-views.ts index 1dacc69e1a..1a0ae14360 100644 --- a/src/test/migrations/steps/20230507154018-step-create-table-data-with-dop-views.ts +++ b/src/test/migrations/steps/20230507154018-step-create-table-data-with-dop-views.ts @@ -1,9 +1,9 @@ -import { TableNames } from '@meta/assessment' +import { TableNames } from 'meta/assessment' -import { AssessmentController } from '@server/controller/assessment' -import { MetadataController } from '@server/controller/metadata' -import { BaseProtocol, DB } from '@server/db' -import { getTableDataWithODPCreateViewDDL } from '@server/repository/assessmentCycle/data/ddl/getTableDataWithODPCreateViewDDL' +import { AssessmentController } from 'server/controller/assessment' +import { MetadataController } from 'server/controller/metadata' +import { BaseProtocol, DB } from 'server/db' +import { getTableDataWithODPCreateViewDDL } from 'server/repository/assessmentCycle/data/ddl/getTableDataWithODPCreateViewDDL' export default async (client: BaseProtocol) => { const assessment = await AssessmentController.getOne({ assessmentName: 'fra' }, client) diff --git a/src/test/migrations/steps/20230508135139-step-update-1a-1b-description.ts b/src/test/migrations/steps/20230508135139-step-update-1a-1b-description.ts index 545d443e8f..d8f04bee57 100644 --- a/src/test/migrations/steps/20230508135139-step-update-1a-1b-description.ts +++ b/src/test/migrations/steps/20230508135139-step-update-1a-1b-description.ts @@ -1,5 +1,5 @@ -import { AssessmentController } from '@server/controller/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { AssessmentController } from 'server/controller/assessment' +import { BaseProtocol, Schemas } from 'server/db' const base = { comments: true, diff --git a/src/test/migrations/steps/20230511110350-step-update-5c-error-message.ts b/src/test/migrations/steps/20230511110350-step-update-5c-error-message.ts index cbfc0cc3a8..a4dfd712dc 100644 --- a/src/test/migrations/steps/20230511110350-step-update-5c-error-message.ts +++ b/src/test/migrations/steps/20230511110350-step-update-5c-error-message.ts @@ -1,7 +1,7 @@ -import { AssessmentController } from '@server/controller/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { AssessmentController } from 'server/controller/assessment' +import { BaseProtocol, Schemas } from 'server/db' -import { AssessmentCycleUtil } from '@test/migrations/steps/utils/getAssessmentCycle' +import { AssessmentCycleUtil } from 'test/migrations/steps/utils/getAssessmentCycle' export default async (client: BaseProtocol) => { const { assessment, cycle } = await AssessmentCycleUtil.getFra2025(client) diff --git a/src/test/migrations/steps/20230516103111-step-add-sections-2025-labels.ts b/src/test/migrations/steps/20230516103111-step-add-sections-2025-labels.ts index 160498a649..9c834948f8 100644 --- a/src/test/migrations/steps/20230516103111-step-add-sections-2025-labels.ts +++ b/src/test/migrations/steps/20230516103111-step-add-sections-2025-labels.ts @@ -1,8 +1,8 @@ -import { Cycle, Section, SubSection } from '@meta/assessment' +import { Cycle, Section, SubSection } from 'meta/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { BaseProtocol, Schemas } from 'server/db' -import { AssessmentCycleUtil } from '@test/migrations/steps/utils/getAssessmentCycle' +import { AssessmentCycleUtil } from 'test/migrations/steps/utils/getAssessmentCycle' const updateLabel = async (section: Section | SubSection, cycle: Cycle, schemaName: string, client: BaseProtocol) => { // if they key doesnt contain 'fra.2025 then add it diff --git a/src/test/migrations/steps/20230517091206-step-fix-forest-area-change-validators.ts b/src/test/migrations/steps/20230517091206-step-fix-forest-area-change-validators.ts index bc39ca8190..1123a8838b 100644 --- a/src/test/migrations/steps/20230517091206-step-fix-forest-area-change-validators.ts +++ b/src/test/migrations/steps/20230517091206-step-fix-forest-area-change-validators.ts @@ -1,7 +1,7 @@ -import { Row, Table } from '@meta/assessment' +import { Row, Table } from 'meta/assessment' -import { AssessmentController } from '@server/controller/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { AssessmentController } from 'server/controller/assessment' +import { BaseProtocol, Schemas } from 'server/db' export default async (client: BaseProtocol) => { const { assessment, cycle } = await AssessmentController.getOneWithCycle( diff --git a/src/test/migrations/steps/20230519093455-step-update-label-1a-other-wooded-land.ts b/src/test/migrations/steps/20230519093455-step-update-label-1a-other-wooded-land.ts index 9d0cb7b42c..ae49d32fab 100644 --- a/src/test/migrations/steps/20230519093455-step-update-label-1a-other-wooded-land.ts +++ b/src/test/migrations/steps/20230519093455-step-update-label-1a-other-wooded-land.ts @@ -1,6 +1,6 @@ -import { BaseProtocol, Schemas } from '@server/db' +import { BaseProtocol, Schemas } from 'server/db' -import { AssessmentCycleUtil } from '@test/migrations/steps/utils/getAssessmentCycle' +import { AssessmentCycleUtil } from 'test/migrations/steps/utils/getAssessmentCycle' export default async (client: BaseProtocol) => { const { assessment, cycle } = await AssessmentCycleUtil.getFra2025(client) diff --git a/src/test/migrations/steps/20230523104609-step-add-other-wooded-land-2005-label.ts b/src/test/migrations/steps/20230523104609-step-add-other-wooded-land-2005-label.ts index fa6bbad3cc..0a78e7c382 100644 --- a/src/test/migrations/steps/20230523104609-step-add-other-wooded-land-2005-label.ts +++ b/src/test/migrations/steps/20230523104609-step-add-other-wooded-land-2005-label.ts @@ -1,8 +1,8 @@ -import { SubSection } from '@meta/assessment' +import { SubSection } from 'meta/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { BaseProtocol, Schemas } from 'server/db' -import { AssessmentCycleUtil } from '@test/migrations/steps/utils/getAssessmentCycle' +import { AssessmentCycleUtil } from 'test/migrations/steps/utils/getAssessmentCycle' export default async (client: BaseProtocol) => { const { assessment, cycle } = await AssessmentCycleUtil.getFra2025(client) diff --git a/src/test/migrations/steps/20230524082208-step-create-node-values-estimation-table.ts b/src/test/migrations/steps/20230524082208-step-create-node-values-estimation-table.ts index 486b1c2947..9a8a006f58 100644 --- a/src/test/migrations/steps/20230524082208-step-create-node-values-estimation-table.ts +++ b/src/test/migrations/steps/20230524082208-step-create-node-values-estimation-table.ts @@ -1,5 +1,5 @@ -import { AssessmentController } from '@server/controller/assessment' -import { BaseProtocol, DB, Schemas } from '@server/db' +import { AssessmentController } from 'server/controller/assessment' +import { BaseProtocol, DB, Schemas } from 'server/db' export default async (client: BaseProtocol) => { const assessment = await AssessmentController.getOne({ assessmentName: 'fra' }, client) diff --git a/src/test/migrations/steps/20230524163727-step-update-original_data_point_data-view.ts b/src/test/migrations/steps/20230524163727-step-update-original_data_point_data-view.ts index 0e2d18518e..e544f3d757 100644 --- a/src/test/migrations/steps/20230524163727-step-update-original_data_point_data-view.ts +++ b/src/test/migrations/steps/20230524163727-step-update-original_data_point_data-view.ts @@ -1,5 +1,5 @@ -import { AssessmentController } from '@server/controller/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { AssessmentController } from 'server/controller/assessment' +import { BaseProtocol, Schemas } from 'server/db' export default async (client: BaseProtocol) => { const assessment = await AssessmentController.getOne({ assessmentName: 'fra' }, client) diff --git a/src/test/migrations/steps/20230524183727-step-new-topic-message-odp-key.ts b/src/test/migrations/steps/20230524183727-step-new-topic-message-odp-key.ts index cf019a0c9f..ad19b77a31 100644 --- a/src/test/migrations/steps/20230524183727-step-new-topic-message-odp-key.ts +++ b/src/test/migrations/steps/20230524183727-step-new-topic-message-odp-key.ts @@ -1,5 +1,5 @@ -import { AssessmentController } from '@server/controller/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { AssessmentController } from 'server/controller/assessment' +import { BaseProtocol, Schemas } from 'server/db' export default async (client: BaseProtocol) => { const assessment = await AssessmentController.getOne({ assessmentName: 'fra' }, client) diff --git a/src/test/migrations/steps/20230531134246-step-fix-4a-forest-ownership-total-2025.ts b/src/test/migrations/steps/20230531134246-step-fix-4a-forest-ownership-total-2025.ts index dab3f8b5ef..67cc7121a7 100644 --- a/src/test/migrations/steps/20230531134246-step-fix-4a-forest-ownership-total-2025.ts +++ b/src/test/migrations/steps/20230531134246-step-fix-4a-forest-ownership-total-2025.ts @@ -1,5 +1,5 @@ -import { AssessmentController } from '@server/controller/assessment' -import { BaseProtocol, Schemas } from '@server/db' +import { AssessmentController } from 'server/controller/assessment' +import { BaseProtocol, Schemas } from 'server/db' import { runCalculations } from './utils/runCalculations' diff --git a/src/test/migrations/steps/template.ts b/src/test/migrations/steps/template.ts index 2ac347e344..b51e94fd70 100644 --- a/src/test/migrations/steps/template.ts +++ b/src/test/migrations/steps/template.ts @@ -1,4 +1,4 @@ -import { BaseProtocol } from '@server/db' +import { BaseProtocol } from 'server/db' export default async (client: BaseProtocol) => { // DB Step diff --git a/src/test/migrations/steps/utils/calculateRow.ts b/src/test/migrations/steps/utils/calculateRow.ts index 6018421ce0..3078e591d0 100644 --- a/src/test/migrations/steps/utils/calculateRow.ts +++ b/src/test/migrations/steps/utils/calculateRow.ts @@ -1,14 +1,14 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { CountryIso } from '@meta/area' -import { Assessment, AssessmentMetaCaches, Cycle, Row } from '@meta/assessment' -import { ExpressionEvaluator } from '@meta/expressionEvaluator' +import { CountryIso } from 'meta/area' +import { Assessment, AssessmentMetaCaches, Cycle, Row } from 'meta/assessment' +import { ExpressionEvaluator } from 'meta/expressionEvaluator' -import { CycleDataController } from '@server/controller/cycleData' -import { MetadataController } from '@server/controller/metadata' -import { BaseProtocol } from '@server/db' +import { CycleDataController } from 'server/controller/cycleData' +import { MetadataController } from 'server/controller/metadata' +import { BaseProtocol } from 'server/db' -import { NodeRow } from '@test/dataMigration/types' +import { NodeRow } from 'test/dataMigration/types' export const calculateRow = async ( props: { diff --git a/src/test/migrations/steps/utils/getAssessmentCycle.ts b/src/test/migrations/steps/utils/getAssessmentCycle.ts index e27a2eab80..9ea536419f 100644 --- a/src/test/migrations/steps/utils/getAssessmentCycle.ts +++ b/src/test/migrations/steps/utils/getAssessmentCycle.ts @@ -1,7 +1,7 @@ -import { Assessment, AssessmentNames, Cycle } from '@meta/assessment' +import { Assessment, AssessmentNames, Cycle } from 'meta/assessment' -import { AssessmentController } from '@server/controller/assessment' -import { BaseProtocol } from '@server/db' +import { AssessmentController } from 'server/controller/assessment' +import { BaseProtocol } from 'server/db' const getFra2025 = async (client: BaseProtocol): Promise<{ assessment: Assessment; cycle: Cycle }> => { return AssessmentController.getOneWithCycle( diff --git a/src/test/migrations/steps/utils/getRow.ts b/src/test/migrations/steps/utils/getRow.ts index bbce5680ea..17b05d5e37 100644 --- a/src/test/migrations/steps/utils/getRow.ts +++ b/src/test/migrations/steps/utils/getRow.ts @@ -1,9 +1,9 @@ -import { Objects } from '@utils/objects' +import { Objects } from 'utils/objects' -import { Assessment, Cycle, Row } from '@meta/assessment' +import { Assessment, Cycle, Row } from 'meta/assessment' -import { BaseProtocol, Schemas } from '@server/db' -import { ColAdapter } from '@server/repository/adapter' +import { BaseProtocol, Schemas } from 'server/db' +import { ColAdapter } from 'server/repository/adapter' export const getRow = async ( props: { diff --git a/src/test/migrations/steps/utils/runCalculations.ts b/src/test/migrations/steps/utils/runCalculations.ts index bcf6b9e770..f440e6deb4 100644 --- a/src/test/migrations/steps/utils/runCalculations.ts +++ b/src/test/migrations/steps/utils/runCalculations.ts @@ -1,10 +1,10 @@ -import { Objects } from '@utils/objects' import * as pgPromise from 'pg-promise' +import { Objects } from 'utils/objects' -import { Assessment, Cycle } from '@meta/assessment' +import { Assessment, Cycle } from 'meta/assessment' -import { AreaController } from '@server/controller/area' -import { BaseProtocol, Schemas } from '@server/db' +import { AreaController } from 'server/controller/area' +import { BaseProtocol, Schemas } from 'server/db' import { calculateRow } from './calculateRow' import { getRow } from './getRow' diff --git a/src/test/sectionSpec/colSpec.ts b/src/test/sectionSpec/colSpec.ts index 3452a786f7..fdd53961e9 100644 --- a/src/test/sectionSpec/colSpec.ts +++ b/src/test/sectionSpec/colSpec.ts @@ -1,6 +1,6 @@ import BigNumber from 'bignumber.js' -import { ColLinkedNode, ColStyle, CycleUuid, Label } from '@meta/assessment' +import { ColLinkedNode, ColStyle, CycleUuid, Label } from 'meta/assessment' import { TypeSpec } from './typeSpec' import { Validator } from './validation' diff --git a/src/test/sectionSpec/rowSpec.ts b/src/test/sectionSpec/rowSpec.ts index ba179f5ef5..62fd10879f 100644 --- a/src/test/sectionSpec/rowSpec.ts +++ b/src/test/sectionSpec/rowSpec.ts @@ -1,4 +1,4 @@ -import { CycleUuid, VariableCache } from '@meta/assessment' +import { CycleUuid, VariableCache } from 'meta/assessment' import { ColSpec } from './colSpec' import { TypeSpec } from './typeSpec' diff --git a/src/test/sectionSpec/sectionSpec.ts b/src/test/sectionSpec/sectionSpec.ts index 379b6a054f..08411e3bc1 100644 --- a/src/test/sectionSpec/sectionSpec.ts +++ b/src/test/sectionSpec/sectionSpec.ts @@ -1,4 +1,4 @@ -import { Label } from '@meta/assessment' +import { Label } from 'meta/assessment' import { DescriptionsSpec } from './descriptionsSpec' import { TableSpec } from './tableSpec' diff --git a/src/test/sectionSpec/sections/holderOfManagementRights.ts b/src/test/sectionSpec/sections/holderOfManagementRights.ts index 61890e5a50..3afbe909b4 100644 --- a/src/test/sectionSpec/sections/holderOfManagementRights.ts +++ b/src/test/sectionSpec/sections/holderOfManagementRights.ts @@ -1,6 +1,6 @@ // @ts-nocheck -import { SectionSpec } from '@test/sectionSpec' +import { SectionSpec } from 'test/sectionSpec' export const holderOfManagementRights: SectionSpec = { sectionName: 'holderOfManagementRights', diff --git a/src/utils/index.ts b/src/utils/index.ts deleted file mode 100644 index a51e59d070..0000000000 --- a/src/utils/index.ts +++ /dev/null @@ -1,7 +0,0 @@ -export { Arrays } from './arrays' -export { Dates } from './dates' -export { Functions } from './functions' -export { Numbers } from './numbers' -export { Objects } from './objects' -export { Strings } from './strings' -export { UUIDs } from './uuids' diff --git a/tools/dataMigration/generateMetaCache/index.ts b/tools/dataMigration/generateMetaCache/index.ts index d22bdb0cb2..c9cf49e705 100644 --- a/tools/dataMigration/generateMetaCache/index.ts +++ b/tools/dataMigration/generateMetaCache/index.ts @@ -5,7 +5,7 @@ import { Col } from '../../../src/meta/assessment/col' import { Row } from '../../../src/meta/assessment/row' import { TableNames } from '../../../src/meta/assessment/table' import { BaseProtocol } from '../../../src/server/db' -import { Objects } from '../../../src/utils' +import { Objects } from '../../../src/utils/objects' import { DBNames } from '../_DBNames' import { DependencyEvaluator } from './dependencyEvaluator' diff --git a/tools/dataMigration/migrateData/_repos.ts b/tools/dataMigration/migrateData/_repos.ts index 8bb403afeb..a0a2839c62 100644 --- a/tools/dataMigration/migrateData/_repos.ts +++ b/tools/dataMigration/migrateData/_repos.ts @@ -3,7 +3,7 @@ import { Col, ColType } from '../../../src/meta/assessment/col' import { Row, RowType } from '../../../src/meta/assessment/row' import { Table } from '../../../src/meta/assessment/table' import { BaseProtocol } from '../../../src/server/db' -import { Objects } from '../../../src/utils' +import { Objects } from '../../../src/utils/objects' export const getRows = (client: BaseProtocol, schema: string, table: Table): Promise> => client.map( @@ -26,11 +26,7 @@ export const getRows = (client: BaseProtocol, schema: string, table: Table): Pro } ) -export const getCols = ( - client: BaseProtocol, - schema: string, - table: Table -): Promise> => +export const getCols = (client: BaseProtocol, schema: string, table: Table): Promise> => client.map( `select c.*,r.props->>'variableName' as variable_name from ${schema}.col c diff --git a/tools/dataMigration/migrateData/getNodeInsertsTableWithODP.ts b/tools/dataMigration/migrateData/getNodeInsertsTableWithODP.ts index eb4e20013f..235f400822 100644 --- a/tools/dataMigration/migrateData/getNodeInsertsTableWithODP.ts +++ b/tools/dataMigration/migrateData/getNodeInsertsTableWithODP.ts @@ -2,7 +2,7 @@ import { Assessment } from '../../../src/meta/assessment/assessment' import { NodeValue } from '../../../src/meta/assessment/node' import { Table } from '../../../src/meta/assessment/table' import { BaseProtocol } from '../../../src/server/db' -import { Objects } from '../../../src/utils' +import { Objects } from '../../../src/utils/objects' import { DBNames } from '../_DBNames' import { NodeRow } from './_getNodeInserts' import { getCols, getRows } from './_repos' diff --git a/tools/dataMigration/migrateReview/getOdpTopics.ts b/tools/dataMigration/migrateReview/getOdpTopics.ts index 80ba67b844..8118e66755 100644 --- a/tools/dataMigration/migrateReview/getOdpTopics.ts +++ b/tools/dataMigration/migrateReview/getOdpTopics.ts @@ -1,7 +1,7 @@ import { Assessment } from '../../../src/meta/assessment/assessment' import { Cycle } from '../../../src/meta/assessment/cycle' import { BaseProtocol } from '../../../src/server/db' -import { Objects } from '../../../src/utils' +import { Objects } from '../../../src/utils/objects' import { DBNames } from '../_DBNames' import { getIssuesLegacy } from './getIssuesLegacy' import { MessageTopicRow } from './messageTopicRow' diff --git a/tsconfig.json b/tsconfig.json index 8d588db316..1fa52d545b 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,7 +4,7 @@ "compilerOptions": { "allowJs": true, "allowSyntheticDefaultImports": true, - "baseUrl": "./", + "baseUrl": "./src", "jsx": "react", "isolatedModules": true, "module": "CommonJS", @@ -13,15 +13,15 @@ "noUnusedLocals": true, "noUnusedParameters": true, "outDir": "./dist/", - "paths": { - "@i18n/*": ["./src/i18n/*"], - "@client/*": ["./src/client/*"], - "@meta/*": ["./src/meta/*"], - "@server/*": ["./src/server/*"], - "@test/*": ["./src/test/*"], - "@utils/*": ["./src/utils/*"] - }, - // "strict": true, +// "paths": { +// "i18n/*": ["./src/i18n/*"], +// "client/*": ["./src/client/*"], +// "meta/*": ["./src/meta/*"], +// "server/*": ["./src/server/*"], +// "test/*": ["./src/test/*"], +// "utils/*": ["./src/utils/*"] +// }, +// "strict": true, "target": "ESNext" } } diff --git a/tsconfig.server.json b/tsconfig.server.json index 4e46cd27d3..56c652f103 100644 --- a/tsconfig.server.json +++ b/tsconfig.server.json @@ -10,13 +10,8 @@ "moduleResolution": "Node", "noImplicitAny": true, "outDir": "./dist/", - "baseUrl": ".", - "paths": { - "@i18n/*": ["src/i18n/*"], - "@meta/*": ["src/meta/*"], - "@server/*": ["src/server/*"], - "@utils/*": ["src/utils/*"] - }, + "baseUrl": "./src", + "rootDir": "./src", "target": "es2020", "lib": ["es2020", "esnext", "dom"] } diff --git a/tsconfig.server.paths.json b/tsconfig.server.paths.json deleted file mode 100644 index 9ee588cf91..0000000000 --- a/tsconfig.server.paths.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "//": "This file is needed for fixing issue with imports: baseUrl is dist instead of .", - "///": "For more info check: https://github.com/microsoft/TypeScript/issues/10866", - "allowSyntheticDefaults": true, - "include": ["i18n", "meta", "server", "utils"], - "exclude": ["node_modules"], - "compilerOptions": { - "allowJs": true, - "allowSyntheticDefaultImports": true, - "skipLibCheck": true, - "module": "CommonJS", - "moduleResolution": "Node", - "noImplicitAny": true, - "outDir": "./dist/", - "baseUrl": "./dist", - "paths": { - "@i18n/*": ["i18n/*"], - "@meta/*": ["meta/*"], - "@server/*": ["server/*"], - "@utils/*": ["utils/*"] - }, - "target": "es2020", - "lib": ["es2020", "esnext"] - } -} diff --git a/tsconfig.test.paths.json b/tsconfig.test.paths.json deleted file mode 100644 index fecff47eae..0000000000 --- a/tsconfig.test.paths.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "//": "This file is needed for fixing issue with imports: baseUrl is dist instead of .", - "///": "For more info check: https://github.com/microsoft/TypeScript/issues/10866", - "allowSyntheticDefaults": true, - "include": ["src"], - "exclude": ["node_modules", "src/client", "test/dataMigration"], - "compilerOptions": { - "allowJs": true, - "allowSyntheticDefaultImports": true, - "skipLibCheck": true, - "module": "CommonJS", - "moduleResolution": "Node", - "noImplicitAny": true, - "outDir": "./dist/", - "baseUrl": "./dist", - "paths": { - "@i18n/*": ["src/i18n/*"], - "@meta/*": ["src/meta/*"], - "@server/*": ["src/server/*"], - "@test/*": ["src/test/*"], - "@utils/*": ["src/utils/*"] - }, - "target": "es2020", - "lib": ["es2020", "esnext"] - } -} diff --git a/webpack.config.babel.js b/webpack.config.babel.js index 5bc8e2ce1f..1f739f8386 100644 --- a/webpack.config.babel.js +++ b/webpack.config.babel.js @@ -60,12 +60,12 @@ const appConfig = { resolve: { extensions: ['.webpack-loader.js', '.web-loader.js', '.loader.js', '.js', '.jsx', '.ts', '.tsx'], alias: { - '@i18n': path.resolve(__dirname, 'src/i18n/'), - '@client': path.resolve(__dirname, 'src/client/'), - '@meta': path.resolve(__dirname, 'src/meta/'), - '@server': path.resolve(__dirname, 'src/server/'), - '@test': path.resolve(__dirname, 'src/test/'), - '@utils': path.resolve(__dirname, 'src/utils/'), + i18n: path.resolve(__dirname, 'src/i18n/'), + client: path.resolve(__dirname, 'src/client/'), + meta: path.resolve(__dirname, 'src/meta/'), + server: path.resolve(__dirname, 'src/server/'), + test: path.resolve(__dirname, 'src/test/'), + utils: path.resolve(__dirname, 'src/utils/'), }, }, output: { diff --git a/webpack.config.babel.test.js b/webpack.config.babel.test.js index e550431139..e5b542f869 100644 --- a/webpack.config.babel.test.js +++ b/webpack.config.babel.test.js @@ -10,12 +10,12 @@ const webpackTestConfig = { resolve: { extensions: ['.webpack-loader.js', '.web-loader.js', '.loader.js', '.js', '.jsx', '.ts', '.tsx'], alias: { - '@i18n': path.resolve(__dirname, 'src/i18n/'), - '@client': path.resolve(__dirname, 'src/client/'), - '@meta': path.resolve(__dirname, 'src/meta/'), - '@server': path.resolve(__dirname, 'src/server/'), - '@test': path.resolve(__dirname, 'src/test/'), - '@utils': path.resolve(__dirname, 'src/utils/'), + i18n: path.resolve(__dirname, 'src/i18n/'), + client: path.resolve(__dirname, 'src/client/'), + meta: path.resolve(__dirname, 'src/meta/'), + server: path.resolve(__dirname, 'src/server/'), + test: path.resolve(__dirname, 'src/test/'), + utils: path.resolve(__dirname, 'src/utils/'), }, }, module: { diff --git a/yarn.lock b/yarn.lock index 30f9619ec7..6bf407973e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1500,14 +1500,6 @@ semver "^7.3.5" tar "^6.1.11" -"@mrmlnc/readdir-enhanced@^2.2.1": - version "2.2.1" - resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde" - integrity sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g== - dependencies: - call-me-maybe "^1.0.1" - glob-to-regexp "^0.3.0" - "@msgpackr-extract/msgpackr-extract-darwin-arm64@2.2.0": version "2.2.0" resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-2.2.0.tgz#901c5937e1441572ea23e631fe6deca68482fe76" @@ -1563,11 +1555,6 @@ resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== -"@nodelib/fs.stat@^1.1.2": - version "1.1.3" - resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b" - integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw== - "@nodelib/fs.walk@^1.2.3": version "1.2.8" resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" @@ -1591,6 +1578,18 @@ proj4 "^2.7.2" uuid "^8.3.2" +"@pkgr/utils@^2.3.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@pkgr/utils/-/utils-2.4.1.tgz#adf291d0357834c410ce80af16e711b56c7b1cd3" + integrity sha512-JOqwkgFEyi+OROIyq7l4Jy28h/WwhDnG/cPkXG2Z1iFbubB6jsHW1NDvmyOzTBxHr3yg68YGirmh1JUgMqa+9w== + dependencies: + cross-spawn "^7.0.3" + fast-glob "^3.2.12" + is-glob "^4.0.3" + open "^9.1.0" + picocolors "^1.0.0" + tslib "^2.5.0" + "@playwright/test@^1.27.1": version "1.27.1" resolved "https://registry.yarnpkg.com/@playwright/test/-/test-1.27.1.tgz#9364d1e02021261211c8ff586d903faa79ce95c4" @@ -3108,7 +3107,7 @@ array-flatten@^2.1.2: resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== -array-includes@^3.1.4, array-includes@^3.1.5: +array-includes@^3.1.5: version "3.1.5" resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.5.tgz#2c320010db8d31031fd2a5f6b3bbd4b1aad31bdb" integrity sha512-iSDYZMMyTPkiFasVqfuAQnWAYcvO/SeBSCGKePoEthjp4LEMTe4uLc7b025o4jAZpHhihh8xPo99TNWUWWkGDQ== @@ -3119,7 +3118,18 @@ array-includes@^3.1.4, array-includes@^3.1.5: get-intrinsic "^1.1.1" is-string "^1.0.7" -array-union@^1.0.1, array-union@^1.0.2: +array-includes@^3.1.6: + version "3.1.6" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.6.tgz#9e9e720e194f198266ba9e18c29e6a9b0e4b225f" + integrity sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.4" + es-abstract "^1.20.4" + get-intrinsic "^1.1.3" + is-string "^1.0.7" + +array-union@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39" integrity sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng== @@ -3141,7 +3151,7 @@ array-unique@^0.3.2: resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ== -array.prototype.flat@^1.2.5: +array.prototype.flat@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz#ffc6576a7ca3efc2f46a143b9d1dda9b4b3cf5e2" integrity sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA== @@ -3151,7 +3161,7 @@ array.prototype.flat@^1.2.5: es-abstract "^1.20.4" es-shim-unscopables "^1.0.0" -array.prototype.flatmap@^1.3.0: +array.prototype.flatmap@^1.3.0, array.prototype.flatmap@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz#1aae7903c2100433cb8261cd4ed310aab5c4a183" integrity sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ== @@ -3432,6 +3442,11 @@ bcrypt@^5.0.1: "@mapbox/node-pre-gyp" "^1.0.10" node-addon-api "^5.0.0" +big-integer@^1.6.44: + version "1.6.51" + resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.51.tgz#0df92a5d9880560d3ff2d5fd20245c889d130686" + integrity sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg== + big.js@^5.2.2: version "5.2.2" resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" @@ -3494,6 +3509,13 @@ boolbase@^1.0.0: resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww== +bplist-parser@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/bplist-parser/-/bplist-parser-0.2.0.tgz#43a9d183e5bf9d545200ceac3e712f79ebbe8d0e" + integrity sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw== + dependencies: + big-integer "^1.6.44" + brace-expansion@^1.1.7: version "1.1.11" resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" @@ -3608,6 +3630,13 @@ bullmq@^3.4.0: tslib "^2.0.0" uuid "^9.0.0" +bundle-name@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/bundle-name/-/bundle-name-3.0.0.tgz#ba59bcc9ac785fb67ccdbf104a2bf60c099f0e1a" + integrity sha512-PKA4BeSvBpQKQ8iPOGCSiell+N8P+Tf1DlwqmYhpe2gAhKPHn8EYOxVT+ShuGmhg8lN8XiSlS80yiExKXrURlw== + dependencies: + run-applescript "^5.0.0" + busboy@^1.0.0: version "1.6.0" resolved "https://registry.yarnpkg.com/busboy/-/busboy-1.6.0.tgz#966ea36a9502e43cdb9146962523b92f531f6893" @@ -3648,11 +3677,6 @@ call-bind@^1.0.0, call-bind@^1.0.2: function-bind "^1.1.1" get-intrinsic "^1.0.2" -call-me-maybe@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.2.tgz#03f964f19522ba643b1b0693acb9152fe2074baa" - integrity sha512-HpX65o1Hnr9HH25ojC1YGs7HCQLq0GCOibSaWER0eNpgJ/Z1MZv2mTc7+xh6WOPxbRVcmgbv4hGU+uSQ/2xFZQ== - callsites@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" @@ -4042,6 +4066,11 @@ commander@^8.3.0: resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== +commander@^9.0.0: + version "9.5.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-9.5.0.tgz#bc08d1eb5cedf7ccb797a96199d41c7bc3e60d30" + integrity sha512-KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ== + commander@^9.3.0: version "9.4.1" resolved "https://registry.yarnpkg.com/commander/-/commander-9.4.1.tgz#d1dd8f2ce6faf93147295c0df13c7c21141cfbdd" @@ -4833,7 +4862,7 @@ db-migrate@^0.11.12: tunnel-ssh "^4.0.0" yargs "^15.3.1" -debug@2.6.9, debug@^2.0.0, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9: +debug@2.6.9, debug@^2.0.0, debug@^2.2.0, debug@^2.3.3: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== @@ -4908,6 +4937,24 @@ deepmerge@^4.2.2: resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg== +default-browser-id@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/default-browser-id/-/default-browser-id-3.0.0.tgz#bee7bbbef1f4e75d31f98f4d3f1556a14cea790c" + integrity sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA== + dependencies: + bplist-parser "^0.2.0" + untildify "^4.0.0" + +default-browser@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/default-browser/-/default-browser-4.0.0.tgz#53c9894f8810bf86696de117a6ce9085a3cbc7da" + integrity sha512-wX5pXO1+BrhMkSbROFsyxUm0i/cJEScyNhA4PPxc41ICuv05ZZB/MX28s8aZx6xjmatvebIapF6hLEKEcpneUA== + dependencies: + bundle-name "^3.0.0" + default-browser-id "^3.0.0" + execa "^7.1.1" + titleize "^3.0.0" + default-gateway@^6.0.3: version "6.0.3" resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71" @@ -4920,6 +4967,11 @@ define-lazy-prop@^2.0.0: resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f" integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og== +define-lazy-prop@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz#dbb19adfb746d7fc6d734a06b72f4a00d021255f" + integrity sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg== + define-properties@^1.1.3, define-properties@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.4.tgz#0b14d7bd7fbeb2f3572c3a7eda80ea5d57fb05b1" @@ -5040,13 +5092,6 @@ diff@^4.0.1: resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== -dir-glob@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4" - integrity sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw== - dependencies: - path-type "^3.0.0" - dir-glob@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" @@ -5301,6 +5346,14 @@ enhanced-resolve@^5.10.0: graceful-fs "^4.2.4" tapable "^2.2.0" +enhanced-resolve@^5.12.0: + version "5.14.1" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.14.1.tgz#de684b6803724477a4af5d74ccae5de52c25f6b3" + integrity sha512-Vklwq2vDKtl0y/vtwjSesgJ5MYS7Etuk5txS8VdKL4AOS1aUlD96zqIfsOSLQsdv3xgMRbtkWM8eG9XDfKUPow== + dependencies: + graceful-fs "^4.2.4" + tapable "^2.2.0" + enquirer@^2.3.5: version "2.3.6" resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" @@ -5482,13 +5535,28 @@ eslint-config-prettier@^8.5.0: resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.5.0.tgz#5a81680ec934beca02c7b1a61cf8ca34b66feab1" integrity sha512-obmWKLUNCnhtQRKc+tmnYuQl0pFU1ibYJQ5BGhTVB08bHe9wC8qUeG7c08dj9XX+AuPj1YSGSQIHl1pnDHZR0Q== -eslint-import-resolver-node@^0.3.6: - version "0.3.6" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd" - integrity sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw== +eslint-import-resolver-node@^0.3.7: + version "0.3.7" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz#83b375187d412324a1963d84fa664377a23eb4d7" + integrity sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA== dependencies: debug "^3.2.7" - resolve "^1.20.0" + is-core-module "^2.11.0" + resolve "^1.22.1" + +eslint-import-resolver-typescript@^3.5.5: + version "3.5.5" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.5.5.tgz#0a9034ae7ed94b254a360fbea89187b60ea7456d" + integrity sha512-TdJqPHs2lW5J9Zpe17DZNQuDnox4xo2o+0tE7Pggain9Rbc19ik8kFtXdxZ250FVx2kF4vlt2RSf4qlUpG7bhw== + dependencies: + debug "^4.3.4" + enhanced-resolve "^5.12.0" + eslint-module-utils "^2.7.4" + get-tsconfig "^4.5.0" + globby "^13.1.3" + is-core-module "^2.11.0" + is-glob "^4.0.3" + synckit "^0.8.5" eslint-import-resolver-webpack@^0.13.1: version "0.13.2" @@ -5507,30 +5575,32 @@ eslint-import-resolver-webpack@^0.13.1: resolve "^1.20.0" semver "^5.7.1" -eslint-module-utils@^2.7.3: - version "2.7.4" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.4.tgz#4f3e41116aaf13a20792261e61d3a2e7e0583974" - integrity sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA== +eslint-module-utils@^2.7.4: + version "2.8.0" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz#e439fee65fc33f6bba630ff621efc38ec0375c49" + integrity sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw== dependencies: debug "^3.2.7" -eslint-plugin-import@^2.23.4: - version "2.26.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.26.0.tgz#f812dc47be4f2b72b478a021605a59fc6fe8b88b" - integrity sha512-hYfi3FXaM8WPLf4S1cikh/r4IxnO6zrhZbEGz2b660EJRbuxgpDS5gkCuYgGWg2xxh2rBuIr4Pvhve/7c31koA== +eslint-plugin-import@^2.27.5: + version "2.27.5" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz#876a6d03f52608a3e5bb439c2550588e51dd6c65" + integrity sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow== dependencies: - array-includes "^3.1.4" - array.prototype.flat "^1.2.5" - debug "^2.6.9" + array-includes "^3.1.6" + array.prototype.flat "^1.3.1" + array.prototype.flatmap "^1.3.1" + debug "^3.2.7" doctrine "^2.1.0" - eslint-import-resolver-node "^0.3.6" - eslint-module-utils "^2.7.3" + eslint-import-resolver-node "^0.3.7" + eslint-module-utils "^2.7.4" has "^1.0.3" - is-core-module "^2.8.1" + is-core-module "^2.11.0" is-glob "^4.0.3" minimatch "^3.1.2" - object.values "^1.1.5" - resolve "^1.22.0" + object.values "^1.1.6" + resolve "^1.22.1" + semver "^6.3.0" tsconfig-paths "^3.14.1" eslint-plugin-jsx-a11y@^6.4.1: @@ -5835,6 +5905,21 @@ execa@^6.1.0: signal-exit "^3.0.7" strip-final-newline "^3.0.0" +execa@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/execa/-/execa-7.1.1.tgz#3eb3c83d239488e7b409d48e8813b76bb55c9c43" + integrity sha512-wH0eMf/UXckdUYnO21+HDztteVv05rq2GXksxT4fCGeHkBhw1DROXh40wcjMcRqDOWE7iPJ4n3M7e2+YFP+76Q== + dependencies: + cross-spawn "^7.0.3" + get-stream "^6.0.1" + human-signals "^4.3.0" + is-stream "^3.0.0" + merge-stream "^2.0.0" + npm-run-path "^5.1.0" + onetime "^6.0.0" + signal-exit "^3.0.7" + strip-final-newline "^3.0.0" + exit@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" @@ -6013,19 +6098,7 @@ fast-diff@^1.1.2: resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03" integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== -fast-glob@^2.2.6: - version "2.2.7" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.7.tgz#6953857c3afa475fff92ee6015d52da70a4cd39d" - integrity sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw== - dependencies: - "@mrmlnc/readdir-enhanced" "^2.2.1" - "@nodelib/fs.stat" "^1.1.2" - glob-parent "^3.1.0" - is-glob "^4.0.0" - merge2 "^1.2.3" - micromatch "^3.1.10" - -fast-glob@^3.0.3, fast-glob@^3.2.11, fast-glob@^3.2.9: +fast-glob@^3.0.3, fast-glob@^3.2.11, fast-glob@^3.2.12, fast-glob@^3.2.9: version "3.2.12" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80" integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w== @@ -6419,6 +6492,13 @@ get-symbol-description@^1.0.0: call-bind "^1.0.2" get-intrinsic "^1.1.1" +get-tsconfig@^4.5.0: + version "4.6.0" + resolved "https://registry.yarnpkg.com/get-tsconfig/-/get-tsconfig-4.6.0.tgz#e977690993a42f3e320e932427502a40f7af6d05" + integrity sha512-lgbo68hHTQnFddybKbbs/RDRJnJT5YyGy2kQzVwbq+g67X73i+5MVTval34QxGkOe9X5Ujf1UYpCaphLyltjEg== + dependencies: + resolve-pkg-maps "^1.0.0" + get-value@^2.0.3, get-value@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" @@ -6436,14 +6516,6 @@ glob-parent@5.1.2, glob-parent@^5.1.2, glob-parent@~5.1.2: dependencies: is-glob "^4.0.1" -glob-parent@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" - integrity sha512-E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA== - dependencies: - is-glob "^3.1.0" - path-dirname "^1.0.0" - glob-parent@^6.0.1: version "6.0.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" @@ -6451,11 +6523,6 @@ glob-parent@^6.0.1: dependencies: is-glob "^4.0.3" -glob-to-regexp@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab" - integrity sha512-Iozmtbqv0noj0uDDqoL0zNq0VBEfK2YFoMAZoxJe4cwphvLR+JskfF30QhXHOR4m3KrE6NLRYw+U9MRXvifyig== - glob-to-regexp@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" @@ -6522,7 +6589,7 @@ globby@^10.0.1: merge2 "^1.2.3" slash "^3.0.0" -globby@^11.1.0: +globby@^11.0.4, globby@^11.1.0: version "11.1.0" resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== @@ -6534,6 +6601,17 @@ globby@^11.1.0: merge2 "^1.4.1" slash "^3.0.0" +globby@^13.1.3: + version "13.1.4" + resolved "https://registry.yarnpkg.com/globby/-/globby-13.1.4.tgz#2f91c116066bcec152465ba36e5caa4a13c01317" + integrity sha512-iui/IiiW+QrJ1X1hKH5qwlMQyv34wJAYwH1vrf8b9kBA4sNiif3gKsMHa+BrdnOpEudWjpotfa7LrTzB1ERS/g== + dependencies: + dir-glob "^3.0.1" + fast-glob "^3.2.11" + ignore "^5.2.0" + merge2 "^1.4.1" + slash "^4.0.0" + globby@^6.1.0: version "6.1.0" resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c" @@ -6545,20 +6623,6 @@ globby@^6.1.0: pify "^2.0.0" pinkie-promise "^2.0.0" -globby@^9.2.0: - version "9.2.0" - resolved "https://registry.yarnpkg.com/globby/-/globby-9.2.0.tgz#fd029a706c703d29bdd170f4b6db3a3f7a7cb63d" - integrity sha512-ollPHROa5mcxDEkwg6bPt3QbEf4pDQSNtd6JPL1YvOvAo/7/0VAm9TccUeoTmarjPw4pfUthSCqcyfNB1I3ZSg== - dependencies: - "@types/glob" "^7.1.1" - array-union "^1.0.2" - dir-glob "^2.2.2" - fast-glob "^2.2.6" - glob "^7.1.3" - ignore "^4.0.3" - pify "^4.0.1" - slash "^2.0.0" - google-auth-library@^7.0.2, google-auth-library@^7.14.0: version "7.14.1" resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-7.14.1.tgz#e3483034162f24cc71b95c8a55a210008826213c" @@ -7011,6 +7075,11 @@ human-signals@^3.0.1: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-3.0.1.tgz#c740920859dafa50e5a3222da9d3bf4bb0e5eef5" integrity sha512-rQLskxnM/5OCldHo+wNXbpVgDn5A17CUoKX+7Sokwaknlq7CdSnphy0W39GU8dw59XiCXmFXDg4fRuckQRKewQ== +human-signals@^4.3.0: + version "4.3.1" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-4.3.1.tgz#ab7f811e851fca97ffbd2c1fe9a958964de321b2" + integrity sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ== + husky@^7.0.0: version "7.0.4" resolved "https://registry.yarnpkg.com/husky/-/husky-7.0.4.tgz#242048245dc49c8fb1bf0cc7cfb98dd722531535" @@ -7057,7 +7126,7 @@ ignore-by-default@^1.0.1: resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09" integrity sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA== -ignore@^4.0.3, ignore@^4.0.6: +ignore@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== @@ -7264,7 +7333,14 @@ is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7: resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055" integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA== -is-core-module@^2.7.0, is-core-module@^2.8.1, is-core-module@^2.9.0: +is-core-module@^2.11.0: + version "2.12.1" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.1.tgz#0c0b6885b6f80011c71541ce15c8d66cf5a4f9fd" + integrity sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg== + dependencies: + has "^1.0.3" + +is-core-module@^2.7.0, is-core-module@^2.9.0: version "2.11.0" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.11.0.tgz#ad4cb3e3863e814523c96f3f58d26cc570ff0144" integrity sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw== @@ -7315,6 +7391,11 @@ is-docker@^2.0.0, is-docker@^2.1.1: resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== +is-docker@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-3.0.0.tgz#90093aa3106277d8a77a5910dbae71747e15a200" + integrity sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ== + is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" @@ -7327,7 +7408,7 @@ is-extendable@^1.0.1: dependencies: is-plain-object "^2.0.4" -is-extglob@^2.1.0, is-extglob@^2.1.1: +is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== @@ -7359,13 +7440,6 @@ is-generator-function@^1.0.7: dependencies: has-tostringtag "^1.0.0" -is-glob@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" - integrity sha512-UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw== - dependencies: - is-extglob "^2.1.0" - is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: version "4.0.3" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084" @@ -7373,6 +7447,13 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1: dependencies: is-extglob "^2.1.1" +is-inside-container@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-inside-container/-/is-inside-container-1.0.0.tgz#e81fba699662eb31dbdaf26766a61d4814717ea4" + integrity sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA== + dependencies: + is-docker "^3.0.0" + is-nan@^1.2.1, is-nan@^1.3.2: version "1.3.2" resolved "https://registry.yarnpkg.com/is-nan/-/is-nan-1.3.2.tgz#043a54adea31748b55b6cd4e09aadafa69bd9e1d" @@ -9168,6 +9249,11 @@ mute-stream@~0.0.4: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== +mylas@^2.1.9: + version "2.1.13" + resolved "https://registry.yarnpkg.com/mylas/-/mylas-2.1.13.tgz#1e23b37d58fdcc76e15d8a5ed23f9ae9fc0cbdf4" + integrity sha512-+MrqnJRtxdF+xngFfUUkIMQrUUL0KsxbADUkn23Z/4ibGg192Q+z+CQyiYwvWTsYjJygmMR8+w3ZDa98Zh6ESg== + nan@^2.14.1, nan@^2.15.0: version "2.17.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.17.0.tgz#c0150a2368a182f033e9aa5195ec76ea41a199cb" @@ -9515,6 +9601,15 @@ object.values@^1.1.5: define-properties "^1.1.3" es-abstract "^1.19.1" +object.values@^1.1.6: + version "1.1.6" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.6.tgz#4abbaa71eba47d63589d402856f908243eea9b1d" + integrity sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.4" + es-abstract "^1.20.4" + obuf@^1.0.0, obuf@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" @@ -9583,6 +9678,16 @@ open@^8.0.9: is-docker "^2.1.1" is-wsl "^2.2.0" +open@^9.1.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/open/-/open-9.1.0.tgz#684934359c90ad25742f5a26151970ff8c6c80b6" + integrity sha512-OS+QTnw1/4vrf+9hh1jc1jnYjzSG4ttTBB8UxOwAnInG3Uo4ssetzC1ihqaIHjLJnA5GGlRl6QlZXOTQhRBUvg== + dependencies: + default-browser "^4.0.0" + define-lazy-prop "^3.0.0" + is-inside-container "^1.0.0" + is-wsl "^2.2.0" + opener@^1.5.2: version "1.5.2" resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598" @@ -9830,11 +9935,6 @@ path-browserify@^1.0.1: resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd" integrity sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g== -path-dirname@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" - integrity sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q== - path-exists@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" @@ -10059,6 +10159,13 @@ playwright-core@1.27.1: resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.27.1.tgz#840ef662e55a3ed759d8b5d3d00a5f885a7184f4" integrity sha512-9EmeXDncC2Pmp/z+teoVYlvmPWUC6ejSSYZUln7YaP89Z6lpAaiaAnqroUt/BoLo8tn7WYShcfaCh+xofZa44Q== +plimit-lit@^1.2.6: + version "1.5.0" + resolved "https://registry.yarnpkg.com/plimit-lit/-/plimit-lit-1.5.0.tgz#f66df8a7041de1e965c4f1c0697ab486968a92a5" + integrity sha512-Eb/MqCb1Iv/ok4m1FqIXqvUKPISufcjZ605hl3KM/n8GaX8zfhtgdLwZU3vKjuHGh2O9Rjog/bHTq8ofIShdng== + dependencies: + queue-lit "^1.5.0" + posix-character-classes@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" @@ -10521,6 +10628,11 @@ querystringify@^2.1.1: resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== +queue-lit@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/queue-lit/-/queue-lit-1.5.0.tgz#8197fdafda1edd615c8a0fc14c48353626e5160a" + integrity sha512-IslToJ4eiCEE9xwMzq3viOO5nH8sUWUCwoElrhNMozzr9IIt2qqvB4I+uHu/zJTQVqc9R5DFwok4ijNK1pU3fA== + queue-microtask@^1.2.2: version "1.2.3" resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" @@ -11000,6 +11112,11 @@ resolve-pathname@^3.0.0: resolved "https://registry.yarnpkg.com/resolve-pathname/-/resolve-pathname-3.0.0.tgz#99d02224d3cf263689becbb393bc560313025dcd" integrity sha512-C7rARubxI8bXFNB/hqcp/4iUeIXJhJZvFPFPiSPRnhU5UPxzMFIl+2E6yY6c4k9giDJAhtV+enfA+G89N6Csng== +resolve-pkg-maps@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz#616b3dc2c57056b5588c31cdf4b3d64db133720f" + integrity sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw== + resolve-url@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" @@ -11010,7 +11127,7 @@ resolve.exports@^1.1.0: resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9" integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ== -resolve@^1.0.0, resolve@^1.1.6, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.9.0: +resolve@^1.0.0, resolve@^1.1.6, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.9.0: version "1.22.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== @@ -11019,6 +11136,15 @@ resolve@^1.0.0, resolve@^1.1.6, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.20. path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" +resolve@^1.22.1: + version "1.22.2" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f" + integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g== + dependencies: + is-core-module "^2.11.0" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" + resolve@^2.0.0-next.3: version "2.0.0-next.4" resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.4.tgz#3d37a113d6429f496ec4752d2a2e58efb1fd4660" @@ -11095,6 +11221,13 @@ robust-predicates@^3.0.0: resolved "https://registry.yarnpkg.com/robust-predicates/-/robust-predicates-3.0.1.tgz#ecde075044f7f30118682bd9fb3f123109577f9a" integrity sha512-ndEIpszUHiG4HtDsQLeIuMvRsDnn8c8rYStabochtUeCvfuvNptb5TUbVD68LRAILPX7p9nqQGh4xJgn3EHS/g== +run-applescript@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/run-applescript/-/run-applescript-5.0.0.tgz#e11e1c932e055d5c6b40d98374e0268d9b11899c" + integrity sha512-XcT5rBksx1QdIhlFOCtgZkB99ZEouFZ1E2Kc2LHqNW13U3/74YGdkQRmThTwxy4QIyookibDKYZOPqX//6BlAg== + dependencies: + execa "^5.0.0" + run-parallel@^1.1.9: version "1.2.0" resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" @@ -11437,6 +11570,11 @@ slash@^3.0.0: resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q== +slash@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7" + integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew== + slice-ansi@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787" @@ -11987,6 +12125,14 @@ symbol-tree@^3.2.4: resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== +synckit@^0.8.5: + version "0.8.5" + resolved "https://registry.yarnpkg.com/synckit/-/synckit-0.8.5.tgz#b7f4358f9bb559437f9f167eb6bc46b3c9818fa3" + integrity sha512-L1dapNV6vu2s/4Sputv8xGsCdAVlb5nRDMFU/E27D44l5U6cw1g0dGd45uLc+OXjNMmF4ntiMdCimzcjFKQI8Q== + dependencies: + "@pkgr/utils" "^2.3.1" + tslib "^2.5.0" + table@^6.0.9: version "6.8.1" resolved "https://registry.yarnpkg.com/table/-/table-6.8.1.tgz#ea2b71359fe03b017a5fbc296204471158080bdf" @@ -12126,6 +12272,11 @@ tiny-warning@^1.0.0: resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754" integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA== +titleize@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/titleize/-/titleize-3.0.0.tgz#71c12eb7fdd2558aa8a44b0be83b8a76694acd53" + integrity sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ== + tmpl@1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" @@ -12332,6 +12483,18 @@ ts-toolbelt@^6.15.1: resolved "https://registry.yarnpkg.com/ts-toolbelt/-/ts-toolbelt-6.15.5.tgz#cb3b43ed725cb63644782c64fbcad7d8f28c0a83" integrity sha512-FZIXf1ksVyLcfr7M317jbB67XFJhOO1YqdTcuGaq9q5jLUoTikukZ+98TPjKiP2jC5CgmYdWWYs0s2nLSU0/1A== +tsc-alias@^1.8.6: + version "1.8.6" + resolved "https://registry.yarnpkg.com/tsc-alias/-/tsc-alias-1.8.6.tgz#28300ed398e90b1c600548ed956f58dfbecc1589" + integrity sha512-vq+i6VpE83IeMsSJVcFN03ZBofADhr8/gIJXjxpbnTRfN/MFXy0+SBaKG2o7p95QqXBGkeG98HYz3IkOOveFbg== + dependencies: + chokidar "^3.5.3" + commander "^9.0.0" + globby "^11.0.4" + mylas "^2.1.9" + normalize-path "^3.0.0" + plimit-lit "^1.2.6" + tsconfig-paths@^3.14.1: version "3.14.1" resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a" @@ -12352,14 +12515,6 @@ tsconfig@^7.0.0: strip-bom "^3.0.0" strip-json-comments "^2.0.0" -tscpaths@^0.0.9: - version "0.0.9" - resolved "https://registry.yarnpkg.com/tscpaths/-/tscpaths-0.0.9.tgz#c77abfde6820920f10c64f83c27753b9505814ab" - integrity sha512-tz4qimSJTCjYtHVsoY7pvxLcxhmhgmwzm7fyMEiL3/kPFFVyUuZOwuwcWwjkAsIrSUKJK22A7fNuJUwxzQ+H+w== - dependencies: - commander "^2.20.0" - globby "^9.2.0" - tslib@^1.8.1: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" @@ -12370,6 +12525,11 @@ tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e" integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA== +tslib@^2.5.0: + version "2.5.2" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.2.tgz#1b6f07185c881557b0ffa84b111a0106989e8338" + integrity sha512-5svOrSA2w3iGFDs1HibEVBGbDrAY82bFQ3HZ3ixB+88nsbsWQoKqDRb5UBYAUPEzbBn6dAp5gRNXglySbx1MlA== + tsutils@^3.21.0: version "3.21.0" resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623" @@ -12633,6 +12793,11 @@ unset-value@^1.0.0: has-value "^0.3.1" isobject "^3.0.0" +untildify@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b" + integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw== + updatable-log@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/updatable-log/-/updatable-log-0.2.0.tgz#8adfe35dd744bd87e8bf217425e4e8bb81b6f3c6"