From 185ab382750ee7e05a5391601fd306f98858880b Mon Sep 17 00:00:00 2001 From: Henri Nieminen Date: Thu, 8 Aug 2024 15:14:45 +0300 Subject: [PATCH 01/24] Setup vite --- .env.example | 14 +- config/paths.js | 2 +- src/index.html => index.html | 5 +- package.json | 25 +- src/api/createUrl.ts | 2 +- src/components/sideMenu/SideMenu.tsx | 4 +- src/index.ts | 3 - src/index.tsx | 27 + src/main.scss | 14 +- src/vite-env.d.ts | 1 + tsconfig.json | 14 +- vite.config.js | 46 + yarn.lock | 1535 +++++++++++++++++++++++--- 13 files changed, 1513 insertions(+), 179 deletions(-) rename src/index.html => index.html (73%) delete mode 100644 src/index.ts create mode 100644 src/index.tsx create mode 100644 src/vite-env.d.ts create mode 100644 vite.config.js diff --git a/.env.example b/.env.example index 67dd880dd..5afea5b9f 100644 --- a/.env.example +++ b/.env.example @@ -1,10 +1,10 @@ # Required -API_URL=https://mvj.dev.hel.ninja/v1 -STORAGE_PREFIX=MVJ +VITE_API_URL=https://mvj.dev.hel.ninja/v1 +VITE_STORAGE_PREFIX=MVJ PORT=3000 # The SSO OpenId Connect settings -OPENID_CONNECT_API_TOKEN_KEY=https://api.hel.fi/auth/mvj -OPENID_CONNECT_API_TOKEN_URL=https://api.hel.fi/sso/api-tokens/ -OPENID_CONNECT_AUTHORITY_URL=https://api.hel.fi/sso/openid/ -OPENID_CONNECT_CLIENT_ID=https://api.hel.fi/auth/mvj -OPENID_CONNECT_SCOPE=openid profile mvj https://api.hel.fi/auth/mvj \ No newline at end of file +VITE_OPENID_CONNECT_API_TOKEN_KEY=https://api.hel.fi/auth/mvj +VITE_OPENID_CONNECT_API_TOKEN_URL=https://api.hel.fi/sso/api-tokens/ +VITE_OPENID_CONNECT_AUTHORITY_URL=https://api.hel.fi/sso/openid/ +VITE_OPENID_CONNECT_CLIENT_ID=https://api.hel.fi/auth/mvj +VITE_OPENID_CONNECT_SCOPE=openid profile mvj https://api.hel.fi/auth/mvj \ No newline at end of file diff --git a/config/paths.js b/config/paths.js index fc0fe22d6..e9bdfcf8c 100644 --- a/config/paths.js +++ b/config/paths.js @@ -9,7 +9,7 @@ const url = require('url'); const appDirectory = fs.realpathSync(process.cwd()); const resolveApp = relativePath => path.resolve(appDirectory, relativePath); -const envPublicUrl = process.env.PUBLIC_URL; +const envPublicUrl = import.meta.env.PUBLIC_URL; function ensureSlash(path, needsSlash) { const hasSlash = path.endsWith('/'); diff --git a/src/index.html b/index.html similarity index 73% rename from src/index.html rename to index.html index 9a3aae61d..605b48344 100644 --- a/src/index.html +++ b/index.html @@ -1,12 +1,13 @@ - + - + Maanvuokrausjärjestelmä | Helsingin Kaupunki
+ diff --git a/package.json b/package.json index 94eb3d2a0..8afed9e26 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,7 @@ "main": "src/index.ts", "author": "Jori Lindell ", "license": "MIT", + "type": "module", "nyc": { "require": [ "@babel/register", @@ -14,6 +15,8 @@ "instrument": false }, "scripts": { + "build": "vite build", + "dev": "vite", "lint": "eslint src", "serve": "webpack serve", "start": "node scripts/start.js", @@ -26,7 +29,7 @@ }, "dependencies": { "classnames": "^2.2.6", - "connected-react-router": "^6.5.2", + "connected-react-router": "^6.9.3", "copy-to-clipboard": "^3.2.0", "date-fns": "^2.0.0-beta.4", "dotenv": "^8.0.0", @@ -47,9 +50,9 @@ "proj4": "^2.5.0", "proj4leaflet": "^1.0.2", "prop-types": "^15.7.2", - "react": "16.8.6", + "react": "^16.9", "react-datepicker": "2.8.0", - "react-dom": "16.8.6", + "react-dom": "^16.9", "react-dual-listbox": "^2.0.0", "react-foundation": "^0.9.6", "react-leaflet": "^2.8.0", @@ -86,10 +89,11 @@ "@types/leaflet": "1.5.23", "@types/lodash": "^4.17.1", "@types/mocha": "^10.0.6", - "@types/react": "^18.3.2", - "@types/react-dom": "^18.3.0", + "@types/react": "^16.9", + "@types/react-dom": "^16.9", "@types/redux-actions": "^2.6.5", "@types/webpack-env": "^1.18.5", + "@vitejs/plugin-react": "^4.3.1", "babel-loader": "^9.1.3", "babel-plugin-istanbul": "^6.1.1", "babel-plugin-module-resolver": "^5.0.0", @@ -104,8 +108,10 @@ "debug": "^4.3.4", "enzyme": "^3.10.0", "enzyme-adapter-react-16": "^1.14.0", - "eslint": "^8.56.0", - "eslint-plugin-react": "^7.14.3", + "eslint": "^8.57.0", + "eslint-plugin-react": "^7.34.3", + "eslint-plugin-react-hooks": "^4.6.2", + "eslint-plugin-react-refresh": "^0.4.7", "favicons-webpack-plugin": "^6.0.1", "file-loader": "^6.2.0", "fs-extra": "^11.2.0", @@ -117,8 +123,11 @@ "nodemon": "^3.0.3", "npm-run-all": "^4.1.5", "nyc": "^14.1.1", + "postcss": "^8.4.41", + "postcss-url": "^10.1.3", "react-dev-utils": "^12.0.1", "react-hot-loader": "^4.13.1", + "sass": "^1.77.8", "sass-loader": "^14.1.0", "sinon": "^7.3.2", "sinon-chai": "^3.3.0", @@ -130,6 +139,8 @@ "typescript": "^5.5.4", "url": "^0.11.3", "url-loader": "^4.1.1", + "vite": "^5.3.5", + "vite-plugin-commonjs": "^0.10.1", "webpack": "^5.9.0", "webpack-dev-server": "^4.15.1", "webpack-hot-middleware": "^2.26.0", diff --git a/src/api/createUrl.ts b/src/api/createUrl.ts index 2d57c79f1..aadeb9967 100644 --- a/src/api/createUrl.ts +++ b/src/api/createUrl.ts @@ -1,4 +1,4 @@ import isArray from "lodash/isArray"; export const stringifyQuery = (query: Record): string => Object.keys(query).map(key => [key, query[key]].map(v => encodeURIComponent(v)).join('=')).join('&'); export const standardStringifyQuery = (query: Record): string => Object.keys(query).map(key => isArray(query[key]) ? [key, query[key].map(v => encodeURIComponent(v)).join(`&${key}=`)].join('=') : [key, query[key]].map(v => encodeURIComponent(v)).join('=')).join('&'); -export default ((url: string, params?: Record): string => `${process.env.API_URL || ''}/${url}${params ? `?${stringifyQuery(params)}` : ''}`); \ No newline at end of file +export default ((url: string, params?: Record): string => `${import.meta.env.VITE_API_URL || ''}/${url}${params ? `?${stringifyQuery(params)}` : ''}`); \ No newline at end of file diff --git a/src/components/sideMenu/SideMenu.tsx b/src/components/sideMenu/SideMenu.tsx index a8b873a4e..136e117e5 100644 --- a/src/components/sideMenu/SideMenu.tsx +++ b/src/components/sideMenu/SideMenu.tsx @@ -195,7 +195,7 @@ class SideMenu extends Component { color: '#b7b7b7' }} onClick={handleClick} to={getRouteById(Routes.LAND_USE_CONTRACTS)}>Maankäyttösopimukset - {process.env.NODE_ENV !== 'production' && { text: 'Tonttihakemukset', to: getRouteById(Routes.PLOT_APPLICATIONS) }]} menuKey='plot' onHeaderClick={this.handleHeaderClick} />} - {process.env.NODE_ENV !== 'production' && + {import.meta.env.NODE_ENV !== 'production' &&
  • Aluehaut
    • } diff --git a/src/index.ts b/src/index.ts deleted file mode 100644 index a7c5d6042..000000000 --- a/src/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -import startApp from "./root/startApp"; -import "./polyfills"; -startApp(); \ No newline at end of file diff --git a/src/index.tsx b/src/index.tsx new file mode 100644 index 000000000..bc1ddc7c9 --- /dev/null +++ b/src/index.tsx @@ -0,0 +1,27 @@ +import React from 'react'; +import ReactDOM from 'react-dom'; +import { Provider } from 'react-redux'; +import { ConnectedRouter } from 'connected-react-router'; +import { OidcProvider } from 'redux-oidc'; +import configureStore, { history } from '@/root/configureStore'; +import routes from '@/root/routes'; +import userManager from '@/auth/util/user-manager'; + +import './polyfills'; +export const store = configureStore(); + +const container = document.getElementById('root'); +ReactDOM.render( + + {/* + // @ts-ignore: Children not included in type error */} + + {/* + // @ts-ignore: Children not included in type error */} + + {routes} + + + , + container + ); \ No newline at end of file diff --git a/src/main.scss b/src/main.scss index b2b89f403..a407c21d6 100644 --- a/src/main.scss +++ b/src/main.scss @@ -1,18 +1,18 @@ @import "./styles/fonts"; @import "./styles/variables"; -@import "~foundation-sites/scss/foundation"; +@import "foundation-sites/scss/foundation"; @include foundation-everything(true); @include foundation-flex-grid; -@import '~react-leaflet-fullscreen/dist/styles.css'; +@import "react-leaflet-fullscreen/dist/styles.css"; @import "styles/mixins"; // Vendor -@import "~react-redux-toastr/src/styles/index"; -@import "~react-datepicker/dist/react-datepicker.css"; -@import '../node_modules/leaflet-draw/dist/leaflet.draw.css'; -@import 'node_modules/react-dual-listbox/src/scss/react-dual-listbox.scss'; -@import '~font-awesome/css/font-awesome.css'; +@import "react-redux-toastr/src/styles/index"; +@import "react-datepicker/dist/react-datepicker.css"; +@import "../node_modules/leaflet-draw/dist/leaflet.draw.css"; +@import "node_modules/react-dual-listbox/src/scss/react-dual-listbox.scss"; +@import "font-awesome/css/font-awesome.css"; // Components @import "components/authorization/authorization"; diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts new file mode 100644 index 000000000..151aa6856 --- /dev/null +++ b/src/vite-env.d.ts @@ -0,0 +1 @@ +/// \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index 1c552c0ac..30118650e 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -11,8 +11,8 @@ // "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */ /* Language and Environment */ - "target": "es2016", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */ - // "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ + "target": "ES2020", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */ + "lib": ["dom", "ES2020"], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ "jsx": "react", /* Specify what JSX code is generated. */ // "experimentalDecorators": true, /* Enable experimental support for legacy experimental decorators. */ // "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */ @@ -25,11 +25,13 @@ // "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */ /* Modules */ - "module": "commonjs", /* Specify what module code is generated. */ + "module": "esnext", /* Specify what module code is generated. */ "rootDir": "./", /* Specify the root folder within your source files. */ - // "moduleResolution": "node10", /* Specify how TypeScript looks up a file from a given module specifier. */ + "moduleResolution": "node", /* Specify how TypeScript looks up a file from a given module specifier. */ "baseUrl": "./src", /* Specify the base directory to resolve non-relative module names. */ - // "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */ + "paths": { + "@/*": ["./*"], + }, /* Specify a set of entries that re-map imports to additional lookup locations. */ // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ "typeRoots": [ "./node_modules/@types", @@ -77,7 +79,7 @@ // "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */ /* Interop Constraints */ - // "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */ + "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */ // "verbatimModuleSyntax": true, /* Do not transform or elide any imports or exports not marked as type-only, ensuring they are written in the output file's format based on the 'module' setting. */ // "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */ "esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */ diff --git a/vite.config.js b/vite.config.js new file mode 100644 index 000000000..3b13ea3fa --- /dev/null +++ b/vite.config.js @@ -0,0 +1,46 @@ +import { defineConfig } from 'vite'; +import react from '@vitejs/plugin-react'; +import commonjs from 'vite-plugin-commonjs'; +import path from 'path'; +import postcssUrl from 'postcss-url'; + +// https://vitejs.dev/config/ +export default defineConfig({ + plugins: [ + react({ + jsxRuntime: 'classic' + }), + commonjs(), + ], + css: { + postcss: { + plugins: [ + postcssUrl({ + url: (asset) => { + if (asset.relativePath && !['src', 'assets'].includes(asset.relativePath.split('/')[0])) { + return `/assets/${asset.url}`; + } + return asset.url; + } + }), + ] + } + }, + resolve: { + alias: { + '@': path.resolve(__dirname, '/src'), + },}, + define: { + 'global': {}, + }, + optimizeDeps: { + esbuildOptions: { + loader: { + '.js': 'jsx', + }, + }, + }, + server: { + port: 3000, + } +}) diff --git a/yarn.lock b/yarn.lock index 34565ae1c..2da80fc6e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -39,6 +39,14 @@ "@babel/highlight" "^7.23.4" chalk "^2.4.2" +"@babel/code-frame@^7.24.7": + version "7.24.7" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.24.7.tgz#882fd9e09e8ee324e496bd040401c6f046ef4465" + integrity sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA== + dependencies: + "@babel/highlight" "^7.24.7" + picocolors "^1.0.0" + "@babel/compat-data@^7.10.1": version "7.10.1" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.10.1.tgz#b1085ffe72cd17bf2c0ee790fc09f9626011b2db" @@ -53,6 +61,11 @@ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.23.5.tgz#ffb878728bb6bdcb6f4510aa51b1be9afb8cfd98" integrity sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw== +"@babel/compat-data@^7.25.2": + version "7.25.2" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.25.2.tgz#e41928bd33475305c586f6acbbb7e3ade7a6f7f5" + integrity sha512-bYcppcpKBvX4znYaPEeFau03bp89ShqNMLs+rmdptMw+heSZh9+z84d2YG+K7cYLbWwzdjtDoW/uqZmPjulClQ== + "@babel/core@^7.11.1", "@babel/core@^7.12.3", "@babel/core@^7.23.9": version "7.23.9" resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.23.9.tgz#b028820718000f267870822fec434820e9b1e4d1" @@ -74,6 +87,27 @@ json5 "^2.2.3" semver "^6.3.1" +"@babel/core@^7.24.5": + version "7.25.2" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.25.2.tgz#ed8eec275118d7613e77a352894cd12ded8eba77" + integrity sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA== + dependencies: + "@ampproject/remapping" "^2.2.0" + "@babel/code-frame" "^7.24.7" + "@babel/generator" "^7.25.0" + "@babel/helper-compilation-targets" "^7.25.2" + "@babel/helper-module-transforms" "^7.25.2" + "@babel/helpers" "^7.25.0" + "@babel/parser" "^7.25.0" + "@babel/template" "^7.25.0" + "@babel/traverse" "^7.25.2" + "@babel/types" "^7.25.2" + convert-source-map "^2.0.0" + debug "^4.1.0" + gensync "^1.0.0-beta.2" + json5 "^2.2.3" + semver "^6.3.1" + "@babel/eslint-parser@^7.23.9": version "7.23.10" resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.23.10.tgz#2d4164842d6db798873b40e0c4238827084667a2" @@ -103,6 +137,16 @@ "@jridgewell/trace-mapping" "^0.3.17" jsesc "^2.5.1" +"@babel/generator@^7.25.0": + version "7.25.0" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.25.0.tgz#f858ddfa984350bc3d3b7f125073c9af6988f18e" + integrity sha512-3LEEcj3PVW8pW2R1SR1M89g/qrYk/m/mB/tLqn7dn4sbBUQyTqnlod+II2U4dqiGtUmkcnAmkMDralTFZttRiw== + dependencies: + "@babel/types" "^7.25.0" + "@jridgewell/gen-mapping" "^0.3.5" + "@jridgewell/trace-mapping" "^0.3.25" + jsesc "^2.5.1" + "@babel/helper-annotate-as-pure@^7.10.1": version "7.10.1" resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.1.tgz#f6d08acc6f70bbd59b436262553fb2e259a1a268" @@ -154,6 +198,17 @@ lru-cache "^5.1.1" semver "^6.3.1" +"@babel/helper-compilation-targets@^7.25.2": + version "7.25.2" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz#e1d9410a90974a3a5a66e84ff55ef62e3c02d06c" + integrity sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw== + dependencies: + "@babel/compat-data" "^7.25.2" + "@babel/helper-validator-option" "^7.24.8" + browserslist "^4.23.1" + lru-cache "^5.1.1" + semver "^6.3.1" + "@babel/helper-create-class-features-plugin@^7.10.1": version "7.10.2" resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.2.tgz#7474295770f217dbcf288bf7572eb213db46ee67" @@ -298,6 +353,14 @@ dependencies: "@babel/types" "^7.22.15" +"@babel/helper-module-imports@^7.24.7": + version "7.24.7" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz#f2f980392de5b84c3328fc71d38bd81bbb83042b" + integrity sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA== + dependencies: + "@babel/traverse" "^7.24.7" + "@babel/types" "^7.24.7" + "@babel/helper-module-transforms@^7.10.1": version "7.10.1" resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.10.1.tgz#24e2f08ee6832c60b157bb0936c86bef7210c622" @@ -322,6 +385,16 @@ "@babel/helper-split-export-declaration" "^7.22.6" "@babel/helper-validator-identifier" "^7.22.20" +"@babel/helper-module-transforms@^7.25.2": + version "7.25.2" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz#ee713c29768100f2776edf04d4eb23b8d27a66e6" + integrity sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ== + dependencies: + "@babel/helper-module-imports" "^7.24.7" + "@babel/helper-simple-access" "^7.24.7" + "@babel/helper-validator-identifier" "^7.24.7" + "@babel/traverse" "^7.25.2" + "@babel/helper-optimise-call-expression@^7.10.1": version "7.10.1" resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.1.tgz#b4a1f2561870ce1247ceddb02a3860fa96d72543" @@ -346,6 +419,11 @@ resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295" integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg== +"@babel/helper-plugin-utils@^7.24.7": + version "7.24.8" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz#94ee67e8ec0e5d44ea7baeb51e571bd26af07878" + integrity sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg== + "@babel/helper-regex@^7.10.1": version "7.10.1" resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.1.tgz#021cf1a7ba99822f993222a001cc3fec83255b96" @@ -407,6 +485,14 @@ dependencies: "@babel/types" "^7.22.5" +"@babel/helper-simple-access@^7.24.7": + version "7.24.7" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz#bcade8da3aec8ed16b9c4953b74e506b51b5edb3" + integrity sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg== + dependencies: + "@babel/traverse" "^7.24.7" + "@babel/types" "^7.24.7" + "@babel/helper-skip-transparent-expression-wrappers@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz#007f15240b5751c537c40e77abb4e89eeaaa8847" @@ -433,6 +519,11 @@ resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83" integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ== +"@babel/helper-string-parser@^7.24.8": + version "7.24.8" + resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz#5b3329c9a58803d5df425e5785865881a81ca48d" + integrity sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ== + "@babel/helper-validator-identifier@^7.10.1": version "7.10.1" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.1.tgz#5770b0c1a826c4f53f5ede5e153163e0318e94b5" @@ -443,11 +534,21 @@ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0" integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A== +"@babel/helper-validator-identifier@^7.24.7": + version "7.24.7" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz#75b889cfaf9e35c2aaf42cf0d72c8e91719251db" + integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w== + "@babel/helper-validator-option@^7.22.15", "@babel/helper-validator-option@^7.23.5": version "7.23.5" resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307" integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw== +"@babel/helper-validator-option@^7.24.8": + version "7.24.8" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz#3725cdeea8b480e86d34df15304806a06975e33d" + integrity sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q== + "@babel/helper-wrap-function@^7.10.1": version "7.10.1" resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.10.1.tgz#956d1310d6696257a7afd47e4c42dfda5dfcedc9" @@ -476,6 +577,14 @@ "@babel/traverse" "^7.23.9" "@babel/types" "^7.23.9" +"@babel/helpers@^7.25.0": + version "7.25.0" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.25.0.tgz#e69beb7841cb93a6505531ede34f34e6a073650a" + integrity sha512-MjgLZ42aCm0oGjJj8CtSM3DB8NOOf8h2l7DCTePJs29u+v7yO/RBX9nShlKMgFnRks/Q4tBAe7Hxnov9VkGwLw== + dependencies: + "@babel/template" "^7.25.0" + "@babel/types" "^7.25.0" + "@babel/highlight@^7.10.1": version "7.10.1" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.1.tgz#841d098ba613ba1a427a2b383d79e35552c38ae0" @@ -494,6 +603,23 @@ chalk "^2.4.2" js-tokens "^4.0.0" +"@babel/highlight@^7.24.7": + version "7.24.7" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.24.7.tgz#a05ab1df134b286558aae0ed41e6c5f731bf409d" + integrity sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw== + dependencies: + "@babel/helper-validator-identifier" "^7.24.7" + chalk "^2.4.2" + js-tokens "^4.0.0" + picocolors "^1.0.0" + +"@babel/parser@^7.1.0", "@babel/parser@^7.20.7", "@babel/parser@^7.25.0", "@babel/parser@^7.25.3": + version "7.25.3" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.25.3.tgz#91fb126768d944966263f0657ab222a642b82065" + integrity sha512-iLTJKDbJ4hMvFPgQwwsVoxtHyWpKKPBrxkANrSYewDPaPpT5py5yeVkgPIJ7XYXhndxJpaA3PyALSXQ7u8e/Dw== + dependencies: + "@babel/types" "^7.25.2" + "@babel/parser@^7.10.1", "@babel/parser@^7.4.3": version "7.10.2" resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.2.tgz#871807f10442b92ff97e4783b9b54f6a0ca812d0" @@ -1291,6 +1417,20 @@ dependencies: "@babel/plugin-transform-react-jsx" "^7.22.5" +"@babel/plugin-transform-react-jsx-self@^7.24.5": + version "7.24.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.24.7.tgz#66bff0248ea0b549972e733516ffad577477bdab" + integrity sha512-fOPQYbGSgH0HUp4UJO4sMBFjY6DuWq+2i8rixyUMb3CdGixs/gccURvYOAhajBdKDoGajFr3mUq5rH3phtkGzw== + dependencies: + "@babel/helper-plugin-utils" "^7.24.7" + +"@babel/plugin-transform-react-jsx-source@^7.24.1": + version "7.24.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.24.7.tgz#1198aab2548ad19582013815c938d3ebd8291ee3" + integrity sha512-J2z+MWzZHVOemyLweMqngXrgGC42jQ//R0KdxqkIz/OrbVIIlhFI3WigZ5fO+nwFvBlncr4MGapd8vTyc7RPNQ== + dependencies: + "@babel/helper-plugin-utils" "^7.24.7" + "@babel/plugin-transform-react-jsx@^7.22.15", "@babel/plugin-transform-react-jsx@^7.22.5": version "7.23.4" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.23.4.tgz#393f99185110cea87184ea47bcb4a7b0c2e39312" @@ -1670,14 +1810,6 @@ resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310" integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA== -"@babel/runtime-corejs3@^7.8.3": - version "7.10.2" - resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.10.2.tgz#3511797ddf9a3d6f3ce46b99cc835184817eaa4e" - integrity sha512-+a2M/u7r15o3dV1NEizr9bRi+KUVnrs/qYxF0Z06DAPx/4VCWaz1WA7EcbE+uqGgt39lp5akWGmHsTseIkHkHg== - dependencies: - core-js-pure "^3.0.0" - regenerator-runtime "^0.13.4" - "@babel/runtime@7.17.9": version "7.17.9" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.9.tgz#d19fbf802d01a8cb6cf053a64e472d42c434ba72" @@ -1699,7 +1831,7 @@ dependencies: regenerator-runtime "^0.14.0" -"@babel/runtime@^7.12.1": +"@babel/runtime@^7.15.4": version "7.25.0" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.25.0.tgz#3af9a91c1b739c569d5d80cc917280919c544ecb" integrity sha512-7dRy4DwXwtzBrPbZflqxnvfxLF8kdZXPkhymtDeFoFqE6ldzjQFgYTtYIFARcLEYDrqfBfYcZt1WqFxRoyC9Rw== @@ -1731,6 +1863,15 @@ "@babel/parser" "^7.23.9" "@babel/types" "^7.23.9" +"@babel/template@^7.25.0": + version "7.25.0" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.25.0.tgz#e733dc3134b4fede528c15bc95e89cb98c52592a" + integrity sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q== + dependencies: + "@babel/code-frame" "^7.24.7" + "@babel/parser" "^7.25.0" + "@babel/types" "^7.25.0" + "@babel/traverse@^7.10.1", "@babel/traverse@^7.4.3": version "7.10.1" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.10.1.tgz#bbcef3031e4152a6c0b50147f4958df54ca0dd27" @@ -1762,6 +1903,28 @@ debug "^4.3.1" globals "^11.1.0" +"@babel/traverse@^7.24.7", "@babel/traverse@^7.25.2": + version "7.25.3" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.3.tgz#f1b901951c83eda2f3e29450ce92743783373490" + integrity sha512-HefgyP1x754oGCsKmV5reSmtV7IXj/kpaE1XYY+D9G5PvKKoFfSbiS4M77MdjuwlZKDIKFCffq9rPU+H/s3ZdQ== + dependencies: + "@babel/code-frame" "^7.24.7" + "@babel/generator" "^7.25.0" + "@babel/parser" "^7.25.3" + "@babel/template" "^7.25.0" + "@babel/types" "^7.25.2" + debug "^4.3.1" + globals "^11.1.0" + +"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.24.7", "@babel/types@^7.25.0", "@babel/types@^7.25.2": + version "7.25.2" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.25.2.tgz#55fb231f7dc958cd69ea141a4c2997e819646125" + integrity sha512-YTnYtra7W9e6/oAZEHj0bJehPRUlLH9/fbpT5LfB0NhQXyALCRkRs3zH9v07IYhkgpqX6Z78FnuccZr/l4Fs4Q== + dependencies: + "@babel/helper-string-parser" "^7.24.8" + "@babel/helper-validator-identifier" "^7.24.7" + to-fast-properties "^2.0.0" + "@babel/types@^7.10.1", "@babel/types@^7.10.2", "@babel/types@^7.4.0", "@babel/types@^7.4.4": version "7.10.2" resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.10.2.tgz#30283be31cad0dbf6fb00bd40641ca0ea675172d" @@ -1869,6 +2032,121 @@ resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46" integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA== +"@esbuild/aix-ppc64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz#c7184a326533fcdf1b8ee0733e21c713b975575f" + integrity sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ== + +"@esbuild/android-arm64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz#09d9b4357780da9ea3a7dfb833a1f1ff439b4052" + integrity sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A== + +"@esbuild/android-arm@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.21.5.tgz#9b04384fb771926dfa6d7ad04324ecb2ab9b2e28" + integrity sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg== + +"@esbuild/android-x64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.21.5.tgz#29918ec2db754cedcb6c1b04de8cd6547af6461e" + integrity sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA== + +"@esbuild/darwin-arm64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz#e495b539660e51690f3928af50a76fb0a6ccff2a" + integrity sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ== + +"@esbuild/darwin-x64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz#c13838fa57372839abdddc91d71542ceea2e1e22" + integrity sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw== + +"@esbuild/freebsd-arm64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz#646b989aa20bf89fd071dd5dbfad69a3542e550e" + integrity sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g== + +"@esbuild/freebsd-x64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz#aa615cfc80af954d3458906e38ca22c18cf5c261" + integrity sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ== + +"@esbuild/linux-arm64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz#70ac6fa14f5cb7e1f7f887bcffb680ad09922b5b" + integrity sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q== + +"@esbuild/linux-arm@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz#fc6fd11a8aca56c1f6f3894f2bea0479f8f626b9" + integrity sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA== + +"@esbuild/linux-ia32@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz#3271f53b3f93e3d093d518d1649d6d68d346ede2" + integrity sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg== + +"@esbuild/linux-loong64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz#ed62e04238c57026aea831c5a130b73c0f9f26df" + integrity sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg== + +"@esbuild/linux-mips64el@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz#e79b8eb48bf3b106fadec1ac8240fb97b4e64cbe" + integrity sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg== + +"@esbuild/linux-ppc64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz#5f2203860a143b9919d383ef7573521fb154c3e4" + integrity sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w== + +"@esbuild/linux-riscv64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz#07bcafd99322d5af62f618cb9e6a9b7f4bb825dc" + integrity sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA== + +"@esbuild/linux-s390x@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz#b7ccf686751d6a3e44b8627ababc8be3ef62d8de" + integrity sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A== + +"@esbuild/linux-x64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz#6d8f0c768e070e64309af8004bb94e68ab2bb3b0" + integrity sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ== + +"@esbuild/netbsd-x64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz#bbe430f60d378ecb88decb219c602667387a6047" + integrity sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg== + +"@esbuild/openbsd-x64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz#99d1cf2937279560d2104821f5ccce220cb2af70" + integrity sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow== + +"@esbuild/sunos-x64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz#08741512c10d529566baba837b4fe052c8f3487b" + integrity sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg== + +"@esbuild/win32-arm64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz#675b7385398411240735016144ab2e99a60fc75d" + integrity sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A== + +"@esbuild/win32-ia32@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz#1bfc3ce98aa6ca9a0969e4d2af72144c59c1193b" + integrity sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA== + +"@esbuild/win32-x64@0.21.5": + version "0.21.5" + resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz#acad351d582d157bb145535db2a6ff53dd514b5c" + integrity sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw== + "@eslint-community/eslint-utils@^4.2.0": version "4.4.0" resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59" @@ -1896,10 +2174,10 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@eslint/js@8.56.0": - version "8.56.0" - resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.56.0.tgz#ef20350fec605a7f7035a01764731b2de0f3782b" - integrity sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A== +"@eslint/js@8.57.0": + version "8.57.0" + resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f" + integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g== "@gar/promisify@^1.0.1", "@gar/promisify@^1.1.3": version "1.1.3" @@ -1920,7 +2198,7 @@ object-assign "^4.1.1" scheduler "^0.20.2" -"@humanwhocodes/config-array@^0.11.13": +"@humanwhocodes/config-array@^0.11.14": version "0.11.14" resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b" integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg== @@ -1971,6 +2249,15 @@ "@jridgewell/sourcemap-codec" "^1.4.10" "@jridgewell/trace-mapping" "^0.3.9" +"@jridgewell/gen-mapping@^0.3.5": + version "0.3.5" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz#dcce6aff74bdf6dad1a95802b69b04a2fcb1fb36" + integrity sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg== + dependencies: + "@jridgewell/set-array" "^1.2.1" + "@jridgewell/sourcemap-codec" "^1.4.10" + "@jridgewell/trace-mapping" "^0.3.24" + "@jridgewell/resolve-uri@^3.0.3": version "3.1.2" resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6" @@ -1986,6 +2273,11 @@ resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== +"@jridgewell/set-array@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.2.1.tgz#558fb6472ed16a4c850b889530e6b36438c49280" + integrity sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A== + "@jridgewell/source-map@^0.3.3": version "0.3.5" resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.5.tgz#a3bb4d5c6825aab0d281268f47f6ad5853431e91" @@ -1999,6 +2291,11 @@ resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== +"@jridgewell/sourcemap-codec@^1.5.0": + version "1.5.0" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz#3188bcb273a414b0d215fd22a58540b989b9409a" + integrity sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ== + "@jridgewell/trace-mapping@0.3.9": version "0.3.9" resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9" @@ -2015,6 +2312,14 @@ "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" +"@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25": + version "0.3.25" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0" + integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ== + dependencies: + "@jridgewell/resolve-uri" "^3.1.0" + "@jridgewell/sourcemap-codec" "^1.4.14" + "@juggle/resize-observer@3.2.0": version "3.2.0" resolved "https://registry.yarnpkg.com/@juggle/resize-observer/-/resize-observer-3.2.0.tgz#5e0b448d27fe3091bae6216456512c5904d05661" @@ -2272,10 +2577,85 @@ estree-walker "^1.0.1" picomatch "^2.2.2" -"@scarf/scarf@^1.0.5": - version "1.0.5" - resolved "https://registry.yarnpkg.com/@scarf/scarf/-/scarf-1.0.5.tgz#accee0bce88a9047672f7c8faf3cada59c996b81" - integrity sha512-9WKaGVpQH905Aqkk+BczFEeLQxS07rl04afFRPUG9IcSlOwmo5EVVuuNu0d4M9LMYucObvK0LoAe+5HfMW2QhQ== +"@rollup/rollup-android-arm-eabi@4.19.2": + version "4.19.2" + resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.19.2.tgz#6b991cb44bf69e50163528ea85bed545330ba821" + integrity sha512-OHflWINKtoCFSpm/WmuQaWW4jeX+3Qt3XQDepkkiFTsoxFc5BpF3Z5aDxFZgBqRjO6ATP5+b1iilp4kGIZVWlA== + +"@rollup/rollup-android-arm64@4.19.2": + version "4.19.2" + resolved "https://registry.yarnpkg.com/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.19.2.tgz#5d3c8c2f9742d62ba258cc378bd2d4720f0c431c" + integrity sha512-k0OC/b14rNzMLDOE6QMBCjDRm3fQOHAL8Ldc9bxEWvMo4Ty9RY6rWmGetNTWhPo+/+FNd1lsQYRd0/1OSix36A== + +"@rollup/rollup-darwin-arm64@4.19.2": + version "4.19.2" + resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.19.2.tgz#8eac8682a34a705bb6a57eb3e739fd6bbedfabed" + integrity sha512-IIARRgWCNWMTeQH+kr/gFTHJccKzwEaI0YSvtqkEBPj7AshElFq89TyreKNFAGh5frLfDCbodnq+Ye3dqGKPBw== + +"@rollup/rollup-darwin-x64@4.19.2": + version "4.19.2" + resolved "https://registry.yarnpkg.com/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.19.2.tgz#70a9953fc624bd7f645901f4250f6b5807ac7e92" + integrity sha512-52udDMFDv54BTAdnw+KXNF45QCvcJOcYGl3vQkp4vARyrcdI/cXH8VXTEv/8QWfd6Fru8QQuw1b2uNersXOL0g== + +"@rollup/rollup-linux-arm-gnueabihf@4.19.2": + version "4.19.2" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.19.2.tgz#8f6c4ff4c4972413ff94345080380d4e3caa3c69" + integrity sha512-r+SI2t8srMPYZeoa1w0o/AfoVt9akI1ihgazGYPQGRilVAkuzMGiTtexNZkrPkQsyFrvqq/ni8f3zOnHw4hUbA== + +"@rollup/rollup-linux-arm-musleabihf@4.19.2": + version "4.19.2" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.19.2.tgz#5d3c0fe5ea5ddf2feb511b3cb031df17eaa7e33d" + integrity sha512-+tYiL4QVjtI3KliKBGtUU7yhw0GMcJJuB9mLTCEauHEsqfk49gtUBXGtGP3h1LW8MbaTY6rSFIQV1XOBps1gBA== + +"@rollup/rollup-linux-arm64-gnu@4.19.2": + version "4.19.2" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.19.2.tgz#b7f104388b2f5624d9f8adfff10ba59af8ab8ed1" + integrity sha512-OR5DcvZiYN75mXDNQQxlQPTv4D+uNCUsmSCSY2FolLf9W5I4DSoJyg7z9Ea3TjKfhPSGgMJiey1aWvlWuBzMtg== + +"@rollup/rollup-linux-arm64-musl@4.19.2": + version "4.19.2" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.19.2.tgz#6d5ca6d3904309bec285ea5202d589cebb93dee4" + integrity sha512-Hw3jSfWdUSauEYFBSFIte6I8m6jOj+3vifLg8EU3lreWulAUpch4JBjDMtlKosrBzkr0kwKgL9iCfjA8L3geoA== + +"@rollup/rollup-linux-powerpc64le-gnu@4.19.2": + version "4.19.2" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.19.2.tgz#4df9be1396ea9eb0ca99fd0f2e858008d7f063e3" + integrity sha512-rhjvoPBhBwVnJRq/+hi2Q3EMiVF538/o9dBuj9TVLclo9DuONqt5xfWSaE6MYiFKpo/lFPJ/iSI72rYWw5Hc7w== + +"@rollup/rollup-linux-riscv64-gnu@4.19.2": + version "4.19.2" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.19.2.tgz#80d63c5562915a2f8616a04251fcaee0218112b0" + integrity sha512-EAz6vjPwHHs2qOCnpQkw4xs14XJq84I81sDRGPEjKPFVPBw7fwvtwhVjcZR6SLydCv8zNK8YGFblKWd/vRmP8g== + +"@rollup/rollup-linux-s390x-gnu@4.19.2": + version "4.19.2" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.19.2.tgz#ef62e9bc5cc3b84fcfe96ec0a42d1989691217b3" + integrity sha512-IJSUX1xb8k/zN9j2I7B5Re6B0NNJDJ1+soezjNojhT8DEVeDNptq2jgycCOpRhyGj0+xBn7Cq+PK7Q+nd2hxLA== + +"@rollup/rollup-linux-x64-gnu@4.19.2": + version "4.19.2" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.19.2.tgz#6a275282a0080fee98ddd9fda0de23c4c6bafd48" + integrity sha512-OgaToJ8jSxTpgGkZSkwKE+JQGihdcaqnyHEFOSAU45utQ+yLruE1dkonB2SDI8t375wOKgNn8pQvaWY9kPzxDQ== + +"@rollup/rollup-linux-x64-musl@4.19.2": + version "4.19.2" + resolved "https://registry.yarnpkg.com/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.19.2.tgz#64f0c704107e6b45b26dd8c2e1ff64246e4a1251" + integrity sha512-5V3mPpWkB066XZZBgSd1lwozBk7tmOkKtquyCJ6T4LN3mzKENXyBwWNQn8d0Ci81hvlBw5RoFgleVpL6aScLYg== + +"@rollup/rollup-win32-arm64-msvc@4.19.2": + version "4.19.2" + resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.19.2.tgz#bada17b0c5017ff58d0feba401c43ff5a646c693" + integrity sha512-ayVstadfLeeXI9zUPiKRVT8qF55hm7hKa+0N1V6Vj+OTNFfKSoUxyZvzVvgtBxqSb5URQ8sK6fhwxr9/MLmxdA== + +"@rollup/rollup-win32-ia32-msvc@4.19.2": + version "4.19.2" + resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.19.2.tgz#a716d862f6ac39d88bdb825e27f63aeb0387cd66" + integrity sha512-Mda7iG4fOLHNsPqjWSjANvNZYoW034yxgrndof0DwCy0D3FvTjeNo+HGE6oGWgvcLZNLlcp0hLEFcRs+UGsMLg== + +"@rollup/rollup-win32-x64-msvc@4.19.2": + version "4.19.2" + resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.19.2.tgz#d67206c5f2e4b2832ce360bbbde194e96d16dc51" + integrity sha512-DPi0ubYhSow/00YqmG1jWm3qt1F8aXziHc/UNy8bo9cpCacqhuWu+iSq/fp2SyEQK7iYTZ60fBU9cat3MXTjIQ== "@sinonjs/commons@^1", "@sinonjs/commons@^1.3.0", "@sinonjs/commons@^1.4.0", "@sinonjs/commons@^1.7.0": version "1.8.0" @@ -2361,6 +2741,39 @@ resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.4.tgz#0b92dcc0cc1c81f6f306a381f28e31b1a56536e9" integrity sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA== +"@types/babel__core@^7.20.5": + version "7.20.5" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.5.tgz#3df15f27ba85319caa07ba08d0721889bb39c017" + integrity sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA== + dependencies: + "@babel/parser" "^7.20.7" + "@babel/types" "^7.20.7" + "@types/babel__generator" "*" + "@types/babel__template" "*" + "@types/babel__traverse" "*" + +"@types/babel__generator@*": + version "7.6.8" + resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.8.tgz#f836c61f48b1346e7d2b0d93c6dacc5b9535d3ab" + integrity sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw== + dependencies: + "@babel/types" "^7.0.0" + +"@types/babel__template@*": + version "7.4.4" + resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.4.tgz#5672513701c1b2199bc6dad636a9d7491586766f" + integrity sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A== + dependencies: + "@babel/parser" "^7.1.0" + "@babel/types" "^7.0.0" + +"@types/babel__traverse@*": + version "7.20.6" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.20.6.tgz#8dc9f0ae0f202c08d8d4dab648912c8d6038e3f7" + integrity sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg== + dependencies: + "@babel/types" "^7.20.7" + "@types/body-parser@*": version "1.19.5" resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.5.tgz#04ce9a3b677dc8bd681a17da1ab9835dc9d3ede4" @@ -2422,7 +2835,7 @@ "@types/estree" "*" "@types/json-schema" "*" -"@types/estree@*", "@types/estree@^1.0.5": +"@types/estree@*", "@types/estree@1.0.5", "@types/estree@^1.0.5": version "1.0.5" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4" integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw== @@ -2472,6 +2885,14 @@ dependencies: history "*" +"@types/hoist-non-react-statics@^3.3.0": + version "3.3.5" + resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz#dab7867ef789d87e2b4b0003c9d65c49cc44a494" + integrity sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg== + dependencies: + "@types/react" "*" + hoist-non-react-statics "^3.3.0" + "@types/html-minifier-terser@^6.0.0": version "6.1.0" resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz#4fc33a00c1d0c16987b1a20cf92d20614c55ac35" @@ -2573,19 +2994,38 @@ resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.7.tgz#50ae4353eaaddc04044279812f52c8c65857dbcb" integrity sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ== -"@types/react-dom@^18.3.0": - version "18.3.0" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.3.0.tgz#0cbc818755d87066ab6ca74fbedb2547d74a82b0" - integrity sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg== +"@types/react-dom@^16.9": + version "16.9.24" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.24.tgz#4d193d7d011267fca842e8a10a2d738f92ec5c30" + integrity sha512-Gcmq2JTDheyWn/1eteqyzzWKSqDjYU6KYsIvH7thb7CR5OYInAWOX+7WnKf6PaU/cbdOc4szJItcDEJO7UGmfA== dependencies: + "@types/react" "^16" + +"@types/react-redux@^7.1.20": + version "7.1.33" + resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.33.tgz#53c5564f03f1ded90904e3c90f77e4bd4dc20b15" + integrity sha512-NF8m5AjWCkert+fosDsN3hAlHzpjSiXlVy9EgQEmLoBhaNXbmyeGs/aj5dQzKuF+/q+S7JQagorGDW8pJ28Hmg== + dependencies: + "@types/hoist-non-react-statics" "^3.3.0" "@types/react" "*" + hoist-non-react-statics "^3.3.0" + redux "^4.0.0" + +"@types/react@*": + version "18.3.3" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.3.tgz#9679020895318b0915d7a3ab004d92d33375c45f" + integrity sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw== + dependencies: + "@types/prop-types" "*" + csstype "^3.0.2" -"@types/react@*", "@types/react@^18.3.2": - version "18.3.2" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.3.2.tgz#462ae4904973bc212fa910424d901e3d137dbfcd" - integrity sha512-Btgg89dAnqD4vV7R3hlwOxgqobUQKgx3MmrQRi0yYbs/P0ym8XozIAlkqVilPqHQwXs4e9Tf63rrCgl58BcO4w== +"@types/react@^16", "@types/react@^16.9": + version "16.14.60" + resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.60.tgz#f7ab62a329b82826f12d02bc8031d4ef4b5e0d81" + integrity sha512-wIFmnczGsTcgwCBeIYOuy2mdXEiKZ5znU/jNOnMZPQyCcIxauMGWlX0TNG4lZ7NxRKj7YUIZRneJQSSdB2jKgg== dependencies: "@types/prop-types" "*" + "@types/scheduler" "^0.16" csstype "^3.0.2" "@types/redux-actions@^2.6.5": @@ -2605,6 +3045,11 @@ resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.0.tgz#2b35eccfcee7d38cd72ad99232fbd58bffb3c84d" integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA== +"@types/scheduler@^0.16": + version "0.16.8" + resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.8.tgz#ce5ace04cfeabe7ef87c0091e50752e36707deff" + integrity sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A== + "@types/send@*": version "0.17.4" resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.4.tgz#6619cd24e7270793702e4e6a4b958a9010cfc57a" @@ -2704,6 +3149,17 @@ resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406" integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ== +"@vitejs/plugin-react@^4.3.1": + version "4.3.1" + resolved "https://registry.yarnpkg.com/@vitejs/plugin-react/-/plugin-react-4.3.1.tgz#d0be6594051ded8957df555ff07a991fb618b48e" + integrity sha512-m/V2syj5CuVnaxcUJOQRel/Wr31FFXRFlnOoq1TVtkCxsY5veGMTEmpWHndrhB2U8ScHtCQB1e+4hWYExQc6Lg== + dependencies: + "@babel/core" "^7.24.5" + "@babel/plugin-transform-react-jsx-self" "^7.24.5" + "@babel/plugin-transform-react-jsx-source" "^7.24.1" + "@types/babel__core" "^7.20.5" + react-refresh "^0.14.2" + "@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5": version "1.11.6" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.6.tgz#db046555d3c413f8966ca50a95176a0e2c642e24" @@ -3105,6 +3561,14 @@ array-buffer-byte-length@^1.0.0: call-bind "^1.0.2" is-array-buffer "^3.0.1" +array-buffer-byte-length@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz#1e5583ec16763540a27ae52eed99ff899223568f" + integrity sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg== + dependencies: + call-bind "^1.0.5" + is-array-buffer "^3.0.4" + array-filter@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/array-filter/-/array-filter-1.0.0.tgz#baf79e62e6ef4c2a4c0b831232daffec251f9d83" @@ -3120,14 +3584,17 @@ array-from@^2.1.1: resolved "https://registry.yarnpkg.com/array-from/-/array-from-2.1.1.tgz#cfe9d8c26628b9dc5aecc62a9f5d8f1f352c1195" integrity sha1-z+nYwmYoudxa7MYqn12PHzUsEZU= -array-includes@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348" - integrity sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ== +array-includes@^3.1.6, array-includes@^3.1.8: + version "3.1.8" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.8.tgz#5e370cbe172fdd5dd6530c1d4aadda25281ba97d" + integrity sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ== dependencies: - define-properties "^1.1.3" - es-abstract "^1.17.0" - is-string "^1.0.5" + call-bind "^1.0.7" + define-properties "^1.2.1" + es-abstract "^1.23.2" + es-object-atoms "^1.0.0" + get-intrinsic "^1.2.4" + is-string "^1.0.7" array-union@^1.0.1: version "1.0.2" @@ -3154,6 +3621,18 @@ array.prototype.find@^2.1.0: define-properties "^1.1.3" es-abstract "^1.17.4" +array.prototype.findlast@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz#3e4fbcb30a15a7f5bf64cf2faae22d139c2e4904" + integrity sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ== + dependencies: + call-bind "^1.0.7" + define-properties "^1.2.1" + es-abstract "^1.23.2" + es-errors "^1.3.0" + es-object-atoms "^1.0.0" + es-shim-unscopables "^1.0.2" + array.prototype.flat@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b" @@ -3162,6 +3641,37 @@ array.prototype.flat@^1.2.3: define-properties "^1.1.3" es-abstract "^1.17.0-next.1" +array.prototype.flat@^1.3.1: + version "1.3.2" + resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz#1476217df8cff17d72ee8f3ba06738db5b387d18" + integrity sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + es-shim-unscopables "^1.0.0" + +array.prototype.flatmap@^1.3.2: + version "1.3.2" + resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz#c9a7c6831db8e719d6ce639190146c24bbd3e527" + integrity sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ== + dependencies: + call-bind "^1.0.2" + define-properties "^1.2.0" + es-abstract "^1.22.1" + es-shim-unscopables "^1.0.0" + +array.prototype.tosorted@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz#fe954678ff53034e717ea3352a03f0b0b86f7ffc" + integrity sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA== + dependencies: + call-bind "^1.0.7" + define-properties "^1.2.1" + es-abstract "^1.23.3" + es-errors "^1.3.0" + es-shim-unscopables "^1.0.2" + arraybuffer.prototype.slice@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz#98bd561953e3e74bb34938e77647179dfe6e9f12" @@ -3175,6 +3685,20 @@ arraybuffer.prototype.slice@^1.0.2: is-array-buffer "^3.0.2" is-shared-array-buffer "^1.0.2" +arraybuffer.prototype.slice@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz#097972f4255e41bc3425e37dc3f6421cf9aefde6" + integrity sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A== + dependencies: + array-buffer-byte-length "^1.0.1" + call-bind "^1.0.5" + define-properties "^1.2.1" + es-abstract "^1.22.3" + es-errors "^1.2.1" + get-intrinsic "^1.2.3" + is-array-buffer "^3.0.4" + is-shared-array-buffer "^1.0.2" + arrify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" @@ -3215,6 +3739,13 @@ available-typed-arrays@^1.0.5: resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.6.tgz#ac812d8ce5a6b976d738e1c45f08d0b00bc7d725" integrity sha512-j1QzY8iPNPG4o4xmO3ptzpRxTciqD3MgEHtifP/YnJpIo58Xu+ne4BejlbkuaLfXn/nz6HFiw29bLpj2PNMdGg== +available-typed-arrays@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz#a5cc375d6a03c2efc87a553f3e0b1522def14846" + integrity sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ== + dependencies: + possible-typed-array-names "^1.0.0" + await-to-js@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/await-to-js/-/await-to-js-3.0.0.tgz#70929994185616f4675a91af6167eb61cc92868f" @@ -3419,6 +3950,16 @@ browserslist@^4.18.1, browserslist@^4.21.10, browserslist@^4.22.2: node-releases "^2.0.14" update-browserslist-db "^1.0.13" +browserslist@^4.23.1: + version "4.23.3" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.23.3.tgz#debb029d3c93ebc97ffbc8d9cbb03403e227c800" + integrity sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA== + dependencies: + caniuse-lite "^1.0.30001646" + electron-to-chromium "^1.5.4" + node-releases "^2.0.18" + update-browserslist-db "^1.1.0" + buffer-from@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" @@ -3506,7 +4047,7 @@ call-bind@^1.0.0, call-bind@^1.0.2, call-bind@^1.0.4, call-bind@^1.0.5: get-intrinsic "^1.2.1" set-function-length "^1.1.1" -call-bind@^1.0.7: +call-bind@^1.0.6, call-bind@^1.0.7: version "1.0.7" resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9" integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w== @@ -3549,6 +4090,11 @@ caniuse-lite@^1.0.30001043, caniuse-lite@^1.0.30001580: resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001585.tgz" integrity sha512-yr2BWR1yLXQ8fMpdS/4ZZXpseBgE7o4g41x3a6AJOqZuOi+iE/WdJYAuZ6Y95i4Ohd2Y+9MzIWRR+uGABH4s3Q== +caniuse-lite@^1.0.30001646: + version "1.0.30001646" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001646.tgz#d472f2882259ba032dd73ee069ff01bfd059b25d" + integrity sha512-dRg00gudiBDDTmUhClSdv3hqRfpbOnU28IpI1T6PBTLWa+kOj0681C8uML3PifYfREuBrVjDGhL3adYpBT6spw== + case-sensitive-paths-webpack-plugin@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.4.0.tgz#db64066c6422eed2e08cc14b986ca43796dbc6d4" @@ -3607,6 +4153,21 @@ cheerio@^1.0.0-rc.3: lodash "^4.15.0" parse5 "^3.0.1" +"chokidar@>=3.0.0 <4.0.0": + version "3.6.0" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b" + integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw== + dependencies: + anymatch "~3.1.2" + braces "~3.0.2" + glob-parent "~5.1.2" + is-binary-path "~2.1.0" + is-glob "~4.0.1" + normalize-path "~3.0.0" + readdirp "~3.6.0" + optionalDependencies: + fsevents "~2.3.2" + chokidar@^3.4.2, chokidar@^3.5.2, chokidar@^3.5.3: version "3.5.3" resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd" @@ -3847,12 +4408,16 @@ connect-history-api-fallback@^2.0.0: resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz#647264845251a0daf25b97ce87834cace0f5f1c8" integrity sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA== -connected-react-router@^6.5.2: - version "6.8.0" - resolved "https://registry.yarnpkg.com/connected-react-router/-/connected-react-router-6.8.0.tgz#ddc687b31d498322445d235d660798489fa56cae" - integrity sha512-E64/6krdJM3Ag3MMmh2nKPtMbH15s3JQDuaYJvOVXzu6MbHbDyIvuwLOyhQIuP4Om9zqEfZYiVyflROibSsONg== +connected-react-router@^6.9.3: + version "6.9.3" + resolved "https://registry.yarnpkg.com/connected-react-router/-/connected-react-router-6.9.3.tgz#72300aca9f9d6f38e1f4a2901572faa02adec972" + integrity sha512-4ThxysOiv/R2Dc4Cke1eJwjKwH1Y51VDwlOrOfs1LjpdYOVvCNjNkZDayo7+sx42EeGJPQUNchWkjAIJdXGIOQ== dependencies: + lodash.isequalwith "^4.4.0" prop-types "^15.7.2" + optionalDependencies: + immutable "^3.8.1 || ^4.0.0" + seamless-immutable "^7.1.3" console-control-strings@^1.1.0: version "1.1.0" @@ -3920,11 +4485,6 @@ core-js-compat@^3.6.2: browserslist "^4.8.5" semver "7.0.0" -core-js-pure@^3.0.0: - version "3.6.5" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.5.tgz#c79e75f5e38dbc85a662d91eea52b8256d53b813" - integrity sha512-lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA== - core-js@^1.0.0: version "1.2.7" resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636" @@ -4093,6 +4653,38 @@ csstype@^3.0.2: resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81" integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw== +cuint@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/cuint/-/cuint-0.2.2.tgz#408086d409550c2631155619e9fa7bcadc3b991b" + integrity sha512-d4ZVpCW31eWwCMe1YT3ur7mUDnTXbgwyzaL320DrcRT45rfjYxkt5QWLrmOJ+/UEAI2+fQgKe/fCjR8l4TpRgw== + +data-view-buffer@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/data-view-buffer/-/data-view-buffer-1.0.1.tgz#8ea6326efec17a2e42620696e671d7d5a8bc66b2" + integrity sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA== + dependencies: + call-bind "^1.0.6" + es-errors "^1.3.0" + is-data-view "^1.0.1" + +data-view-byte-length@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz#90721ca95ff280677eb793749fce1011347669e2" + integrity sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ== + dependencies: + call-bind "^1.0.7" + es-errors "^1.3.0" + is-data-view "^1.0.1" + +data-view-byte-offset@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz#5e0bbfb4828ed2d1b9b400cd8a7d119bca0ff18a" + integrity sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA== + dependencies: + call-bind "^1.0.6" + es-errors "^1.3.0" + is-data-view "^1.0.1" + date-fns@2.16.1: version "2.16.1" resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.16.1.tgz#05775792c3f3331da812af253e1a935851d3834b" @@ -4484,6 +5076,11 @@ electron-to-chromium@^1.4.648: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.653.tgz#832ab25e80ad698ac09c1ca547bd9ee6cce7df10" integrity sha512-wA2A2LQCqnEwQAvwADQq3KpMpNwgAUBnRmrFgRzHnPhbQUFArTR32Ab46f4p0MovDLcg4uqd4nCsN2hTltslpA== +electron-to-chromium@^1.5.4: + version "1.5.4" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.4.tgz#cd477c830dd6fca41fbd5465c1ff6ce08ac22343" + integrity sha512-orzA81VqLyIGUEA77YkVA1D+N+nNfl2isJVjjmOyrlxuooZ19ynb+dOlaDTqd/idKRS9lDCSBmtzM+kyCsMnkA== + emoji-regex@^7.0.1: version "7.0.3" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" @@ -4634,7 +5231,7 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.4, es-abstract@^1.17.5: +es-abstract@^1.17.0-next.1, es-abstract@^1.17.4, es-abstract@^1.17.5: version "1.17.5" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.5.tgz#d8c9d1d66c8981fb9200e2251d799eee92774ae9" integrity sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg== @@ -4696,6 +5293,58 @@ es-abstract@^1.22.1: unbox-primitive "^1.0.2" which-typed-array "^1.1.13" +es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.1, es-abstract@^1.23.2, es-abstract@^1.23.3: + version "1.23.3" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.3.tgz#8f0c5a35cd215312573c5a27c87dfd6c881a0aa0" + integrity sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A== + dependencies: + array-buffer-byte-length "^1.0.1" + arraybuffer.prototype.slice "^1.0.3" + available-typed-arrays "^1.0.7" + call-bind "^1.0.7" + data-view-buffer "^1.0.1" + data-view-byte-length "^1.0.1" + data-view-byte-offset "^1.0.0" + es-define-property "^1.0.0" + es-errors "^1.3.0" + es-object-atoms "^1.0.0" + es-set-tostringtag "^2.0.3" + es-to-primitive "^1.2.1" + function.prototype.name "^1.1.6" + get-intrinsic "^1.2.4" + get-symbol-description "^1.0.2" + globalthis "^1.0.3" + gopd "^1.0.1" + has-property-descriptors "^1.0.2" + has-proto "^1.0.3" + has-symbols "^1.0.3" + hasown "^2.0.2" + internal-slot "^1.0.7" + is-array-buffer "^3.0.4" + is-callable "^1.2.7" + is-data-view "^1.0.1" + is-negative-zero "^2.0.3" + is-regex "^1.1.4" + is-shared-array-buffer "^1.0.3" + is-string "^1.0.7" + is-typed-array "^1.1.13" + is-weakref "^1.0.2" + object-inspect "^1.13.1" + object-keys "^1.1.1" + object.assign "^4.1.5" + regexp.prototype.flags "^1.5.2" + safe-array-concat "^1.1.2" + safe-regex-test "^1.0.3" + string.prototype.trim "^1.2.9" + string.prototype.trimend "^1.0.8" + string.prototype.trimstart "^1.0.8" + typed-array-buffer "^1.0.2" + typed-array-byte-length "^1.0.1" + typed-array-byte-offset "^1.0.2" + typed-array-length "^1.0.6" + unbox-primitive "^1.0.2" + which-typed-array "^1.1.15" + es-define-property@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845" @@ -4703,16 +5352,43 @@ es-define-property@^1.0.0: dependencies: get-intrinsic "^1.2.4" -es-errors@^1.3.0: +es-errors@^1.2.1, es-errors@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f" integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw== +es-iterator-helpers@^1.0.19: + version "1.0.19" + resolved "https://registry.yarnpkg.com/es-iterator-helpers/-/es-iterator-helpers-1.0.19.tgz#117003d0e5fec237b4b5c08aded722e0c6d50ca8" + integrity sha512-zoMwbCcH5hwUkKJkT8kDIBZSz9I6mVG//+lDCinLCGov4+r7NIy0ld8o03M0cJxl2spVf6ESYVS6/gpIfq1FFw== + dependencies: + call-bind "^1.0.7" + define-properties "^1.2.1" + es-abstract "^1.23.3" + es-errors "^1.3.0" + es-set-tostringtag "^2.0.3" + function-bind "^1.1.2" + get-intrinsic "^1.2.4" + globalthis "^1.0.3" + has-property-descriptors "^1.0.2" + has-proto "^1.0.3" + has-symbols "^1.0.3" + internal-slot "^1.0.7" + iterator.prototype "^1.1.2" + safe-array-concat "^1.1.2" + es-module-lexer@^1.2.1: version "1.4.1" resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.4.1.tgz#41ea21b43908fe6a287ffcbe4300f790555331f5" integrity sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w== +es-object-atoms@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/es-object-atoms/-/es-object-atoms-1.0.0.tgz#ddb55cd47ac2e240701260bc2a8e31ecb643d941" + integrity sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw== + dependencies: + es-errors "^1.3.0" + es-set-tostringtag@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz#11f7cc9f63376930a5f20be4915834f4bc74f9c9" @@ -4722,6 +5398,22 @@ es-set-tostringtag@^2.0.1: has-tostringtag "^1.0.0" hasown "^2.0.0" +es-set-tostringtag@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz#8bb60f0a440c2e4281962428438d58545af39777" + integrity sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ== + dependencies: + get-intrinsic "^1.2.4" + has-tostringtag "^1.0.2" + hasown "^2.0.1" + +es-shim-unscopables@^1.0.0, es-shim-unscopables@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz#1f6942e71ecc7835ed1c8a83006d8771a63a3763" + integrity sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw== + dependencies: + hasown "^2.0.0" + es-to-primitive@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" @@ -4736,11 +5428,45 @@ es6-error@^4.0.1, es6-error@^4.1.1: resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d" integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg== +esbuild@^0.21.3: + version "0.21.5" + resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.21.5.tgz#9ca301b120922959b766360d8ac830da0d02997d" + integrity sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw== + optionalDependencies: + "@esbuild/aix-ppc64" "0.21.5" + "@esbuild/android-arm" "0.21.5" + "@esbuild/android-arm64" "0.21.5" + "@esbuild/android-x64" "0.21.5" + "@esbuild/darwin-arm64" "0.21.5" + "@esbuild/darwin-x64" "0.21.5" + "@esbuild/freebsd-arm64" "0.21.5" + "@esbuild/freebsd-x64" "0.21.5" + "@esbuild/linux-arm" "0.21.5" + "@esbuild/linux-arm64" "0.21.5" + "@esbuild/linux-ia32" "0.21.5" + "@esbuild/linux-loong64" "0.21.5" + "@esbuild/linux-mips64el" "0.21.5" + "@esbuild/linux-ppc64" "0.21.5" + "@esbuild/linux-riscv64" "0.21.5" + "@esbuild/linux-s390x" "0.21.5" + "@esbuild/linux-x64" "0.21.5" + "@esbuild/netbsd-x64" "0.21.5" + "@esbuild/openbsd-x64" "0.21.5" + "@esbuild/sunos-x64" "0.21.5" + "@esbuild/win32-arm64" "0.21.5" + "@esbuild/win32-ia32" "0.21.5" + "@esbuild/win32-x64" "0.21.5" + escalade@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40" integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw== +escalade@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27" + integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA== + escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" @@ -4756,22 +5482,39 @@ escape-string-regexp@^4.0.0: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== -eslint-plugin-react@^7.14.3: - version "7.20.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.20.0.tgz#f98712f0a5e57dfd3e5542ef0604b8739cd47be3" - integrity sha512-rqe1abd0vxMjmbPngo4NaYxTcR3Y4Hrmc/jg4T+sYz63yqlmJRknpEQfmWY+eDWPuMmix6iUIK+mv0zExjeLgA== - dependencies: - array-includes "^3.1.1" +eslint-plugin-react-hooks@^4.6.2: + version "4.6.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz#c829eb06c0e6f484b3fbb85a97e57784f328c596" + integrity sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ== + +eslint-plugin-react-refresh@^0.4.7: + version "0.4.9" + resolved "https://registry.yarnpkg.com/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.9.tgz#bf870372b353b12e1e6fb7fc41b282d9cbc8d93d" + integrity sha512-QK49YrBAo5CLNLseZ7sZgvgTy21E6NEw22eZqc4teZfH8pxV3yXc9XXOYfUI6JNpw7mfHNkAeWtBxrTyykB6HA== + +eslint-plugin-react@^7.34.3: + version "7.35.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.35.0.tgz#00b1e4559896710e58af6358898f2ff917ea4c41" + integrity sha512-v501SSMOWv8gerHkk+IIQBkcGRGrO2nfybfj5pLxuJNFTPxxA3PSryhXTK+9pNbtkggheDdsC0E9Q8CuPk6JKA== + dependencies: + array-includes "^3.1.8" + array.prototype.findlast "^1.2.5" + array.prototype.flatmap "^1.3.2" + array.prototype.tosorted "^1.1.4" doctrine "^2.1.0" - has "^1.0.3" - jsx-ast-utils "^2.2.3" - object.entries "^1.1.1" - object.fromentries "^2.0.2" - object.values "^1.1.1" - prop-types "^15.7.2" - resolve "^1.15.1" - string.prototype.matchall "^4.0.2" - xregexp "^4.3.0" + es-iterator-helpers "^1.0.19" + estraverse "^5.3.0" + hasown "^2.0.2" + jsx-ast-utils "^2.4.1 || ^3.0.0" + minimatch "^3.1.2" + object.entries "^1.1.8" + object.fromentries "^2.0.8" + object.values "^1.2.0" + prop-types "^15.8.1" + resolve "^2.0.0-next.5" + semver "^6.3.1" + string.prototype.matchall "^4.0.11" + string.prototype.repeat "^1.0.0" eslint-scope@5.1.1: version "5.1.1" @@ -4799,16 +5542,16 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4 resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800" integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag== -eslint@^8.56.0: - version "8.56.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.56.0.tgz#4957ce8da409dc0809f99ab07a1b94832ab74b15" - integrity sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ== +eslint@^8.57.0: + version "8.57.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668" + integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ== dependencies: "@eslint-community/eslint-utils" "^4.2.0" "@eslint-community/regexpp" "^4.6.1" "@eslint/eslintrc" "^2.1.4" - "@eslint/js" "8.56.0" - "@humanwhocodes/config-array" "^0.11.13" + "@eslint/js" "8.57.0" + "@humanwhocodes/config-array" "^0.11.14" "@humanwhocodes/module-importer" "^1.0.1" "@nodelib/fs.walk" "^1.2.8" "@ungap/structured-clone" "^1.2.0" @@ -4881,7 +5624,7 @@ estraverse@^5.1.0: resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz#374309d39fd935ae500e7b92e8a6b4c720e59642" integrity sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw== -estraverse@^5.2.0: +estraverse@^5.2.0, estraverse@^5.3.0: version "5.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA== @@ -4978,7 +5721,7 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== -fast-glob@^3.2.9: +fast-glob@^3.2.12, fast-glob@^3.2.9: version "3.3.2" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129" integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow== @@ -5275,7 +6018,7 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= -fsevents@~2.3.2: +fsevents@~2.3.2, fsevents@~2.3.3: version "2.3.3" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6" integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw== @@ -5372,7 +6115,7 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@ has-symbols "^1.0.3" hasown "^2.0.0" -get-intrinsic@^1.2.4: +get-intrinsic@^1.2.3, get-intrinsic@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd" integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ== @@ -5411,6 +6154,15 @@ get-symbol-description@^1.0.0: call-bind "^1.0.2" get-intrinsic "^1.1.1" +get-symbol-description@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.2.tgz#533744d5aa20aca4e079c8e5daf7fd44202821f5" + integrity sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg== + dependencies: + call-bind "^1.0.5" + es-errors "^1.3.0" + get-intrinsic "^1.2.4" + glob-parent@^5.1.2, glob-parent@~5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" @@ -5635,6 +6387,11 @@ has-proto@^1.0.1: resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0" integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg== +has-proto@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd" + integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q== + has-symbols@^1.0.0, has-symbols@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" @@ -5652,6 +6409,13 @@ has-tostringtag@^1.0.0: dependencies: has-symbols "^1.0.2" +has-tostringtag@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.2.tgz#2cdc42d40bef2e5b4eeab7c01a73c54ce7ab5abc" + integrity sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw== + dependencies: + has-symbols "^1.0.3" + has-unicode@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" @@ -5678,6 +6442,13 @@ hasown@^2.0.0: dependencies: function-bind "^1.1.2" +hasown@^2.0.1, hasown@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003" + integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ== + dependencies: + function-bind "^1.1.2" + hds-core@3.8.0: version "3.8.0" resolved "https://registry.yarnpkg.com/hds-core/-/hds-core-3.8.0.tgz#39003a0c129de767239fc1f904d89b6424edc9a1" @@ -5999,6 +6770,11 @@ immutable@>=3.6.0: resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3" integrity sha1-wkOZUUVbs5kT2vKBN28VMOEErfM= +"immutable@^3.8.1 || ^4.0.0", immutable@^4.0.0: + version "4.3.7" + resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.7.tgz#c70145fc90d89fb02021e65c84eb0226e4e5a381" + integrity sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw== + import-fresh@^3.1.0: version "3.2.1" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66" @@ -6058,15 +6834,6 @@ ini@^1.3.5: resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927" integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw== -internal-slot@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz#9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3" - integrity sha512-2cQNfwhAfJIkU4KZPkDI+Gj5yNNnbqi40W9Gge6dfnk4TocEVm00B3bdiL+JINrbGJil2TeHvM4rETGzk/f/0g== - dependencies: - es-abstract "^1.17.0-next.1" - has "^1.0.3" - side-channel "^1.0.2" - internal-slot@^1.0.5: version "1.0.6" resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.6.tgz#37e756098c4911c5e912b8edbf71ed3aa116f930" @@ -6076,6 +6843,15 @@ internal-slot@^1.0.5: hasown "^2.0.0" side-channel "^1.0.4" +internal-slot@^1.0.7: + version "1.0.7" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.7.tgz#c06dcca3ed874249881007b0a5523b172a190802" + integrity sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g== + dependencies: + es-errors "^1.3.0" + hasown "^2.0.0" + side-channel "^1.0.4" + invariant@^2.2.2, invariant@^2.2.4: version "2.2.4" resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" @@ -6112,11 +6888,26 @@ is-array-buffer@^3.0.1, is-array-buffer@^3.0.2: get-intrinsic "^1.2.0" is-typed-array "^1.1.10" +is-array-buffer@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/is-array-buffer/-/is-array-buffer-3.0.4.tgz#7a1f92b3d61edd2bc65d24f130530ea93d7fae98" + integrity sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw== + dependencies: + call-bind "^1.0.2" + get-intrinsic "^1.2.1" + is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= +is-async-function@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-async-function/-/is-async-function-2.0.0.tgz#8e4418efd3e5d3a6ebb0164c05ef5afb69aa9646" + integrity sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA== + dependencies: + has-tostringtag "^1.0.0" + is-bigint@^1.0.1: version "1.0.4" resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" @@ -6166,11 +6957,25 @@ is-core-module@^2.13.0, is-core-module@^2.5.0: dependencies: hasown "^2.0.0" +is-data-view@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-data-view/-/is-data-view-1.0.1.tgz#4b4d3a511b70f3dc26d42c03ca9ca515d847759f" + integrity sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w== + dependencies: + is-typed-array "^1.1.13" + is-date-object@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e" integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g== +is-date-object@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" + integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== + dependencies: + has-tostringtag "^1.0.0" + is-docker@^2.0.0, is-docker@^2.1.1: version "2.2.1" resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" @@ -6181,6 +6986,13 @@ is-extglob@^2.1.1: resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= +is-finalizationregistry@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz#c8749b65f17c133313e661b1289b95ad3dbd62e6" + integrity sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw== + dependencies: + call-bind "^1.0.2" + is-fullwidth-code-point@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" @@ -6191,6 +7003,13 @@ is-fullwidth-code-point@^3.0.0: resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== +is-generator-function@^1.0.10: + version "1.0.10" + resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.10.tgz#f1558baf1ac17e0deea7c0415c438351ff2b3c72" + integrity sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A== + dependencies: + has-tostringtag "^1.0.0" + is-glob@^4.0.0, is-glob@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" @@ -6210,6 +7029,11 @@ is-lambda@^1.0.1: resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ== +is-map@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/is-map/-/is-map-2.0.3.tgz#ede96b7fe1e270b3c4465e3a465658764926d62e" + integrity sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw== + is-module@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591" @@ -6220,6 +7044,11 @@ is-negative-zero@^2.0.2: resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== +is-negative-zero@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.3.tgz#ced903a027aca6381b777a5743069d7376a49747" + integrity sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw== + is-number-object@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197" @@ -6306,6 +7135,11 @@ is-root@^2.1.0: resolved "https://registry.yarnpkg.com/is-root/-/is-root-2.1.0.tgz#809e18129cf1129644302a4f8544035d51984a9c" integrity sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg== +is-set@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.3.tgz#8ab209ea424608141372ded6e0cb200ef1d9d01d" + integrity sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg== + is-shared-array-buffer@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz#8f259c573b60b6a32d4058a1a07430c0a7344c79" @@ -6313,6 +7147,13 @@ is-shared-array-buffer@^1.0.2: dependencies: call-bind "^1.0.2" +is-shared-array-buffer@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz#1237f1cba059cdb62431d378dcc37d9680181688" + integrity sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg== + dependencies: + call-bind "^1.0.7" + is-stream@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" @@ -6361,6 +7202,18 @@ is-typed-array@^1.1.10, is-typed-array@^1.1.12, is-typed-array@^1.1.9: dependencies: which-typed-array "^1.1.11" +is-typed-array@^1.1.13: + version "1.1.13" + resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.13.tgz#d6c5ca56df62334959322d7d7dd1cca50debe229" + integrity sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw== + dependencies: + which-typed-array "^1.1.14" + +is-weakmap@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/is-weakmap/-/is-weakmap-2.0.2.tgz#bf72615d649dfe5f699079c54b83e47d1ae19cfd" + integrity sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w== + is-weakref@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" @@ -6368,6 +7221,14 @@ is-weakref@^1.0.2: dependencies: call-bind "^1.0.2" +is-weakset@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/is-weakset/-/is-weakset-2.0.3.tgz#e801519df8c0c43e12ff2834eead84ec9e624007" + integrity sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ== + dependencies: + call-bind "^1.0.7" + get-intrinsic "^1.2.4" + is-wsl@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271" @@ -6476,6 +7337,17 @@ istanbul-reports@^2.2.4: dependencies: html-escaper "^2.0.0" +iterator.prototype@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/iterator.prototype/-/iterator.prototype-1.1.2.tgz#5e29c8924f01916cb9335f1ff80619dcff22b0c0" + integrity sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w== + dependencies: + define-properties "^1.2.1" + get-intrinsic "^1.2.1" + has-symbols "^1.0.3" + reflect.getprototypeof "^1.0.4" + set-function-name "^2.0.1" + jake@^10.8.5: version "10.8.7" resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.7.tgz#63a32821177940c33f356e0ba44ff9d34e1c7d8f" @@ -6618,13 +7490,15 @@ jsonpointer@^5.0.0: resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-5.0.1.tgz#2110e0af0900fd37467b5907ecd13a7884a1b559" integrity sha512-p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ== -jsx-ast-utils@^2.2.3: - version "2.3.0" - resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.3.0.tgz#edd727794ea284d7fda575015ed1b0cde0289ab6" - integrity sha512-3HNoc7nZ1hpZIKB3hJ7BlFRkzCx2BynRtfSwbkqZdpRdvAPsGMnzclPwrvDBS7/lalHTj21NwIeaEpysHBOudg== +"jsx-ast-utils@^2.4.1 || ^3.0.0": + version "3.3.5" + resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz#4766bd05a8e2a11af222becd19e15575e52a853a" + integrity sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ== dependencies: - array-includes "^3.1.1" - object.assign "^4.1.0" + array-includes "^3.1.6" + array.prototype.flat "^1.3.1" + object.assign "^4.1.4" + object.values "^1.1.6" just-curry-it@^3.1.0: version "3.1.0" @@ -6845,6 +7719,11 @@ lodash.isequal@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= +lodash.isequalwith@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/lodash.isequalwith/-/lodash.isequalwith-4.4.0.tgz#266726ddd528f854f21f4ea98a065606e0fbc6b0" + integrity sha512-dcZON0IalGBpRmJBmMkaoV7d3I80R2O+FrzsZyHdNSFrANq/cgDqKQNmAHE8UEj4+QYWwwhkQOVdLHiAopzlsQ== + lodash.merge@^4.6.2: version "4.6.2" resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" @@ -6927,6 +7806,13 @@ magic-string@^0.25.0, magic-string@^0.25.7: dependencies: sourcemap-codec "^1.4.8" +magic-string@^0.30.1: + version "0.30.11" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.11.tgz#301a6f93b3e8c2cb13ac1a7a673492c0dfd12954" + integrity sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A== + dependencies: + "@jridgewell/sourcemap-codec" "^1.5.0" + make-dir@^2.0.0, make-dir@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5" @@ -6935,6 +7821,13 @@ make-dir@^2.0.0, make-dir@^2.1.0: pify "^4.0.1" semver "^5.6.0" +make-dir@~3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" + integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== + dependencies: + semver "^6.0.0" + make-error@^1.1.1: version "1.3.6" resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" @@ -7108,6 +8001,11 @@ mime@1.6.0: resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== +mime@~2.5.2: + version "2.5.2" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe" + integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg== + mimic-fn@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" @@ -7173,6 +8071,13 @@ minimatch@^5.0.1: dependencies: brace-expansion "^2.0.1" +minimatch@~3.0.4: + version "3.0.8" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.8.tgz#5e6a59bd11e2ab0de1cfb843eb2d82e546c321c1" + integrity sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q== + dependencies: + brace-expansion "^1.1.7" + minimist-options@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619" @@ -7470,6 +8375,11 @@ node-releases@^2.0.14: resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b" integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw== +node-releases@^2.0.18: + version "2.0.18" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.18.tgz#f010e8d35e2fe8d6b2944f03f70213ecedc4ca3f" + integrity sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g== + node-sass@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-8.0.0.tgz#c80d52148db0ce88610bcf1e1d112027393c13e1" @@ -7670,7 +8580,7 @@ object.assign@4.1.0, object.assign@^4.1.0: has-symbols "^1.0.0" object-keys "^1.0.11" -object.assign@^4.1.4: +object.assign@^4.1.4, object.assign@^4.1.5: version "4.1.5" resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.5.tgz#3a833f9ab7fdb80fc9e8d2300c803d216d8fdbb0" integrity sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ== @@ -7689,6 +8599,15 @@ object.entries@^1.1.0, object.entries@^1.1.1: es-abstract "^1.17.5" has "^1.0.3" +object.entries@^1.1.8: + version "1.1.8" + resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.8.tgz#bffe6f282e01f4d17807204a24f8edd823599c41" + integrity sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ== + dependencies: + call-bind "^1.0.7" + define-properties "^1.2.1" + es-object-atoms "^1.0.0" + object.fromentries@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz#4a09c9b9bb3843dd0f89acdb517a794d4f355ac9" @@ -7699,6 +8618,16 @@ object.fromentries@^2.0.2: function-bind "^1.1.1" has "^1.0.3" +object.fromentries@^2.0.8: + version "2.0.8" + resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.8.tgz#f7195d8a9b97bd95cbc1999ea939ecd1a2b00c65" + integrity sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ== + dependencies: + call-bind "^1.0.7" + define-properties "^1.2.1" + es-abstract "^1.23.2" + es-object-atoms "^1.0.0" + object.getownpropertydescriptors@^2.0.3: version "2.1.0" resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz#369bf1f9592d8ab89d712dced5cb81c7c5352649" @@ -7717,6 +8646,15 @@ object.values@^1.1.1: function-bind "^1.1.1" has "^1.0.3" +object.values@^1.1.6, object.values@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.2.0.tgz#65405a9d92cee68ac2d303002e0b8470a4d9ab1b" + integrity sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ== + dependencies: + call-bind "^1.0.7" + define-properties "^1.2.1" + es-object-atoms "^1.0.0" + obuf@^1.0.0, obuf@^1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e" @@ -8057,6 +8995,11 @@ picocolors@^1.0.0: resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== +picocolors@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.1.tgz#a8ad579b571952f0e5d25892de5445bcfe25aaa1" + integrity sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew== + picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" @@ -8132,6 +9075,11 @@ popper.js@^1.14.4: resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1.tgz#2a223cb3dc7b6213d740e40372be40de43e65b1b" integrity sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ== +possible-typed-array-names@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f" + integrity sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q== + postcss-modules-extract-imports@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d" @@ -8177,6 +9125,16 @@ postcss-selector-parser@^6.0.4: cssesc "^3.0.0" util-deprecate "^1.0.2" +postcss-url@^10.1.3: + version "10.1.3" + resolved "https://registry.yarnpkg.com/postcss-url/-/postcss-url-10.1.3.tgz#54120cc910309e2475ec05c2cfa8f8a2deafdf1e" + integrity sha512-FUzyxfI5l2tKmXdYc6VTu3TWZsInayEKPbiyW+P6vmmIrrb4I6CGX0BFoewgYHLK+oIL5FECEK02REYRpBvUCw== + dependencies: + make-dir "~3.1.0" + mime "~2.5.2" + minimatch "~3.0.4" + xxhashjs "~0.2.2" + postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" @@ -8200,6 +9158,24 @@ postcss@^8.4.33: picocolors "^1.0.0" source-map-js "^1.0.2" +postcss@^8.4.39: + version "8.4.40" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.40.tgz#eb81f2a4dd7668ed869a6db25999e02e9ad909d8" + integrity sha512-YF2kKIUzAofPMpfH6hOi2cGnv/HrUlfucspc7pDyvv7kGdqXrfj8SCl/t8owkEgKEuu8ZcRjSOxFxVLqwChZ2Q== + dependencies: + nanoid "^3.3.7" + picocolors "^1.0.1" + source-map-js "^1.2.0" + +postcss@^8.4.41: + version "8.4.41" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.41.tgz#d6104d3ba272d882fe18fc07d15dc2da62fa2681" + integrity sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ== + dependencies: + nanoid "^3.3.7" + picocolors "^1.0.1" + source-map-js "^1.2.0" + prelude-ls@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" @@ -8299,6 +9275,15 @@ prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, object-assign "^4.1.1" react-is "^16.8.1" +prop-types@^15.8.1: + version "15.8.1" + resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5" + integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg== + dependencies: + loose-envify "^1.4.0" + object-assign "^4.1.1" + react-is "^16.13.1" + property-expr@^2.0.5: version "2.0.6" resolved "https://registry.yarnpkg.com/property-expr/-/property-expr-2.0.6.tgz#f77bc00d5928a6c748414ad12882e83f24aec1e8" @@ -8444,15 +9429,15 @@ react-dev-utils@^12.0.1: strip-ansi "^6.0.1" text-table "^0.2.0" -react-dom@16.8.6: - version "16.8.6" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.6.tgz#71d6303f631e8b0097f56165ef608f051ff6e10f" - integrity sha512-1nL7PIq9LTL3fthPqwkvr2zY7phIPjYrT0jp4HjyEQrEROnw4dG41VVwi/wfoCneoleqrNX7iAD+pXebJZwrwA== +react-dom@^16.9: + version "16.14.0" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz#7ad838ec29a777fb3c75c3a190f661cf92ab8b89" + integrity sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" prop-types "^15.6.2" - scheduler "^0.13.6" + scheduler "^0.19.1" react-dual-listbox@^2.0.0: version "2.0.0" @@ -8514,6 +9499,11 @@ react-is@^16.12.0, react-is@^16.13.1, react-is@^16.4.2, react-is@^16.6.0, react- resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== +react-is@^17.0.2: + version "17.0.2" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" + integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== + react-leaflet-draw@^0.19.0: version "0.19.0" resolved "https://registry.yarnpkg.com/react-leaflet-draw/-/react-leaflet-draw-0.19.0.tgz#95de33054016db27e171f8f8f646f6bad17106f3" @@ -8584,15 +9574,21 @@ react-redux-toastr@^7.5.1: eventemitter3 "^3.1.0" react-redux@^7.1.0: - version "7.2.0" - resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.0.tgz#f970f62192b3981642fec46fd0db18a074fe879d" - integrity sha512-EvCAZYGfOLqwV7gh849xy9/pt55rJXPwmYvI4lilPM5rUT/1NxuuN59ipdBksRVSvz0KInbPnp4IfoXJXCqiDA== + version "7.2.9" + resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.9.tgz#09488fbb9416a4efe3735b7235055442b042481d" + integrity sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ== dependencies: - "@babel/runtime" "^7.5.5" - hoist-non-react-statics "^3.3.0" + "@babel/runtime" "^7.15.4" + "@types/react-redux" "^7.1.20" + hoist-non-react-statics "^3.3.2" loose-envify "^1.4.0" prop-types "^15.7.2" - react-is "^16.9.0" + react-is "^17.0.2" + +react-refresh@^0.14.2: + version "0.14.2" + resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.14.2.tgz#3833da01ce32da470f1f936b9d477da5c7028bf9" + integrity sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA== react-resize-detector@^4.2.0: version "4.2.3" @@ -8694,15 +9690,14 @@ react-virtual@2.10.4: dependencies: "@reach/observe-rect" "^1.1.0" -react@16.8.6: - version "16.8.6" - resolved "https://registry.yarnpkg.com/react/-/react-16.8.6.tgz#ad6c3a9614fd3a4e9ef51117f54d888da01f2bbe" - integrity sha512-pC0uMkhLaHm11ZSJULfOBqV4tIZkx87ZLvbbQYunNixAAvjnC+snJCg0XQXn9VIsttVsbZP/H/ewzgsd5fxKXw== +react@^16.9: + version "16.14.0" + resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d" + integrity sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" prop-types "^15.6.2" - scheduler "^0.13.6" read-pkg-up@^4.0.0: version "4.0.0" @@ -8801,12 +9796,11 @@ redux-actions@^2.6.5: to-camel-case "^1.0.0" redux-form@^8.2.5: - version "8.3.6" - resolved "https://registry.yarnpkg.com/redux-form/-/redux-form-8.3.6.tgz#c098dcd0b9d8c38e2e443dab91033ea0e74d4609" - integrity sha512-PfDdi+9JtNdr29Pv+9123TiojJlFB6+qczCRfP++cVT4nO2tEv4tDJHSV1l/Ol3Qh9z2cRg1QeLMhShNtRZ3+g== + version "8.3.10" + resolved "https://registry.yarnpkg.com/redux-form/-/redux-form-8.3.10.tgz#335657fafd4b26b91b4ce65371cd9dabe3648158" + integrity sha512-Eeog8dJYUxCSZI/oBoy7VkprvMjj1lpUnHa3LwjVNZvYDNeiRZMoZoaAT+6nlK2YQ4aiBopKUMiLe4ihUOHCGg== dependencies: "@babel/runtime" "^7.9.2" - "@scarf/scarf" "^1.0.5" es6-error "^4.1.1" hoist-non-react-statics "^3.3.2" invariant "^2.2.4" @@ -8829,6 +9823,13 @@ redux-saga@^1.0.5: dependencies: "@redux-saga/core" "^1.1.3" +redux@^4.0.0: + version "4.2.1" + resolved "https://registry.yarnpkg.com/redux/-/redux-4.2.1.tgz#c08f4306826c49b5e9dc901dee0452ea8fce6197" + integrity sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w== + dependencies: + "@babel/runtime" "^7.9.2" + redux@^4.0.4: version "4.0.5" resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.5.tgz#4db5de5816e17891de8a80c424232d06f051d93f" @@ -8837,6 +9838,19 @@ redux@^4.0.4: loose-envify "^1.4.0" symbol-observable "^1.2.0" +reflect.getprototypeof@^1.0.4: + version "1.0.6" + resolved "https://registry.yarnpkg.com/reflect.getprototypeof/-/reflect.getprototypeof-1.0.6.tgz#3ab04c32a8390b770712b7a8633972702d278859" + integrity sha512-fmfw4XgoDke3kdI6h4xcUz1dG8uaiv5q9gcEwLS4Pnth2kxT+GZ7YehS1JTMGBQmtV7Y4GFGbs2re2NqhdozUg== + dependencies: + call-bind "^1.0.7" + define-properties "^1.2.1" + es-abstract "^1.23.1" + es-errors "^1.3.0" + get-intrinsic "^1.2.4" + globalthis "^1.0.3" + which-builtin-type "^1.1.3" + reflect.ownkeys@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz#749aceec7f3fdf8b63f927a04809e90c5c0b3460" @@ -8891,7 +9905,7 @@ regenerator-transform@^0.15.2: dependencies: "@babel/runtime" "^7.8.4" -regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.3.0: +regexp.prototype.flags@^1.2.0: version "1.3.0" resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75" integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ== @@ -8908,6 +9922,16 @@ regexp.prototype.flags@^1.5.0, regexp.prototype.flags@^1.5.1: define-properties "^1.2.0" set-function-name "^2.0.0" +regexp.prototype.flags@^1.5.2: + version "1.5.2" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz#138f644a3350f981a858c44f6bb1a61ff59be334" + integrity sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw== + dependencies: + call-bind "^1.0.6" + define-properties "^1.2.1" + es-errors "^1.3.0" + set-function-name "^2.0.1" + regexpu-core@^4.7.0: version "4.7.0" resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz#fcbf458c50431b0bb7b45d6967b8192d91f3d938" @@ -9019,7 +10043,7 @@ 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@^1.10.0, resolve@^1.12.0, resolve@^1.15.1: +resolve@^1.10.0, resolve@^1.12.0: version "1.17.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444" integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w== @@ -9035,6 +10059,15 @@ resolve@^1.14.2, resolve@^1.19.0, resolve@^1.22.1: path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" +resolve@^2.0.0-next.5: + version "2.0.0-next.5" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.5.tgz#6b0ec3107e671e52b68cd068ef327173b90dc03c" + integrity sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA== + dependencies: + is-core-module "^2.13.0" + path-parse "^1.0.7" + supports-preserve-symlinks-flag "^1.0.0" + ret@~0.1.10: version "0.1.15" resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" @@ -9086,6 +10119,31 @@ rollup@^2.43.1: optionalDependencies: fsevents "~2.3.2" +rollup@^4.13.0: + version "4.19.2" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.19.2.tgz#4985cd2028965157e8d674a70e49f33aca9038eb" + integrity sha512-6/jgnN1svF9PjNYJ4ya3l+cqutg49vOZ4rVgsDKxdl+5gpGPnByFXWGyfH9YGx9i3nfBwSu1Iyu6vGwFFA0BdQ== + dependencies: + "@types/estree" "1.0.5" + optionalDependencies: + "@rollup/rollup-android-arm-eabi" "4.19.2" + "@rollup/rollup-android-arm64" "4.19.2" + "@rollup/rollup-darwin-arm64" "4.19.2" + "@rollup/rollup-darwin-x64" "4.19.2" + "@rollup/rollup-linux-arm-gnueabihf" "4.19.2" + "@rollup/rollup-linux-arm-musleabihf" "4.19.2" + "@rollup/rollup-linux-arm64-gnu" "4.19.2" + "@rollup/rollup-linux-arm64-musl" "4.19.2" + "@rollup/rollup-linux-powerpc64le-gnu" "4.19.2" + "@rollup/rollup-linux-riscv64-gnu" "4.19.2" + "@rollup/rollup-linux-s390x-gnu" "4.19.2" + "@rollup/rollup-linux-x64-gnu" "4.19.2" + "@rollup/rollup-linux-x64-musl" "4.19.2" + "@rollup/rollup-win32-arm64-msvc" "4.19.2" + "@rollup/rollup-win32-ia32-msvc" "4.19.2" + "@rollup/rollup-win32-x64-msvc" "4.19.2" + fsevents "~2.3.2" + rst-selector-parser@^2.2.3: version "2.2.3" resolved "https://registry.yarnpkg.com/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz#81b230ea2fcc6066c89e3472de794285d9b03d91" @@ -9111,6 +10169,16 @@ safe-array-concat@^1.0.1: has-symbols "^1.0.3" isarray "^2.0.5" +safe-array-concat@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.2.tgz#81d77ee0c4e8b863635227c721278dd524c20edb" + integrity sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q== + dependencies: + call-bind "^1.0.7" + get-intrinsic "^1.2.4" + has-symbols "^1.0.3" + isarray "^2.0.5" + safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" @@ -9130,6 +10198,15 @@ safe-regex-test@^1.0.0: get-intrinsic "^1.2.2" is-regex "^1.1.4" +safe-regex-test@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.3.tgz#a5b4c0f06e0ab50ea2c395c14d8371232924c377" + integrity sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw== + dependencies: + call-bind "^1.0.6" + es-errors "^1.3.0" + is-regex "^1.1.4" + "safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0": version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" @@ -9152,13 +10229,14 @@ sass-loader@^14.1.0: dependencies: neo-async "^2.6.2" -scheduler@^0.13.6: - version "0.13.6" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.6.tgz#466a4ec332467b31a91b9bf74e5347072e4cd889" - integrity sha512-IWnObHt413ucAYKsD9J1QShUKkbKLQQHdxRyw73sw4FN26iWr3DY/H34xGPe4nmL1DwXyWmSWmMrA9TfQbE/XQ== +sass@^1.77.8: + version "1.77.8" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.77.8.tgz#9f18b449ea401759ef7ec1752a16373e296b52bd" + integrity sha512-4UHg6prsrycW20fqLGPShtEvo/WyHRVRHwOP4DzkUrObWoWI05QBSfzU71TVB7PFaL104TwNaHpjlWXAZbQiNQ== dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" + chokidar ">=3.0.0 <4.0.0" + immutable "^4.0.0" + source-map-js ">=0.6.2 <2.0.0" scheduler@^0.19.1: version "0.19.1" @@ -9220,6 +10298,11 @@ scss-tokenizer@^0.4.3: js-base64 "^2.4.9" source-map "^0.7.3" +seamless-immutable@^7.1.3: + version "7.1.4" + resolved "https://registry.yarnpkg.com/seamless-immutable/-/seamless-immutable-7.1.4.tgz#6e9536def083ddc4dea0207d722e0e80d0f372f8" + integrity sha512-XiUO1QP4ki4E2PHegiGAlu6r82o5A+6tRh7IkGGTVg/h+UoeX4nFBeCGPOhb4CYjvkqsfm/TUtvOMYC1xmV30A== + select-hose@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" @@ -9353,6 +10436,16 @@ set-function-name@^2.0.0: functions-have-names "^1.2.3" has-property-descriptors "^1.0.0" +set-function-name@^2.0.1, set-function-name@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.2.tgz#16a705c5a0dc2f5e638ca96d8a8cd4e1c2b90985" + integrity sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ== + dependencies: + define-data-property "^1.1.4" + es-errors "^1.3.0" + functions-have-names "^1.2.3" + has-property-descriptors "^1.0.2" + setimmediate@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" @@ -9414,14 +10507,6 @@ shell-quote@^1.7.3, shell-quote@^1.8.1: resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680" integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA== -side-channel@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz#df5d1abadb4e4bf4af1cd8852bf132d2f7876947" - integrity sha512-7rL9YlPHg7Ancea1S96Pa8/QWb4BtXL/TZvS6B8XFetGBeuhAsfmUspK6DokBeZ64+Kj9TCNRD/30pVz1BvQNA== - dependencies: - es-abstract "^1.17.0-next.1" - object-inspect "^1.7.0" - side-channel@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" @@ -9536,16 +10621,16 @@ source-list-map@^2.0.0, source-list-map@^2.0.1: resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== +"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af" + integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg== + source-map-js@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c" integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw== -source-map-js@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af" - integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg== - source-map-support@^0.5.16: version "0.5.19" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" @@ -9733,17 +10818,23 @@ string-width@^4.1.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.0" -string.prototype.matchall@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz#48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e" - integrity sha512-N/jp6O5fMf9os0JU3E72Qhf590RSRZU/ungsL/qJUYVTNv7hTG0P/dbPjxINVN9jpscu3nzYwKESU3P3RY5tOg== +string.prototype.matchall@^4.0.11: + version "4.0.11" + resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz#1092a72c59268d2abaad76582dccc687c0297e0a" + integrity sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg== dependencies: - define-properties "^1.1.3" - es-abstract "^1.17.0" - has-symbols "^1.0.1" - internal-slot "^1.0.2" - regexp.prototype.flags "^1.3.0" - side-channel "^1.0.2" + call-bind "^1.0.7" + define-properties "^1.2.1" + es-abstract "^1.23.2" + es-errors "^1.3.0" + es-object-atoms "^1.0.0" + get-intrinsic "^1.2.4" + gopd "^1.0.1" + has-symbols "^1.0.3" + internal-slot "^1.0.7" + regexp.prototype.flags "^1.5.2" + set-function-name "^2.0.2" + side-channel "^1.0.6" string.prototype.matchall@^4.0.6: version "4.0.10" @@ -9768,6 +10859,14 @@ string.prototype.padend@^3.0.0: define-properties "^1.1.3" es-abstract "^1.17.0-next.1" +string.prototype.repeat@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz#e90872ee0308b29435aa26275f6e1b762daee01a" + integrity sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w== + dependencies: + define-properties "^1.1.3" + es-abstract "^1.17.5" + string.prototype.trim@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.1.tgz#141233dff32c82bfad80684d7e5f0869ee0fb782" @@ -9786,6 +10885,16 @@ string.prototype.trim@^1.2.8: define-properties "^1.2.0" es-abstract "^1.22.1" +string.prototype.trim@^1.2.9: + version "1.2.9" + resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz#b6fa326d72d2c78b6df02f7759c73f8f6274faa4" + integrity sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw== + dependencies: + call-bind "^1.0.7" + define-properties "^1.2.1" + es-abstract "^1.23.0" + es-object-atoms "^1.0.0" + string.prototype.trimend@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913" @@ -9803,6 +10912,15 @@ string.prototype.trimend@^1.0.7: define-properties "^1.2.0" es-abstract "^1.22.1" +string.prototype.trimend@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz#3651b8513719e8a9f48de7f2f77640b26652b229" + integrity sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ== + dependencies: + call-bind "^1.0.7" + define-properties "^1.2.1" + es-object-atoms "^1.0.0" + string.prototype.trimleft@^2.1.1: version "2.1.2" resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz#4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc" @@ -9838,6 +10956,15 @@ string.prototype.trimstart@^1.0.7: define-properties "^1.2.0" es-abstract "^1.22.1" +string.prototype.trimstart@^1.0.8: + version "1.0.8" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz#7ee834dda8c7c17eff3118472bb35bfedaa34dde" + integrity sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg== + dependencies: + call-bind "^1.0.7" + define-properties "^1.2.1" + es-object-atoms "^1.0.0" + string_decoder@^1.1.1: version "1.3.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" @@ -10279,6 +11406,15 @@ typed-array-buffer@^1.0.0: get-intrinsic "^1.2.1" is-typed-array "^1.1.10" +typed-array-buffer@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz#1867c5d83b20fcb5ccf32649e5e2fc7424474ff3" + integrity sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ== + dependencies: + call-bind "^1.0.7" + es-errors "^1.3.0" + is-typed-array "^1.1.13" + typed-array-byte-length@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz#d787a24a995711611fb2b87a4052799517b230d0" @@ -10289,6 +11425,17 @@ typed-array-byte-length@^1.0.0: has-proto "^1.0.1" is-typed-array "^1.1.10" +typed-array-byte-length@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz#d92972d3cff99a3fa2e765a28fcdc0f1d89dec67" + integrity sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw== + dependencies: + call-bind "^1.0.7" + for-each "^0.3.3" + gopd "^1.0.1" + has-proto "^1.0.3" + is-typed-array "^1.1.13" + typed-array-byte-offset@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz#cbbe89b51fdef9cd6aaf07ad4707340abbc4ea0b" @@ -10300,6 +11447,18 @@ typed-array-byte-offset@^1.0.0: has-proto "^1.0.1" is-typed-array "^1.1.10" +typed-array-byte-offset@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz#f9ec1acb9259f395093e4567eb3c28a580d02063" + integrity sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA== + dependencies: + available-typed-arrays "^1.0.7" + call-bind "^1.0.7" + for-each "^0.3.3" + gopd "^1.0.1" + has-proto "^1.0.3" + is-typed-array "^1.1.13" + typed-array-length@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb" @@ -10309,6 +11468,18 @@ typed-array-length@^1.0.4: for-each "^0.3.3" is-typed-array "^1.1.9" +typed-array-length@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.6.tgz#57155207c76e64a3457482dfdc1c9d1d3c4c73a3" + integrity sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g== + dependencies: + call-bind "^1.0.7" + for-each "^0.3.3" + gopd "^1.0.1" + has-proto "^1.0.3" + is-typed-array "^1.1.13" + possible-typed-array-names "^1.0.0" + typed-styles@^0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/typed-styles/-/typed-styles-0.0.7.tgz#93392a008794c4595119ff62dde6809dbc40a3d9" @@ -10472,6 +11643,14 @@ update-browserslist-db@^1.0.13: escalade "^3.1.1" picocolors "^1.0.0" +update-browserslist-db@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz#7ca61c0d8650766090728046e416a8cde682859e" + integrity sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ== + dependencies: + escalade "^3.1.2" + picocolors "^1.0.1" + uri-js@^4.2.2: version "4.2.2" resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0" @@ -10564,6 +11743,37 @@ vary@~1.1.2: resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= +vite-plugin-commonjs@^0.10.1: + version "0.10.1" + resolved "https://registry.yarnpkg.com/vite-plugin-commonjs/-/vite-plugin-commonjs-0.10.1.tgz#18585abc6020adaee733150847972f55a1f88c55" + integrity sha512-taP8R9kYGlCW5OzkVR0UIWRCnG6rSxeWWuA7tnU5b9t5MniibOnDY219NhisTeDhJAeGT8cEnrhVWZ9A5yD+vg== + dependencies: + acorn "^8.8.2" + fast-glob "^3.2.12" + magic-string "^0.30.1" + vite-plugin-dynamic-import "^1.5.0" + +vite-plugin-dynamic-import@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/vite-plugin-dynamic-import/-/vite-plugin-dynamic-import-1.5.0.tgz#a28f4768da977f0e448009489617aec259180b63" + integrity sha512-Qp85c+AVJmLa8MLni74U4BDiWpUeFNx7NJqbGZyR2XJOU7mgW0cb7nwlAMucFyM4arEd92Nfxp4j44xPi6Fu7g== + dependencies: + acorn "^8.8.2" + es-module-lexer "^1.2.1" + fast-glob "^3.2.12" + magic-string "^0.30.1" + +vite@^5.3.5: + version "5.3.5" + resolved "https://registry.yarnpkg.com/vite/-/vite-5.3.5.tgz#b847f846fb2b6cb6f6f4ed50a830186138cb83d8" + integrity sha512-MdjglKR6AQXQb9JGiS7Rc2wC6uMjcm7Go/NHNO63EwiJXfuk9PgqiP/n5IDJCziMkfw9n4Ubp7lttNwz+8ZVKA== + dependencies: + esbuild "^0.21.3" + postcss "^8.4.39" + rollup "^4.13.0" + optionalDependencies: + fsevents "~2.3.3" + warning@^4.0.2, warning@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3" @@ -10745,6 +11955,34 @@ which-boxed-primitive@^1.0.2: is-string "^1.0.5" is-symbol "^1.0.3" +which-builtin-type@^1.1.3: + version "1.1.4" + resolved "https://registry.yarnpkg.com/which-builtin-type/-/which-builtin-type-1.1.4.tgz#592796260602fc3514a1b5ee7fa29319b72380c3" + integrity sha512-bppkmBSsHFmIMSl8BO9TbsyzsvGjVoppt8xUiGzwiu/bhDCGxnpOKCxgqj6GuyHE0mINMDecBFPlOm2hzY084w== + dependencies: + function.prototype.name "^1.1.6" + has-tostringtag "^1.0.2" + is-async-function "^2.0.0" + is-date-object "^1.0.5" + is-finalizationregistry "^1.0.2" + is-generator-function "^1.0.10" + is-regex "^1.1.4" + is-weakref "^1.0.2" + isarray "^2.0.5" + which-boxed-primitive "^1.0.2" + which-collection "^1.0.2" + which-typed-array "^1.1.15" + +which-collection@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/which-collection/-/which-collection-1.0.2.tgz#627ef76243920a107e7ce8e96191debe4b16c2a0" + integrity sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw== + dependencies: + is-map "^2.0.3" + is-set "^2.0.3" + is-weakmap "^2.0.2" + is-weakset "^2.0.3" + which-module@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" @@ -10761,6 +11999,17 @@ which-typed-array@^1.1.11, which-typed-array@^1.1.13: gopd "^1.0.1" has-tostringtag "^1.0.0" +which-typed-array@^1.1.14, which-typed-array@^1.1.15: + version "1.1.15" + resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.15.tgz#264859e9b11a649b388bfaaf4f767df1f779b38d" + integrity sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA== + dependencies: + available-typed-arrays "^1.0.7" + call-bind "^1.0.7" + for-each "^0.3.3" + gopd "^1.0.1" + has-tostringtag "^1.0.2" + which@1.3.1, which@^1.2.9, which@^1.3.0, which@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" @@ -11000,12 +12249,12 @@ ws@^8.13.0: resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc" integrity sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw== -xregexp@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.3.0.tgz#7e92e73d9174a99a59743f67a4ce879a04b5ae50" - integrity sha512-7jXDIFXh5yJ/orPn4SXjuVrWWoi4Cr8jfV1eHv9CixKSbU+jY4mxfrBwAuDvupPNKpMUY+FeIqsVw/JLT9+B8g== +xxhashjs@~0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/xxhashjs/-/xxhashjs-0.2.2.tgz#8a6251567621a1c46a5ae204da0249c7f8caa9d8" + integrity sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw== dependencies: - "@babel/runtime-corejs3" "^7.8.3" + cuint "^0.2.2" y18n@^4.0.0: version "4.0.3" From 625c63ccc080b7aa4c1bfbb6304995c5778e8624 Mon Sep 17 00:00:00 2001 From: Henri Nieminen Date: Mon, 12 Aug 2024 17:13:21 +0300 Subject: [PATCH 02/24] Fix env paths to use VITE_ prefix --- src/auth/saga.ts | 2 +- src/auth/selectors.ts | 2 +- src/auth/util/user-manager.ts | 6 +++--- src/components/sideMenu/SideMenu.tsx | 4 ++-- src/root/startApp.ts | 22 ---------------------- src/util/helpers.tsx | 2 +- src/util/storage.ts | 2 +- 7 files changed, 9 insertions(+), 31 deletions(-) delete mode 100644 src/root/startApp.ts diff --git a/src/auth/saga.ts b/src/auth/saga.ts index 3648817f5..76e8b07ac 100644 --- a/src/auth/saga.ts +++ b/src/auth/saga.ts @@ -8,7 +8,7 @@ function* fetchApiTokenSaga({ type: any }): Generator { try { - const request = new Request(process.env.OPENID_CONNECT_API_TOKEN_URL || 'https://api.hel.fi/sso/api-tokens/', { + const request = new Request(import.meta.env.VITE_OPENID_CONNECT_API_TOKEN_URL || 'https://api.hel.fi/sso/api-tokens/', { headers: { 'Authorization': `Bearer ${token}` } diff --git a/src/auth/selectors.ts b/src/auth/selectors.ts index 1fe022bd7..538e88daf 100644 --- a/src/auth/selectors.ts +++ b/src/auth/selectors.ts @@ -1,7 +1,7 @@ import type { Selector } from "../types"; import type { ApiToken, AuthState } from "./types"; // Helper functions to select state -export const getApiToken: Selector = (state: Record): AuthState => state.auth.apiToken[process.env.OPENID_CONNECT_API_TOKEN_KEY || 'https://api.hel.fi/auth/mvj']; +export const getApiToken: Selector = (state: Record): AuthState => state.auth.apiToken[import.meta.env.VITE_OPENID_CONNECT_API_TOKEN_KEY || 'https://api.hel.fi/auth/mvj']; export const getApiTokenExpires: Selector = (state: Record): AuthState => state.auth.apiToken['expires_at']; export const getIsFetching: Selector = (state: Record): AuthState => state.auth.isFetching; export const getLoggedInUser: Selector, void> = (state: Record): Record => state.oidc.user; \ No newline at end of file diff --git a/src/auth/util/user-manager.ts b/src/auth/util/user-manager.ts index 8613fbf20..2c8275712 100644 --- a/src/auth/util/user-manager.ts +++ b/src/auth/util/user-manager.ts @@ -3,14 +3,14 @@ // TODO: migrate to oidc-client-ts, because oidc-client is not maintained anymore import { Global, Log, UserManager, WebStorageStateStore } from "oidc-client"; const userManagerConfig = { - authority: process.env.OPENID_CONNECT_AUTHORITY_URL || 'https://api.hel.fi/sso/openid/', + authority: import.meta.env.VITE_OPENID_CONNECT_AUTHORITY_URL || 'https://api.hel.fi/sso/openid/', automaticSilentRenew: true, - client_id: process.env.OPENID_CONNECT_CLIENT_ID || '', + client_id: import.meta.env.VITE_OPENID_CONNECT_CLIENT_ID || '', filterProtocolClaims: true, loadUserInfo: true, redirect_uri: `${location.origin}/callback`, response_type: 'id_token token', - scope: process.env.OPENID_CONNECT_SCOPE || 'openid profile https://api.hel.fi/auth/mvj', + scope: import.meta.env.VITE_OPENID_CONNECT_SCOPE || 'openid profile https://api.hel.fi/auth/mvj', silent_redirect_uri: `${location.origin}/silent_renew.html`, userStore: new WebStorageStateStore({ store: Global.localStorage diff --git a/src/components/sideMenu/SideMenu.tsx b/src/components/sideMenu/SideMenu.tsx index 136e117e5..c751f3276 100644 --- a/src/components/sideMenu/SideMenu.tsx +++ b/src/components/sideMenu/SideMenu.tsx @@ -195,7 +195,7 @@ class SideMenu extends Component { color: '#b7b7b7' }} onClick={handleClick} to={getRouteById(Routes.LAND_USE_CONTRACTS)}>Maankäyttösopimukset - {import.meta.env.NODE_ENV !== 'production' && { text: 'Tonttihakemukset', to: getRouteById(Routes.PLOT_APPLICATIONS) }]} menuKey='plot' onHeaderClick={this.handleHeaderClick} />} - {import.meta.env.NODE_ENV !== 'production' && + {!import.meta.env.PROD &&
  • Aluehaut
    • } diff --git a/src/root/startApp.ts b/src/root/startApp.ts deleted file mode 100644 index bf716c509..000000000 --- a/src/root/startApp.ts +++ /dev/null @@ -1,22 +0,0 @@ -import configureStore, { history } from "./configureStore"; -import renderApp from "./renderApp"; -import Root from "./Root"; -export const store = configureStore(); -export default (() => { - const rootProps = { - history, - store - }; - renderApp(Root, rootProps); - - if (module.hot) { - module.hot.accept('./Root', () => { - const nextRootComponent = require('./Root').default; - - renderApp(nextRootComponent, rootProps); - }); - } // if (process.env.NODE_ENV === 'production') { - // require('./enableOfflineMode'); - // } - -}); \ No newline at end of file diff --git a/src/util/helpers.tsx b/src/util/helpers.tsx index 6a71b8298..756a12655 100644 --- a/src/util/helpers.tsx +++ b/src/util/helpers.tsx @@ -298,7 +298,7 @@ export const formatDateRange = (startDate: any, endDate: any): string => { /* istanbul ignore next */ export const getApiUrlWithOutVersionSuffix = (): string => { - return process.env.API_URL ? process.env.API_URL.split('/v1')[0] : ''; + return import.meta.env.VITE_API_URL ? import.meta.env.VITE_API_URL.split('/v1')[0] : ''; }; /** diff --git a/src/util/storage.ts b/src/util/storage.ts index 417967639..6cd844bf2 100644 --- a/src/util/storage.ts +++ b/src/util/storage.ts @@ -98,7 +98,7 @@ export const removeSessionStorageItem = (key: string, callback: ((...args: Array * @returns {string} */ const buildStorageKey = (key: string) => { - return [process.env.STORAGE_PREFIX, key].join('.'); + return [import.meta.env.VITE_STORAGE_PREFIX, key].join('.'); }; /** From fde3e1a7cd885329906046944af104d410fdfed3 Mon Sep 17 00:00:00 2001 From: Henri Nieminen Date: Mon, 12 Aug 2024 17:09:56 +0300 Subject: [PATCH 03/24] Fix imports to use the configured "@/*" shortcut for "src/" --- src/api/ApiErrorModal.tsx | 4 +- src/api/callApi.ts | 4 +- src/api/callApiAsync.ts | 6 +- src/api/callUploadRequest.ts | 6 +- src/api/createUrlWithoutVersionSuffix.ts | 2 +- src/api/reducer.ts | 2 +- src/api/selectors.ts | 2 +- src/api/types.ts | 2 +- src/app/App.tsx | 47 ++++----- src/application/actions.ts | 2 +- .../components/ApplicationAnswersField.tsx | 12 +-- .../components/ApplicationAnswersSection.tsx | 8 +- .../components/ApplicationSubsection.tsx | 44 ++++----- .../infoCheck/ApplicantInfoCheck.tsx | 4 +- .../infoCheck/ApplicantInfoCheckEdit.tsx | 10 +- .../infoCheck/ApplicantInfoCheckEditItem.tsx | 6 +- .../infoCheck/ApplicantInfoCheckForm.tsx | 14 +-- .../infoCheck/ApplicantInfoCheckModal.tsx | 16 ++-- src/application/constants.ts | 2 +- src/application/formValidation.ts | 2 +- src/application/helpers.ts | 20 ++-- src/application/reducer.ts | 2 +- src/application/requests.ts | 6 +- src/application/saga.ts | 14 +-- src/application/selectors.ts | 4 +- src/application/spec.ts | 10 +- src/areaNote/components/AreaNoteListPage.tsx | 34 +++---- src/areaNote/components/AreaNotesEditMap.tsx | 10 +- src/areaNote/components/AreaNotesLayer.tsx | 14 +-- src/areaNote/components/MapContainer.tsx | 10 +- .../components/SaveConditionPanel.tsx | 18 ++-- src/areaNote/components/search/Search.tsx | 8 +- src/areaNote/helpers.ts | 2 +- src/areaNote/requests.ts | 6 +- src/areaNote/saga.ts | 4 +- src/areaNote/selectors.ts | 2 +- src/areaSearch/actions.ts | 2 +- .../AreaSearchApplicantInfoCheck.tsx | 8 +- .../AreaSearchApplicantInfoCheckEdit.tsx | 8 +- .../components/AreaSearchApplication.tsx | 50 +++++----- .../AreaSearchApplicationAuditLog.tsx | 30 +++--- .../AreaSearchApplicationCreateForm.tsx | 12 +-- .../AreaSearchApplicationCreatePage.tsx | 42 ++++---- .../AreaSearchApplicationCreateSpecs.tsx | 24 ++--- .../components/AreaSearchApplicationEdit.tsx | 62 ++++++------ .../AreaSearchApplicationListPage.tsx | 76 +++++++-------- .../components/AreaSearchApplicationPage.tsx | 66 ++++++------- ...eaSearchApplicationPropertyIdentifiers.tsx | 4 +- .../components/AreaSearchExportModal.tsx | 18 ++-- .../AreaSearchStatusNoteHistory.tsx | 6 +- .../components/EditAreaSearchPreparerForm.tsx | 20 ++-- .../EditAreaSearchPreparerModal.tsx | 10 +- .../components/map/AreaSearchLayer.tsx | 6 +- .../components/map/AreaSearchListMap.tsx | 24 ++--- .../components/map/AreaSearchMap.tsx | 6 +- .../components/map/SingleAreaSearchMap.tsx | 8 +- src/areaSearch/components/search/Search.tsx | 28 +++--- src/areaSearch/constants.ts | 2 +- src/areaSearch/helpers.ts | 14 +-- src/areaSearch/reducer.ts | 4 +- src/areaSearch/requests.ts | 6 +- src/areaSearch/saga.ts | 18 ++-- src/areaSearch/selectors.ts | 2 +- src/areaSearch/spec.ts | 6 +- src/areaSearch/types.ts | 2 +- src/auditLog/actions.ts | 8 +- src/auditLog/helpers.ts | 8 +- src/auditLog/reducer.ts | 2 +- src/auditLog/requests.ts | 4 +- src/auditLog/saga.ts | 2 +- src/auditLog/selectors.ts | 2 +- src/auditLog/types.ts | 8 +- src/auth/components/CallbackPage.tsx | 6 +- src/auth/reducer.ts | 2 +- src/auth/saga.ts | 4 +- src/auth/selectors.ts | 2 +- src/auth/types.ts | 2 +- .../components/BasisOfRentCalculatorForm.tsx | 12 +-- .../components/BasisOfRentCalculatorPage.tsx | 24 ++--- src/batchrun/actions.ts | 2 +- src/batchrun/components/BatchRunPage.tsx | 40 ++++---- .../components/JobRunLogEntryPanel.tsx | 20 ++-- src/batchrun/components/JobRuns.tsx | 40 ++++---- src/batchrun/components/ScheduledJobs.tsx | 32 +++---- src/batchrun/reducer.ts | 2 +- src/batchrun/requests.ts | 4 +- src/batchrun/saga.ts | 6 +- src/batchrun/selectors.ts | 4 +- src/billingPeriods/reducer.ts | 2 +- src/billingPeriods/requests.ts | 4 +- src/billingPeriods/saga.ts | 2 +- src/billingPeriods/selectors.ts | 4 +- src/billingPeriods/types.ts | 4 +- src/collectionCourtDecision/actions.ts | 2 +- src/collectionCourtDecision/reducer.ts | 2 +- src/collectionCourtDecision/requests.ts | 8 +- src/collectionCourtDecision/saga.ts | 4 +- src/collectionCourtDecision/selectors.ts | 4 +- src/collectionCourtDecision/types.ts | 2 +- src/collectionLetter/actions.ts | 2 +- src/collectionLetter/requests.ts | 8 +- src/collectionLetter/saga.ts | 4 +- src/collectionLetter/selectors.ts | 4 +- src/collectionLetter/types.ts | 2 +- src/collectionNote/actions.ts | 2 +- src/collectionNote/requests.ts | 6 +- src/collectionNote/saga.ts | 4 +- src/collectionNote/selectors.ts | 6 +- src/collectionNote/types.ts | 2 +- src/comments/actions.ts | 2 +- src/comments/helpers.ts | 2 +- src/comments/requests.ts | 4 +- src/comments/saga.ts | 6 +- src/comments/selectors.ts | 4 +- src/comments/types.ts | 2 +- .../address-search/AddressSearchInput.tsx | 11 +-- .../attributes/AreaNoteAttributes.tsx | 4 +- .../attributes/AreaSearchAttributes.tsx | 6 +- .../BatchrunJobRunsTabAttributes.tsx | 4 +- .../BatchrunScheduledJobsTabAttributes.tsx | 4 +- .../attributes/ContactAttributes.tsx | 4 +- .../InfillDevelopmentListPageAttributes.tsx | 4 +- .../InfillDevelopmentPageAttributes.tsx | 12 +-- .../attributes/InvoiceNoteAttributes.tsx | 4 +- .../attributes/LandUseContractAttributes.tsx | 8 +- src/components/attributes/LeaseAttributes.tsx | 4 +- .../attributes/LeaseInvoiceTabAttributes.tsx | 28 +++--- ...eInvoicingConfirmationReportAttributes.tsx | 4 +- .../attributes/LeasePageAttributes.tsx | 16 ++-- .../LeaseStatisticReportAttributes.tsx | 6 +- .../LeaseholdTransferAttributes.tsx | 4 +- .../attributes/PlotApplicationsAttributes.tsx | 4 +- .../attributes/PlotSearchAttributes.tsx | 8 +- .../attributes/RentBasisAttributes.tsx | 4 +- .../attributes/SapInvoicesAttributes.tsx | 4 +- .../attributes/UsersPermissions.tsx | 6 +- src/components/auditLog/AuditLogTableItem.tsx | 8 +- .../auditLog/AuditLogTableItemChange.tsx | 14 +-- src/components/button/BackButton.tsx | 2 +- src/components/button/CloseButton.tsx | 4 +- src/components/button/EditButton.tsx | 2 +- src/components/button/SendupButton.tsx | 2 +- src/components/collapse/Collapse.tsx | 12 +-- .../collapse/CollapseHeaderTitle.tsx | 2 +- src/components/content/SubTitle.tsx | 2 +- src/components/content/Title.tsx | 2 +- src/components/content/TitleH3.tsx | 2 +- .../controlButtons/CommentButton.tsx | 2 +- .../controlButtons/ControlButtonBar.tsx | 10 +- .../controlButtons/ControlButtons.tsx | 10 +- src/components/excel/ExcelLink.tsx | 10 +- src/components/file/FileDownloadButton.tsx | 8 +- src/components/file/FileDownloadLink.tsx | 8 +- src/components/form/AddButton.tsx | 2 +- src/components/form/AddButtonSecondary.tsx | 2 +- src/components/form/AddButtonThird.tsx | 2 +- src/components/form/AddFileButton.tsx | 2 +- src/components/form/ArchiveButton.tsx | 2 +- src/components/form/AsyncSelect.tsx | 4 +- src/components/form/AttachButton.tsx | 2 +- src/components/form/CopyToClipboardButton.tsx | 2 +- src/components/form/DecisionSelectInput.tsx | 6 +- src/components/form/DocumentsButton.tsx | 2 +- src/components/form/EditButton.tsx | 2 +- src/components/form/FieldTypeAddress.tsx | 2 +- .../form/FieldTypeContactSelect.tsx | 10 +- src/components/form/FieldTypeDatePicker.tsx | 2 +- src/components/form/FieldTypeDecimal.tsx | 4 +- .../form/FieldTypeIntendedUseSelect.tsx | 10 +- src/components/form/FieldTypeLeaseSelect.tsx | 10 +- src/components/form/FieldTypeLessorSelect.tsx | 10 +- src/components/form/FieldTypeMultiSelect.tsx | 2 +- src/components/form/FieldTypeSelect.tsx | 4 +- src/components/form/FieldTypeUserSelect.tsx | 10 +- src/components/form/FormField.tsx | 66 ++++++------- src/components/form/FormFieldLabel.tsx | 2 +- src/components/form/FormTextTitle.tsx | 2 +- src/components/form/FormTitleAndText.tsx | 4 +- src/components/form/RemoveButton.tsx | 4 +- src/components/form/UnarchiveButton.tsx | 2 +- src/components/form/normalizers.ts | 2 +- src/components/form/validations.ts | 4 +- src/components/formValidations.ts | 2 +- src/components/helpers.ts | 6 +- src/components/inputs/EstateIdSelectInput.tsx | 4 +- src/components/inputs/LeaseSelectInput.tsx | 18 ++-- src/components/inputs/PlanUnitSelectInput.tsx | 6 +- .../inputs/SelectLoadingIndicator.tsx | 4 +- src/components/inputs/SingleRadioInput.tsx | 2 +- .../inputs/UserServiceUnitSelectInput.tsx | 12 +-- .../invoice-simulator/InvoiceSimulator.tsx | 38 ++++---- .../InvoiceSimulatorBillingPeriods.tsx | 14 +-- .../InvoiceSimulatorForm.tsx | 10 +- .../InvoiceSimulatorInvoice.tsx | 16 ++-- .../InvoiceSimulatorInvoiceRows.tsx | 12 +-- src/components/ktj/KtjLink.tsx | 8 +- src/components/links/DecisionLink.tsx | 4 +- src/components/links/ExternalLink.tsx | 2 +- src/components/modal/ConfirmationModal.tsx | 6 +- src/components/modal/Modal.tsx | 2 +- .../rent-calculator/RentCalculator.tsx | 42 ++++---- .../RentCalculatorExplanation.tsx | 12 +-- .../rent-calculator/RentCalculatorForm.tsx | 20 ++-- .../rent-calculator/RentCalculatorSubItem.tsx | 10 +- .../RentCalculatorTotalRow.tsx | 8 +- .../rent-calculator/RentForPeriod.tsx | 10 +- src/components/resize/WindowResizeHandler.tsx | 2 +- src/components/sideMenu/SideMenu.tsx | 24 ++--- src/components/sideMenu/SubMenu.tsx | 6 +- src/components/spec.ts | 6 +- src/components/table/MultiItemCollapse.tsx | 2 +- src/components/table/SortableTable.tsx | 4 +- src/components/table/SortableTableGroup.tsx | 2 +- src/components/table/SortableTableHeader.tsx | 4 +- src/components/table/SortableTableRow.tsx | 2 +- src/components/table/TableFilters.tsx | 2 +- src/components/table/TablePanel.tsx | 2 +- src/components/table/TablePanelContainer.tsx | 2 +- src/components/tabs/Tabs.tsx | 2 +- src/components/tooltip/Tooltip.tsx | 4 +- src/components/tooltip/UIDataTooltip.tsx | 44 ++++----- .../topNavigation/TopNavigation.tsx | 22 ++--- src/components/uiData/UiDataListHOC.tsx | 6 +- src/components/vat/AmountWithVat.tsx | 8 +- src/contacts/components/ContactAuditLog.tsx | 20 ++-- src/contacts/components/ContactEdit.tsx | 2 +- src/contacts/components/ContactModal.tsx | 16 ++-- src/contacts/components/ContactPage.tsx | 72 +++++++------- src/contacts/components/ContactReadonly.tsx | 6 +- src/contacts/components/ContactsListPage.tsx | 50 +++++----- src/contacts/components/NewContactPage.tsx | 46 ++++----- src/contacts/components/forms/ContactForm.tsx | 38 ++++---- src/contacts/components/search/Search.tsx | 14 +-- .../components/templates/ContactTemplate.tsx | 22 ++--- src/contacts/constants.ts | 2 +- src/contacts/helpers.ts | 6 +- src/contacts/reducer.ts | 2 +- src/contacts/requests.ts | 4 +- src/contacts/requestsAsync.ts | 4 +- src/contacts/saga.ts | 6 +- src/contacts/selectors.ts | 2 +- src/contacts/types.ts | 2 +- src/contractFile/reducer.ts | 2 +- src/contractFile/requests.ts | 4 +- src/contractFile/saga.ts | 2 +- src/contractFile/selectors.ts | 2 +- src/contractFile/types.ts | 2 +- src/createCollectionLetter/reducer.ts | 2 +- src/createCollectionLetter/requests.ts | 4 +- src/createCollectionLetter/saga.ts | 2 +- src/createCollectionLetter/selectors.ts | 2 +- src/createCollectionLetter/types.ts | 2 +- src/creditDecision/actions.ts | 2 +- .../components/CreditDecisionHistory.tsx | 22 ++--- .../components/CreditDecisionRequest.tsx | 36 +++---- .../components/CreditDecisionSearchPage.tsx | 32 +++---- .../components/CreditDecisionTemplate.tsx | 6 +- src/creditDecision/components/SearchForm.tsx | 22 ++--- src/creditDecision/components/StatusText.tsx | 8 +- src/creditDecision/reducer.ts | 2 +- src/creditDecision/requests.ts | 4 +- src/creditDecision/saga.ts | 2 +- src/creditDecision/selectors.ts | 2 +- src/district/helpers.ts | 2 +- src/district/reducer.ts | 2 +- src/district/requests.ts | 4 +- src/district/saga.ts | 2 +- src/district/selectors.ts | 2 +- src/district/types.ts | 2 +- src/enums.tsx | 2 +- src/index/actions.ts | 2 +- src/index/components/IndexListPage.tsx | 28 +++--- src/index/helpers.ts | 2 +- src/index/reducer.ts | 2 +- src/index/requests.ts | 4 +- src/index/selectors.ts | 4 +- .../components/InfillDevelopmentListPage.tsx | 44 ++++----- .../components/InfillDevelopmentPage.tsx | 62 ++++++------ .../components/NewInfillDevelopmentPage.tsx | 38 ++++---- .../forms/InfillDevelopmentForm.tsx | 24 ++--- .../components/forms/LeaseItemEdit.tsx | 76 +++++++-------- .../components/forms/LeaseItemsEdit.tsx | 22 ++--- .../components/search/Search.tsx | 24 ++--- .../basicInfo/InfillDevelopmentTemplate.tsx | 24 ++--- .../sections/basicInfo/LeaseInfo.tsx | 30 +++--- .../sections/basicInfo/LeaseItem.tsx | 50 +++++----- .../map/InfillDevelopmentLeaseLayer.tsx | 6 +- .../map/SingleInfillDevelopmentMap.tsx | 42 ++++---- src/infillDevelopment/constants.ts | 2 +- src/infillDevelopment/helpers.ts | 16 ++-- src/infillDevelopment/reducer.ts | 4 +- src/infillDevelopment/requests.ts | 4 +- src/infillDevelopment/saga.ts | 6 +- src/infillDevelopment/selectors.ts | 2 +- src/infillDevelopment/types.ts | 2 +- src/infillDevelopmentAttachment/reducer.ts | 2 +- src/infillDevelopmentAttachment/requests.ts | 6 +- src/infillDevelopmentAttachment/saga.ts | 6 +- src/infillDevelopmentAttachment/selectors.ts | 2 +- src/infillDevelopmentAttachment/types.ts | 4 +- .../components/CreateInvoiceNoteModal.tsx | 22 ++--- .../components/InvoiceNoteListPage.tsx | 50 +++++----- src/invoiceNote/components/Search.tsx | 12 +-- src/invoiceNote/requests.ts | 4 +- src/invoiceNote/saga.ts | 4 +- src/invoiceNote/selectors.ts | 6 +- src/invoiceSets/actions.ts | 2 +- src/invoiceSets/helpers.ts | 4 +- src/invoiceSets/reducer.ts | 2 +- src/invoiceSets/requests.ts | 6 +- src/invoiceSets/saga.ts | 6 +- src/invoiceSets/selectors.ts | 4 +- src/invoiceSets/types.ts | 4 +- src/invoices/actions.ts | 2 +- src/invoices/helpers.ts | 4 +- src/invoices/reducer.ts | 2 +- src/invoices/requests.ts | 4 +- src/invoices/saga.ts | 4 +- src/invoices/selectors.ts | 4 +- src/invoices/types.ts | 2 +- src/landUseAgreementAttachment/reducer.ts | 2 +- src/landUseAgreementAttachment/requests.ts | 6 +- src/landUseAgreementAttachment/saga.ts | 6 +- src/landUseAgreementAttachment/selectors.ts | 2 +- src/landUseAgreementAttachment/types.ts | 2 +- .../components/LandUseContractListPage.tsx | 40 ++++---- .../components/LandUseContractPage.tsx | 60 ++++++------ .../CreateLandUseContractForm.tsx | 22 ++--- .../CreateLandUseContractModal.tsx | 2 +- .../components/search/Search.tsx | 8 +- .../components/sections/AddressItemEdit.tsx | 14 +-- .../components/sections/BasicInformation.tsx | 40 ++++---- .../sections/BasicInformationEdit.tsx | 52 +++++----- .../components/sections/Changes.tsx | 24 ++--- .../components/sections/Compensations.tsx | 36 +++---- .../components/sections/CompensationsEdit.tsx | 54 +++++------ .../components/sections/ConditionItemEdit.tsx | 8 +- .../components/sections/Conditions.tsx | 20 ++-- .../components/sections/ConditionsEdit.tsx | 18 ++-- .../components/sections/ContractItem.tsx | 14 +-- .../components/sections/ContractItemEdit.tsx | 38 ++++---- .../components/sections/Contracts.tsx | 10 +- .../components/sections/ContractsEdit.tsx | 20 ++-- .../sections/CreateAndCreditInvoiceR.tsx | 38 ++++---- .../sections/DecisionConditions.tsx | 22 ++--- .../components/sections/DecisionItem.tsx | 14 +-- .../components/sections/DecisionItemEdit.tsx | 36 +++---- .../components/sections/Decisions.tsx | 6 +- .../components/sections/DecisionsEdit.tsx | 16 ++-- .../components/sections/InvoiceNotesR.tsx | 40 ++++---- .../components/sections/InvoicePanelR.tsx | 20 ++-- .../sections/InvoiceTableAndPanelR.tsx | 36 +++---- .../components/sections/InvoiceTemplateR.tsx | 24 ++--- .../components/sections/Invoices.tsx | 16 ++-- .../components/sections/InvoicesEdit.tsx | 22 ++--- .../components/sections/InvoicesR.tsx | 32 +++---- .../sections/LandUseContractMap.tsx | 20 ++-- .../components/sections/Litigant.tsx | 14 +-- .../sections/LitigantBillingPerson.tsx | 30 +++--- .../sections/LitigantBillingPersonEdit.tsx | 32 +++---- .../components/sections/LitigantItem.tsx | 20 ++-- .../components/sections/LitigantItemEdit.tsx | 38 ++++---- .../components/sections/Litigants.tsx | 16 ++-- .../components/sections/LitigantsEdit.tsx | 40 ++++---- .../sections/UnitPricesUsedInCalculations.tsx | 10 +- .../components/sections/Warrants.tsx | 18 ++-- .../sections/forms/CreditInvoiceForm.tsx | 30 +++--- .../sections/forms/EditInvoiceForm.tsx | 54 +++++------ .../components/sections/forms/InvoiceRows.tsx | 24 ++--- .../sections/forms/InvoiceRowsEdit.tsx | 30 +++--- .../sections/forms/NewInvoiceForm.tsx | 38 ++++---- src/landUseContract/formValidators.ts | 4 +- src/landUseContract/helpers.ts | 14 +-- src/landUseContract/reducer.ts | 2 +- src/landUseContract/requests.ts | 4 +- src/landUseContract/requestsAsync.ts | 4 +- src/landUseContract/saga.ts | 6 +- src/landUseContract/selectors.ts | 4 +- src/landUseContract/types.ts | 2 +- src/landUseInvoices/actions.ts | 2 +- src/landUseInvoices/helpers.ts | 4 +- src/landUseInvoices/reducer.ts | 2 +- src/landUseInvoices/requests.ts | 4 +- src/landUseInvoices/saga.ts | 8 +- src/landUseInvoices/selectors.ts | 2 +- src/leaseAreaAttachment/requests.ts | 6 +- src/leaseAreaAttachment/saga.ts | 6 +- src/leaseAreaAttachment/types.ts | 2 +- src/leaseCreateCharge/helpers.ts | 2 +- src/leaseCreateCharge/reducer.ts | 2 +- src/leaseCreateCharge/requests.ts | 6 +- src/leaseCreateCharge/saga.ts | 2 +- src/leaseCreateCharge/selectors.ts | 2 +- src/leaseInspectionAttachment/requests.ts | 6 +- src/leaseInspectionAttachment/saga.ts | 6 +- src/leaseInspectionAttachment/types.ts | 2 +- .../LeaseInvoicingConfirmationReport.tsx | 36 +++---- .../components/LeaseStatisticReportForm.tsx | 26 ++--- .../components/LeaseStatisticReportPage.tsx | 36 +++---- src/leaseStatisticReport/helpers.ts | 8 +- src/leaseStatisticReport/reducer.ts | 2 +- src/leaseStatisticReport/requests.ts | 4 +- src/leaseStatisticReport/saga.ts | 4 +- src/leaseStatisticReport/selectors.ts | 2 +- src/leaseStatisticReport/types.ts | 2 +- src/leaseType/reducer.ts | 2 +- src/leaseType/requests.ts | 4 +- src/leaseType/saga.ts | 2 +- src/leaseType/selectors.ts | 4 +- src/leaseType/types.ts | 2 +- src/leaseholdTransfer/actions.ts | 2 +- .../components/LeaseholdTransferListPage.tsx | 48 +++++----- .../components/search/Search.tsx | 8 +- src/leaseholdTransfer/constants.ts | 2 +- src/leaseholdTransfer/helpers.ts | 8 +- src/leaseholdTransfer/reducer.ts | 2 +- src/leaseholdTransfer/requests.ts | 4 +- src/leaseholdTransfer/saga.ts | 4 +- src/leaseholdTransfer/selectors.ts | 4 +- src/leases/components/LeaseListPage.tsx | 90 ++++++++--------- src/leases/components/LeasePage.tsx | 90 ++++++++--------- .../createLease/CreateLeaseForm.tsx | 42 ++++---- .../createLease/CreateLeaseModal.tsx | 2 +- .../leaseSections/auditLog/LeaseAuditLog.tsx | 30 +++--- .../leaseSections/comments/Comment.tsx | 18 ++-- .../leaseSections/comments/CommentPanel.tsx | 34 +++---- .../leaseSections/comments/NewCommentForm.tsx | 22 ++--- .../constructability/Comment.tsx | 18 ++-- .../constructability/Comments.tsx | 10 +- .../constructability/Constructability.tsx | 18 ++-- .../constructability/ConstructabilityEdit.tsx | 22 ++--- .../constructability/ConstructabilityItem.tsx | 30 +++--- .../ConstructabilityItemEdit.tsx | 58 +++++------ .../constructability/SendEmail.tsx | 34 +++---- .../constructability/SendEmailModal.tsx | 18 ++-- .../constructability/StatusIndicator.tsx | 4 +- .../contract/AttachDecisionModal.tsx | 18 ++-- .../leaseSections/contract/Collateral.tsx | 16 ++-- .../leaseSections/contract/CollateralEdit.tsx | 28 +++--- .../contract/ContractFileModal.tsx | 26 ++--- .../leaseSections/contract/ContractItem.tsx | 34 +++---- .../contract/ContractItemEdit.tsx | 58 +++++------ .../leaseSections/contract/Contracts.tsx | 12 +-- .../leaseSections/contract/ContractsEdit.tsx | 30 +++--- .../contract/DecisionConditionsEdit.tsx | 46 ++++----- .../leaseSections/contract/DecisionItem.tsx | 30 +++--- .../contract/DecisionItemEdit.tsx | 32 +++---- .../leaseSections/contract/Decisions.tsx | 12 +-- .../leaseSections/contract/DecisionsEdit.tsx | 26 ++--- .../leaseSections/contract/DecisionsMain.tsx | 14 +-- .../contract/DecisionsMainEdit.tsx | 14 +-- .../leaseSections/contract/InspectionItem.tsx | 20 ++-- .../contract/InspectionItemEdit.tsx | 48 +++++----- .../leaseSections/contract/Inspections.tsx | 14 +-- .../contract/InspectionsEdit.tsx | 32 +++---- .../invoice/CollectionCourtDecisionPanel.tsx | 24 ++--- .../invoice/CreateAndCreditInvoice.tsx | 40 ++++---- .../invoice/CreateCollectionLetter.tsx | 8 +- .../leaseSections/invoice/DebtCollection.tsx | 2 +- .../leaseSections/invoice/InvoiceNotes.tsx | 40 ++++---- .../leaseSections/invoice/InvoicePanel.tsx | 20 ++-- .../invoice/InvoiceTableAndPanel.tsx | 38 ++++---- .../leaseSections/invoice/InvoiceTemplate.tsx | 24 ++--- .../leaseSections/invoice/Invoices.tsx | 72 +++++++------- .../forms/CollectionLetterInvoiceRow.tsx | 26 ++--- .../forms/CollectionLetterTotalRow.tsx | 8 +- .../forms/CreateCollectionLetterForm.tsx | 38 ++++---- .../invoice/forms/CreditInvoiceForm.tsx | 30 +++--- .../invoice/forms/DebtCollectionForm.tsx | 80 ++++++++-------- .../invoice/forms/EditInvoiceForm.tsx | 54 +++++------ .../invoice/forms/InvoiceRows.tsx | 24 ++--- .../invoice/forms/InvoiceRowsEdit.tsx | 36 +++---- .../invoice/forms/NewCollectionNote.tsx | 16 ++-- .../invoice/forms/NewInvoiceForm.tsx | 62 ++++++------ .../leaseArea/ArchiveAreaModal.tsx | 22 ++--- .../leaseArea/CustomDetailedPlan.tsx | 20 ++-- .../leaseArea/CustomDetailedPlanEdit.tsx | 40 ++++---- .../leaseSections/leaseArea/LeaseArea.tsx | 28 +++--- .../leaseSections/leaseArea/LeaseAreaEdit.tsx | 46 ++++----- .../leaseArea/LeaseAreaWithArchiceInfo.tsx | 26 ++--- .../LeaseAreaWithArchiveInfoEdit.tsx | 36 +++---- .../leaseSections/leaseArea/LeaseAreas.tsx | 22 ++--- .../leaseArea/LeaseAreasEdit.tsx | 40 ++++---- .../leaseSections/leaseArea/PlanUnitItem.tsx | 22 ++--- .../leaseArea/PlanUnitItemEdit.tsx | 28 +++--- .../leaseSections/leaseArea/PlotItem.tsx | 20 ++-- .../leaseSections/leaseArea/PlotItemEdit.tsx | 32 +++---- .../leaseSections/leaseInfo/LeaseInfo.tsx | 16 ++-- .../leaseSections/map/AreasLayer.tsx | 2 +- .../leaseSections/map/LeaseListLayer.tsx | 6 +- .../leaseSections/map/LeaseListMap.tsx | 30 +++--- .../leaseSections/map/PlanUnitsLayer.tsx | 4 +- .../leaseSections/map/PlotsLayer.tsx | 2 +- .../leaseSections/map/SingleLeaseMap.tsx | 36 +++---- .../leaseSections/rent/BasicInfo.tsx | 16 ++-- .../leaseSections/rent/BasicInfoEdit.tsx | 44 ++++----- .../leaseSections/rent/BasisOfRent.tsx | 34 +++---- .../leaseSections/rent/BasisOfRentEdit.tsx | 56 +++++------ .../BasisOfRentManagementSubventionEdit.tsx | 24 ++--- .../BasisOfRentTemporarySubventionEdit.tsx | 24 ++--- .../leaseSections/rent/BasisOfRents.tsx | 18 ++-- .../leaseSections/rent/BasisOfRentsEdit.tsx | 32 +++---- .../leaseSections/rent/CalculateRentTotal.tsx | 8 +- .../leaseSections/rent/ContractRentEdit.tsx | 34 +++---- .../leaseSections/rent/ContractRents.tsx | 22 ++--- .../leaseSections/rent/ContractRentsEdit.tsx | 32 +++---- .../leaseSections/rent/EqualizedRents.tsx | 12 +-- .../rent/FixedInitialYearRents.tsx | 22 ++--- .../rent/FixedInitialYearRentsEdit.tsx | 44 ++++----- .../leaseSections/rent/IndexAdjustedRents.tsx | 12 +-- .../leaseSections/rent/MastChildrenEdit.tsx | 14 +-- .../leaseSections/rent/PayableRents.tsx | 12 +-- .../leaseSections/rent/RentAdjustmentEdit.tsx | 52 +++++----- ...RentAdjustmentManagementSubventionEdit.tsx | 20 ++-- .../RentAdjustmentTemporarySubventionEdit.tsx | 20 ++-- .../leaseSections/rent/RentAdjustments.tsx | 30 +++--- .../rent/RentAdjustmentsEdit.tsx | 32 +++---- .../leaseSections/rent/RentItem.tsx | 18 ++-- .../leaseSections/rent/RentItemEdit.tsx | 26 ++--- .../components/leaseSections/rent/Rents.tsx | 40 ++++---- .../leaseSections/rent/RentsEdit.tsx | 50 +++++----- .../rent/SteppedDiscountForm.tsx | 16 ++-- .../rent/SteppedDiscountModal.tsx | 10 +- .../leaseSections/summary/LeaseHistory.tsx | 16 ++-- .../summary/LeaseHistoryEdit.tsx | 46 ++++----- .../summary/LeaseHistoryItem.tsx | 32 +++---- .../leaseSections/summary/Summary.tsx | 50 +++++----- .../leaseSections/summary/SummaryEdit.tsx | 50 +++++----- .../summary/SummaryLeaseInfo.tsx | 56 +++++------ .../leaseSections/tenant/OtherTenantItem.tsx | 38 ++++---- .../tenant/OtherTenantItemEdit.tsx | 46 ++++----- .../leaseSections/tenant/Tenant.tsx | 18 ++-- .../leaseSections/tenant/TenantItem.tsx | 30 +++--- .../leaseSections/tenant/TenantItemEdit.tsx | 62 ++++++------ .../leaseSections/tenant/Tenants.tsx | 28 +++--- .../leaseSections/tenant/TenantsEdit.tsx | 64 ++++++------- src/leases/components/search/Search.tsx | 36 +++---- src/leases/constants.ts | 2 +- src/leases/enums.ts | 2 +- src/leases/formValidators.ts | 12 +-- src/leases/helpers.ts | 28 +++--- src/leases/reducer.ts | 4 +- src/leases/requests.ts | 4 +- src/leases/requestsAsync.ts | 4 +- src/leases/saga.ts | 10 +- src/leases/selectors.ts | 2 +- src/leases/types.ts | 4 +- src/lessor/helpers.ts | 2 +- src/lessor/reducer.ts | 2 +- src/lessor/saga.ts | 2 +- src/lessor/selectors.ts | 2 +- src/lessor/types.ts | 2 +- src/penaltyInterest/actions.ts | 2 +- src/penaltyInterest/reducer.ts | 2 +- src/penaltyInterest/requests.ts | 6 +- src/penaltyInterest/saga.ts | 2 +- src/penaltyInterest/selectors.ts | 4 +- src/penaltyInterest/types.ts | 2 +- src/plotApplications/actions.ts | 2 +- .../components/PlotApplication.tsx | 54 +++++------ .../components/PlotApplicationCreate.tsx | 46 ++++----- .../components/PlotApplicationCreatePage.tsx | 56 +++++------ .../components/PlotApplicationEdit.tsx | 36 +++---- .../PlotApplicationOpeningRecordForm.tsx | 18 ++-- .../components/PlotApplicationPage.tsx | 68 ++++++------- .../PlotApplicationsListOpeningModal.tsx | 22 ++--- .../components/PlotApplicationsListPage.tsx | 62 ++++++------ .../exportModal/PlotSearchExportModal.tsx | 26 ++--- .../PlotSearchExportModalTargetTable.tsx | 8 +- .../PlotApplicationApplicantInfoCheck.tsx | 14 +-- .../PlotApplicationApplicantInfoCheckEdit.tsx | 10 +- .../PlotApplicationInfoCheckCollapse.tsx | 2 +- .../PlotApplicationTargetInfoCheck.tsx | 24 ++--- .../PlotApplicationTargetInfoCheckEdit.tsx | 46 ++++----- .../components/map/ApplicationListMap.tsx | 26 ++--- .../components/map/TargetListLayer.tsx | 2 +- .../components/search/Search.tsx | 30 +++--- src/plotApplications/constants.ts | 2 +- src/plotApplications/helpers.ts | 20 ++-- src/plotApplications/reducer.ts | 4 +- src/plotApplications/requests.ts | 6 +- src/plotApplications/saga.ts | 20 ++-- src/plotApplications/selectors.ts | 6 +- src/plotApplications/spec.ts | 6 +- src/plotApplications/types.ts | 4 +- src/plotSearch/actions.ts | 2 +- .../components/CreatePlotSearchForm.tsx | 14 +-- .../components/CreatePlotSearchModal.tsx | 4 +- .../components/PlotSearchListPage.tsx | 62 ++++++------ src/plotSearch/components/PlotSearchPage.tsx | 78 +++++++-------- .../DirectReservationLinkModal.tsx | 24 ++--- .../application/Application.tsx | 24 ++--- .../application/ApplicationEdit.tsx | 44 ++++----- .../application/ApplicationPreviewSection.tsx | 22 ++--- .../EditPlotApplicationSectionFieldForm.tsx | 32 +++---- .../EditPlotApplicationSectionForm.tsx | 40 ++++---- .../EditPlotApplicationSectionModal.tsx | 4 +- .../basicInfo/BasicInfo.tsx | 50 +++++----- .../basicInfo/BasicInfoDecisionEdit.tsx | 14 +-- .../basicInfo/BasicInfoEdit.tsx | 62 ++++++------ .../PlotSearchApplicationsOpeningSection.tsx | 26 ++--- .../PlotSearchReservationRecipients.tsx | 6 +- .../PlotSearchSiteCustomDetailedPlan.tsx | 30 +++--- .../basicInfo/PlotSearchSiteEdit.tsx | 52 +++++----- .../PlotSearchSiteEditCustomDetailedPlan.tsx | 24 ++--- .../basicInfo/PlotSearchSitePlanUnit.tsx | 32 +++---- .../basicInfo/PlotSearchTargetListing.tsx | 14 +-- .../basicInfo/SuggestedEdit.tsx | 14 +-- .../plotSearchSections/map/ApplicationMap.tsx | 18 ++-- .../ReservationIdentifiersModal.tsx | 38 ++++---- src/plotSearch/components/search/Search.tsx | 24 ++--- src/plotSearch/constants.ts | 6 +- src/plotSearch/helpers.ts | 16 ++-- src/plotSearch/reducer.ts | 6 +- src/plotSearch/requests.ts | 6 +- src/plotSearch/requestsAsync.ts | 4 +- src/plotSearch/saga.ts | 18 ++-- src/plotSearch/selectors.ts | 8 +- src/plotSearch/spec.ts | 14 +-- src/previewInvoices/reducer.ts | 4 +- src/previewInvoices/requests.ts | 6 +- src/previewInvoices/saga.ts | 2 +- src/previewInvoices/selectors.ts | 2 +- src/previewInvoices/types.ts | 2 +- src/relatedLease/requests.ts | 4 +- src/relatedLease/saga.ts | 6 +- src/relatedLease/types.ts | 2 +- src/rentForPeriod/reducer.ts | 2 +- src/rentForPeriod/requests.ts | 4 +- src/rentForPeriod/saga.ts | 2 +- src/rentForPeriod/selectors.ts | 4 +- src/rentForPeriod/types.ts | 2 +- src/rentbasis/components/NewRentBasisPage.tsx | 40 ++++---- src/rentbasis/components/RentBasisInfo.tsx | 10 +- .../components/RentBasisListPage.tsx | 44 ++++----- src/rentbasis/components/RentBasisPage.tsx | 66 ++++++------- .../components/forms/RentBasisForm.tsx | 44 ++++----- src/rentbasis/components/search/Search.tsx | 24 ++--- .../sections/basicInfo/RentBasisEdit.tsx | 4 +- .../sections/basicInfo/RentBasisReadonly.tsx | 26 ++--- .../sections/map/RentBasisLayer.tsx | 2 +- .../sections/map/SingleRentBasisMap.tsx | 30 +++--- src/rentbasis/constants.ts | 2 +- src/rentbasis/formValidators.ts | 2 +- src/rentbasis/helpers.ts | 10 +- src/rentbasis/reducer.ts | 2 +- src/rentbasis/requests.ts | 4 +- src/rentbasis/saga.ts | 6 +- src/rentbasis/selectors.ts | 2 +- src/root/Root.tsx | 2 +- src/root/configureStore.ts | 18 ++-- src/root/createRootReducer.ts | 96 +++++++++---------- src/root/createRootSaga.ts | 94 +++++++++--------- src/root/routes.tsx | 68 ++++++------- src/sapInvoice/actions.ts | 2 +- .../components/SapInvoicesListPage.tsx | 52 +++++----- src/sapInvoice/components/Search.tsx | 12 +-- src/sapInvoice/constants.ts | 2 +- src/sapInvoice/helpers.ts | 8 +- src/sapInvoice/reducer.ts | 2 +- src/sapInvoice/saga.ts | 4 +- src/sapInvoice/selectors.ts | 4 +- src/sapInvoice/types.ts | 2 +- src/serviceUnits/reducer.ts | 2 +- src/serviceUnits/requests.ts | 4 +- src/serviceUnits/saga.ts | 2 +- src/serviceUnits/selectors.ts | 2 +- src/serviceUnits/types.ts | 2 +- src/tradeRegister/actions.ts | 2 +- .../components/CompanyExtended.tsx | 30 +++--- .../components/CompanyNotice.tsx | 30 +++--- .../components/CompanyRepresent.tsx | 28 +++--- .../components/DownloadableFiles.tsx | 18 ++-- src/tradeRegister/components/Search.tsx | 16 ++-- .../components/TradeRegisterSearchPage.tsx | 28 +++--- .../components/TradeRegisterTemplate.tsx | 16 ++-- src/tradeRegister/reducer.ts | 2 +- src/tradeRegister/requests.ts | 4 +- src/tradeRegister/saga.ts | 2 +- src/tradeRegister/selectors.ts | 2 +- src/types.ts | 2 +- src/uiData/actions.ts | 2 +- src/uiData/helpers.ts | 2 +- src/uiData/reducer.ts | 2 +- src/uiData/requests.ts | 4 +- src/uiData/saga.ts | 4 +- src/uiData/selectors.ts | 4 +- src/users/helpers.ts | 2 +- src/users/reducer.ts | 2 +- src/users/requests.ts | 4 +- src/users/requestsAsync.ts | 4 +- src/users/saga.ts | 2 +- src/users/selectors.ts | 2 +- src/users/types.ts | 2 +- src/usersPermissions/reducer.ts | 2 +- src/usersPermissions/requests.ts | 4 +- src/usersPermissions/saga.ts | 2 +- src/usersPermissions/selectors.ts | 2 +- src/usersPermissions/types.ts | 2 +- src/util/forms.ts | 12 +-- src/util/helpers.tsx | 10 +- src/util/map.ts | 12 +-- src/util/testUtil.ts | 4 +- src/vat/reducer.ts | 2 +- src/vat/requests.ts | 4 +- src/vat/saga.ts | 2 +- src/vat/selectors.ts | 4 +- src/vat/types.ts | 2 +- 708 files changed, 5452 insertions(+), 5464 deletions(-) diff --git a/src/api/ApiErrorModal.tsx b/src/api/ApiErrorModal.tsx index 8cd98db7f..c4b6be914 100644 --- a/src/api/ApiErrorModal.tsx +++ b/src/api/ApiErrorModal.tsx @@ -2,8 +2,8 @@ import flowRight from "lodash/flowRight"; import React from "react"; import { Button } from "react-foundation"; -import { reveal } from "../foundation/reveal"; -import { Sizes } from "../foundation/enums"; +import { reveal } from "@/foundation/reveal"; +import { Sizes } from "@/foundation/enums"; const ApiErrorModal = ({ data, diff --git a/src/api/callApi.ts b/src/api/callApi.ts index 85ee74024..64d35f2db 100644 --- a/src/api/callApi.ts +++ b/src/api/callApi.ts @@ -1,6 +1,6 @@ import { call, select } from "redux-saga/effects"; -import { getApiToken } from "auth/selectors"; -import { UI_ACCEPT_LANGUAGE_VALUE } from "api/constants"; +import { getApiToken } from "@/auth/selectors"; +import { UI_ACCEPT_LANGUAGE_VALUE } from "@/api/constants"; function* callApi(request: Request): Generator { const apiToken = yield select(getApiToken); diff --git a/src/api/callApiAsync.ts b/src/api/callApiAsync.ts index 685947309..f5a79edec 100644 --- a/src/api/callApiAsync.ts +++ b/src/api/callApiAsync.ts @@ -1,6 +1,6 @@ -import { store } from "root/startApp"; -import { getApiToken } from "auth/selectors"; -import { UI_ACCEPT_LANGUAGE_VALUE } from "api/constants"; +import { store } from "@/index"; +import { getApiToken } from "@/auth/selectors"; +import { UI_ACCEPT_LANGUAGE_VALUE } from "@/api/constants"; import type { ApiSyncResponse } from "./types"; import type { ApiResponse } from "types"; diff --git a/src/api/callUploadRequest.ts b/src/api/callUploadRequest.ts index 36c5e7d68..e9b28d674 100644 --- a/src/api/callUploadRequest.ts +++ b/src/api/callUploadRequest.ts @@ -1,7 +1,7 @@ import { call, put, select } from "redux-saga/effects"; -import { receiveError } from "api/actions"; -import { getApiToken } from "auth/selectors"; -import { UI_ACCEPT_LANGUAGE_VALUE } from "api/constants"; +import { receiveError } from "@/api/actions"; +import { getApiToken } from "@/auth/selectors"; +import { UI_ACCEPT_LANGUAGE_VALUE } from "@/api/constants"; function* callUploadRequest(request: Request): Generator { const apiToken = yield select(getApiToken); diff --git a/src/api/createUrlWithoutVersionSuffix.ts b/src/api/createUrlWithoutVersionSuffix.ts index 9f472b730..5dd2bb97a 100644 --- a/src/api/createUrlWithoutVersionSuffix.ts +++ b/src/api/createUrlWithoutVersionSuffix.ts @@ -1,4 +1,4 @@ -import { getApiUrlWithOutVersionSuffix } from "util/helpers"; +import { getApiUrlWithOutVersionSuffix } from "@/util/helpers"; import { stringifyQuery } from "./createUrl"; export default ((url: string, params?: Record) => { const apiUrlWithOutVersionSuffix = getApiUrlWithOutVersionSuffix(); diff --git a/src/api/reducer.ts b/src/api/reducer.ts index bedae0a29..5e850c53d 100644 --- a/src/api/reducer.ts +++ b/src/api/reducer.ts @@ -1,6 +1,6 @@ import { combineReducers } from "redux"; import { handleActions } from "redux-actions"; -import type { Reducer } from "../types"; +import type { Reducer } from "@/types"; import type { ApiError, ReceiveErrorAction } from "./types"; export const errorReducer: Reducer = handleActions({ ['mvj/api/RECEIVE_ERROR']: (state, { diff --git a/src/api/selectors.ts b/src/api/selectors.ts index e417b985c..b02600a77 100644 --- a/src/api/selectors.ts +++ b/src/api/selectors.ts @@ -1,3 +1,3 @@ -import type { Selector } from "../types"; +import type { Selector } from "@/types"; import type { ApiError } from "./types"; export const getError: Selector = state => state.api.error; \ No newline at end of file diff --git a/src/api/types.ts b/src/api/types.ts index d89d59f8a..ca926a3d1 100644 --- a/src/api/types.ts +++ b/src/api/types.ts @@ -1,4 +1,4 @@ -import type { Action } from "../types"; +import type { Action } from "@/types"; export type ApiError = Record | null; export type ReceiveErrorAction = Action; export type ClearErrorAction = Action; diff --git a/src/app/App.tsx b/src/app/App.tsx index cd3170e68..836072382 100644 --- a/src/app/App.tsx +++ b/src/app/App.tsx @@ -5,29 +5,30 @@ import { withRouter } from "react-router"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; import get from "lodash/get"; -import { Sizes } from "foundation/enums"; -import { revealContext } from "foundation/reveal"; -import { ActionTypes, AppConsumer, AppProvider } from "app/AppContext"; -import ApiErrorModal from "api/ApiErrorModal"; -import ConfirmationModal from "components/modal/ConfirmationModal"; -import Loader from "components/loader/Loader"; -import LoginPage from "auth/components/LoginPage"; -import SideMenu from "components/sideMenu/SideMenu"; -import TopNavigation from "components/topNavigation/TopNavigation"; -import userManager from "auth/util/user-manager"; -import { Routes, getRouteById } from "root/routes"; -import { clearError } from "api/actions"; -import { clearApiToken, fetchApiToken } from "auth/actions"; -import { getEpochTime } from "util/helpers"; -import { getError } from "api/selectors"; -import { getApiToken, getApiTokenExpires, getIsFetching, getLoggedInUser } from "auth/selectors"; -import { getLinkUrl, getPageTitle, getShowSearch } from "components/topNavigation/selectors"; -import { getUserGroups, getUserActiveServiceUnit, getUserServiceUnits } from "usersPermissions/selectors"; -import { setRedirectUrlToSessionStorage } from "util/storage"; -import type { ApiError } from "../api/types"; -import type { ApiToken } from "../auth/types"; -import type { UserGroups, UserServiceUnit, UserServiceUnits } from "usersPermissions/types"; -import type { RootState } from "../root/types"; +import { Sizes } from "@/foundation/enums"; +import { revealContext } from "@/foundation/reveal"; +import { ActionTypes, AppConsumer, AppProvider } from "@/app/AppContext"; +import ApiErrorModal from "@/api/ApiErrorModal"; +import ConfirmationModal from "@/components/modal/ConfirmationModal"; +import Loader from "@/components/loader/Loader"; +import LoginPage from "@/auth/components/LoginPage"; +import SideMenu from "@/components/sideMenu/SideMenu"; +import TopNavigation from "@/components/topNavigation/TopNavigation"; +import userManager from "@/auth/util/user-manager"; +import { Routes, getRouteById } from "@/root/routes"; +import { clearError } from "@/api/actions"; +import { clearApiToken, fetchApiToken } from "@/auth/actions"; +import { getEpochTime } from "@/util/helpers"; +import { getError } from "@/api/selectors"; +import { getApiToken, getApiTokenExpires, getIsFetching, getLoggedInUser } from "@/auth/selectors"; +import { getLinkUrl, getPageTitle, getShowSearch } from "@/components/topNavigation/selectors"; +import { getUserGroups, getUserActiveServiceUnit, getUserServiceUnits } from "@/usersPermissions/selectors"; +import { setRedirectUrlToSessionStorage } from "@/util/storage"; +import type { ApiError } from "@/api/types"; +import type { ApiToken } from "@/auth/types"; +import type { UserGroups, UserServiceUnit, UserServiceUnits } from "@/usersPermissions/types"; +import type { RootState } from "@/root/types"; +import "@/main.scss"; const url = window.location.toString(); const IS_DEVELOPMENT_URL = url.includes('ninja') || url.includes('localhost'); type OwnProps = { diff --git a/src/application/actions.ts b/src/application/actions.ts index 77742705b..87db92e63 100644 --- a/src/application/actions.ts +++ b/src/application/actions.ts @@ -1,5 +1,5 @@ import { createAction } from "redux-actions"; -import type { ApplicantInfoCheckAttributesNotFoundAction, ApplicationRelatedAttachmentsNotFoundAction, AttachmentAttributesNotFoundAction, AttributesNotFoundAction, DeleteUploadAction, FetchApplicantInfoCheckAttributesAction, FetchApplicationRelatedAttachmentsAction, FetchAttachmentAttributesAction, FetchAttributesAction, FetchFormAttributesAction, FetchPendingUploadsAction, FormAttributesNotFoundAction, PendingUploadsNotFoundAction, ReceiveApplicantInfoCheckAttributesAction, ReceiveApplicationRelatedAttachmentsAction, ReceiveAttachmentAttributesAction, ReceiveAttachmentMethodsAction, ReceiveAttributesAction, ReceiveFileOperationFinishedAction, ReceiveFormAttributesAction, ReceiveMethodsAction, ReceivePendingUploadsAction, ReceiveUpdatedApplicantInfoCheckItemAction, ReceiveUpdatedTargetInfoCheckItemAction, UploadAttachmentPayload, UploadFileAction } from "application/types"; +import type { ApplicantInfoCheckAttributesNotFoundAction, ApplicationRelatedAttachmentsNotFoundAction, AttachmentAttributesNotFoundAction, AttributesNotFoundAction, DeleteUploadAction, FetchApplicantInfoCheckAttributesAction, FetchApplicationRelatedAttachmentsAction, FetchAttachmentAttributesAction, FetchAttributesAction, FetchFormAttributesAction, FetchPendingUploadsAction, FormAttributesNotFoundAction, PendingUploadsNotFoundAction, ReceiveApplicantInfoCheckAttributesAction, ReceiveApplicationRelatedAttachmentsAction, ReceiveAttachmentAttributesAction, ReceiveAttachmentMethodsAction, ReceiveAttributesAction, ReceiveFileOperationFinishedAction, ReceiveFormAttributesAction, ReceiveMethodsAction, ReceivePendingUploadsAction, ReceiveUpdatedApplicantInfoCheckItemAction, ReceiveUpdatedTargetInfoCheckItemAction, UploadAttachmentPayload, UploadFileAction } from "@/application/types"; import type { Attributes, Methods } from "types"; export const fetchAttributes = (): FetchAttributesAction => createAction('mvj/application/FETCH_ATTRIBUTES')(); export const receiveMethods = (methods: Methods): ReceiveMethodsAction => createAction('mvj/application/RECEIVE_METHODS')(methods); diff --git a/src/application/components/ApplicationAnswersField.tsx b/src/application/components/ApplicationAnswersField.tsx index d5071af1c..41b4115a5 100644 --- a/src/application/components/ApplicationAnswersField.tsx +++ b/src/application/components/ApplicationAnswersField.tsx @@ -1,11 +1,11 @@ import React from "react"; import { Column, Row } from "react-foundation"; -import FileDownloadLink from "components/file/FileDownloadLink"; -import FormTextTitle from "components/form/FormTextTitle"; -import FormText from "components/form/FormText"; -import ApplicationAnswersSection from "application/components/ApplicationAnswersSection"; -import { getApplicationAttachmentDownloadLink } from "application/helpers"; -import type { FormSection, SavedApplicationFormSection, SectionExtraComponentProps, UploadedFileMeta } from "application/types"; +import FileDownloadLink from "@/components/file/FileDownloadLink"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import FormText from "@/components/form/FormText"; +import ApplicationAnswersSection from "@/application/components/ApplicationAnswersSection"; +import { getApplicationAttachmentDownloadLink } from "@/application/helpers"; +import type { FormSection, SavedApplicationFormSection, SectionExtraComponentProps, UploadedFileMeta } from "@/application/types"; type Props = { section: FormSection; answer: SavedApplicationFormSection; diff --git a/src/application/components/ApplicationAnswersSection.tsx b/src/application/components/ApplicationAnswersSection.tsx index eb135a3e6..f4598ab98 100644 --- a/src/application/components/ApplicationAnswersSection.tsx +++ b/src/application/components/ApplicationAnswersSection.tsx @@ -1,8 +1,8 @@ import React from "react"; -import Collapse from "components/collapse/Collapse"; -import SubTitle from "components/content/SubTitle"; -import ApplicationAnswersField from "application/components/ApplicationAnswersField"; -import type { FormSection, SavedApplicationFormSection, SectionExtraComponentProps } from "application/types"; +import Collapse from "@/components/collapse/Collapse"; +import SubTitle from "@/components/content/SubTitle"; +import ApplicationAnswersField from "@/application/components/ApplicationAnswersField"; +import type { FormSection, SavedApplicationFormSection, SectionExtraComponentProps } from "@/application/types"; type Props = { section: FormSection; answer: SavedApplicationFormSection | Array; diff --git a/src/application/components/ApplicationSubsection.tsx b/src/application/components/ApplicationSubsection.tsx index bb3556c08..dab4104d3 100644 --- a/src/application/components/ApplicationSubsection.tsx +++ b/src/application/components/ApplicationSubsection.tsx @@ -2,28 +2,28 @@ import React, { Fragment, useCallback } from "react"; import { change, FieldArray, formValueSelector } from "redux-form"; import { connect } from "react-redux"; import { Column, Row } from "react-foundation"; -import AddButton from "components/form/AddButton"; -import RemoveButton from "components/form/RemoveButton"; -import FormField from "components/form/FormField"; -import AddFileButton from "components/form/AddFileButton"; -import FormTextTitle from "components/form/FormTextTitle"; -import FormText from "components/form/FormText"; -import Authorization from "components/authorization/Authorization"; -import FileDownloadLink from "components/file/FileDownloadLink"; -import LoadingIndicator from "components/multi-select/LoadingIndicator"; -import { ButtonColors } from "components/enums"; -import FormHintText from "components/form/FormHintText"; -import { formatDate, isFieldAllowedToRead } from "util/helpers"; -import { ConfirmationModalTexts } from "enums"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import { ApplicantTypes } from "application/enums"; -import { getApplicationAttachmentDownloadLink, getFieldFileIds, getSectionApplicantType, getSectionTemplate, valueToApplicantType } from "application/helpers"; -import { getAttachmentAttributes, getAttachmentMethods, getExistingUploads, getFieldTypeMapping, getIsFetchingApplicationRelatedAttachments, getIsFetchingAttachmentAttributes, getIsFetchingPendingUploads, getIsPerformingFileOperation, getPendingUploads } from "application/selectors"; -import { ApplicationSectionKeys } from "application/components/enums"; -import { APPLICANT_MAIN_IDENTIFIERS, APPLICANT_SECTION_IDENTIFIER, APPLICANT_TYPE_FIELD_IDENTIFIER, EMAIL_FIELD_IDENTIFIER, TARGET_SECTION_IDENTIFIER } from "application/constants"; -import { deleteUploadedAttachment, uploadAttachment } from "application/actions"; -import type { FormSection, PlotApplicationFormValue, UploadedFileMeta } from "application/types"; -import { companyIdentifierValidator, emailValidator, personalIdentifierValidator } from "application/formValidation"; +import AddButton from "@/components/form/AddButton"; +import RemoveButton from "@/components/form/RemoveButton"; +import FormField from "@/components/form/FormField"; +import AddFileButton from "@/components/form/AddFileButton"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import FormText from "@/components/form/FormText"; +import Authorization from "@/components/authorization/Authorization"; +import FileDownloadLink from "@/components/file/FileDownloadLink"; +import LoadingIndicator from "@/components/multi-select/LoadingIndicator"; +import { ButtonColors } from "@/components/enums"; +import FormHintText from "@/components/form/FormHintText"; +import { formatDate, isFieldAllowedToRead } from "@/util/helpers"; +import { ConfirmationModalTexts } from "@/enums"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import { ApplicantTypes } from "@/application/enums"; +import { getApplicationAttachmentDownloadLink, getFieldFileIds, getSectionApplicantType, getSectionTemplate, valueToApplicantType } from "@/application/helpers"; +import { getAttachmentAttributes, getAttachmentMethods, getExistingUploads, getFieldTypeMapping, getIsFetchingApplicationRelatedAttachments, getIsFetchingAttachmentAttributes, getIsFetchingPendingUploads, getIsPerformingFileOperation, getPendingUploads } from "@/application/selectors"; +import { ApplicationSectionKeys } from "@/application/components/enums"; +import { APPLICANT_MAIN_IDENTIFIERS, APPLICANT_SECTION_IDENTIFIER, APPLICANT_TYPE_FIELD_IDENTIFIER, EMAIL_FIELD_IDENTIFIER, TARGET_SECTION_IDENTIFIER } from "@/application/constants"; +import { deleteUploadedAttachment, uploadAttachment } from "@/application/actions"; +import type { FormSection, PlotApplicationFormValue, UploadedFileMeta } from "@/application/types"; +import { companyIdentifierValidator, emailValidator, personalIdentifierValidator } from "@/application/formValidation"; const ApplicationFormFileField = connect((state, props) => { const { formName, diff --git a/src/application/components/infoCheck/ApplicantInfoCheck.tsx b/src/application/components/infoCheck/ApplicantInfoCheck.tsx index ab637be46..938c139b9 100644 --- a/src/application/components/infoCheck/ApplicantInfoCheck.tsx +++ b/src/application/components/infoCheck/ApplicantInfoCheck.tsx @@ -1,7 +1,7 @@ import React, { Component } from "react"; import { Column, Row } from "react-foundation"; -import { getLabelOfOption } from "util/helpers"; -import { getUserFullName } from "users/helpers"; +import { getLabelOfOption } from "@/util/helpers"; +import { getUserFullName } from "@/users/helpers"; type Props = { infoChecks: Record; infoCheckStateOptions: any; diff --git a/src/application/components/infoCheck/ApplicantInfoCheckEdit.tsx b/src/application/components/infoCheck/ApplicantInfoCheckEdit.tsx index 3ebd042b7..73c19000f 100644 --- a/src/application/components/infoCheck/ApplicantInfoCheckEdit.tsx +++ b/src/application/components/infoCheck/ApplicantInfoCheckEdit.tsx @@ -2,11 +2,11 @@ import React, { Component } from "react"; import { Row } from "react-foundation"; import { connect } from "react-redux"; import { change } from "redux-form"; -import ApplicantInfoCheckModal from "application/components/infoCheck/ApplicantInfoCheckModal"; -import { ApplicantInfoCheckFieldPaths, ApplicantInfoCheckFieldTitles, ApplicantTypes } from "application/enums"; -import ApplicantInfoCheckEditItem from "application/components/infoCheck/ApplicantInfoCheckEditItem"; -import FormText from "components/form/FormText"; -import { getApplicantInfoCheckFormName } from "application/helpers"; +import ApplicantInfoCheckModal from "@/application/components/infoCheck/ApplicantInfoCheckModal"; +import { ApplicantInfoCheckFieldPaths, ApplicantInfoCheckFieldTitles, ApplicantTypes } from "@/application/enums"; +import ApplicantInfoCheckEditItem from "@/application/components/infoCheck/ApplicantInfoCheckEditItem"; +import FormText from "@/components/form/FormText"; +import { getApplicantInfoCheckFormName } from "@/application/helpers"; type OwnProps = { infoCheckIds: Array; answer: Record; diff --git a/src/application/components/infoCheck/ApplicantInfoCheckEditItem.tsx b/src/application/components/infoCheck/ApplicantInfoCheckEditItem.tsx index e8f8bfaef..a7e76b868 100644 --- a/src/application/components/infoCheck/ApplicantInfoCheckEditItem.tsx +++ b/src/application/components/infoCheck/ApplicantInfoCheckEditItem.tsx @@ -4,9 +4,9 @@ import { connect } from "react-redux"; import { getFormValues, reduxForm } from "redux-form"; import { Column, Row } from "react-foundation"; import classNames from "classnames"; -import { getApplicantInfoCheckAttributes } from "application/selectors"; -import { getFieldOptions, getLabelOfOption } from "util/helpers"; -import { getUserFullName } from "users/helpers"; +import { getApplicantInfoCheckAttributes } from "@/application/selectors"; +import { getFieldOptions, getLabelOfOption } from "@/util/helpers"; +import { getUserFullName } from "@/users/helpers"; import type { Attributes } from "types"; type OwnProps = { openModal: (...args: Array) => any; diff --git a/src/application/components/infoCheck/ApplicantInfoCheckForm.tsx b/src/application/components/infoCheck/ApplicantInfoCheckForm.tsx index d4666b882..160a9a38c 100644 --- a/src/application/components/infoCheck/ApplicantInfoCheckForm.tsx +++ b/src/application/components/infoCheck/ApplicantInfoCheckForm.tsx @@ -4,13 +4,13 @@ import { Column, Row } from "react-foundation"; import get from "lodash/get"; import flowRight from "lodash/flowRight"; import { connect } from "react-redux"; -import { FieldTypes, FormNames } from "enums"; -import { ButtonColors } from "components/enums"; -import FormField from "components/form/FormField"; -import ModalButtonWrapper from "components/modal/ModalButtonWrapper"; -import Button from "components/button/Button"; -import { ApplicantInfoCheckFieldPaths, ApplicantInfoCheckFieldTitles } from "application/enums"; -import { getApplicantInfoCheckAttributes } from "application/selectors"; +import { FieldTypes, FormNames } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import FormField from "@/components/form/FormField"; +import ModalButtonWrapper from "@/components/modal/ModalButtonWrapper"; +import Button from "@/components/button/Button"; +import { ApplicantInfoCheckFieldPaths, ApplicantInfoCheckFieldTitles } from "@/application/enums"; +import { getApplicantInfoCheckAttributes } from "@/application/selectors"; import type { Attributes } from "types"; type OwnProps = { infoCheck: Record; diff --git a/src/application/components/infoCheck/ApplicantInfoCheckModal.tsx b/src/application/components/infoCheck/ApplicantInfoCheckModal.tsx index 33b3b88c9..58c54e69f 100644 --- a/src/application/components/infoCheck/ApplicantInfoCheckModal.tsx +++ b/src/application/components/infoCheck/ApplicantInfoCheckModal.tsx @@ -1,12 +1,12 @@ import React, { Component } from "react"; -import Modal from "components/modal/Modal"; -import ModalButtonWrapper from "components/modal/ModalButtonWrapper"; -import Button from "components/button/Button"; -import ApplicantInfoCheckForm from "application/components/infoCheck/ApplicantInfoCheckForm"; -import TradeRegisterTemplate from "tradeRegister/components/TradeRegisterTemplate"; -import CreditDecisionTemplate from "creditDecision/components/CreditDecisionTemplate"; -import { ContactTypes } from "contacts/enums"; -import { ApplicantInfoCheckExternalTypes } from "application/enums"; +import Modal from "@/components/modal/Modal"; +import ModalButtonWrapper from "@/components/modal/ModalButtonWrapper"; +import Button from "@/components/button/Button"; +import ApplicantInfoCheckForm from "@/application/components/infoCheck/ApplicantInfoCheckForm"; +import TradeRegisterTemplate from "@/tradeRegister/components/TradeRegisterTemplate"; +import CreditDecisionTemplate from "@/creditDecision/components/CreditDecisionTemplate"; +import { ContactTypes } from "@/contacts/enums"; +import { ApplicantInfoCheckExternalTypes } from "@/application/enums"; type Props = { isOpen: boolean; onClose: (...args: Array) => any; diff --git a/src/application/constants.ts b/src/application/constants.ts index fe07ec4b0..33bf82771 100644 --- a/src/application/constants.ts +++ b/src/application/constants.ts @@ -1,4 +1,4 @@ -import { ApplicantTypes } from "application/enums"; +import { ApplicantTypes } from "@/application/enums"; export const APPLICANT_SECTION_IDENTIFIER = 'hakijan-tiedot'; export const TARGET_SECTION_IDENTIFIER = 'haettava-kohde'; export const APPLICANT_TYPE_FIELD_IDENTIFIER = 'hakija'; diff --git a/src/application/formValidation.ts b/src/application/formValidation.ts index 1eb4ab636..fb563e829 100644 --- a/src/application/formValidation.ts +++ b/src/application/formValidation.ts @@ -1,6 +1,6 @@ import { parseISO } from "date-fns"; import { get, set } from "lodash/object"; -import { CONTROL_SHARE_FIELD_IDENTIFIER } from "application/constants"; +import { CONTROL_SHARE_FIELD_IDENTIFIER } from "@/application/constants"; const PERSONAL_IDENTIFIER_CHECK_CHAR_LIST = '0123456789ABCDEFHJKLMNPRSTUVWXY'; // from the rightmost digit to the leftmost const COMPANY_IDENTIFIER_CHECKSUM_MULTIPLIERS = [2, 4, 8, 5, 10, 9, 7]; diff --git a/src/application/helpers.ts b/src/application/helpers.ts index a24a9860a..9bb2e30e5 100644 --- a/src/application/helpers.ts +++ b/src/application/helpers.ts @@ -1,15 +1,15 @@ import { formValueSelector } from "redux-form"; import _ from "lodash"; -import { FormNames } from "enums"; -import { ApplicantInfoCheckExternalTypes, ApplicantInfoCheckTypes, ApplicantTypes, TargetIdentifierTypes } from "application/enums"; -import { getContentUser } from "users/helpers"; -import createUrl from "api/createUrl"; -import { APPLICANT_MAIN_IDENTIFIERS, APPLICANT_SECTION_IDENTIFIER, TARGET_SECTION_IDENTIFIER } from "application/constants"; -import { store } from "root/startApp"; -import { displayUIMessage } from "util/helpers"; -import type { PlotSearch } from "plotSearch/types"; -import type { RootState } from "root/types"; -import type { ApplicationFormSection, Form, FormSection, PlotApplicationFormValue, SavedApplicationFormSection, UploadedFileMeta } from "application/types"; +import { FormNames } from "@/enums"; +import { ApplicantInfoCheckExternalTypes, ApplicantInfoCheckTypes, ApplicantTypes, TargetIdentifierTypes } from "@/application/enums"; +import { getContentUser } from "@/users/helpers"; +import createUrl from "@/api/createUrl"; +import { APPLICANT_MAIN_IDENTIFIERS, APPLICANT_SECTION_IDENTIFIER, TARGET_SECTION_IDENTIFIER } from "@/application/constants"; +import { store } from "@/index"; +import { displayUIMessage } from "@/util/helpers"; +import type { PlotSearch } from "@/plotSearch/types"; +import type { RootState } from "@/root/types"; +import type { ApplicationFormSection, Form, FormSection, PlotApplicationFormValue, SavedApplicationFormSection, UploadedFileMeta } from "@/application/types"; export const transformTargetSectionTitle = (plotSearch: PlotSearch): (...args: Array) => any => (title: string, section: FormSection, answer: SavedApplicationFormSection): string => { if (section.identifier === TARGET_SECTION_IDENTIFIER && answer?.metadata?.identifier) { const target = plotSearch?.plot_search_targets.find(target => target.id === answer.metadata?.identifier); diff --git a/src/application/reducer.ts b/src/application/reducer.ts index 118cc60ab..67b366d04 100644 --- a/src/application/reducer.ts +++ b/src/application/reducer.ts @@ -2,7 +2,7 @@ import type { Action } from "redux"; import { combineReducers } from "redux"; import { handleActions } from "redux-actions"; import type { Attributes, Methods, Reducer } from "types"; -import type { ApplicationState, ReceiveApplicantInfoCheckAttributesAction, ReceiveApplicationRelatedAttachmentsAction, ReceiveAttachmentAttributesAction, ReceiveAttachmentMethodsAction, ReceiveAttributesAction, ReceiveFormAttributesAction, ReceiveMethodsAction } from "application/types"; +import type { ApplicationState, ReceiveApplicantInfoCheckAttributesAction, ReceiveApplicationRelatedAttachmentsAction, ReceiveAttachmentAttributesAction, ReceiveAttachmentMethodsAction, ReceiveAttributesAction, ReceiveFormAttributesAction, ReceiveMethodsAction } from "@/application/types"; const attributesReducer: Reducer = handleActions({ ['mvj/application/RECEIVE_ATTRIBUTES']: (state: Attributes, { payload: attributes diff --git a/src/application/requests.ts b/src/application/requests.ts index ef97e59ee..6ece53c02 100644 --- a/src/application/requests.ts +++ b/src/application/requests.ts @@ -1,6 +1,6 @@ -import callApi from "api/callApi"; -import createUrl from "api/createUrl"; -import callUploadRequest from "api/callUploadRequest"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; +import callUploadRequest from "@/api/callUploadRequest"; import { UploadFileData } from "./types"; export const fetchAttributesRequest = (): Generator => { return callApi(new Request(createUrl('answer/'), { diff --git a/src/application/saga.ts b/src/application/saga.ts index b67b331b4..c96ae8a8c 100644 --- a/src/application/saga.ts +++ b/src/application/saga.ts @@ -1,12 +1,12 @@ import { all, call, fork, put, select, takeEvery, takeLatest } from "redux-saga/effects"; import { getFormValues, initialize } from "redux-form"; -import { applicantInfoCheckAttributesNotFound, applicationRelatedAttachmentsNotFound, attachmentAttributesNotFound, attributesNotFound, fetchApplicationRelatedAttachments, fetchPendingUploads, formAttributesNotFound, pendingUploadsNotFound, receiveApplicantInfoCheckAttributes, receiveApplicationRelatedAttachments, receiveAttachmentAttributes, receiveAttachmentMethods, receiveAttributes, receiveFileOperationFinished, receiveFormAttributes, receiveMethods, receivePendingUploads } from "application/actions"; -import { receiveError } from "api/actions"; -import { deleteUploadRequest, fetchApplicantInfoCheckAttributesRequest, fetchAttachmentAttributesRequest, fetchAttributesRequest, fetchFormAttributesRequest, fetchPendingUploadsRequest, fetchSingleApplicationAttachments, uploadFileRequest } from "application/requests"; -import { getApplicantInfoCheckFormName } from "application/helpers"; -import { getContentUser } from "users/helpers"; -import { displayUIMessage } from "util/helpers"; -import type { DeleteUploadAction, ReceiveUpdatedTargetInfoCheckItemAction, UploadFileAction } from "application/types"; +import { applicantInfoCheckAttributesNotFound, applicationRelatedAttachmentsNotFound, attachmentAttributesNotFound, attributesNotFound, fetchApplicationRelatedAttachments, fetchPendingUploads, formAttributesNotFound, pendingUploadsNotFound, receiveApplicantInfoCheckAttributes, receiveApplicationRelatedAttachments, receiveAttachmentAttributes, receiveAttachmentMethods, receiveAttributes, receiveFileOperationFinished, receiveFormAttributes, receiveMethods, receivePendingUploads } from "@/application/actions"; +import { receiveError } from "@/api/actions"; +import { deleteUploadRequest, fetchApplicantInfoCheckAttributesRequest, fetchAttachmentAttributesRequest, fetchAttributesRequest, fetchFormAttributesRequest, fetchPendingUploadsRequest, fetchSingleApplicationAttachments, uploadFileRequest } from "@/application/requests"; +import { getApplicantInfoCheckFormName } from "@/application/helpers"; +import { getContentUser } from "@/users/helpers"; +import { displayUIMessage } from "@/util/helpers"; +import type { DeleteUploadAction, ReceiveUpdatedTargetInfoCheckItemAction, UploadFileAction } from "@/application/types"; function* fetchAttributesSaga(): Generator { try { diff --git a/src/application/selectors.ts b/src/application/selectors.ts index c6bab8d53..897c5e2b4 100644 --- a/src/application/selectors.ts +++ b/src/application/selectors.ts @@ -1,5 +1,5 @@ -import type { Attributes, Methods, Selector } from "types"; -import type { RootState } from "root/types"; +import type { Attributes, Methods, Selector } from "@/types"; +import type { RootState } from "@/root/types"; export const getAttributes: Selector = (state: RootState): Attributes => state.application.attributes; export const getMethods: Selector = (state: RootState): Methods => state.application.methods; export const getIsFetchingAttributes: Selector = (state: RootState): boolean => state.application.isFetchingAttributes; diff --git a/src/application/spec.ts b/src/application/spec.ts index 1b26adb45..e7896170e 100644 --- a/src/application/spec.ts +++ b/src/application/spec.ts @@ -1,9 +1,9 @@ import { expect } from "chai"; -import applicationReducer from "application/reducer"; -import type { ApplicationState } from "application/types"; -import { attributesNotFound, fetchAttachmentAttributes, fetchAttributes, receiveAttachmentAttributes, receiveAttributes, receiveFormAttributes, receiveMethods } from "application/actions"; -import mockFormAttributes from "application/form-attributes-mock-data.json"; -import { companyIdentifierValidator, emailValidator, personalIdentifierValidator, validateApplicationForm } from "application/formValidation"; +import applicationReducer from "@/application/reducer"; +import type { ApplicationState } from "@/application/types"; +import { attributesNotFound, fetchAttachmentAttributes, fetchAttributes, receiveAttachmentAttributes, receiveAttributes, receiveFormAttributes, receiveMethods } from "@/application/actions"; +import mockFormAttributes from "@/application/form-attributes-mock-data.json"; +import { companyIdentifierValidator, emailValidator, personalIdentifierValidator, validateApplicationForm } from "@/application/formValidation"; import { get } from "lodash/object"; const baseState: ApplicationState = { attributes: null, diff --git a/src/areaNote/components/AreaNoteListPage.tsx b/src/areaNote/components/AreaNoteListPage.tsx index 86e451edf..6f79cf249 100644 --- a/src/areaNote/components/AreaNoteListPage.tsx +++ b/src/areaNote/components/AreaNoteListPage.tsx @@ -5,26 +5,26 @@ import { withRouter } from "react-router"; import { initialize } from "redux-form"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; -import AddButtonSecondary from "components/form/AddButtonSecondary"; -import AreaNotesEditMap from "areaNote/components/AreaNotesEditMap"; +import AddButtonSecondary from "@/components/form/AddButtonSecondary"; +import AreaNotesEditMap from "@/areaNote/components/AreaNotesEditMap"; import AreaNotesLayer from "./AreaNotesLayer"; -import Authorization from "components/authorization/Authorization"; -import AuthorizationError from "components/authorization/AuthorizationError"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import PageContainer from "components/content/PageContainer"; +import Authorization from "@/components/authorization/Authorization"; +import AuthorizationError from "@/components/authorization/AuthorizationError"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import PageContainer from "@/components/content/PageContainer"; import Search from "./search/Search"; -import { fetchAreaNoteList, hideEditMode, initializeAreaNote, showEditMode } from "areaNote/actions"; -import { receiveTopNavigationSettings } from "components/topNavigation/actions"; -import { FormNames, Methods, PermissionMissingTexts } from "enums"; -import { getAreaNoteById, getAreaNoteCoordinates } from "areaNote/helpers"; -import { getSearchQuery, getUrlParams, isMethodAllowed, setPageTitle } from "util/helpers"; -import { getBoundsFromCoordinates, getCenterFromCoordinates } from "util/map"; -import { getRouteById, Routes } from "root/routes"; -import { getAreaNoteList, getIsEditMode, getIsFetching } from "areaNote/selectors"; -import { withAreaNoteAttributes } from "components/attributes/AreaNoteAttributes"; +import { fetchAreaNoteList, hideEditMode, initializeAreaNote, showEditMode } from "@/areaNote/actions"; +import { receiveTopNavigationSettings } from "@/components/topNavigation/actions"; +import { FormNames, Methods, PermissionMissingTexts } from "@/enums"; +import { getAreaNoteById, getAreaNoteCoordinates } from "@/areaNote/helpers"; +import { getSearchQuery, getUrlParams, isMethodAllowed, setPageTitle } from "@/util/helpers"; +import { getBoundsFromCoordinates, getCenterFromCoordinates } from "@/util/map"; +import { getRouteById, Routes } from "@/root/routes"; +import { getAreaNoteList, getIsEditMode, getIsFetching } from "@/areaNote/selectors"; +import { withAreaNoteAttributes } from "@/components/attributes/AreaNoteAttributes"; import type { Methods as MethodsType } from "types"; -import type { AreaNoteList } from "areaNote/types"; +import type { AreaNoteList } from "@/areaNote/types"; type Props = { areaNoteMethods: MethodsType; areaNotes: AreaNoteList; diff --git a/src/areaNote/components/AreaNotesEditMap.tsx b/src/areaNote/components/AreaNotesEditMap.tsx index 53d91a236..1643b5e72 100644 --- a/src/areaNote/components/AreaNotesEditMap.tsx +++ b/src/areaNote/components/AreaNotesEditMap.tsx @@ -9,11 +9,11 @@ import throttle from "lodash/throttle"; import MapContainer from "./MapContainer"; import SaveConditionPanel from "./SaveConditionPanel"; import ZoomLevelWarning from "./ZoomLevelWarning"; -import { createAreaNote, deleteAreaNote, editAreaNote, hideEditMode } from "areaNote/actions"; -import { DEFAULT_CENTER, DEFAULT_ZOOM } from "util/constants"; -import { convertFeatureCollectionToFeature } from "areaNote/helpers"; -import { localizeMap } from "util/map"; -import { getInitialAreaNote, getIsEditMode } from "areaNote/selectors"; +import { createAreaNote, deleteAreaNote, editAreaNote, hideEditMode } from "@/areaNote/actions"; +import { DEFAULT_CENTER, DEFAULT_ZOOM } from "@/util/constants"; +import { convertFeatureCollectionToFeature } from "@/areaNote/helpers"; +import { localizeMap } from "@/util/map"; +import { getInitialAreaNote, getIsEditMode } from "@/areaNote/selectors"; localizeMap(); const SHAPE_COLOR = '#9c27b0'; const SHAPE_FILL_OPACITY = 0.5; diff --git a/src/areaNote/components/AreaNotesLayer.tsx b/src/areaNote/components/AreaNotesLayer.tsx index 2601b7247..9d5326ea8 100644 --- a/src/areaNote/components/AreaNotesLayer.tsx +++ b/src/areaNote/components/AreaNotesLayer.tsx @@ -1,14 +1,14 @@ import React, { Component } from "react"; import { connect } from "react-redux"; import { GeoJSON } from "react-leaflet"; -import { initializeAreaNote, showEditMode } from "areaNote/actions"; -import { Methods } from "enums"; -import { convertAreaNoteListToGeoJson, convertFeatureToFeatureCollection } from "areaNote/helpers"; -import { getUserFullName } from "users/helpers"; -import { formatDate, isMethodAllowed } from "util/helpers"; -import { getIsEditMode, getMethods as getAreaNoteMethods } from "areaNote/selectors"; +import { initializeAreaNote, showEditMode } from "@/areaNote/actions"; +import { Methods } from "@/enums"; +import { convertAreaNoteListToGeoJson, convertFeatureToFeatureCollection } from "@/areaNote/helpers"; +import { getUserFullName } from "@/users/helpers"; +import { formatDate, isMethodAllowed } from "@/util/helpers"; +import { getIsEditMode, getMethods as getAreaNoteMethods } from "@/areaNote/selectors"; import type { Methods as MethodsType } from "types"; -import type { AreaNoteList } from "areaNote/types"; +import type { AreaNoteList } from "@/areaNote/types"; type Props = { allowToEdit?: boolean; areaNoteMethods: MethodsType; diff --git a/src/areaNote/components/MapContainer.tsx b/src/areaNote/components/MapContainer.tsx index b960efc16..a9163ef4f 100644 --- a/src/areaNote/components/MapContainer.tsx +++ b/src/areaNote/components/MapContainer.tsx @@ -9,11 +9,11 @@ const { import FullscreenControl from "react-leaflet-fullscreen"; import proj4 from "proj4"; import "proj4leaflet"; -import GeoSearch from "components/map/GeoSearch"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import ZoomBox from "components/map/ZoomBox"; -import { MIN_ZOOM, MAX_ZOOM } from "util/constants"; +import GeoSearch from "@/components/map/GeoSearch"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import ZoomBox from "@/components/map/ZoomBox"; +import { MIN_ZOOM, MAX_ZOOM } from "@/util/constants"; const bounds = L.bounds([25440000, 6630000], [25571072, 6761072]); const CRS = new L.Proj.CRS('EPSG:3879', '+proj=tmerc +lat_0=0 +lon_0=25 +k=1 +x_0=25500000 +y_0=0 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 +units=m +no_defs', { resolutions: [256, 128, 64, 32, 16, 8, 4, 2, 1, 0.5, 0.25, 0.125, 0.0625, 0.03125], diff --git a/src/areaNote/components/SaveConditionPanel.tsx b/src/areaNote/components/SaveConditionPanel.tsx index f6de3640c..8684fb889 100644 --- a/src/areaNote/components/SaveConditionPanel.tsx +++ b/src/areaNote/components/SaveConditionPanel.tsx @@ -2,15 +2,15 @@ import React, { Component } from "react"; import { connect } from "react-redux"; import classNames from "classnames"; import { Row, Column } from "react-foundation"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import Authorization from "components/authorization/Authorization"; -import Button from "components/button/Button"; -import FormFieldLabel from "components/form/FormFieldLabel"; -import TextAreaInput from "components/inputs/TextAreaInput"; -import { ConfirmationModalTexts, Methods } from "enums"; -import { ButtonColors } from "components/enums"; -import { isMethodAllowed } from "util/helpers"; -import { getMethods as getAreaNoteMethods } from "areaNote/selectors"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import Authorization from "@/components/authorization/Authorization"; +import Button from "@/components/button/Button"; +import FormFieldLabel from "@/components/form/FormFieldLabel"; +import TextAreaInput from "@/components/inputs/TextAreaInput"; +import { ConfirmationModalTexts, Methods } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { isMethodAllowed } from "@/util/helpers"; +import { getMethods as getAreaNoteMethods } from "@/areaNote/selectors"; import type { Methods as MethodsType } from "types"; type Props = { areaNoteMethods: MethodsType; diff --git a/src/areaNote/components/search/Search.tsx b/src/areaNote/components/search/Search.tsx index 8438a78e4..2a01f071f 100644 --- a/src/areaNote/components/search/Search.tsx +++ b/src/areaNote/components/search/Search.tsx @@ -5,10 +5,10 @@ import { Row, Column } from "react-foundation"; import debounce from "lodash/debounce"; import flowRight from "lodash/flowRight"; import isEqual from "lodash/isEqual"; -import FormField from "components/form/FormField"; -import SearchClearLink from "components/search/SearchClearLink"; -import SearchContainer from "components/search/SearchContainer"; -import { FieldTypes, FormNames } from "enums"; +import FormField from "@/components/form/FormField"; +import SearchClearLink from "@/components/search/SearchClearLink"; +import SearchContainer from "@/components/search/SearchContainer"; +import { FieldTypes, FormNames } from "@/enums"; type Props = { formValues: Record; handleSubmit: (...args: Array) => any; diff --git a/src/areaNote/helpers.ts b/src/areaNote/helpers.ts index 3f5c27726..a05a6662e 100644 --- a/src/areaNote/helpers.ts +++ b/src/areaNote/helpers.ts @@ -1,5 +1,5 @@ import get from "lodash/get"; -import { getCoordinatesOfGeometry } from "util/map"; +import { getCoordinatesOfGeometry } from "@/util/map"; import type { AreaNote } from "./types"; /** diff --git a/src/areaNote/requests.ts b/src/areaNote/requests.ts index 43dcfc81f..2e3c01b9f 100644 --- a/src/areaNote/requests.ts +++ b/src/areaNote/requests.ts @@ -1,6 +1,6 @@ -import callApi from "../api/callApi"; -import createUrl from "../api/createUrl"; -import type { AreaNote, AreaNoteId } from "areaNote/types"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; +import type { AreaNote, AreaNoteId } from "@/areaNote/types"; export const fetchAttributes = (): Generator => { return callApi(new Request(createUrl(`area_note/`), { method: 'OPTIONS' diff --git a/src/areaNote/saga.ts b/src/areaNote/saga.ts index 7213bd136..1ce42eb2b 100644 --- a/src/areaNote/saga.ts +++ b/src/areaNote/saga.ts @@ -1,8 +1,8 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects"; import { SubmissionError } from "redux-form"; -import { receiveError } from "api/actions"; +import { receiveError } from "@/api/actions"; import { receiveAttributes, receiveMethods, attributesNotFound, hideEditMode, notFound, receiveAreaNoteList, receiveDeletedAreaNote, receiveEditedAreaNote } from "./actions"; -import { displayUIMessage } from "util/helpers"; +import { displayUIMessage } from "@/util/helpers"; import { createAreaNote, deleteAreaNote, editAreaNote, fetchAreaNotes, fetchAttributes } from "./requests"; function* fetchAttributesSaga(): Generator { diff --git a/src/areaNote/selectors.ts b/src/areaNote/selectors.ts index c8ef02385..c3521c133 100644 --- a/src/areaNote/selectors.ts +++ b/src/areaNote/selectors.ts @@ -1,5 +1,5 @@ import type { Attributes, Methods, Selector } from "types"; -import type { RootState } from "root/types"; +import type { RootState } from "@/root/types"; import type { AreaNoteList } from "./types"; export const getIsFetching: Selector = (state: RootState): boolean => state.areaNote.isFetching; export const getIsFetchingAttributes: Selector = (state: RootState): boolean => state.areaNote.isFetchingAttributes; diff --git a/src/areaSearch/actions.ts b/src/areaSearch/actions.ts index b6fcb7ce5..e2d8c1c61 100644 --- a/src/areaSearch/actions.ts +++ b/src/areaSearch/actions.ts @@ -1,5 +1,5 @@ import { createAction } from "redux-actions"; -import type { AreaSearchesByBBoxNotFoundAction, AreaSearchesNotFoundAction, AttributesNotFoundAction, FetchAreaSearchListAction, FetchAreaSearchListByBBoxAction, FetchAttributesAction, FetchSingleAreaSearchAction, ReceiveAreaSearchListAction, ReceiveAreaSearchListByBBoxAction, ReceiveAttributesAction, ReceiveMethodsAction, ReceiveSingleAreaSearchAction, SingleAreaSearchNotFoundAction, ClearFormValidFlagsAction, HideEditModeAction, ReceiveCollapseStatesAction, ReceiveFormValidFlagsAction, ReceiveIsSaveClickedAction, ShowEditModeAction, FetchListAttributesAction, ReceiveListAttributesAction, ReceiveListMethodsAction, ListAttributesNotFoundAction, ReceiveAreaSearchInfoCheckBatchEditSuccessAction, ReceiveAreaSearchInfoCheckBatchEditFailureAction, BatchEditAreaSearchInfoChecksAction, EditAreaSearchAction, ReceiveAreaSearchEditedAction, ReceiveAreaSearchEditFailedAction, CreateAreaSearchSpecsAction, ReceiveAreaSearchSpecsCreateFailedAction, ReceiveAreaSearchSpecsCreatedAction, CreateAreaSearchApplicationAction, ReceiveAreaSearchApplicationCreatedAction, ReceiveAreaSearchApplicationCreateFailedAction, DeleteAreaSearchAttachmentAction, UploadAreaSearchAttachmentAction, ReceiveFileOperationFinishedAction, ReceiveFileOperationFailedAction, SetAreaSearchAttachmentsAction, UploadedAreaSearchAttachmentMeta } from "areaSearch/types"; +import type { AreaSearchesByBBoxNotFoundAction, AreaSearchesNotFoundAction, AttributesNotFoundAction, FetchAreaSearchListAction, FetchAreaSearchListByBBoxAction, FetchAttributesAction, FetchSingleAreaSearchAction, ReceiveAreaSearchListAction, ReceiveAreaSearchListByBBoxAction, ReceiveAttributesAction, ReceiveMethodsAction, ReceiveSingleAreaSearchAction, SingleAreaSearchNotFoundAction, ClearFormValidFlagsAction, HideEditModeAction, ReceiveCollapseStatesAction, ReceiveFormValidFlagsAction, ReceiveIsSaveClickedAction, ShowEditModeAction, FetchListAttributesAction, ReceiveListAttributesAction, ReceiveListMethodsAction, ListAttributesNotFoundAction, ReceiveAreaSearchInfoCheckBatchEditSuccessAction, ReceiveAreaSearchInfoCheckBatchEditFailureAction, BatchEditAreaSearchInfoChecksAction, EditAreaSearchAction, ReceiveAreaSearchEditedAction, ReceiveAreaSearchEditFailedAction, CreateAreaSearchSpecsAction, ReceiveAreaSearchSpecsCreateFailedAction, ReceiveAreaSearchSpecsCreatedAction, CreateAreaSearchApplicationAction, ReceiveAreaSearchApplicationCreatedAction, ReceiveAreaSearchApplicationCreateFailedAction, DeleteAreaSearchAttachmentAction, UploadAreaSearchAttachmentAction, ReceiveFileOperationFinishedAction, ReceiveFileOperationFailedAction, SetAreaSearchAttachmentsAction, UploadedAreaSearchAttachmentMeta } from "@/areaSearch/types"; import type { Attributes, Methods } from "types"; export const hideEditMode = (): HideEditModeAction => createAction('mvj/areaSearch/HIDE_EDIT')(); export const showEditMode = (): ShowEditModeAction => createAction('mvj/areaSearch/SHOW_EDIT')(); diff --git a/src/areaSearch/components/AreaSearchApplicantInfoCheck.tsx b/src/areaSearch/components/AreaSearchApplicantInfoCheck.tsx index ad74eb890..a036699ff 100644 --- a/src/areaSearch/components/AreaSearchApplicantInfoCheck.tsx +++ b/src/areaSearch/components/AreaSearchApplicantInfoCheck.tsx @@ -1,10 +1,10 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; -import { getFieldOptions } from "util/helpers"; +import { getFieldOptions } from "@/util/helpers"; import type { Attributes } from "types"; -import ApplicantInfoCheck from "application/components/infoCheck/ApplicantInfoCheck"; -import { getApplicantInfoCheckAttributes } from "application/selectors"; -import { getApplicantInfoCheckItems } from "application/helpers"; +import ApplicantInfoCheck from "@/application/components/infoCheck/ApplicantInfoCheck"; +import { getApplicantInfoCheckAttributes } from "@/application/selectors"; +import { getApplicantInfoCheckItems } from "@/application/helpers"; type OwnProps = { infoCheckData: Array>; }; diff --git a/src/areaSearch/components/AreaSearchApplicantInfoCheckEdit.tsx b/src/areaSearch/components/AreaSearchApplicantInfoCheckEdit.tsx index 4936d9f41..e6307f108 100644 --- a/src/areaSearch/components/AreaSearchApplicantInfoCheckEdit.tsx +++ b/src/areaSearch/components/AreaSearchApplicantInfoCheckEdit.tsx @@ -1,10 +1,10 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import { change } from "redux-form"; -import PlotApplicationInfoCheckCollapse from "plotApplications/components/infoCheck/PlotApplicationInfoCheckCollapse"; -import { getApplicantInfoCheckSubmissionErrors, getApplicationApplicantInfoCheckData } from "areaSearch/selectors"; -import ApplicantInfoCheckEdit from "application/components/infoCheck/ApplicantInfoCheckEdit"; -import { getApplicantInfoCheckFormName } from "application/helpers"; +import PlotApplicationInfoCheckCollapse from "@/plotApplications/components/infoCheck/PlotApplicationInfoCheckCollapse"; +import { getApplicantInfoCheckSubmissionErrors, getApplicationApplicantInfoCheckData } from "@/areaSearch/selectors"; +import ApplicantInfoCheckEdit from "@/application/components/infoCheck/ApplicantInfoCheckEdit"; +import { getApplicantInfoCheckFormName } from "@/application/helpers"; type OwnProps = { section: Record; identifier: string; diff --git a/src/areaSearch/components/AreaSearchApplication.tsx b/src/areaSearch/components/AreaSearchApplication.tsx index a950796a2..1bb774a81 100644 --- a/src/areaSearch/components/AreaSearchApplication.tsx +++ b/src/areaSearch/components/AreaSearchApplication.tsx @@ -4,32 +4,32 @@ import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; import orderBy from "lodash/orderBy"; import { Column, Row } from "react-foundation"; -import { getAttributes, getCurrentAreaSearch } from "areaSearch/selectors"; -import ApplicationAnswersSection from "application/components/ApplicationAnswersSection"; -import { formatDate, formatDateRange, formatNumber, getFieldAttributes, getFieldOptions, getLabelOfOption } from "util/helpers"; +import { getAttributes, getCurrentAreaSearch } from "@/areaSearch/selectors"; +import ApplicationAnswersSection from "@/application/components/ApplicationAnswersSection"; +import { formatDate, formatDateRange, formatNumber, getFieldAttributes, getFieldOptions, getLabelOfOption } from "@/util/helpers"; import type { Attributes } from "types"; -import { reshapeSavedApplicationObject } from "plotApplications/helpers"; -import { transformApplicantSectionTitle, getAreaSearchApplicationAttachmentDownloadLink } from "application/helpers"; -import Title from "components/content/Title"; -import Divider from "components/content/Divider"; -import Collapse from "components/collapse/Collapse"; -import Loader from "components/loader/Loader"; -import FormTextTitle from "components/form/FormTextTitle"; -import FormText from "components/form/FormText"; -import { AreaSearchFieldTitles } from "areaSearch/enums"; -import { getUserFullName } from "users/helpers"; -import SubTitle from "components/content/SubTitle"; -import FileDownloadLink from "components/file/FileDownloadLink"; -import { getAreaFromGeoJSON } from "util/map"; -import SingleAreaSearchMap from "areaSearch/components/map/SingleAreaSearchMap"; -import AreaSearchApplicationPropertyIdentifiers from "areaSearch/components/AreaSearchApplicationPropertyIdentifiers"; -import AreaSearchApplicantInfoCheck from "areaSearch/components/AreaSearchApplicantInfoCheck"; -import { transformApplicantInfoCheckTitle } from "areaSearch/helpers"; -import TitleH3 from "components/content/TitleH3"; -import AreaSearchStatusNoteHistory from "areaSearch/components/AreaSearchStatusNoteHistory"; -import { getFormAttributes, getIsFetchingFormAttributes } from "application/selectors"; -import { APPLICANT_SECTION_IDENTIFIER } from "application/constants"; -import type { Form } from "application/types"; +import { reshapeSavedApplicationObject } from "@/plotApplications/helpers"; +import { transformApplicantSectionTitle, getAreaSearchApplicationAttachmentDownloadLink } from "@/application/helpers"; +import Title from "@/components/content/Title"; +import Divider from "@/components/content/Divider"; +import Collapse from "@/components/collapse/Collapse"; +import Loader from "@/components/loader/Loader"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import FormText from "@/components/form/FormText"; +import { AreaSearchFieldTitles } from "@/areaSearch/enums"; +import { getUserFullName } from "@/users/helpers"; +import SubTitle from "@/components/content/SubTitle"; +import FileDownloadLink from "@/components/file/FileDownloadLink"; +import { getAreaFromGeoJSON } from "@/util/map"; +import SingleAreaSearchMap from "@/areaSearch/components/map/SingleAreaSearchMap"; +import AreaSearchApplicationPropertyIdentifiers from "@/areaSearch/components/AreaSearchApplicationPropertyIdentifiers"; +import AreaSearchApplicantInfoCheck from "@/areaSearch/components/AreaSearchApplicantInfoCheck"; +import { transformApplicantInfoCheckTitle } from "@/areaSearch/helpers"; +import TitleH3 from "@/components/content/TitleH3"; +import AreaSearchStatusNoteHistory from "@/areaSearch/components/AreaSearchStatusNoteHistory"; +import { getFormAttributes, getIsFetchingFormAttributes } from "@/application/selectors"; +import { APPLICANT_SECTION_IDENTIFIER } from "@/application/constants"; +import type { Form } from "@/application/types"; type OwnProps = {}; type Props = OwnProps & { areaSearch: Record | null; diff --git a/src/areaSearch/components/AreaSearchApplicationAuditLog.tsx b/src/areaSearch/components/AreaSearchApplicationAuditLog.tsx index 6ac91f625..3cb456a15 100644 --- a/src/areaSearch/components/AreaSearchApplicationAuditLog.tsx +++ b/src/areaSearch/components/AreaSearchApplicationAuditLog.tsx @@ -1,21 +1,21 @@ import React, { Fragment, PureComponent } from "react"; import { connect } from "react-redux"; import isEmpty from "lodash/isEmpty"; -import AuditLogTable from "components/auditLog/AuditLogTable"; -import Divider from "components/content/Divider"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import Pagination from "components/table/Pagination"; -import TableWrapper from "components/table/TableWrapper"; -import Title from "components/content/Title"; -import { fetchAuditLogByAreaSearch } from "auditLog/actions"; -import { LIST_TABLE_PAGE_SIZE } from "util/constants"; -import { AreaSearchFieldPaths, AreaSearchFieldTitles } from "areaSearch/enums"; -import { getApiResponseCount, getApiResponseMaxPage, getApiResponseResults } from "util/helpers"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { getAuditLogByAreaSearch, getIsFetchingByAreaSearch } from "auditLog/selectors"; -import { getIsEditMode } from "leases/selectors"; -import type { AuditLogList } from "auditLog/types"; +import AuditLogTable from "@/components/auditLog/AuditLogTable"; +import Divider from "@/components/content/Divider"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import Pagination from "@/components/table/Pagination"; +import TableWrapper from "@/components/table/TableWrapper"; +import Title from "@/components/content/Title"; +import { fetchAuditLogByAreaSearch } from "@/auditLog/actions"; +import { LIST_TABLE_PAGE_SIZE } from "@/util/constants"; +import { AreaSearchFieldPaths, AreaSearchFieldTitles } from "@/areaSearch/enums"; +import { getApiResponseCount, getApiResponseMaxPage, getApiResponseResults } from "@/util/helpers"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { getAuditLogByAreaSearch, getIsFetchingByAreaSearch } from "@/auditLog/selectors"; +import { getIsEditMode } from "@/leases/selectors"; +import type { AuditLogList } from "@/auditLog/types"; type Props = { auditLogList: AuditLogList; fetchAuditLogByAreaSearch: (...args: Array) => any; diff --git a/src/areaSearch/components/AreaSearchApplicationCreateForm.tsx b/src/areaSearch/components/AreaSearchApplicationCreateForm.tsx index 9b7dc505b..474aaa415 100644 --- a/src/areaSearch/components/AreaSearchApplicationCreateForm.tsx +++ b/src/areaSearch/components/AreaSearchApplicationCreateForm.tsx @@ -2,12 +2,12 @@ import React, { Component } from "react"; import { connect } from "react-redux"; import { flowRight } from "lodash/util"; import { getFormValues, reduxForm } from "redux-form"; -import ApplicationSubsection from "application/components/ApplicationSubsection"; -import { getInitialApplicationForm } from "application/helpers"; -import { getFieldTypeMapping } from "application/selectors"; -import { FormNames } from "enums"; -import { receiveFormValidFlags } from "areaSearch/actions"; -import { validateApplicationForm } from "application/formValidation"; +import ApplicationSubsection from "@/application/components/ApplicationSubsection"; +import { getInitialApplicationForm } from "@/application/helpers"; +import { getFieldTypeMapping } from "@/application/selectors"; +import { FormNames } from "@/enums"; +import { receiveFormValidFlags } from "@/areaSearch/actions"; +import { validateApplicationForm } from "@/application/formValidation"; type OwnProps = { formData: any; }; diff --git a/src/areaSearch/components/AreaSearchApplicationCreatePage.tsx b/src/areaSearch/components/AreaSearchApplicationCreatePage.tsx index 647fedfe4..81faaa30e 100644 --- a/src/areaSearch/components/AreaSearchApplicationCreatePage.tsx +++ b/src/areaSearch/components/AreaSearchApplicationCreatePage.tsx @@ -2,28 +2,28 @@ import React, { Component } from "react"; import { connect } from "react-redux"; import { flowRight } from "lodash/util"; import { destroy, getFormValues, initialize, isDirty } from "redux-form"; -import { getRouteById, Routes } from "root/routes"; -import FullWidthContainer from "components/content/FullWidthContainer"; -import PageNavigationWrapper from "components/content/PageNavigationWrapper"; -import ControlButtonBar from "components/controlButtons/ControlButtonBar"; -import ControlButtons from "components/controlButtons/ControlButtons"; -import Tabs from "components/tabs/Tabs"; -import TabContent from "components/tabs/TabContent"; -import TabPane from "components/tabs/TabPane"; -import PageContainer from "components/content/PageContainer"; -import ContentContainer from "components/content/ContentContainer"; -import AreaSearchApplicationCreateSpecs from "areaSearch/components/AreaSearchApplicationCreateSpecs"; -import { createAreaSearchApplication, createAreaSearchSpecs, deleteUploadedAttachment, fetchAttributes, hideEditMode, receiveIsSaveClicked, receiveSingleAreaSearch, showEditMode, uploadAttachment } from "areaSearch/actions"; -import { getAttributes, getCurrentAreaSearch, getIsFetchingAttributes, getIsFormValidById, getIsSaveClicked, getIsPerformingFileOperation, getIsSubmittingAreaSearchSpecs, getIsSubmittingAreaSearchApplication } from "areaSearch/selectors"; -import { setPageTitle } from "util/helpers"; -import Loader from "components/loader/Loader"; -import AreaSearchApplicationCreateForm from "areaSearch/components/AreaSearchApplicationCreateForm"; -import { FormNames } from "enums"; -import { getInitialAreaSearchCreateForm, prepareAreaSearchDataForSubmission } from "areaSearch/helpers"; +import { getRouteById, Routes } from "@/root/routes"; +import FullWidthContainer from "@/components/content/FullWidthContainer"; +import PageNavigationWrapper from "@/components/content/PageNavigationWrapper"; +import ControlButtonBar from "@/components/controlButtons/ControlButtonBar"; +import ControlButtons from "@/components/controlButtons/ControlButtons"; +import Tabs from "@/components/tabs/Tabs"; +import TabContent from "@/components/tabs/TabContent"; +import TabPane from "@/components/tabs/TabPane"; +import PageContainer from "@/components/content/PageContainer"; +import ContentContainer from "@/components/content/ContentContainer"; +import AreaSearchApplicationCreateSpecs from "@/areaSearch/components/AreaSearchApplicationCreateSpecs"; +import { createAreaSearchApplication, createAreaSearchSpecs, deleteUploadedAttachment, fetchAttributes, hideEditMode, receiveIsSaveClicked, receiveSingleAreaSearch, showEditMode, uploadAttachment } from "@/areaSearch/actions"; +import { getAttributes, getCurrentAreaSearch, getIsFetchingAttributes, getIsFormValidById, getIsSaveClicked, getIsPerformingFileOperation, getIsSubmittingAreaSearchSpecs, getIsSubmittingAreaSearchApplication } from "@/areaSearch/selectors"; +import { setPageTitle } from "@/util/helpers"; +import Loader from "@/components/loader/Loader"; +import AreaSearchApplicationCreateForm from "@/areaSearch/components/AreaSearchApplicationCreateForm"; +import { FormNames } from "@/enums"; +import { getInitialAreaSearchCreateForm, prepareAreaSearchDataForSubmission } from "@/areaSearch/helpers"; import type { Attributes } from "types"; -import { getFormAttributes, getIsFetchingFormAttributes } from "application/selectors"; -import { fetchFormAttributes } from "application/actions"; -import type { UploadedFileMeta } from "application/types"; +import { getFormAttributes, getIsFetchingFormAttributes } from "@/application/selectors"; +import { fetchFormAttributes } from "@/application/actions"; +import type { UploadedFileMeta } from "@/application/types"; type OwnProps = {}; type Props = OwnProps & { history: Record; diff --git a/src/areaSearch/components/AreaSearchApplicationCreateSpecs.tsx b/src/areaSearch/components/AreaSearchApplicationCreateSpecs.tsx index 2a6d6bb97..2e7548a48 100644 --- a/src/areaSearch/components/AreaSearchApplicationCreateSpecs.tsx +++ b/src/areaSearch/components/AreaSearchApplicationCreateSpecs.tsx @@ -4,19 +4,19 @@ import { connect } from "react-redux"; import { Column, Row } from "react-foundation"; import get from "lodash/get"; import { flowRight } from "lodash/util"; -import Title from "components/content/Title"; -import { FieldTypes, FormNames } from "enums"; -import { getAttributes, getIsPerformingFileOperation, getIsSaveClicked, getIsSubmittingAreaSearchSpecs } from "areaSearch/selectors"; +import Title from "@/components/content/Title"; +import { FieldTypes, FormNames } from "@/enums"; +import { getAttributes, getIsPerformingFileOperation, getIsSaveClicked, getIsSubmittingAreaSearchSpecs } from "@/areaSearch/selectors"; import type { Attributes } from "types"; -import Authorization from "components/authorization/Authorization"; -import FormField from "components/form/FormField"; -import AreaSearchMap from "areaSearch/components/map/AreaSearchMap"; -import FormFieldLabel from "components/form/FormFieldLabel"; -import { createAreaSearchSpecs, receiveFormValidFlags } from "areaSearch/actions"; -import AddFileButton from "components/form/AddFileButton"; -import RemoveButton from "components/form/RemoveButton"; -import type { UploadedFileMeta } from "application/types"; -import { nonEmptyGeometry } from "areaSearch/validators"; +import Authorization from "@/components/authorization/Authorization"; +import FormField from "@/components/form/FormField"; +import AreaSearchMap from "@/areaSearch/components/map/AreaSearchMap"; +import FormFieldLabel from "@/components/form/FormFieldLabel"; +import { createAreaSearchSpecs, receiveFormValidFlags } from "@/areaSearch/actions"; +import AddFileButton from "@/components/form/AddFileButton"; +import RemoveButton from "@/components/form/RemoveButton"; +import type { UploadedFileMeta } from "@/application/types"; +import { nonEmptyGeometry } from "@/areaSearch/validators"; import { startOfToday } from "date-fns"; type OwnProps = { onFileAdded: (...args: Array) => any; diff --git a/src/areaSearch/components/AreaSearchApplicationEdit.tsx b/src/areaSearch/components/AreaSearchApplicationEdit.tsx index 44d0909fa..1a24bf71c 100644 --- a/src/areaSearch/components/AreaSearchApplicationEdit.tsx +++ b/src/areaSearch/components/AreaSearchApplicationEdit.tsx @@ -6,38 +6,38 @@ import orderBy from "lodash/orderBy"; import get from "lodash/get"; import { Column, Row } from "react-foundation"; import { reduxForm } from "redux-form"; -import { getAttributes, getCurrentAreaSearch } from "areaSearch/selectors"; -import ApplicationAnswersSection from "application/components/ApplicationAnswersSection"; -import { formatDate, formatDateRange, formatNumber, getFieldAttributes, getFieldOptions, getLabelOfOption, displayUIMessage } from "util/helpers"; +import { getAttributes, getCurrentAreaSearch } from "@/areaSearch/selectors"; +import ApplicationAnswersSection from "@/application/components/ApplicationAnswersSection"; +import { formatDate, formatDateRange, formatNumber, getFieldAttributes, getFieldOptions, getLabelOfOption, displayUIMessage } from "@/util/helpers"; import type { Attributes } from "types"; -import { reshapeSavedApplicationObject } from "plotApplications/helpers"; -import { transformApplicantSectionTitle, getAreaSearchApplicationAttachmentDownloadLink } from "application/helpers"; -import Title from "components/content/Title"; -import Divider from "components/content/Divider"; -import Collapse from "components/collapse/Collapse"; -import Loader from "components/loader/Loader"; -import FormTextTitle from "components/form/FormTextTitle"; -import FormText from "components/form/FormText"; -import { AreaSearchFieldTitles } from "areaSearch/enums"; -import { getUserFullName } from "users/helpers"; -import SubTitle from "components/content/SubTitle"; -import FileDownloadLink from "components/file/FileDownloadLink"; -import { getAreaFromGeoJSON } from "util/map"; -import SingleAreaSearchMap from "areaSearch/components/map/SingleAreaSearchMap"; -import AreaSearchApplicationPropertyIdentifiers from "areaSearch/components/AreaSearchApplicationPropertyIdentifiers"; -import AreaSearchApplicantInfoCheckEdit from "areaSearch/components/AreaSearchApplicantInfoCheckEdit"; -import { FieldTypes, FormNames } from "enums"; -import { getInitialAreaSearchEditForm, transformApplicantInfoCheckTitle } from "areaSearch/helpers"; -import FormField from "components/form/FormField"; -import TitleH3 from "components/content/TitleH3"; -import AreaSearchStatusNoteHistory from "areaSearch/components/AreaSearchStatusNoteHistory"; -import { getFormAttributes, getIsFetchingFormAttributes, getIsPerformingFileOperation } from "application/selectors"; -import { APPLICANT_SECTION_IDENTIFIER } from "application/constants"; -import type { Form } from "application/types"; -import type { AreaSearch, UploadedAreaSearchAttachmentMeta } from "areaSearch/types"; -import AddFileButton from "components/form/AddFileButton"; -import { uploadAttachment, setAreaSearchAttachments } from "areaSearch/actions"; -import RemoveButton from "components/form/RemoveButton"; +import { reshapeSavedApplicationObject } from "@/plotApplications/helpers"; +import { transformApplicantSectionTitle, getAreaSearchApplicationAttachmentDownloadLink } from "@/application/helpers"; +import Title from "@/components/content/Title"; +import Divider from "@/components/content/Divider"; +import Collapse from "@/components/collapse/Collapse"; +import Loader from "@/components/loader/Loader"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import FormText from "@/components/form/FormText"; +import { AreaSearchFieldTitles } from "@/areaSearch/enums"; +import { getUserFullName } from "@/users/helpers"; +import SubTitle from "@/components/content/SubTitle"; +import FileDownloadLink from "@/components/file/FileDownloadLink"; +import { getAreaFromGeoJSON } from "@/util/map"; +import SingleAreaSearchMap from "@/areaSearch/components/map/SingleAreaSearchMap"; +import AreaSearchApplicationPropertyIdentifiers from "@/areaSearch/components/AreaSearchApplicationPropertyIdentifiers"; +import AreaSearchApplicantInfoCheckEdit from "@/areaSearch/components/AreaSearchApplicantInfoCheckEdit"; +import { FieldTypes, FormNames } from "@/enums"; +import { getInitialAreaSearchEditForm, transformApplicantInfoCheckTitle } from "@/areaSearch/helpers"; +import FormField from "@/components/form/FormField"; +import TitleH3 from "@/components/content/TitleH3"; +import AreaSearchStatusNoteHistory from "@/areaSearch/components/AreaSearchStatusNoteHistory"; +import { getFormAttributes, getIsFetchingFormAttributes, getIsPerformingFileOperation } from "@/application/selectors"; +import { APPLICANT_SECTION_IDENTIFIER } from "@/application/constants"; +import type { Form } from "@/application/types"; +import type { AreaSearch, UploadedAreaSearchAttachmentMeta } from "@/areaSearch/types"; +import AddFileButton from "@/components/form/AddFileButton"; +import { uploadAttachment, setAreaSearchAttachments } from "@/areaSearch/actions"; +import RemoveButton from "@/components/form/RemoveButton"; type Props = { areaSearch: AreaSearch | null; isFetchingFormAttributes: boolean; diff --git a/src/areaSearch/components/AreaSearchApplicationListPage.tsx b/src/areaSearch/components/AreaSearchApplicationListPage.tsx index 62bbe0e59..b5671834e 100644 --- a/src/areaSearch/components/AreaSearchApplicationListPage.tsx +++ b/src/areaSearch/components/AreaSearchApplicationListPage.tsx @@ -7,46 +7,46 @@ import { Row, Column } from "react-foundation"; import { formValueSelector, initialize, reduxForm } from "redux-form"; import { withRouter } from "react-router"; import debounce from "lodash/debounce"; -import AuthorizationError from "components/authorization/AuthorizationError"; -import { FieldTypes, FormNames, Methods, PermissionMissingTexts } from "enums"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import PageContainer from "components/content/PageContainer"; -import Pagination from "components/table/Pagination"; -import { receiveTopNavigationSettings } from "components/topNavigation/actions"; -import Search from "areaSearch/components/search/Search"; -import { LIST_TABLE_PAGE_SIZE } from "util/constants"; -import SortableTable from "components/table/SortableTable"; -import TableFilters from "components/table/TableFilters"; -import TableFilterWrapper from "components/table/TableFilterWrapper"; -import TableWrapper from "components/table/TableWrapper"; -import IconRadioButtons from "components/button/IconRadioButtons"; -import TableIcon from "components/icons/TableIcon"; -import MapIcon from "components/icons/MapIcon"; -import { getRouteById, Routes } from "root/routes"; -import { formatDate, getLabelOfOption, setPageTitle, getFieldOptions, getSearchQuery, getApiResponseCount, getApiResponseMaxPage, getUrlParams, isMethodAllowed } from "util/helpers"; -import { withAreaSearchAttributes } from "components/attributes/AreaSearchAttributes"; -import { getAreaSearchList, getAreaSearchListByBBox, getIsEditingAreaSearch, getIsFetchingAreaSearchList, getIsFetchingAreaSearchListByBBox, getLastAreaSearchEditError } from "areaSearch/selectors"; -import { DEFAULT_AREA_SEARCH_STATES, DEFAULT_SORT_KEY, DEFAULT_SORT_ORDER } from "areaSearch/constants"; -import { editAreaSearch, fetchAreaSearchList, fetchAreaSearchListByBBox } from "areaSearch/actions"; -import { getUserFullName } from "users/helpers"; -import { areaSearchSearchFilters } from "areaSearch/helpers"; -import { BOUNDING_BOX_FOR_SEARCH_QUERY, MAX_ZOOM_LEVEL_TO_FETCH_AREA_SEARCHES } from "areaSearch/constants"; -import AreaSearchListMap from "areaSearch/components/map/AreaSearchListMap"; -import VisualisationTypeWrapper from "components/table/VisualisationTypeWrapper"; -import { ButtonColors } from "components/enums"; -import Button from "components/button/Button"; -import EditAreaSearchPreparerModal from "areaSearch/components/EditAreaSearchPreparerModal"; -import Authorization from "components/authorization/Authorization"; -import AddButtonSecondary from "components/form/AddButtonSecondary"; -import FormField from "components/form/FormField"; +import AuthorizationError from "@/components/authorization/AuthorizationError"; +import { FieldTypes, FormNames, Methods, PermissionMissingTexts } from "@/enums"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import PageContainer from "@/components/content/PageContainer"; +import Pagination from "@/components/table/Pagination"; +import { receiveTopNavigationSettings } from "@/components/topNavigation/actions"; +import Search from "@/areaSearch/components/search/Search"; +import { LIST_TABLE_PAGE_SIZE } from "@/util/constants"; +import SortableTable from "@/components/table/SortableTable"; +import TableFilters from "@/components/table/TableFilters"; +import TableFilterWrapper from "@/components/table/TableFilterWrapper"; +import TableWrapper from "@/components/table/TableWrapper"; +import IconRadioButtons from "@/components/button/IconRadioButtons"; +import TableIcon from "@/components/icons/TableIcon"; +import MapIcon from "@/components/icons/MapIcon"; +import { getRouteById, Routes } from "@/root/routes"; +import { formatDate, getLabelOfOption, setPageTitle, getFieldOptions, getSearchQuery, getApiResponseCount, getApiResponseMaxPage, getUrlParams, isMethodAllowed } from "@/util/helpers"; +import { withAreaSearchAttributes } from "@/components/attributes/AreaSearchAttributes"; +import { getAreaSearchList, getAreaSearchListByBBox, getIsEditingAreaSearch, getIsFetchingAreaSearchList, getIsFetchingAreaSearchListByBBox, getLastAreaSearchEditError } from "@/areaSearch/selectors"; +import { DEFAULT_AREA_SEARCH_STATES, DEFAULT_SORT_KEY, DEFAULT_SORT_ORDER } from "@/areaSearch/constants"; +import { editAreaSearch, fetchAreaSearchList, fetchAreaSearchListByBBox } from "@/areaSearch/actions"; +import { getUserFullName } from "@/users/helpers"; +import { areaSearchSearchFilters } from "@/areaSearch/helpers"; +import { BOUNDING_BOX_FOR_SEARCH_QUERY, MAX_ZOOM_LEVEL_TO_FETCH_AREA_SEARCHES } from "@/areaSearch/constants"; +import AreaSearchListMap from "@/areaSearch/components/map/AreaSearchListMap"; +import VisualisationTypeWrapper from "@/components/table/VisualisationTypeWrapper"; +import { ButtonColors } from "@/components/enums"; +import Button from "@/components/button/Button"; +import EditAreaSearchPreparerModal from "@/areaSearch/components/EditAreaSearchPreparerModal"; +import Authorization from "@/components/authorization/Authorization"; +import AddButtonSecondary from "@/components/form/AddButtonSecondary"; +import FormField from "@/components/form/FormField"; import type { Attributes, Methods as MethodsType } from "types"; import type { ApiResponse } from "types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; -import AreaSearchExportModal from "areaSearch/components/AreaSearchExportModal"; -import { getUserActiveServiceUnit } from "usersPermissions/selectors"; -import type { UserServiceUnit } from "usersPermissions/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; +import AreaSearchExportModal from "@/areaSearch/components/AreaSearchExportModal"; +import { getUserActiveServiceUnit } from "@/usersPermissions/selectors"; +import type { UserServiceUnit } from "@/usersPermissions/types"; const VisualizationTypes = { MAP: 'map', TABLE: 'table' diff --git a/src/areaSearch/components/AreaSearchApplicationPage.tsx b/src/areaSearch/components/AreaSearchApplicationPage.tsx index 6ba7e9cc0..42797a087 100644 --- a/src/areaSearch/components/AreaSearchApplicationPage.tsx +++ b/src/areaSearch/components/AreaSearchApplicationPage.tsx @@ -7,40 +7,40 @@ import isEmpty from "lodash/isEmpty"; import { groupBy } from "lodash/collection"; import { initialize, isDirty, destroy, getFormValues, isValid, change } from "redux-form"; import type { ContextRouter } from "react-router"; -import AuthorizationError from "components/authorization/AuthorizationError"; -import FullWidthContainer from "components/content/FullWidthContainer"; -import PageContainer from "components/content/PageContainer"; -import { ButtonColors } from "components/enums"; -import Loader from "components/loader/Loader"; -import TabContent from "components/tabs/TabContent"; -import TabPane from "components/tabs/TabPane"; -import Tabs from "components/tabs/Tabs"; -import ContentContainer from "components/content/ContentContainer"; -import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "usersPermissions/selectors"; -import PageNavigationWrapper from "components/content/PageNavigationWrapper"; -import ControlButtonBar from "components/controlButtons/ControlButtonBar"; -import ControlButtons from "components/controlButtons/ControlButtons"; -import { receiveTopNavigationSettings } from "components/topNavigation/actions"; -import { getRouteById, Routes } from "root/routes"; -import { ConfirmationModalTexts, FormNames, Methods, PermissionMissingTexts } from "enums"; -import { getIsEditMode, getIsSaveClicked, getIsFormValidFlags, getCurrentAreaSearch, getIsFetchingCurrentAreaSearch } from "areaSearch/selectors"; -import { showEditMode, receiveIsSaveClicked, hideEditMode, clearFormValidFlags, receiveFormValidFlags, fetchSingleAreaSearch, batchEditAreaSearchInfoChecks } from "areaSearch/actions"; -import { getUrlParams, setPageTitle, isMethodAllowed, getSearchQuery, scrollToTopPage } from "util/helpers"; -import { clearUnsavedChanges } from "contacts/helpers"; -import ConfirmationModal from "components/modal/ConfirmationModal"; -import AreaSearchApplication from "areaSearch/components/AreaSearchApplication"; -import { withAreaSearchAttributes } from "components/attributes/AreaSearchAttributes"; -import AreaSearchApplicationEdit from "areaSearch/components/AreaSearchApplicationEdit"; -import AreaSearchApplicationAuditLog from "areaSearch/components/AreaSearchApplicationAuditLog"; -import { fetchApplicantInfoCheckAttributes, fetchFormAttributes } from "application/actions"; -import { getFormAttributes, getIsFetchingApplicantInfoCheckAttributes, getIsFetchingFormAttributes } from "application/selectors"; -import { getApplicationApplicantInfoCheckData } from "areaSearch/selectors"; -import { getApplicantInfoCheckFormName, getApplicantInfoCheckItems, prepareApplicantInfoCheckForSubmission } from "application/helpers"; -import { prepareAreaSearchForSubmission } from "areaSearch/helpers"; +import AuthorizationError from "@/components/authorization/AuthorizationError"; +import FullWidthContainer from "@/components/content/FullWidthContainer"; +import PageContainer from "@/components/content/PageContainer"; +import { ButtonColors } from "@/components/enums"; +import Loader from "@/components/loader/Loader"; +import TabContent from "@/components/tabs/TabContent"; +import TabPane from "@/components/tabs/TabPane"; +import Tabs from "@/components/tabs/Tabs"; +import ContentContainer from "@/components/content/ContentContainer"; +import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "@/usersPermissions/selectors"; +import PageNavigationWrapper from "@/components/content/PageNavigationWrapper"; +import ControlButtonBar from "@/components/controlButtons/ControlButtonBar"; +import ControlButtons from "@/components/controlButtons/ControlButtons"; +import { receiveTopNavigationSettings } from "@/components/topNavigation/actions"; +import { getRouteById, Routes } from "@/root/routes"; +import { ConfirmationModalTexts, FormNames, Methods, PermissionMissingTexts } from "@/enums"; +import { getIsEditMode, getIsSaveClicked, getIsFormValidFlags, getCurrentAreaSearch, getIsFetchingCurrentAreaSearch } from "@/areaSearch/selectors"; +import { showEditMode, receiveIsSaveClicked, hideEditMode, clearFormValidFlags, receiveFormValidFlags, fetchSingleAreaSearch, batchEditAreaSearchInfoChecks } from "@/areaSearch/actions"; +import { getUrlParams, setPageTitle, isMethodAllowed, getSearchQuery, scrollToTopPage } from "@/util/helpers"; +import { clearUnsavedChanges } from "@/contacts/helpers"; +import ConfirmationModal from "@/components/modal/ConfirmationModal"; +import AreaSearchApplication from "@/areaSearch/components/AreaSearchApplication"; +import { withAreaSearchAttributes } from "@/components/attributes/AreaSearchAttributes"; +import AreaSearchApplicationEdit from "@/areaSearch/components/AreaSearchApplicationEdit"; +import AreaSearchApplicationAuditLog from "@/areaSearch/components/AreaSearchApplicationAuditLog"; +import { fetchApplicantInfoCheckAttributes, fetchFormAttributes } from "@/application/actions"; +import { getFormAttributes, getIsFetchingApplicantInfoCheckAttributes, getIsFetchingFormAttributes } from "@/application/selectors"; +import { getApplicationApplicantInfoCheckData } from "@/areaSearch/selectors"; +import { getApplicantInfoCheckFormName, getApplicantInfoCheckItems, prepareApplicantInfoCheckForSubmission } from "@/application/helpers"; +import { prepareAreaSearchForSubmission } from "@/areaSearch/helpers"; import type { Attributes, Methods as MethodsType } from "types"; -import type { InfoCheckBatchEditData } from "areaSearch/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; -import SingleAreaSearchMap from "areaSearch/components/map/SingleAreaSearchMap"; +import type { InfoCheckBatchEditData } from "@/areaSearch/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; +import SingleAreaSearchMap from "@/areaSearch/components/map/SingleAreaSearchMap"; type OwnProps = {}; type Props = ContextRouter & OwnProps & { clearFormValidFlags: (...args: Array) => any; diff --git a/src/areaSearch/components/AreaSearchApplicationPropertyIdentifiers.tsx b/src/areaSearch/components/AreaSearchApplicationPropertyIdentifiers.tsx index 29d544bb7..fff302f9b 100644 --- a/src/areaSearch/components/AreaSearchApplicationPropertyIdentifiers.tsx +++ b/src/areaSearch/components/AreaSearchApplicationPropertyIdentifiers.tsx @@ -1,6 +1,6 @@ import React, { Component, Fragment } from "react"; -import Button from "components/button/Button"; -import { ButtonColors } from "components/enums"; +import Button from "@/components/button/Button"; +import { ButtonColors } from "@/components/enums"; type Props = { ids: Array | null | undefined; }; diff --git a/src/areaSearch/components/AreaSearchExportModal.tsx b/src/areaSearch/components/AreaSearchExportModal.tsx index 244e9dc6b..3ae1eb1a9 100644 --- a/src/areaSearch/components/AreaSearchExportModal.tsx +++ b/src/areaSearch/components/AreaSearchExportModal.tsx @@ -2,15 +2,15 @@ import React, { Component } from "react"; import { formValueSelector, reduxForm } from "redux-form"; import { flowRight } from "lodash/util"; import { connect } from "react-redux"; -import Modal from "components/modal/Modal"; -import ModalButtonWrapper from "components/modal/ModalButtonWrapper"; -import Button from "components/button/Button"; -import { ButtonColors } from "components/enums"; -import FileDownloadButton from "components/file/FileDownloadButton"; -import FormField from "components/form/FormField"; -import { FieldTypes, FormNames } from "enums"; -import type { RootState } from "root/types"; -import createUrl from "api/createUrl"; +import Modal from "@/components/modal/Modal"; +import ModalButtonWrapper from "@/components/modal/ModalButtonWrapper"; +import Button from "@/components/button/Button"; +import { ButtonColors } from "@/components/enums"; +import FileDownloadButton from "@/components/file/FileDownloadButton"; +import FormField from "@/components/form/FormField"; +import { FieldTypes, FormNames } from "@/enums"; +import type { RootState } from "@/root/types"; +import createUrl from "@/api/createUrl"; type OwnProps = { isOpen: boolean; onClose: () => void; diff --git a/src/areaSearch/components/AreaSearchStatusNoteHistory.tsx b/src/areaSearch/components/AreaSearchStatusNoteHistory.tsx index 94a9138ee..321448900 100644 --- a/src/areaSearch/components/AreaSearchStatusNoteHistory.tsx +++ b/src/areaSearch/components/AreaSearchStatusNoteHistory.tsx @@ -1,7 +1,7 @@ import React, { Component } from "react"; -import Collapse from "components/collapse/Collapse"; -import { formatDate } from "util/helpers"; -import { getUserFullName } from "users/helpers"; +import Collapse from "@/components/collapse/Collapse"; +import { formatDate } from "@/util/helpers"; +import { getUserFullName } from "@/users/helpers"; type Props = { statusNotes: Array> | null | undefined; }; diff --git a/src/areaSearch/components/EditAreaSearchPreparerForm.tsx b/src/areaSearch/components/EditAreaSearchPreparerForm.tsx index 4227e2fa0..5cb02575f 100644 --- a/src/areaSearch/components/EditAreaSearchPreparerForm.tsx +++ b/src/areaSearch/components/EditAreaSearchPreparerForm.tsx @@ -4,16 +4,16 @@ import { getFormValues, reduxForm } from "redux-form"; import { connect } from "react-redux"; import { Column, Row } from "react-foundation"; import get from "lodash/get"; -import { editAreaSearch } from "areaSearch/actions"; -import FormField from "components/form/FormField"; -import { getAttributes } from "areaSearch/selectors"; -import { AreaSearchFieldTitles } from "areaSearch/enums"; -import { FieldTypes, FormNames } from "enums"; -import Button from "components/button/Button"; -import { ButtonColors } from "components/enums"; -import { getInitialAreaSearchEditForm } from "areaSearch/helpers"; -import ModalButtonWrapper from "components/modal/ModalButtonWrapper"; -import AreaSearchStatusNoteHistory from "areaSearch/components/AreaSearchStatusNoteHistory"; +import { editAreaSearch } from "@/areaSearch/actions"; +import FormField from "@/components/form/FormField"; +import { getAttributes } from "@/areaSearch/selectors"; +import { AreaSearchFieldTitles } from "@/areaSearch/enums"; +import { FieldTypes, FormNames } from "@/enums"; +import Button from "@/components/button/Button"; +import { ButtonColors } from "@/components/enums"; +import { getInitialAreaSearchEditForm } from "@/areaSearch/helpers"; +import ModalButtonWrapper from "@/components/modal/ModalButtonWrapper"; +import AreaSearchStatusNoteHistory from "@/areaSearch/components/AreaSearchStatusNoteHistory"; import type { Attributes } from "types"; type OwnProps = { onClose: (...args: Array) => any; diff --git a/src/areaSearch/components/EditAreaSearchPreparerModal.tsx b/src/areaSearch/components/EditAreaSearchPreparerModal.tsx index f7bfc8a42..76c2ff00e 100644 --- a/src/areaSearch/components/EditAreaSearchPreparerModal.tsx +++ b/src/areaSearch/components/EditAreaSearchPreparerModal.tsx @@ -1,10 +1,10 @@ import React, { Component } from "react"; -import Modal from "components/modal/Modal"; -import EditAreaSearchPreparerForm from "areaSearch/components/EditAreaSearchPreparerForm"; -import { getAreaSearchList } from "areaSearch/selectors"; +import Modal from "@/components/modal/Modal"; +import EditAreaSearchPreparerForm from "@/areaSearch/components/EditAreaSearchPreparerForm"; +import { getAreaSearchList } from "@/areaSearch/selectors"; import { connect } from "react-redux"; -import { formatDate } from "util/helpers"; -import FormText from "components/form/FormText"; +import { formatDate } from "@/util/helpers"; +import FormText from "@/components/form/FormText"; type OwnProps = { allowToChangeRelateTo?: boolean; isOpen: boolean; diff --git a/src/areaSearch/components/map/AreaSearchLayer.tsx b/src/areaSearch/components/map/AreaSearchLayer.tsx index 8752dd730..6abbb20da 100644 --- a/src/areaSearch/components/map/AreaSearchLayer.tsx +++ b/src/areaSearch/components/map/AreaSearchLayer.tsx @@ -3,10 +3,10 @@ import { withRouter } from "react-router"; import { FeatureGroup, GeoJSON, Popup } from "react-leaflet"; import flowRight from "lodash/flowRight"; import { Link } from "react-router-dom"; -import { getRouteById, Routes } from "root/routes"; +import { getRouteById, Routes } from "@/root/routes"; import type { Attributes, LeafletGeoJson } from "types"; -import { withAreaSearchAttributes } from "components/attributes/AreaSearchAttributes"; -import { formatDate, getFieldOptions, getLabelOfOption } from "util/helpers"; +import { withAreaSearchAttributes } from "@/components/attributes/AreaSearchAttributes"; +import { formatDate, getFieldOptions, getLabelOfOption } from "@/util/helpers"; type OwnProps = { color: string; areaSearchesGeoJson: LeafletGeoJson; diff --git a/src/areaSearch/components/map/AreaSearchListMap.tsx b/src/areaSearch/components/map/AreaSearchListMap.tsx index f42b479d9..f24ab6abd 100644 --- a/src/areaSearch/components/map/AreaSearchListMap.tsx +++ b/src/areaSearch/components/map/AreaSearchListMap.tsx @@ -3,19 +3,19 @@ import { connect } from "react-redux"; import { withRouter } from "react-router"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; -import AreaNotesEditMap from "areaNote/components/AreaNotesEditMap"; -import { DEFAULT_ZOOM, MAP_COLORS } from "util/constants"; -import { getApiResponseResults, getUrlParams } from "util/helpers"; -import { getBoundsFromBBox, getBoundsFromFeatures } from "util/map"; -import { getAreaNoteList } from "areaNote/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import AreaSearchLayer from "areaSearch/components/map/AreaSearchLayer"; -import { getAreaSearchListByBBox } from "areaSearch/selectors"; -import { getAreaSearchGeoJson } from "areaSearch/helpers"; -import { MAX_ZOOM_LEVEL_TO_FETCH_AREA_SEARCHES } from "areaSearch/constants"; +import AreaNotesEditMap from "@/areaNote/components/AreaNotesEditMap"; +import { DEFAULT_ZOOM, MAP_COLORS } from "@/util/constants"; +import { getApiResponseResults, getUrlParams } from "@/util/helpers"; +import { getBoundsFromBBox, getBoundsFromFeatures } from "@/util/map"; +import { getAreaNoteList } from "@/areaNote/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import AreaSearchLayer from "@/areaSearch/components/map/AreaSearchLayer"; +import { getAreaSearchListByBBox } from "@/areaSearch/selectors"; +import { getAreaSearchGeoJson } from "@/areaSearch/helpers"; +import { MAX_ZOOM_LEVEL_TO_FETCH_AREA_SEARCHES } from "@/areaSearch/constants"; import type { ApiResponse, LeafletGeoJson } from "types"; -import type { AreaNoteList } from "areaNote/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { AreaNoteList } from "@/areaNote/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; const getMapBounds = () => { const { diff --git a/src/areaSearch/components/map/AreaSearchMap.tsx b/src/areaSearch/components/map/AreaSearchMap.tsx index a98106061..99eb5f322 100644 --- a/src/areaSearch/components/map/AreaSearchMap.tsx +++ b/src/areaSearch/components/map/AreaSearchMap.tsx @@ -3,9 +3,9 @@ import { FeatureGroup } from "react-leaflet"; import { EditControl } from "react-leaflet-draw"; import throttle from "lodash/throttle"; import classNames from "classnames"; -import MapContainer from "areaNote/components/MapContainer"; -import { DEFAULT_CENTER, DEFAULT_ZOOM } from "util/constants"; -import { convertFeatureCollectionToFeature } from "areaNote/helpers"; +import MapContainer from "@/areaNote/components/MapContainer"; +import { DEFAULT_CENTER, DEFAULT_ZOOM } from "@/util/constants"; +import { convertFeatureCollectionToFeature } from "@/areaNote/helpers"; const SHAPE_COLOR = '#9c27b0'; const SHAPE_FILL_OPACITY = 0.5; const SHAPE_ERROR_COLOR = '#bd2719'; diff --git a/src/areaSearch/components/map/SingleAreaSearchMap.tsx b/src/areaSearch/components/map/SingleAreaSearchMap.tsx index ed56749c5..9df457b3a 100644 --- a/src/areaSearch/components/map/SingleAreaSearchMap.tsx +++ b/src/areaSearch/components/map/SingleAreaSearchMap.tsx @@ -1,11 +1,11 @@ import React, { Component } from "react"; import { FeatureGroup, GeoJSON } from "react-leaflet"; import classNames from "classnames"; -import { DEFAULT_CENTER, DEFAULT_ZOOM } from "util/constants"; -import MapContainer from "areaNote/components/MapContainer"; -import { getBoundsFromFeatures, getCenterFromCoordinates, getCoordinatesOfGeometry } from "util/map"; +import { DEFAULT_CENTER, DEFAULT_ZOOM } from "@/util/constants"; +import MapContainer from "@/areaNote/components/MapContainer"; +import { getBoundsFromFeatures, getCenterFromCoordinates, getCoordinatesOfGeometry } from "@/util/map"; import type { LeafletFeatureGeometry } from "types"; -import { getAreaSearchFeatures } from "areaSearch/helpers"; +import { getAreaSearchFeatures } from "@/areaSearch/helpers"; type Props = { geometry: LeafletFeatureGeometry; minimap?: boolean; diff --git a/src/areaSearch/components/search/Search.tsx b/src/areaSearch/components/search/Search.tsx index fd637ca38..72dcd2128 100644 --- a/src/areaSearch/components/search/Search.tsx +++ b/src/areaSearch/components/search/Search.tsx @@ -7,21 +7,21 @@ import debounce from "lodash/debounce"; import flowRight from "lodash/flowRight"; import isEqual from "lodash/isEqual"; import isEmpty from "lodash/isEmpty"; -import { getFieldOptions, getUrlParams } from "util/helpers"; -import FormField from "components/form/FormField"; -import SearchClearLink from "components/search/SearchClearLink"; -import SearchChangeTypeLink from "components/search/SearchChangeTypeLink"; -import SearchContainer from "components/search/SearchContainer"; -import SearchRow from "components/search/SearchRow"; -import SearchLabelColumn from "components/search/SearchLabelColumn"; -import SearchLabel from "components/search/SearchLabel"; -import SearchInputColumn from "components/search/SearchInputColumn"; -import { FieldTypes, FormNames } from "enums"; +import { getFieldOptions, getUrlParams } from "@/util/helpers"; +import FormField from "@/components/form/FormField"; +import SearchClearLink from "@/components/search/SearchClearLink"; +import SearchChangeTypeLink from "@/components/search/SearchChangeTypeLink"; +import SearchContainer from "@/components/search/SearchContainer"; +import SearchRow from "@/components/search/SearchRow"; +import SearchLabelColumn from "@/components/search/SearchLabelColumn"; +import SearchLabel from "@/components/search/SearchLabel"; +import SearchInputColumn from "@/components/search/SearchInputColumn"; +import { FieldTypes, FormNames } from "@/enums"; import type { ApiResponse, Attributes } from "types"; -import { getAreaSearchList, getAttributes } from "areaSearch/selectors"; -import SearchSubtitleLabel from "components/search/SearchSubtitleLabel"; -import { AreaSearchFieldPaths } from "areaSearch/enums"; -import { getIsFetching as getIsFetchingDistricts } from "district/selectors"; +import { getAreaSearchList, getAttributes } from "@/areaSearch/selectors"; +import SearchSubtitleLabel from "@/components/search/SearchSubtitleLabel"; +import { AreaSearchFieldPaths } from "@/areaSearch/enums"; +import { getIsFetching as getIsFetchingDistricts } from "@/district/selectors"; type OwnProps = { isSearchInitialized: boolean; onSearch: (...args: Array) => any; diff --git a/src/areaSearch/constants.ts b/src/areaSearch/constants.ts index f77beb893..89f1dd3b5 100644 --- a/src/areaSearch/constants.ts +++ b/src/areaSearch/constants.ts @@ -1,4 +1,4 @@ -import { TableSortOrder } from "enums"; +import { TableSortOrder } from "@/enums"; export const DEFAULT_AREA_SEARCH_STATES: Array = []; export const DEFAULT_SORT_KEY = 'identifier'; export const DEFAULT_SORT_ORDER = TableSortOrder.ASCENDING; diff --git a/src/areaSearch/helpers.ts b/src/areaSearch/helpers.ts index 0a00ac687..8010a0fd3 100644 --- a/src/areaSearch/helpers.ts +++ b/src/areaSearch/helpers.ts @@ -1,14 +1,14 @@ import isArray from "lodash/isArray"; import get from "lodash/get"; import { formValueSelector, getFormValues } from "redux-form"; -import { FormNames, TableSortOrder } from "enums"; -import { APPLICANT_MAIN_IDENTIFIERS } from "application/constants"; -import { getUserFullName } from "users/helpers"; -import { store } from "root/startApp"; -import { getCurrentAreaSearch } from "areaSearch/selectors"; -import { prepareApplicationForSubmission } from "application/helpers"; +import { FormNames, TableSortOrder } from "@/enums"; +import { APPLICANT_MAIN_IDENTIFIERS } from "@/application/constants"; +import { getUserFullName } from "@/users/helpers"; +import { store } from "@/index"; +import { getCurrentAreaSearch } from "@/areaSearch/selectors"; +import { prepareApplicationForSubmission } from "@/application/helpers"; import type { LeafletFeature, LeafletGeoJson } from "types"; -import type { SavedApplicationFormSection } from "application/types"; +import type { SavedApplicationFormSection } from "@/application/types"; export const areaSearchSearchFilters = (query: Record): Record => { const searchQuery = { ...query }; diff --git a/src/areaSearch/reducer.ts b/src/areaSearch/reducer.ts index eacd83ca9..aebf109b2 100644 --- a/src/areaSearch/reducer.ts +++ b/src/areaSearch/reducer.ts @@ -2,8 +2,8 @@ import { combineReducers } from "redux"; import type { Action } from "redux"; import { handleActions } from "redux-actions"; import type { Attributes, Methods, Reducer } from "types"; -import type { AreaSearchState, ReceiveAreaSearchEditFailedAction, ReceiveAreaSearchListAction, ReceiveCollapseStatesAction, ReceiveFormValidFlagsAction, ReceiveIsSaveClickedAction, ReceiveSingleAreaSearchAction } from "areaSearch/types"; -import type { ReceiveAttributesAction, ReceiveMethodsAction, SetAreaSearchAttachmentsAction } from "areaSearch/types"; +import type { AreaSearchState, ReceiveAreaSearchEditFailedAction, ReceiveAreaSearchListAction, ReceiveCollapseStatesAction, ReceiveFormValidFlagsAction, ReceiveIsSaveClickedAction, ReceiveSingleAreaSearchAction } from "@/areaSearch/types"; +import type { ReceiveAttributesAction, ReceiveMethodsAction, SetAreaSearchAttachmentsAction } from "@/areaSearch/types"; import type { ApiResponse } from "types"; import merge from "lodash/merge"; const attributesReducer: Reducer = handleActions({ diff --git a/src/areaSearch/requests.ts b/src/areaSearch/requests.ts index e3aa3325f..746330430 100644 --- a/src/areaSearch/requests.ts +++ b/src/areaSearch/requests.ts @@ -1,6 +1,6 @@ -import callApi from "api/callApi"; -import createUrl from "api/createUrl"; -import callUploadRequest from "api/callUploadRequest"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; +import callUploadRequest from "@/api/callUploadRequest"; export const fetchAreaSearchListAttributesRequest = (): Generator => { return callApi(new Request(createUrl('area_search/'), { method: 'OPTIONS' diff --git a/src/areaSearch/saga.ts b/src/areaSearch/saga.ts index edd64d2c7..6e0ce5700 100644 --- a/src/areaSearch/saga.ts +++ b/src/areaSearch/saga.ts @@ -1,14 +1,14 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects"; -import { receiveError } from "api/actions"; -import { receiveAttributes, receiveMethods, attributesNotFound, receiveAreaSearchList, areaSearchesNotFound, areaSearchesByBBoxNotFound, receiveAreaSearchByBBoxList, receiveSingleAreaSearch, singleAreaSearchNotFound, listAttributesNotFound, receiveListAttributes, receiveListMethods, receiveAreaSearchInfoChecksBatchEditFailure, receiveAreaSearchInfoChecksBatchEditSuccess, hideEditMode, fetchSingleAreaSearch, receiveAreaSearchEdited, receiveAreaSearchEditFailed, receiveAreaSearchSpecsCreated, receiveAreaSearchSpecsCreateFailed, receiveAreaSearchApplicationCreated, receiveAreaSearchApplicationCreateFailed, receiveFileOperationFailed, receiveFileOperationFinished } from "areaSearch/actions"; -import { editSingleAreaSearchRequest, fetchAreaSearchAttributesRequest, fetchAreaSearchesRequest, fetchAreaSearchListAttributesRequest, fetchSingleAreaSearchRequest, createAreaSearchSpecsRequest, deleteAreaSearchAttachmentRequest, uploadAreaSearchAttachmentRequest } from "areaSearch/requests"; -import { editApplicantInfoCheckItemRequest } from "plotApplications/requests"; -import { receiveUpdatedApplicantInfoCheckItem } from "application/actions"; -import { displayUIMessage } from "util/helpers"; +import { receiveError } from "@/api/actions"; +import { receiveAttributes, receiveMethods, attributesNotFound, receiveAreaSearchList, areaSearchesNotFound, areaSearchesByBBoxNotFound, receiveAreaSearchByBBoxList, receiveSingleAreaSearch, singleAreaSearchNotFound, listAttributesNotFound, receiveListAttributes, receiveListMethods, receiveAreaSearchInfoChecksBatchEditFailure, receiveAreaSearchInfoChecksBatchEditSuccess, hideEditMode, fetchSingleAreaSearch, receiveAreaSearchEdited, receiveAreaSearchEditFailed, receiveAreaSearchSpecsCreated, receiveAreaSearchSpecsCreateFailed, receiveAreaSearchApplicationCreated, receiveAreaSearchApplicationCreateFailed, receiveFileOperationFailed, receiveFileOperationFinished } from "@/areaSearch/actions"; +import { editSingleAreaSearchRequest, fetchAreaSearchAttributesRequest, fetchAreaSearchesRequest, fetchAreaSearchListAttributesRequest, fetchSingleAreaSearchRequest, createAreaSearchSpecsRequest, deleteAreaSearchAttachmentRequest, uploadAreaSearchAttachmentRequest } from "@/areaSearch/requests"; +import { editApplicantInfoCheckItemRequest } from "@/plotApplications/requests"; +import { receiveUpdatedApplicantInfoCheckItem } from "@/application/actions"; +import { displayUIMessage } from "@/util/helpers"; import { push } from "react-router-redux"; -import { getRouteById, Routes } from "root/routes"; -import { createApplicationRequest } from "application/requests"; -import type { DeleteAreaSearchAttachmentAction, UploadAreaSearchAttachmentAction } from "areaSearch/types"; +import { getRouteById, Routes } from "@/root/routes"; +import { createApplicationRequest } from "@/application/requests"; +import type { DeleteAreaSearchAttachmentAction, UploadAreaSearchAttachmentAction } from "@/areaSearch/types"; function* fetchListAttributesSaga(): Generator { try { diff --git a/src/areaSearch/selectors.ts b/src/areaSearch/selectors.ts index 7643a233c..fccc3d08a 100644 --- a/src/areaSearch/selectors.ts +++ b/src/areaSearch/selectors.ts @@ -1,6 +1,6 @@ import get from "lodash/get"; import type { ApiResponse, Attributes, Methods, Selector } from "types"; -import type { RootState } from "root/types"; +import type { RootState } from "@/root/types"; export const getAttributes: Selector = (state: RootState): Attributes => state.areaSearch.attributes; export const getMethods: Selector = (state: RootState): Methods => state.areaSearch.methods; export const getIsFetchingAttributes: Selector = (state: RootState): boolean => state.areaSearch.isFetchingAttributes; diff --git a/src/areaSearch/spec.ts b/src/areaSearch/spec.ts index f40df178c..5f42845bc 100644 --- a/src/areaSearch/spec.ts +++ b/src/areaSearch/spec.ts @@ -1,7 +1,7 @@ import { expect } from "chai"; -import areaSearchReducer from "areaSearch/reducer"; -import { areaSearchesByBBoxNotFound, areaSearchesNotFound, attributesNotFound, batchEditAreaSearchInfoChecks, editAreaSearch, fetchAreaSearchList, fetchAreaSearchListByBBox, fetchAttributes, fetchListAttributes, fetchSingleAreaSearch, hideEditMode, listAttributesNotFound, receiveAreaSearchByBBoxList, receiveAreaSearchEdited, receiveAreaSearchEditFailed, receiveAreaSearchList, receiveAttributes, receiveListAttributes, receiveListMethods, receiveMethods, receiveSingleAreaSearch, setAreaSearchAttachments, showEditMode, singleAreaSearchNotFound } from "areaSearch/actions"; -import type { AreaSearchState } from "areaSearch/types"; +import areaSearchReducer from "@/areaSearch/reducer"; +import { areaSearchesByBBoxNotFound, areaSearchesNotFound, attributesNotFound, batchEditAreaSearchInfoChecks, editAreaSearch, fetchAreaSearchList, fetchAreaSearchListByBBox, fetchAttributes, fetchListAttributes, fetchSingleAreaSearch, hideEditMode, listAttributesNotFound, receiveAreaSearchByBBoxList, receiveAreaSearchEdited, receiveAreaSearchEditFailed, receiveAreaSearchList, receiveAttributes, receiveListAttributes, receiveListMethods, receiveMethods, receiveSingleAreaSearch, setAreaSearchAttachments, showEditMode, singleAreaSearchNotFound } from "@/areaSearch/actions"; +import type { AreaSearchState } from "@/areaSearch/types"; const defaultState: AreaSearchState = { attributes: null, methods: null, diff --git a/src/areaSearch/types.ts b/src/areaSearch/types.ts index 836573484..bad25af4f 100644 --- a/src/areaSearch/types.ts +++ b/src/areaSearch/types.ts @@ -1,5 +1,5 @@ import type { Action, ApiResponse, Attributes, Methods, User } from "types"; -import type { UploadedFileMeta } from "application/types"; +import type { UploadedFileMeta } from "@/application/types"; export type AreaSearchState = { attributes: Attributes; methods: Methods; diff --git a/src/auditLog/actions.ts b/src/auditLog/actions.ts index 5415976a9..8ce38b6ff 100644 --- a/src/auditLog/actions.ts +++ b/src/auditLog/actions.ts @@ -1,8 +1,8 @@ import { createAction } from "redux-actions"; -import type { ContactId } from "contacts/types"; -import type { LeaseId } from "leases/types"; -import type { AreaSearchId } from "areaSearch/types"; -import type { AuditLogListMap, FetchAuditLogByContactAction, ReceiveAuditLogByContactAction, NotFoundByContactAction, FetchAuditLogByLeaseAction, ReceiveAuditLogByLeaseAction, NotFoundByLeaseAction, FetchAuditLogByAreaSearchAction, ReceiveAuditLogByAreaSearchAction, NotFoundByAreaSearchAction } from "auditLog/types"; +import type { ContactId } from "@/contacts/types"; +import type { LeaseId } from "@/leases/types"; +import type { AreaSearchId } from "@/areaSearch/types"; +import type { AuditLogListMap, FetchAuditLogByContactAction, ReceiveAuditLogByContactAction, NotFoundByContactAction, FetchAuditLogByLeaseAction, ReceiveAuditLogByLeaseAction, NotFoundByLeaseAction, FetchAuditLogByAreaSearchAction, ReceiveAuditLogByAreaSearchAction, NotFoundByAreaSearchAction } from "@/auditLog/types"; export const fetchAuditLogByContact = (contactId: ContactId): FetchAuditLogByContactAction => createAction('mvj/auditLog/FETCH_BY_CONTACT')(contactId); export const receiveAuditLogByContact = (payload: AuditLogListMap): ReceiveAuditLogByContactAction => createAction('mvj/auditLog/RECEIVE_BY_CONTACT')(payload); export const notFoundByContact = (contactId: ContactId): NotFoundByContactAction => createAction('mvj/auditLog/NOT_FOUND_BY_CONTACT')(contactId); diff --git a/src/auditLog/helpers.ts b/src/auditLog/helpers.ts index cf164fda7..f87e3f63a 100644 --- a/src/auditLog/helpers.ts +++ b/src/auditLog/helpers.ts @@ -1,8 +1,8 @@ import get from "lodash/get"; -import { InfillDevelopmentCompensationLeasesFieldPaths, InfillDevelopmentCompensationLeaseDecisionsFieldPaths, InfillDevelopmentCompensationLeaseIntendedUsesFieldPaths } from "infillDevelopment/enums"; -import { InvoicePaymentsFieldPaths, InvoiceRowsFieldPaths } from "invoices/enums"; -import { LeaseAreasFieldPaths, LeaseAreaAddressesFieldPaths, LeaseBasisOfRentsFieldPaths, LeaseContractsFieldPaths, LeaseContractChangesFieldPaths, LeaseContractCollateralsFieldPaths, LeaseConstructabilityDescriptionsFieldPaths, LeaseDecisionsFieldPaths, LeaseDecisionConditionsFieldPaths, LeaseInspectionsFieldPaths, LeasePlanUnitsFieldPaths, LeasePlotsFieldPaths, LeaseRentsFieldPaths, LeaseRentContractRentsFieldPaths, LeaseRentDueDatesFieldPaths, LeaseRentFixedInitialYearRentsFieldPaths, LeaseRentAdjustmentsFieldPaths, LeaseTenantsFieldPaths, LeaseTenantContactSetFieldPaths } from "leases/enums"; -import { getFieldAttributes } from "util/helpers"; +import { InfillDevelopmentCompensationLeasesFieldPaths, InfillDevelopmentCompensationLeaseDecisionsFieldPaths, InfillDevelopmentCompensationLeaseIntendedUsesFieldPaths } from "@/infillDevelopment/enums"; +import { InvoicePaymentsFieldPaths, InvoiceRowsFieldPaths } from "@/invoices/enums"; +import { LeaseAreasFieldPaths, LeaseAreaAddressesFieldPaths, LeaseBasisOfRentsFieldPaths, LeaseContractsFieldPaths, LeaseContractChangesFieldPaths, LeaseContractCollateralsFieldPaths, LeaseConstructabilityDescriptionsFieldPaths, LeaseDecisionsFieldPaths, LeaseDecisionConditionsFieldPaths, LeaseInspectionsFieldPaths, LeasePlanUnitsFieldPaths, LeasePlotsFieldPaths, LeaseRentsFieldPaths, LeaseRentContractRentsFieldPaths, LeaseRentDueDatesFieldPaths, LeaseRentFixedInitialYearRentsFieldPaths, LeaseRentAdjustmentsFieldPaths, LeaseTenantsFieldPaths, LeaseTenantContactSetFieldPaths } from "@/leases/enums"; +import { getFieldAttributes } from "@/util/helpers"; import type { Attributes } from "types"; /** diff --git a/src/auditLog/reducer.ts b/src/auditLog/reducer.ts index 6dedc82c5..dda81f467 100644 --- a/src/auditLog/reducer.ts +++ b/src/auditLog/reducer.ts @@ -1,7 +1,7 @@ import { combineReducers } from "redux"; import { handleActions } from "redux-actions"; import type { Reducer } from "types"; -import type { AuditLogListMap, AuditLogIsFetchingMap, FetchAuditLogByContactAction, ReceiveAuditLogByContactAction, NotFoundByContactAction, FetchAuditLogByLeaseAction, ReceiveAuditLogByLeaseAction, NotFoundByLeaseAction, FetchAuditLogByAreaSearchAction, NotFoundByAreaSearchAction, ReceiveAuditLogByAreaSearchAction } from "auditLog/types"; +import type { AuditLogListMap, AuditLogIsFetchingMap, FetchAuditLogByContactAction, ReceiveAuditLogByContactAction, NotFoundByContactAction, FetchAuditLogByLeaseAction, ReceiveAuditLogByLeaseAction, NotFoundByLeaseAction, FetchAuditLogByAreaSearchAction, NotFoundByAreaSearchAction, ReceiveAuditLogByAreaSearchAction } from "@/auditLog/types"; const isFetchingByContactReducer: Reducer = handleActions({ ['mvj/auditLog/FETCH_BY_CONTACT']: (state: AuditLogIsFetchingMap, { payload: contactId diff --git a/src/auditLog/requests.ts b/src/auditLog/requests.ts index 250e8e2b4..aa9333c43 100644 --- a/src/auditLog/requests.ts +++ b/src/auditLog/requests.ts @@ -1,5 +1,5 @@ -import callApi from "api/callApi"; -import createUrl from "api/createUrl"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; export const fetchAuditLog = (params: Record): Generator => { return callApi(new Request(createUrl('auditlog/', params))); }; \ No newline at end of file diff --git a/src/auditLog/saga.ts b/src/auditLog/saga.ts index 6d5d9c81e..0e3be8de3 100644 --- a/src/auditLog/saga.ts +++ b/src/auditLog/saga.ts @@ -1,5 +1,5 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects"; -import { receiveError } from "api/actions"; +import { receiveError } from "@/api/actions"; import { receiveAuditLogByContact, notFoundByContact, receiveAuditLogByLease, notFoundByLease, receiveAuditLogByAreaSearch, notFoundByAreaSearch } from "./actions"; import { fetchAuditLog } from "./requests"; diff --git a/src/auditLog/selectors.ts b/src/auditLog/selectors.ts index e6f89b4c8..f8c020a37 100644 --- a/src/auditLog/selectors.ts +++ b/src/auditLog/selectors.ts @@ -1,4 +1,4 @@ -import type { RootState } from "root/types"; +import type { RootState } from "@/root/types"; import type { Selector } from "types"; export const getIsFetchingByContact: Selector = (state: RootState, contactId: string): boolean => state.auditLog.isFetchingByContact[contactId]; export const getAuditLogByContact: Selector = (state: RootState, contactId: string): boolean => state.auditLog.byContact[contactId]; diff --git a/src/auditLog/types.ts b/src/auditLog/types.ts index 22fae8f6e..3e20fa5a2 100644 --- a/src/auditLog/types.ts +++ b/src/auditLog/types.ts @@ -1,7 +1,7 @@ -import type { Action } from "../types"; -import type { ContactId } from "contacts/types"; -import type { LeaseId } from "leases/types"; -import type { AreaSearchId } from "areaSearch/types"; +import type { Action } from "@/types"; +import type { ContactId } from "@/contacts/types"; +import type { LeaseId } from "@/leases/types"; +import type { AreaSearchId } from "@/areaSearch/types"; export type AuditLogState = { byContact: AuditLogListMap; byLease: AuditLogListMap; diff --git a/src/auth/components/CallbackPage.tsx b/src/auth/components/CallbackPage.tsx index 6294d279f..8d1216254 100644 --- a/src/auth/components/CallbackPage.tsx +++ b/src/auth/components/CallbackPage.tsx @@ -1,9 +1,9 @@ import React, { PureComponent } from "react"; import { withRouter } from "react-router"; import { CallbackComponent, CallbackComponentProps } from "redux-oidc"; -import { getRedirectUrlFromSessionStorage } from "util/storage"; -import userManager from "auth/util/user-manager"; -import { getRouteById, Routes } from "root/routes"; +import { getRedirectUrlFromSessionStorage } from "@/util/storage"; +import userManager from "@/auth/util/user-manager"; +import { getRouteById, Routes } from "@/root/routes"; type Props = { history: Record; }; diff --git a/src/auth/reducer.ts b/src/auth/reducer.ts index 38326648f..d5de7ff98 100644 --- a/src/auth/reducer.ts +++ b/src/auth/reducer.ts @@ -1,6 +1,6 @@ import { handleActions } from "redux-actions"; import { combineReducers } from "redux"; -import type { Reducer } from "../types"; +import type { Reducer } from "@/types"; import type { ReceiveApiTokenAction } from "./types"; const isFetchingReducer: Reducer = handleActions({ 'mvj/auth/FETCH_API_TOKEN': () => true, diff --git a/src/auth/saga.ts b/src/auth/saga.ts index 76e8b07ac..9d728b631 100644 --- a/src/auth/saga.ts +++ b/src/auth/saga.ts @@ -1,7 +1,7 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects"; import { tokenNotFound, receiveApiToken } from "./actions"; -import { getEpochTime } from "util/helpers"; -import userManager from "../auth/util/user-manager"; +import { getEpochTime } from "@/util/helpers"; +import userManager from "@/auth/util/user-manager"; function* fetchApiTokenSaga({ payload: token, diff --git a/src/auth/selectors.ts b/src/auth/selectors.ts index 538e88daf..b4d7ed563 100644 --- a/src/auth/selectors.ts +++ b/src/auth/selectors.ts @@ -1,4 +1,4 @@ -import type { Selector } from "../types"; +import type { Selector } from "@/types"; import type { ApiToken, AuthState } from "./types"; // Helper functions to select state export const getApiToken: Selector = (state: Record): AuthState => state.auth.apiToken[import.meta.env.VITE_OPENID_CONNECT_API_TOKEN_KEY || 'https://api.hel.fi/auth/mvj']; diff --git a/src/auth/types.ts b/src/auth/types.ts index 1884afa20..161cacc49 100644 --- a/src/auth/types.ts +++ b/src/auth/types.ts @@ -1,4 +1,4 @@ -import type { Action } from "../types"; +import type { Action } from "@/types"; export type ApiToken = Record | null; export type AuthState = Record | null; export type FetchApiTokenAction = Action; diff --git a/src/basisOfRentCalculator/components/BasisOfRentCalculatorForm.tsx b/src/basisOfRentCalculator/components/BasisOfRentCalculatorForm.tsx index 32eb7fcad..06d5cc4f9 100644 --- a/src/basisOfRentCalculator/components/BasisOfRentCalculatorForm.tsx +++ b/src/basisOfRentCalculator/components/BasisOfRentCalculatorForm.tsx @@ -2,12 +2,12 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import { FieldArray, formValueSelector, reduxForm } from "redux-form"; import flowRight from "lodash/flowRight"; -import BasisOfRentsEdit from "leases/components/leaseSections/rent/BasisOfRentsEdit"; -import Divider from "components/content/Divider"; -import Title from "components/content/Title"; -import { FormNames } from "enums"; -import { LeaseBasisOfRentsFieldPaths, LeaseBasisOfRentsFieldTitles } from "leases/enums"; -import { getUiDataLeaseKey } from "uiData/helpers"; +import BasisOfRentsEdit from "@/leases/components/leaseSections/rent/BasisOfRentsEdit"; +import Divider from "@/components/content/Divider"; +import Title from "@/components/content/Title"; +import { FormNames } from "@/enums"; +import { LeaseBasisOfRentsFieldPaths, LeaseBasisOfRentsFieldTitles } from "@/leases/enums"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; type Props = { basisOfRents: Array>; }; diff --git a/src/basisOfRentCalculator/components/BasisOfRentCalculatorPage.tsx b/src/basisOfRentCalculator/components/BasisOfRentCalculatorPage.tsx index 6d2e06115..e69b87ec2 100644 --- a/src/basisOfRentCalculator/components/BasisOfRentCalculatorPage.tsx +++ b/src/basisOfRentCalculator/components/BasisOfRentCalculatorPage.tsx @@ -1,19 +1,19 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; -import AuthorizationError from "components/authorization/AuthorizationError"; +import AuthorizationError from "@/components/authorization/AuthorizationError"; import BasisOfRentCalculatorForm from "./BasisOfRentCalculatorForm"; -import ContentContainer from "components/content/ContentContainer"; -import Loader from "components/loader/Loader"; -import PageContainer from "components/content/PageContainer"; -import { receiveTopNavigationSettings } from "components/topNavigation/actions"; -import { PermissionMissingTexts } from "enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { hasPermissions, setPageTitle } from "util/helpers"; -import { getRouteById, Routes } from "root/routes"; -import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "usersPermissions/selectors"; -import { withLeaseAttributes } from "components/attributes/LeaseAttributes"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import ContentContainer from "@/components/content/ContentContainer"; +import Loader from "@/components/loader/Loader"; +import PageContainer from "@/components/content/PageContainer"; +import { receiveTopNavigationSettings } from "@/components/topNavigation/actions"; +import { PermissionMissingTexts } from "@/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { hasPermissions, setPageTitle } from "@/util/helpers"; +import { getRouteById, Routes } from "@/root/routes"; +import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "@/usersPermissions/selectors"; +import { withLeaseAttributes } from "@/components/attributes/LeaseAttributes"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { isFetchingLeaseAttributes: boolean; isFetchingUsersPermissions: boolean; diff --git a/src/batchrun/actions.ts b/src/batchrun/actions.ts index d22142eaa..fb3440cfa 100644 --- a/src/batchrun/actions.ts +++ b/src/batchrun/actions.ts @@ -1,6 +1,6 @@ import { createAction } from "redux-actions"; import type { Attributes, Methods } from "types"; -import type { FetchJobRunAttributesAction, ReceiveJobRunAttributesAction, ReceiveJobRunMethodsAction, NotFoundJobRunAttributesAction, FetchJobRunLogEntryAttributesAction, ReceiveJobRunLogEntryAttributesAction, ReceiveJobRunLogEntryMethodsAction, NotFoundJobRunLogEntryAttributesAction, FetchScheduledJobAttributesAction, ReceiveScheduledJobAttributesAction, ReceiveScheduledJobMethodsAction, NotFoundScheduledJobAttributesAction, FetchJobRunsAction, ReceiveJobRunsAction, NotFoundJobRunsAction, FetchJobRunLogEntriesByRunAction, ReceiveJobRunLogEntriesByRunAction, NotFoundJobRunLogEntriesByRunAction, FetchScheduledJobsAction, ReceiveScheduledJobsAction, NotFoundScheduledJobsAction } from "batchrun/types"; +import type { FetchJobRunAttributesAction, ReceiveJobRunAttributesAction, ReceiveJobRunMethodsAction, NotFoundJobRunAttributesAction, FetchJobRunLogEntryAttributesAction, ReceiveJobRunLogEntryAttributesAction, ReceiveJobRunLogEntryMethodsAction, NotFoundJobRunLogEntryAttributesAction, FetchScheduledJobAttributesAction, ReceiveScheduledJobAttributesAction, ReceiveScheduledJobMethodsAction, NotFoundScheduledJobAttributesAction, FetchJobRunsAction, ReceiveJobRunsAction, NotFoundJobRunsAction, FetchJobRunLogEntriesByRunAction, ReceiveJobRunLogEntriesByRunAction, NotFoundJobRunLogEntriesByRunAction, FetchScheduledJobsAction, ReceiveScheduledJobsAction, NotFoundScheduledJobsAction } from "@/batchrun/types"; export const fetchJobRunAttributes = (): FetchJobRunAttributesAction => createAction('mvj/batchrun/FETCH_JOB_RUN_ATTRIBUTES')(); export const receiveJobRunAttributes = (attributes: Attributes): ReceiveJobRunAttributesAction => createAction('mvj/batchrun/RECEIVE_JOB_RUN_ATTRIBUTES')(attributes); export const receiveJobRunMethods = (methods: Methods): ReceiveJobRunMethodsAction => createAction('mvj/batchrun/RECEIVE_JOB_RUN_METHODS')(methods); diff --git a/src/batchrun/components/BatchRunPage.tsx b/src/batchrun/components/BatchRunPage.tsx index 361128bf5..5ce0ee9e9 100644 --- a/src/batchrun/components/BatchRunPage.tsx +++ b/src/batchrun/components/BatchRunPage.tsx @@ -3,26 +3,26 @@ import { connect } from "react-redux"; import { withRouter } from "react-router"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; -import AuthorizationError from "components/authorization/AuthorizationError"; -import ContentContainer from "components/content/ContentContainer"; -import Divider from "components/content/Divider"; -import FullWidthContainer from "components/content/FullWidthContainer"; -import PageContainer from "components/content/PageContainer"; -import PageNavigationWrapper from "components/content/PageNavigationWrapper"; -import JobRuns from "batchrun/components/JobRuns"; -import Loader from "components/loader/Loader"; -import ScheduledJobs from "batchrun/components/ScheduledJobs"; -import Tabs from "components/tabs/Tabs"; -import TabContent from "components/tabs/TabContent"; -import TabPane from "components/tabs/TabPane"; -import Title from "components/content/Title"; -import { receiveTopNavigationSettings } from "components/topNavigation/actions"; -import { PermissionMissingTexts } from "enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getSearchQuery, getUrlParams, hasPermissions, setPageTitle } from "util/helpers"; -import { getRouteById, Routes } from "root/routes"; -import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "usersPermissions/selectors"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import AuthorizationError from "@/components/authorization/AuthorizationError"; +import ContentContainer from "@/components/content/ContentContainer"; +import Divider from "@/components/content/Divider"; +import FullWidthContainer from "@/components/content/FullWidthContainer"; +import PageContainer from "@/components/content/PageContainer"; +import PageNavigationWrapper from "@/components/content/PageNavigationWrapper"; +import JobRuns from "@/batchrun/components/JobRuns"; +import Loader from "@/components/loader/Loader"; +import ScheduledJobs from "@/batchrun/components/ScheduledJobs"; +import Tabs from "@/components/tabs/Tabs"; +import TabContent from "@/components/tabs/TabContent"; +import TabPane from "@/components/tabs/TabPane"; +import Title from "@/components/content/Title"; +import { receiveTopNavigationSettings } from "@/components/topNavigation/actions"; +import { PermissionMissingTexts } from "@/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getSearchQuery, getUrlParams, hasPermissions, setPageTitle } from "@/util/helpers"; +import { getRouteById, Routes } from "@/root/routes"; +import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "@/usersPermissions/selectors"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { history: Record; isFetchingUsersPermissions: boolean; diff --git a/src/batchrun/components/JobRunLogEntryPanel.tsx b/src/batchrun/components/JobRunLogEntryPanel.tsx index 74af7a1a4..e6092df7e 100644 --- a/src/batchrun/components/JobRunLogEntryPanel.tsx +++ b/src/batchrun/components/JobRunLogEntryPanel.tsx @@ -1,16 +1,16 @@ import React, { Fragment, PureComponent } from "react"; import { connect } from "react-redux"; import isEmpty from "lodash/isEmpty"; -import CopyToClipboardButton from "components/form/CopyToClipboardButton"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import SortableTable from "components/table/SortableTable"; -import TablePanel from "components/table/TablePanel"; -import { fetchJobRunLogEntriesByRun } from "batchrun/actions"; -import { JobRunLogEntryFieldPaths, JobRunLogEntryFieldTitles } from "batchrun/enums"; -import { copyElementContentsToClipboard, displayUIMessage, formatDate, getApiResponseResults, isFieldAllowedToRead } from "util/helpers"; -import { TableSortOrder } from "enums"; -import { getIsFetchingJobRunLogEntriesByRun, getJobRunLogEntryAttributes, getJobRunLogEntriesByRun } from "batchrun/selectors"; +import CopyToClipboardButton from "@/components/form/CopyToClipboardButton"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import SortableTable from "@/components/table/SortableTable"; +import TablePanel from "@/components/table/TablePanel"; +import { fetchJobRunLogEntriesByRun } from "@/batchrun/actions"; +import { JobRunLogEntryFieldPaths, JobRunLogEntryFieldTitles } from "@/batchrun/enums"; +import { copyElementContentsToClipboard, displayUIMessage, formatDate, getApiResponseResults, isFieldAllowedToRead } from "@/util/helpers"; +import { TableSortOrder } from "@/enums"; +import { getIsFetchingJobRunLogEntriesByRun, getJobRunLogEntryAttributes, getJobRunLogEntriesByRun } from "@/batchrun/selectors"; import type { ApiResponse, Attributes } from "types"; type Props = { fetchJobRunLogEntriesByRun: (...args: Array) => any; diff --git a/src/batchrun/components/JobRuns.tsx b/src/batchrun/components/JobRuns.tsx index e265065c5..f4eff9153 100644 --- a/src/batchrun/components/JobRuns.tsx +++ b/src/batchrun/components/JobRuns.tsx @@ -3,28 +3,28 @@ import { withRouter } from "react-router"; import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; -import AuthorizationError from "components/authorization/AuthorizationError"; -import ErrorIcon from "components/icons/ErrorIcon"; -import GreenBox from "components/content/GreenBox"; +import AuthorizationError from "@/components/authorization/AuthorizationError"; +import ErrorIcon from "@/components/icons/ErrorIcon"; +import GreenBox from "@/components/content/GreenBox"; import JobRunLogEntryPanel from "./JobRunLogEntryPanel"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import Pagination from "components/table/Pagination"; -import SortableTable from "components/table/SortableTable"; -import SuccessIcon from "components/icons/SuccessIcon"; -import TableAndPanelWrapper from "components/table/TableAndPanelWrapper"; -import { fetchJobRuns } from "batchrun/actions"; -import { LIST_TABLE_PAGE_SIZE } from "util/constants"; -import { PermissionMissingTexts } from "enums"; -import { JobRunFieldPaths, JobRunFieldTitles, JobRunJobFieldPaths, JobRunJobFieldTitles } from "batchrun/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { formatDate, getApiResponseCount, getApiResponseMaxPage, getApiResponseResults, hasPermissions, isFieldAllowedToRead } from "util/helpers"; -import { getIsFetchingJobRuns, getJobRunAttributes, getJobRuns } from "batchrun/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import { withBatchrunJobRunTabAttributes } from "components/attributes/BatchrunJobRunsTabAttributes"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import Pagination from "@/components/table/Pagination"; +import SortableTable from "@/components/table/SortableTable"; +import SuccessIcon from "@/components/icons/SuccessIcon"; +import TableAndPanelWrapper from "@/components/table/TableAndPanelWrapper"; +import { fetchJobRuns } from "@/batchrun/actions"; +import { LIST_TABLE_PAGE_SIZE } from "@/util/constants"; +import { PermissionMissingTexts } from "@/enums"; +import { JobRunFieldPaths, JobRunFieldTitles, JobRunJobFieldPaths, JobRunJobFieldTitles } from "@/batchrun/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { formatDate, getApiResponseCount, getApiResponseMaxPage, getApiResponseResults, hasPermissions, isFieldAllowedToRead } from "@/util/helpers"; +import { getIsFetchingJobRuns, getJobRunAttributes, getJobRuns } from "@/batchrun/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import { withBatchrunJobRunTabAttributes } from "@/components/attributes/BatchrunJobRunsTabAttributes"; import type { Attributes } from "types"; -import type { JobRuns as JobRunsType } from "batchrun/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { JobRuns as JobRunsType } from "@/batchrun/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { fetchJobRuns: (...args: Array) => any; isFetchingBatchrunJobRunsTabAttributes: boolean; diff --git a/src/batchrun/components/ScheduledJobs.tsx b/src/batchrun/components/ScheduledJobs.tsx index c9645646e..d60d93d54 100644 --- a/src/batchrun/components/ScheduledJobs.tsx +++ b/src/batchrun/components/ScheduledJobs.tsx @@ -3,23 +3,23 @@ import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; import get from "lodash/get"; import isEmpty from "lodash/isEmpty"; -import AuthorizationError from "components/authorization/AuthorizationError"; -import FormText from "components/form/FormText"; -import GreenBox from "components/content/GreenBox"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import SortableTable from "components/table/SortableTable"; -import { fetchScheduledJobs } from "batchrun/actions"; -import { PermissionMissingTexts } from "enums"; -import { ScheduledJobFieldPaths, ScheduledJobFieldTitles, ScheduledJobJobFieldPaths, ScheduledJobJobFieldTitles } from "batchrun/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getApiResponseResults, hasPermissions, isFieldAllowedToRead } from "util/helpers"; -import { getIsFetchingScheduledJobs, getScheduledJobs } from "batchrun/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import { withBatchrunScheduledJobTabAttributes } from "components/attributes/BatchrunScheduledJobsTabAttributes"; +import AuthorizationError from "@/components/authorization/AuthorizationError"; +import FormText from "@/components/form/FormText"; +import GreenBox from "@/components/content/GreenBox"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import SortableTable from "@/components/table/SortableTable"; +import { fetchScheduledJobs } from "@/batchrun/actions"; +import { PermissionMissingTexts } from "@/enums"; +import { ScheduledJobFieldPaths, ScheduledJobFieldTitles, ScheduledJobJobFieldPaths, ScheduledJobJobFieldTitles } from "@/batchrun/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getApiResponseResults, hasPermissions, isFieldAllowedToRead } from "@/util/helpers"; +import { getIsFetchingScheduledJobs, getScheduledJobs } from "@/batchrun/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import { withBatchrunScheduledJobTabAttributes } from "@/components/attributes/BatchrunScheduledJobsTabAttributes"; import type { Attributes } from "types"; -import type { ScheduledJobs as ScheduledJobsType } from "batchrun/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { ScheduledJobs as ScheduledJobsType } from "@/batchrun/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { batchrunScheduledJobAttributes: Attributes; fetchScheduledJobs: (...args: Array) => any; diff --git a/src/batchrun/reducer.ts b/src/batchrun/reducer.ts index 7f90ed10a..904f09531 100644 --- a/src/batchrun/reducer.ts +++ b/src/batchrun/reducer.ts @@ -1,7 +1,7 @@ import { combineReducers } from "redux"; import { handleActions } from "redux-actions"; import type { Attributes, Methods, Reducer } from "types"; -import type { ReceiveJobRunAttributesAction, ReceiveJobRunMethodsAction, ReceiveJobRunsAction, JobRuns, ReceiveJobRunLogEntryAttributesAction, ReceiveJobRunLogEntryMethodsAction, FetchJobRunLogEntriesByRunAction, ReceiveJobRunLogEntriesByRunAction, NotFoundJobRunLogEntriesByRunAction, ReceiveScheduledJobAttributesAction, ReceiveScheduledJobMethodsAction, ReceiveScheduledJobsAction, ScheduledJobs } from "batchrun/types"; +import type { ReceiveJobRunAttributesAction, ReceiveJobRunMethodsAction, ReceiveJobRunsAction, JobRuns, ReceiveJobRunLogEntryAttributesAction, ReceiveJobRunLogEntryMethodsAction, FetchJobRunLogEntriesByRunAction, ReceiveJobRunLogEntriesByRunAction, NotFoundJobRunLogEntriesByRunAction, ReceiveScheduledJobAttributesAction, ReceiveScheduledJobMethodsAction, ReceiveScheduledJobsAction, ScheduledJobs } from "@/batchrun/types"; const isFetchingJobRunsReducer: Reducer = handleActions({ 'mvj/batchrun/FETCH_JOB_RUNS': () => true, 'mvj/batchrun/RECEIVE_JOB_RUNS': () => false, diff --git a/src/batchrun/requests.ts b/src/batchrun/requests.ts index d0153bf97..6ad0226be 100644 --- a/src/batchrun/requests.ts +++ b/src/batchrun/requests.ts @@ -1,5 +1,5 @@ -import callApi from "../api/callApi"; -import createUrl from "../api/createUrl"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; export const fetchJobRunAttributes = () => { return callApi(new Request(createUrl('job_run/'), { method: 'OPTIONS' diff --git a/src/batchrun/saga.ts b/src/batchrun/saga.ts index 13f275323..fde449a6b 100644 --- a/src/batchrun/saga.ts +++ b/src/batchrun/saga.ts @@ -1,7 +1,7 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects"; -import { receiveError } from "api/actions"; -import { notFoundJobRuns, notFoundJobRunAttributes, notFoundJobRunLogEntryAttributes, notFoundJobRunLogEntriesByRun, notFoundScheduledJobAttributes, notFoundScheduledJobs, receiveJobRunAttributes, receiveJobRunMethods, receiveJobRuns, receiveJobRunLogEntryAttributes, receiveJobRunLogEntryMethods, receiveJobRunLogEntriesByRun, receiveScheduledJobAttributes, receiveScheduledJobMethods, receiveScheduledJobs } from "batchrun/actions"; -import { fetchJobRunAttributes, fetchJobRuns, fetchJobRunLogEntryAttributes, fetchJobRunLogEntries, fetchScheduledJobAttributes, fetchScheduledJobs } from "batchrun/requests"; +import { receiveError } from "@/api/actions"; +import { notFoundJobRuns, notFoundJobRunAttributes, notFoundJobRunLogEntryAttributes, notFoundJobRunLogEntriesByRun, notFoundScheduledJobAttributes, notFoundScheduledJobs, receiveJobRunAttributes, receiveJobRunMethods, receiveJobRuns, receiveJobRunLogEntryAttributes, receiveJobRunLogEntryMethods, receiveJobRunLogEntriesByRun, receiveScheduledJobAttributes, receiveScheduledJobMethods, receiveScheduledJobs } from "@/batchrun/actions"; +import { fetchJobRunAttributes, fetchJobRuns, fetchJobRunLogEntryAttributes, fetchJobRunLogEntries, fetchScheduledJobAttributes, fetchScheduledJobs } from "@/batchrun/requests"; function* fetchJobRunAttributesSaga(): Generator { try { diff --git a/src/batchrun/selectors.ts b/src/batchrun/selectors.ts index 181b46eec..35da4f860 100644 --- a/src/batchrun/selectors.ts +++ b/src/batchrun/selectors.ts @@ -1,6 +1,6 @@ import type { ApiResponse, Attributes, Methods, Selector } from "types"; -import type { RootState } from "root/types"; -import type { JobRuns, ScheduledJobs } from "batchrun/types"; +import type { RootState } from "@/root/types"; +import type { JobRuns, ScheduledJobs } from "@/batchrun/types"; export const getIsFetchingJobRunAttributes: Selector = (state: RootState): boolean => state.batchrun.isFetchingJobRunAttributes; export const getJobRunAttributes: Selector = (state: RootState): Attributes => state.batchrun.jobRunAttributes; export const getJobRunMethods: Selector = (state: RootState): Methods => state.batchrun.jobRunMethods; diff --git a/src/billingPeriods/reducer.ts b/src/billingPeriods/reducer.ts index 13c47242a..4b3f587c2 100644 --- a/src/billingPeriods/reducer.ts +++ b/src/billingPeriods/reducer.ts @@ -1,6 +1,6 @@ import { combineReducers } from "redux"; import { handleActions } from "redux-actions"; -import type { Reducer } from "../types"; +import type { Reducer } from "@/types"; import type { ReceiveBillingPeriodsAction } from "./types"; const isFetchingReducer: Reducer = handleActions({ 'mvj/billingperiods/FETCH_ALL': () => true, diff --git a/src/billingPeriods/requests.ts b/src/billingPeriods/requests.ts index 14ed2f954..5ddc6b71a 100644 --- a/src/billingPeriods/requests.ts +++ b/src/billingPeriods/requests.ts @@ -1,5 +1,5 @@ -import callApi from "../api/callApi"; -import createUrl from "../api/createUrl"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; import type { FetchBillingPeriodsPayload } from "./types"; export const fetchBillingPeriods = (payload: FetchBillingPeriodsPayload): Generator => { return callApi(new Request(createUrl(`lease_billing_periods/?lease=${payload.leaseId}&year=${payload.year}`))); diff --git a/src/billingPeriods/saga.ts b/src/billingPeriods/saga.ts index cc689d0e2..c5c30471b 100644 --- a/src/billingPeriods/saga.ts +++ b/src/billingPeriods/saga.ts @@ -1,7 +1,7 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects"; import { notFound, receiveBillingPeriodsByLease } from "./actions"; import { fetchBillingPeriods } from "./requests"; -import { receiveError } from "../api/actions"; +import { receiveError } from "@/api/actions"; function* fetchBillingPeriodsSaga({ payload, diff --git a/src/billingPeriods/selectors.ts b/src/billingPeriods/selectors.ts index e18ca1d28..ac944a243 100644 --- a/src/billingPeriods/selectors.ts +++ b/src/billingPeriods/selectors.ts @@ -1,6 +1,6 @@ import type { Selector } from "types"; -import type { RootState } from "root/types"; -import type { LeaseId } from "leases/types"; +import type { RootState } from "@/root/types"; +import type { LeaseId } from "@/leases/types"; export const getIsFetching: Selector = (state: RootState): boolean => state.billingPeriod.isFetching; export const getBillingPeriodsByLease: Selector, LeaseId> = (state: RootState, leaseId: LeaseId): Record => { return state.billingPeriod.byLease[leaseId]; diff --git a/src/billingPeriods/types.ts b/src/billingPeriods/types.ts index bb90acb98..b219f4f29 100644 --- a/src/billingPeriods/types.ts +++ b/src/billingPeriods/types.ts @@ -1,5 +1,5 @@ -import type { Action } from "../types"; -import type { LeaseId } from "leases/types"; +import type { Action } from "@/types"; +import type { LeaseId } from "@/leases/types"; export type BillingPeriodState = { byLease: Record; isFetching: boolean; diff --git a/src/collectionCourtDecision/actions.ts b/src/collectionCourtDecision/actions.ts index ba00411b9..be48b89db 100644 --- a/src/collectionCourtDecision/actions.ts +++ b/src/collectionCourtDecision/actions.ts @@ -1,6 +1,6 @@ import { createAction } from "redux-actions"; import type { Attributes, Methods } from "types"; -import type { LeaseId } from "leases/types"; +import type { LeaseId } from "@/leases/types"; import type { FetchAttributesAction, ReceiveAttributesAction, ReceiveMethodsAction, CollectionCourtDecisionAttributesNotFoundAction, UploadCollectionCourtDecisionPayload, DeleteCollectionCourtDecisionPayload, FetchCollectionCourtDecisionsByLeaseAction, ReceiveCollectionCourtDecisionsByLeaseAction, CollectionCourtDecisionsNotFoundByLeaseAction, UploadCollectionCourtDecisionAction, DeleteCollectionCourtDecisionAction, HideCollectionCourtDecisionPanelAction, ShowCollectionCourtDecisionPanelAction } from "./types"; export const fetchAttributes = (): FetchAttributesAction => createAction('mvj/collectionCourtDecision/FETCH_ATTRIBUTES')(); export const receiveAttributes = (attributes: Attributes): ReceiveAttributesAction => createAction('mvj/collectionCourtDecision/RECEIVE_ATTRIBUTES')(attributes); diff --git a/src/collectionCourtDecision/reducer.ts b/src/collectionCourtDecision/reducer.ts index deaeb4b77..824f12292 100644 --- a/src/collectionCourtDecision/reducer.ts +++ b/src/collectionCourtDecision/reducer.ts @@ -1,6 +1,6 @@ import { combineReducers } from "redux"; import { handleActions } from "redux-actions"; -import type { Attributes, Methods, Reducer } from "../types"; +import type { Attributes, Methods, Reducer } from "@/types"; import type { ReceiveAttributesAction, ReceiveMethodsAction, FetchCollectionCourtDecisionsByLeaseAction, ReceiveCollectionCourtDecisionsByLeaseAction, CollectionCourtDecisionsNotFoundByLeaseAction } from "./types"; const isFetchingAttributesReducer: Reducer = handleActions({ 'mvj/collectionCourtDecision/FETCH_ATTRIBUTES': () => true, diff --git a/src/collectionCourtDecision/requests.ts b/src/collectionCourtDecision/requests.ts index 92df22e36..f112b8ef9 100644 --- a/src/collectionCourtDecision/requests.ts +++ b/src/collectionCourtDecision/requests.ts @@ -1,8 +1,8 @@ -import callApi from "api/callApi"; -import callUploadRequest from "api/callUploadRequest"; -import createUrl from "api/createUrl"; +import callApi from "@/api/callApi"; +import callUploadRequest from "@/api/callUploadRequest"; +import createUrl from "@/api/createUrl"; import type { CollectionCourtDecisionId, UploadCollectionCourtDecisionPayload } from "./types"; -import type { LeaseId } from "leases/types"; +import type { LeaseId } from "@/leases/types"; export const fetchAttributes = (): Generator => { return callApi(new Request(createUrl('collection_court_decision/'), { method: 'OPTIONS' diff --git a/src/collectionCourtDecision/saga.ts b/src/collectionCourtDecision/saga.ts index ed04824d7..665b8c0a3 100644 --- a/src/collectionCourtDecision/saga.ts +++ b/src/collectionCourtDecision/saga.ts @@ -1,8 +1,8 @@ import { all, call, fork, put, select, takeLatest } from "redux-saga/effects"; import { SubmissionError } from "redux-form"; -import { receiveError } from "api/actions"; +import { receiveError } from "@/api/actions"; import { receiveAttributes, receiveMethods, attributesNotFound, fetchCollectionCourtDecisionsByLease as fetchCollectionCourtDecisionsByLeaseAction, hideCollectionCourtDecisionPanel, receiveCollectionCourtDecisionsByLease, notFoundByLease } from "./actions"; -import { displayUIMessage } from "../util/helpers"; +import { displayUIMessage } from "@/util/helpers"; import { fetchAttributes, fetchCollectionCourtDecisionsByLease, uploadCollectionCourtDecision, deleteCollectionCourtDecision } from "./requests"; import { getCollectionCourtDecisionsByLease } from "./selectors"; diff --git a/src/collectionCourtDecision/selectors.ts b/src/collectionCourtDecision/selectors.ts index 6ae1cb4f9..e69ff1ffd 100644 --- a/src/collectionCourtDecision/selectors.ts +++ b/src/collectionCourtDecision/selectors.ts @@ -1,6 +1,6 @@ import type { Attributes, Methods, Selector } from "types"; -import type { LeaseId } from "leases/types"; -import type { RootState } from "root/types"; +import type { LeaseId } from "@/leases/types"; +import type { RootState } from "@/root/types"; export const getAttributes: Selector = (state: RootState): Attributes => state.collectionCourtDecision.attributes; export const getMethods: Selector = (state: RootState): Methods => state.collectionCourtDecision.methods; export const getIsFetchingAttributes: Selector = (state: RootState): boolean => state.collectionCourtDecision.isFetchingAttributes; diff --git a/src/collectionCourtDecision/types.ts b/src/collectionCourtDecision/types.ts index fb7cfe9df..cb3ed65c8 100644 --- a/src/collectionCourtDecision/types.ts +++ b/src/collectionCourtDecision/types.ts @@ -1,5 +1,5 @@ import type { Action, Attributes, Methods } from "types"; -import type { LeaseId } from "leases/types"; +import type { LeaseId } from "@/leases/types"; export type CollectionCourtDecisionState = { attributes: Attributes; byLease: Record; diff --git a/src/collectionLetter/actions.ts b/src/collectionLetter/actions.ts index cec086781..e9f74163e 100644 --- a/src/collectionLetter/actions.ts +++ b/src/collectionLetter/actions.ts @@ -1,6 +1,6 @@ import { createAction } from "redux-actions"; import type { Attributes, Methods } from "types"; -import type { LeaseId } from "leases/types"; +import type { LeaseId } from "@/leases/types"; import type { FetchAttributesAction, ReceiveAttributesAction, ReceiveMethodsAction, CollectionLetterAttributesNotFoundAction, UploadCollectionLetterPayload, DeleteCollectionLetterPayload, FetchCollectionLettersByLeaseAction, ReceiveCollectionLettersByLeaseAction, CollectionLettersNotFoundByLeaseAction, UploadCollectionLetterAction, DeleteCollectionLetterAction } from "./types"; export const fetchAttributes = (): FetchAttributesAction => createAction('mvj/collectionLetter/FETCH_ATTRIBUTES')(); export const receiveAttributes = (attributes: Attributes): ReceiveAttributesAction => createAction('mvj/collectionLetter/RECEIVE_ATTRIBUTES')(attributes); diff --git a/src/collectionLetter/requests.ts b/src/collectionLetter/requests.ts index 66fac847e..48c69f16a 100644 --- a/src/collectionLetter/requests.ts +++ b/src/collectionLetter/requests.ts @@ -1,8 +1,8 @@ -import callApi from "api/callApi"; -import callUploadRequest from "api/callUploadRequest"; -import createUrl from "api/createUrl"; +import callApi from "@/api/callApi"; +import callUploadRequest from "@/api/callUploadRequest"; +import createUrl from "@/api/createUrl"; import type { CollectionLetterId, UploadCollectionLetterPayload } from "./types"; -import type { LeaseId } from "leases/types"; +import type { LeaseId } from "@/leases/types"; export const fetchAttributes = (): Generator => { return callApi(new Request(createUrl('collection_letter/'), { method: 'OPTIONS' diff --git a/src/collectionLetter/saga.ts b/src/collectionLetter/saga.ts index 262e5f49e..7cc3c02ea 100644 --- a/src/collectionLetter/saga.ts +++ b/src/collectionLetter/saga.ts @@ -1,8 +1,8 @@ import { all, call, fork, put, select, takeLatest } from "redux-saga/effects"; import { SubmissionError } from "redux-form"; -import { receiveError } from "api/actions"; +import { receiveError } from "@/api/actions"; import { attributesNotFound, receiveAttributes, receiveMethods, fetchCollectionLettersByLease as fetchCollectionLettersByLeaseAction, receiveCollectionLettersByLease, notFoundByLease } from "./actions"; -import { displayUIMessage } from "../util/helpers"; +import { displayUIMessage } from "@/util/helpers"; import { fetchAttributes, fetchCollectionLettersByLease, uploadCollectionLetter, deleteCollectionLetter } from "./requests"; import { getCollectionLettersByLease } from "./selectors"; diff --git a/src/collectionLetter/selectors.ts b/src/collectionLetter/selectors.ts index bd58f300e..857b890cb 100644 --- a/src/collectionLetter/selectors.ts +++ b/src/collectionLetter/selectors.ts @@ -1,6 +1,6 @@ import type { Attributes, Methods, Selector } from "types"; -import type { LeaseId } from "leases/types"; -import type { RootState } from "root/types"; +import type { LeaseId } from "@/leases/types"; +import type { RootState } from "@/root/types"; export const getAttributes: Selector = (state: RootState): Attributes => state.collectionLetter.attributes; export const getMethods: Selector = (state: RootState): Methods => state.collectionLetter.methods; export const getIsFetchingAttributes: Selector = (state: RootState): boolean => state.collectionLetter.isFetchingAttributes; diff --git a/src/collectionLetter/types.ts b/src/collectionLetter/types.ts index dd2ec7895..85bee3b22 100644 --- a/src/collectionLetter/types.ts +++ b/src/collectionLetter/types.ts @@ -1,5 +1,5 @@ import type { Action, Attributes, Methods } from "types"; -import type { LeaseId } from "leases/types"; +import type { LeaseId } from "@/leases/types"; export type CollectionLetterState = { attributes: Attributes; byLease: Record; diff --git a/src/collectionNote/actions.ts b/src/collectionNote/actions.ts index d2ced8c88..7765d6408 100644 --- a/src/collectionNote/actions.ts +++ b/src/collectionNote/actions.ts @@ -1,7 +1,7 @@ import { createAction } from "redux-actions"; import type { Attributes, Methods } from "types"; import type { FetchAttributesAction, ReceiveAttributesAction, ReceiveMethodsAction, CollectionNoteAttributesNotFoundAction, CreateCollectionNotePayload, DeleteCollectionNotePayload, FetchCollectionNotesByLeaseAction, ReceiveCollectionNotesByLeaseAction, CollectionNotesNotFoundByLeaseAction, CreateCollectionNoteAction, DeleteCollectionNoteAction } from "./types"; -import type { LeaseId } from "../leases/types"; +import type { LeaseId } from "@/leases/types"; export const fetchAttributes = (): FetchAttributesAction => createAction('mvj/collectionNote/FETCH_ATTRIBUTES')(); export const receiveAttributes = (attributes: Attributes): ReceiveAttributesAction => createAction('mvj/collectionNote/RECEIVE_ATTRIBUTES')(attributes); export const receiveMethods = (methods: Methods): ReceiveMethodsAction => createAction('mvj/collectionNote/RECEIVE_METHODS')(methods); diff --git a/src/collectionNote/requests.ts b/src/collectionNote/requests.ts index 9eccb874c..d139fd417 100644 --- a/src/collectionNote/requests.ts +++ b/src/collectionNote/requests.ts @@ -1,7 +1,7 @@ -import callApi from "api/callApi"; -import createUrl from "api/createUrl"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; import type { CollectionNoteId } from "./types"; -import type { LeaseId } from "leases/types"; +import type { LeaseId } from "@/leases/types"; export const fetchAttributes = (): Generator => { return callApi(new Request(createUrl('collection_note/'), { method: 'OPTIONS' diff --git a/src/collectionNote/saga.ts b/src/collectionNote/saga.ts index 476b731e7..afbdf38bb 100644 --- a/src/collectionNote/saga.ts +++ b/src/collectionNote/saga.ts @@ -1,8 +1,8 @@ import { all, call, fork, put, select, takeLatest } from "redux-saga/effects"; import { SubmissionError } from "redux-form"; -import { receiveError } from "api/actions"; +import { receiveError } from "@/api/actions"; import { receiveAttributes, receiveMethods, attributesNotFound, fetchCollectionNotesByLease as fetchCollectionNotesByLeaseAction, receiveCollectionNotesByLease, notFoundByLease } from "./actions"; -import { displayUIMessage } from "util/helpers"; +import { displayUIMessage } from "@/util/helpers"; import { fetchAttributes, fetchCollectionNotesByLease, createCollectionNote, deleteCollectionNote } from "./requests"; import { getCollectionNotesByLease } from "./selectors"; diff --git a/src/collectionNote/selectors.ts b/src/collectionNote/selectors.ts index a0f7f56f3..e9c7f4b4d 100644 --- a/src/collectionNote/selectors.ts +++ b/src/collectionNote/selectors.ts @@ -1,6 +1,6 @@ -import type { Attributes, Methods, Selector } from "../types"; -import type { LeaseId } from "leases/types"; -import type { RootState } from "root/types"; +import type { Attributes, Methods, Selector } from "@/types"; +import type { LeaseId } from "@/leases/types"; +import type { RootState } from "@/root/types"; export const getAttributes: Selector = (state: RootState): Attributes => state.collectionNote.attributes; export const getMethods: Selector = (state: RootState): Methods => state.collectionNote.methods; export const getIsFetchingAttributes: Selector = (state: RootState): boolean => state.collectionNote.isFetchingAttributes; diff --git a/src/collectionNote/types.ts b/src/collectionNote/types.ts index 69b67a025..c5db47d0a 100644 --- a/src/collectionNote/types.ts +++ b/src/collectionNote/types.ts @@ -1,5 +1,5 @@ import type { Action, Attributes, Methods } from "types"; -import type { LeaseId } from "leases/types"; +import type { LeaseId } from "@/leases/types"; export type CollectionNoteId = number; export type CollectionNoteState = { attributes: Attributes; diff --git a/src/comments/actions.ts b/src/comments/actions.ts index bce5ad53f..b4f7d1d6a 100644 --- a/src/comments/actions.ts +++ b/src/comments/actions.ts @@ -1,6 +1,6 @@ import { createAction } from "redux-actions"; import type { Attributes, Methods } from "types"; -import type { LeaseId } from "leases/types"; +import type { LeaseId } from "@/leases/types"; import type { Comment, CommentId, FetchAttributesAction, ReceiveAttributesAction, ReceiveMethodsAction, FetchCommentsByLeaseAction, CreateCommentAction, EditCommentAction, ReceiveCommentsByLeaseAction, CommentAttributesNotFoundAction, CommentNotFoundAction, ClearEditFlagsAction, HideEditModeByIdAction, ShowEditModeByIdAction, ReceiveIsSaveClickedAction } from "./types"; export const attributesNotFound = (): CommentAttributesNotFoundAction => createAction('mvj/comments/ATTRIBUTES_NOT_FOUND')(); export const notFound = (): CommentNotFoundAction => createAction('mvj/comments/NOT_FOUND')(); diff --git a/src/comments/helpers.ts b/src/comments/helpers.ts index 6ea571dcb..2dce93fd5 100644 --- a/src/comments/helpers.ts +++ b/src/comments/helpers.ts @@ -1,5 +1,5 @@ import get from "lodash/get"; -import { getContentUser } from "users/helpers"; +import { getContentUser } from "@/users/helpers"; /** * Get content comments diff --git a/src/comments/requests.ts b/src/comments/requests.ts index 12d6556f0..b20fbc161 100644 --- a/src/comments/requests.ts +++ b/src/comments/requests.ts @@ -1,5 +1,5 @@ -import callApi from "../api/callApi"; -import createUrl from "../api/createUrl"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; import type { Comment } from "./types"; export const fetchAttributes = (): Generator => { return callApi(new Request(createUrl('comment/'), { diff --git a/src/comments/saga.ts b/src/comments/saga.ts index 8736bb619..2f3ce1764 100644 --- a/src/comments/saga.ts +++ b/src/comments/saga.ts @@ -1,9 +1,9 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects"; import { initialize, SubmissionError } from "redux-form"; import { attributesNotFound, notFound, fetchCommentsByLease, hideEditModeById, receiveAttributes, receiveMethods, receiveCommentsByLease, receiveIsSaveClicked } from "./actions"; -import { receiveError } from "../api/actions"; -import { FormNames } from "enums"; -import { displayUIMessage } from "util/helpers"; +import { receiveError } from "@/api/actions"; +import { FormNames } from "@/enums"; +import { displayUIMessage } from "@/util/helpers"; import { createComment, editComment, fetchAttributes, fetchComments } from "./requests"; function* fetchAttributesSaga(): Generator { diff --git a/src/comments/selectors.ts b/src/comments/selectors.ts index 1b9000b18..d5a01be8a 100644 --- a/src/comments/selectors.ts +++ b/src/comments/selectors.ts @@ -1,7 +1,7 @@ import type { Attributes, Methods, Selector } from "types"; -import type { RootState } from "root/types"; +import type { RootState } from "@/root/types"; import type { CommentId, CommentList } from "./types"; -import type { LeaseId } from "leases/types"; +import type { LeaseId } from "@/leases/types"; export const getEditModeFlags: Selector, void> = (state: RootState): Record => state.comment.isEditModeById; export const getIsEditModeById: Selector = (state: RootState, commentId: CommentId): boolean => state.comment.isEditModeById[commentId]; export const getIsFetching: Selector = (state: RootState): boolean => state.comment.isFetching; diff --git a/src/comments/types.ts b/src/comments/types.ts index 62f9093ac..e4f4f34b9 100644 --- a/src/comments/types.ts +++ b/src/comments/types.ts @@ -1,5 +1,5 @@ import type { Action, Attributes, Methods } from "types"; -import type { LeaseId } from "leases/types"; +import type { LeaseId } from "@/leases/types"; export type CommentState = { attributes: Attributes; byLease: Record; diff --git a/src/components/address-search/AddressSearchInput.tsx b/src/components/address-search/AddressSearchInput.tsx index 696ebe76a..9ea036d5a 100644 --- a/src/components/address-search/AddressSearchInput.tsx +++ b/src/components/address-search/AddressSearchInput.tsx @@ -3,13 +3,12 @@ import ReactDOM from "react-dom"; import classNames from "classnames"; import capitalize from "lodash/capitalize"; import debounce from "lodash/debounce"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import { stringifyQuery } from "api/createUrl"; -import { KeyCodes } from "enums"; -import { findFromOcdString } from "util/helpers"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import { stringifyQuery } from "@/api/createUrl"; +import { KeyCodes } from "@/enums"; +import { findFromOcdString } from "@/util/helpers"; import { SERVICE_MAP_URL } from "util/constants"; - type Language = "fi" | "sv"; const MINIMUM_SEARCH_STRING = 3; const DEBOUNCE_TIME_MILLISECONDS = 500; diff --git a/src/components/attributes/AreaNoteAttributes.tsx b/src/components/attributes/AreaNoteAttributes.tsx index 9b604b3e8..b1ac90ec4 100644 --- a/src/components/attributes/AreaNoteAttributes.tsx +++ b/src/components/attributes/AreaNoteAttributes.tsx @@ -1,8 +1,8 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; -import { fetchAttributes as fetchAreaNoteAttributes } from "areaNote/actions"; -import { getAttributes as getAreaNoteAttributes, getIsFetchingAttributes as getIsFetchingAreaNoteAttributes, getMethods as getAreaNoteMethods } from "areaNote/selectors"; +import { fetchAttributes as fetchAreaNoteAttributes } from "@/areaNote/actions"; +import { getAttributes as getAreaNoteAttributes, getIsFetchingAttributes as getIsFetchingAreaNoteAttributes, getMethods as getAreaNoteMethods } from "@/areaNote/selectors"; import type { Attributes, Methods } from "types"; function AreaNoteAttributes(WrappedComponent: any) { diff --git a/src/components/attributes/AreaSearchAttributes.tsx b/src/components/attributes/AreaSearchAttributes.tsx index 9bdd4bfa5..db582dd3c 100644 --- a/src/components/attributes/AreaSearchAttributes.tsx +++ b/src/components/attributes/AreaSearchAttributes.tsx @@ -1,10 +1,10 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; -import { getAttributes, getIsFetchingAttributes, getIsFetchingListAttributes, getListAttributes, getListMethods, getMethods } from "areaSearch/selectors"; +import { getAttributes, getIsFetchingAttributes, getIsFetchingListAttributes, getListAttributes, getListMethods, getMethods } from "@/areaSearch/selectors"; import type { Attributes, Methods } from "types"; -import { fetchAttributes, fetchListAttributes } from "areaSearch/actions"; -import type { RootState } from "root/types"; +import { fetchAttributes, fetchListAttributes } from "@/areaSearch/actions"; +import type { RootState } from "@/root/types"; function AreaSearchAttributes(WrappedComponent: React.ComponentType) { type Props = { diff --git a/src/components/attributes/BatchrunJobRunsTabAttributes.tsx b/src/components/attributes/BatchrunJobRunsTabAttributes.tsx index 6867b81bf..40de77c7e 100644 --- a/src/components/attributes/BatchrunJobRunsTabAttributes.tsx +++ b/src/components/attributes/BatchrunJobRunsTabAttributes.tsx @@ -1,8 +1,8 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; -import { fetchJobRunAttributes as fetchBatchrunJobRunAttributes, fetchJobRunLogEntryAttributes as fetchBatchrunJobRunLogEntryAttributes } from "batchrun/actions"; -import { getIsFetchingJobRunAttributes as getIsFetchingBatchrunJobRunAttributes, getIsFetchingJobRunLogEntryAttributes as getIsFetchingBatchrunJobRunLogEntryAttributes, getJobRunAttributes as getBatchrunJobRunAttributes, getJobRunMethods as getBatchrunJobRunMethods, getJobRunLogEntryAttributes as getBatchrunJobRunLogEntryAttributes, getJobRunLogEntryMethods as getBatchrunJobRunLogEntryMethods } from "batchrun/selectors"; +import { fetchJobRunAttributes as fetchBatchrunJobRunAttributes, fetchJobRunLogEntryAttributes as fetchBatchrunJobRunLogEntryAttributes } from "@/batchrun/actions"; +import { getIsFetchingJobRunAttributes as getIsFetchingBatchrunJobRunAttributes, getIsFetchingJobRunLogEntryAttributes as getIsFetchingBatchrunJobRunLogEntryAttributes, getJobRunAttributes as getBatchrunJobRunAttributes, getJobRunMethods as getBatchrunJobRunMethods, getJobRunLogEntryAttributes as getBatchrunJobRunLogEntryAttributes, getJobRunLogEntryMethods as getBatchrunJobRunLogEntryMethods } from "@/batchrun/selectors"; import type { Attributes, Methods } from "types"; function BatchrunJobRunTabAttributes(WrappedComponent: any) { diff --git a/src/components/attributes/BatchrunScheduledJobsTabAttributes.tsx b/src/components/attributes/BatchrunScheduledJobsTabAttributes.tsx index ffaa061de..617f6c8b0 100644 --- a/src/components/attributes/BatchrunScheduledJobsTabAttributes.tsx +++ b/src/components/attributes/BatchrunScheduledJobsTabAttributes.tsx @@ -1,8 +1,8 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; -import { fetchScheduledJobAttributes as fetchBatchrunScheduledJobAttributes } from "batchrun/actions"; -import { getScheduledJobAttributes as getBatchrunScheduledJobAttributes, getIsFetchingScheduledJobAttributes as getIsFetchingBatchrunScheduledJobAttributes, getScheduledJobMethods as getBatchrunScheduledJobMethods } from "batchrun/selectors"; +import { fetchScheduledJobAttributes as fetchBatchrunScheduledJobAttributes } from "@/batchrun/actions"; +import { getScheduledJobAttributes as getBatchrunScheduledJobAttributes, getIsFetchingScheduledJobAttributes as getIsFetchingBatchrunScheduledJobAttributes, getScheduledJobMethods as getBatchrunScheduledJobMethods } from "@/batchrun/selectors"; import type { Attributes, Methods } from "types"; function BatchrunScheduledJobTabAttributes(WrappedComponent: any) { diff --git a/src/components/attributes/ContactAttributes.tsx b/src/components/attributes/ContactAttributes.tsx index b8b4aea63..7ea29f825 100644 --- a/src/components/attributes/ContactAttributes.tsx +++ b/src/components/attributes/ContactAttributes.tsx @@ -1,8 +1,8 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; -import { fetchAttributes as fetchContactAttributes } from "contacts/actions"; -import { getAttributes as getContactAttributes, getIsFetchingAttributes as getIsFetchingContactAttributes, getMethods as getContactMethods } from "contacts/selectors"; +import { fetchAttributes as fetchContactAttributes } from "@/contacts/actions"; +import { getAttributes as getContactAttributes, getIsFetchingAttributes as getIsFetchingContactAttributes, getMethods as getContactMethods } from "@/contacts/selectors"; import type { Attributes, Methods } from "types"; function ContactAttributes(WrappedComponent: any) { diff --git a/src/components/attributes/InfillDevelopmentListPageAttributes.tsx b/src/components/attributes/InfillDevelopmentListPageAttributes.tsx index 8db87013d..d51be592e 100644 --- a/src/components/attributes/InfillDevelopmentListPageAttributes.tsx +++ b/src/components/attributes/InfillDevelopmentListPageAttributes.tsx @@ -1,8 +1,8 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; -import { fetchAttributes as fetchInfillDevelopmentAttributes } from "infillDevelopment/actions"; -import { getAttributes as getInfillDevelopmentAttributes, getIsFetchingAttributes as getIsFetchingInfillDevelopmentAttributes, getMethods as getInfillDevelopmentMethods } from "infillDevelopment/selectors"; +import { fetchAttributes as fetchInfillDevelopmentAttributes } from "@/infillDevelopment/actions"; +import { getAttributes as getInfillDevelopmentAttributes, getIsFetchingAttributes as getIsFetchingInfillDevelopmentAttributes, getMethods as getInfillDevelopmentMethods } from "@/infillDevelopment/selectors"; import type { Attributes, Methods } from "types"; function InfillDevelopmentListPageAttributes(WrappedComponent: any) { diff --git a/src/components/attributes/InfillDevelopmentPageAttributes.tsx b/src/components/attributes/InfillDevelopmentPageAttributes.tsx index 09527666e..36ac5df21 100644 --- a/src/components/attributes/InfillDevelopmentPageAttributes.tsx +++ b/src/components/attributes/InfillDevelopmentPageAttributes.tsx @@ -1,12 +1,12 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; -import { fetchAttributes as fetchInfillDevelopmentAttributes } from "infillDevelopment/actions"; -import { fetchAttributes as fetchInfillDevelopmentAttachmentAttributes } from "infillDevelopmentAttachment/actions"; -import { fetchAttributes as fetchLeaseAttributes } from "leases/actions"; -import { getAttributes as getInfillDevelopmentAttributes, getIsFetchingAttributes as getIsFetchingInfillDevelopmentAttributes, getMethods as getInfillDevelopmentMethods } from "infillDevelopment/selectors"; -import { getAttributes as getInfillDevelopmentAttachmentAttributes, getIsFetchingAttributes as getIsFetchingInfillDevelopmentAttachmentAttributes, getMethods as getInfillDevelopmentAttachmentMethods } from "infillDevelopmentAttachment/selectors"; -import { getAttributes as getLeaseAttributes, getIsFetchingAttributes as getIsFetchingLeaseAttributes, getMethods as getLeaseMethods } from "leases/selectors"; +import { fetchAttributes as fetchInfillDevelopmentAttributes } from "@/infillDevelopment/actions"; +import { fetchAttributes as fetchInfillDevelopmentAttachmentAttributes } from "@/infillDevelopmentAttachment/actions"; +import { fetchAttributes as fetchLeaseAttributes } from "@/leases/actions"; +import { getAttributes as getInfillDevelopmentAttributes, getIsFetchingAttributes as getIsFetchingInfillDevelopmentAttributes, getMethods as getInfillDevelopmentMethods } from "@/infillDevelopment/selectors"; +import { getAttributes as getInfillDevelopmentAttachmentAttributes, getIsFetchingAttributes as getIsFetchingInfillDevelopmentAttachmentAttributes, getMethods as getInfillDevelopmentAttachmentMethods } from "@/infillDevelopmentAttachment/selectors"; +import { getAttributes as getLeaseAttributes, getIsFetchingAttributes as getIsFetchingLeaseAttributes, getMethods as getLeaseMethods } from "@/leases/selectors"; import type { Attributes, Methods } from "types"; function InfillDevelopmentPageAttributes(WrappedComponent: any) { diff --git a/src/components/attributes/InvoiceNoteAttributes.tsx b/src/components/attributes/InvoiceNoteAttributes.tsx index 9f41774ca..bd1ee6984 100644 --- a/src/components/attributes/InvoiceNoteAttributes.tsx +++ b/src/components/attributes/InvoiceNoteAttributes.tsx @@ -1,8 +1,8 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; -import { fetchAttributes as fetchInvoiceNoteAttributes } from "invoiceNote/actions"; -import { getAttributes as getInvoiceNoteAttributes, getIsFetchingAttributes as getIsFetchingInvoiceNoteAttributes, getMethods as getInvoiceNoteMethods } from "invoiceNote/selectors"; +import { fetchAttributes as fetchInvoiceNoteAttributes } from "@/invoiceNote/actions"; +import { getAttributes as getInvoiceNoteAttributes, getIsFetchingAttributes as getIsFetchingInvoiceNoteAttributes, getMethods as getInvoiceNoteMethods } from "@/invoiceNote/selectors"; import type { Attributes, Methods } from "types"; function InvoiceNoteAttributes(WrappedComponent: any) { diff --git a/src/components/attributes/LandUseContractAttributes.tsx b/src/components/attributes/LandUseContractAttributes.tsx index 1bb84651d..5cc659139 100644 --- a/src/components/attributes/LandUseContractAttributes.tsx +++ b/src/components/attributes/LandUseContractAttributes.tsx @@ -1,11 +1,11 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; -import { fetchAttributes as fetchLandUseContractAttributes } from "landUseContract/actions"; -import { getAttributes as getLandUseContractAttributes, getIsFetchingAttributes as getIsFetchingLandUseContractAttributes, getMethods as getLandUseContractMethods } from "landUseContract/selectors"; +import { fetchAttributes as fetchLandUseContractAttributes } from "@/landUseContract/actions"; +import { getAttributes as getLandUseContractAttributes, getIsFetchingAttributes as getIsFetchingLandUseContractAttributes, getMethods as getLandUseContractMethods } from "@/landUseContract/selectors"; import type { Attributes, Methods } from "types"; -import { fetchAttributes as fetchLandUseAgreementAttachmentAttributes } from "landUseAgreementAttachment/actions"; -import { getAttributes as getLandUseAgreementAttachmentAttributes, getIsFetchingAttributes as getIsFetchingLandUseAgreementAttachmentAttributes, getMethods as getLandUseAgreementAttachmentMethods } from "landUseAgreementAttachment/selectors"; +import { fetchAttributes as fetchLandUseAgreementAttachmentAttributes } from "@/landUseAgreementAttachment/actions"; +import { getAttributes as getLandUseAgreementAttachmentAttributes, getIsFetchingAttributes as getIsFetchingLandUseAgreementAttachmentAttributes, getMethods as getLandUseAgreementAttachmentMethods } from "@/landUseAgreementAttachment/selectors"; function LandUseContractAttributes(WrappedComponent: any) { type Props = { diff --git a/src/components/attributes/LeaseAttributes.tsx b/src/components/attributes/LeaseAttributes.tsx index 635ef8b4d..f196f3cea 100644 --- a/src/components/attributes/LeaseAttributes.tsx +++ b/src/components/attributes/LeaseAttributes.tsx @@ -1,8 +1,8 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; -import { fetchAttributes as fetchLeaseAttributes } from "leases/actions"; -import { getAttributes as getLeaseAttributes, getIsFetchingAttributes as getIsFetchingLeaseAttributes, getMethods as getLeaseMethods } from "leases/selectors"; +import { fetchAttributes as fetchLeaseAttributes } from "@/leases/actions"; +import { getAttributes as getLeaseAttributes, getIsFetchingAttributes as getIsFetchingLeaseAttributes, getMethods as getLeaseMethods } from "@/leases/selectors"; import type { Attributes, Methods } from "types"; function LeaseAttributes(WrappedComponent: any) { diff --git a/src/components/attributes/LeaseInvoiceTabAttributes.tsx b/src/components/attributes/LeaseInvoiceTabAttributes.tsx index 7855f1297..edbc09c11 100644 --- a/src/components/attributes/LeaseInvoiceTabAttributes.tsx +++ b/src/components/attributes/LeaseInvoiceTabAttributes.tsx @@ -1,20 +1,20 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; -import { fetchAttributes as fetchCollectionCourtDecisionAttributes } from "collectionCourtDecision/actions"; -import { fetchAttributes as fetchCollectionLetterAttributes } from "collectionLetter/actions"; -import { fetchAttributes as fetchCollectionNoteAttributes } from "collectionNote/actions"; -import { fetchAttributes as fetchCreateCollectionLetterAttributes } from "createCollectionLetter/actions"; -import { fetchAttributes as fetchInvoiceNoteAttributes } from "invoiceNote/actions"; -import { fetchAttributes as fetchLeaseCreateChargeAttributes } from "leaseCreateCharge/actions"; -import { fetchReceivableTypes } from "leaseCreateCharge/actions"; -import { getAttributes as getCollectionCourtDecisionAttributes, getIsFetchingAttributes as getIsFetchingCollectionCourtDecisionAttributes, getMethods as getCollectionCourtDecisionMethods } from "collectionCourtDecision/selectors"; -import { getAttributes as getCollectionLetterAttributes, getIsFetchingAttributes as getIsFetchignCollectionLetterAttributes, getMethods as getCollectionLetterMethods } from "collectionLetter/selectors"; -import { getAttributes as getCollectionNoteAttributes, getIsFetchingAttributes as getIsFetchingCollectionNoteAttributes, getMethods as getCollectionNoteMethods } from "collectionNote/selectors"; -import { getAttributes as getCreateCollectionLetterAttributes, getIsFetchingAttributes as getIsFetchignCreateCollectionLetterAttributes } from "createCollectionLetter/selectors"; -import { getAttributes as getInvoiceNoteAttributes, getIsFetchingAttributes as getIsFetchingInvoiceNoteAttributes, getMethods as getInvoiceNoteMethods } from "invoiceNote/selectors"; -import { getAttributes as getLeaseCreateChargeAttributes, getIsFetchingAttributes as getIsFetchingLeaseCreateChargeAttributes } from "leaseCreateCharge/selectors"; -import { getIsFetchingReceivableTypes, getReceivableTypes } from "leaseCreateCharge/selectors"; +import { fetchAttributes as fetchCollectionCourtDecisionAttributes } from "@/collectionCourtDecision/actions"; +import { fetchAttributes as fetchCollectionLetterAttributes } from "@/collectionLetter/actions"; +import { fetchAttributes as fetchCollectionNoteAttributes } from "@/collectionNote/actions"; +import { fetchAttributes as fetchCreateCollectionLetterAttributes } from "@/createCollectionLetter/actions"; +import { fetchAttributes as fetchInvoiceNoteAttributes } from "@/invoiceNote/actions"; +import { fetchAttributes as fetchLeaseCreateChargeAttributes } from "@/leaseCreateCharge/actions"; +import { fetchReceivableTypes } from "@/leaseCreateCharge/actions"; +import { getAttributes as getCollectionCourtDecisionAttributes, getIsFetchingAttributes as getIsFetchingCollectionCourtDecisionAttributes, getMethods as getCollectionCourtDecisionMethods } from "@/collectionCourtDecision/selectors"; +import { getAttributes as getCollectionLetterAttributes, getIsFetchingAttributes as getIsFetchignCollectionLetterAttributes, getMethods as getCollectionLetterMethods } from "@/collectionLetter/selectors"; +import { getAttributes as getCollectionNoteAttributes, getIsFetchingAttributes as getIsFetchingCollectionNoteAttributes, getMethods as getCollectionNoteMethods } from "@/collectionNote/selectors"; +import { getAttributes as getCreateCollectionLetterAttributes, getIsFetchingAttributes as getIsFetchignCreateCollectionLetterAttributes } from "@/createCollectionLetter/selectors"; +import { getAttributes as getInvoiceNoteAttributes, getIsFetchingAttributes as getIsFetchingInvoiceNoteAttributes, getMethods as getInvoiceNoteMethods } from "@/invoiceNote/selectors"; +import { getAttributes as getLeaseCreateChargeAttributes, getIsFetchingAttributes as getIsFetchingLeaseCreateChargeAttributes } from "@/leaseCreateCharge/selectors"; +import { getIsFetchingReceivableTypes, getReceivableTypes } from "@/leaseCreateCharge/selectors"; import type { Attributes, Methods } from "types"; function LeaseInvoiceTabAttributes(WrappedComponent: any) { diff --git a/src/components/attributes/LeaseInvoicingConfirmationReportAttributes.tsx b/src/components/attributes/LeaseInvoicingConfirmationReportAttributes.tsx index 430964f65..baf45d590 100644 --- a/src/components/attributes/LeaseInvoicingConfirmationReportAttributes.tsx +++ b/src/components/attributes/LeaseInvoicingConfirmationReportAttributes.tsx @@ -1,8 +1,8 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; -import { fetchLeaseInvoicingConfirmationReportAttributes } from "leaseStatisticReport/actions"; -import { getReportData, getIsFetchingReportData, getReportOptions, getReports } from "leaseStatisticReport/selectors"; +import { fetchLeaseInvoicingConfirmationReportAttributes } from "@/leaseStatisticReport/actions"; +import { getReportData, getIsFetchingReportData, getReportOptions, getReports } from "@/leaseStatisticReport/selectors"; function LeaseInvoicingConfirmationReportAttributes(WrappedComponent: any) { type Props = {}; diff --git a/src/components/attributes/LeasePageAttributes.tsx b/src/components/attributes/LeasePageAttributes.tsx index 29cb5ab2b..fb4244810 100644 --- a/src/components/attributes/LeasePageAttributes.tsx +++ b/src/components/attributes/LeasePageAttributes.tsx @@ -1,15 +1,15 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; -import { fetchAttributes as fetchCommentAttributes } from "comments/actions"; -import { fetchAttributes as fetchInvoiceAttributes } from "invoices/actions"; -import { fetchAttributes as fetchLeaseAttributes } from "leases/actions"; -import { getAttributes as getCommentAttributes, getIsFetchingAttributes as getIsFetchingCommentAttributes, getMethods as getCommentMethods } from "comments/selectors"; -import { getAttributes as getInvoiceAttributes, getIsFetchingAttributes as getIsFetchingInvoiceAttributes, getMethods as getInvoiceMethods } from "invoices/selectors"; -import { getAttributes as getLeaseAttributes, getIsFetchingAttributes as getIsFetchingLeaseAttributes, getMethods as getLeaseMethods } from "leases/selectors"; -import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "usersPermissions/selectors"; +import { fetchAttributes as fetchCommentAttributes } from "@/comments/actions"; +import { fetchAttributes as fetchInvoiceAttributes } from "@/invoices/actions"; +import { fetchAttributes as fetchLeaseAttributes } from "@/leases/actions"; +import { getAttributes as getCommentAttributes, getIsFetchingAttributes as getIsFetchingCommentAttributes, getMethods as getCommentMethods } from "@/comments/selectors"; +import { getAttributes as getInvoiceAttributes, getIsFetchingAttributes as getIsFetchingInvoiceAttributes, getMethods as getInvoiceMethods } from "@/invoices/selectors"; +import { getAttributes as getLeaseAttributes, getIsFetchingAttributes as getIsFetchingLeaseAttributes, getMethods as getLeaseMethods } from "@/leases/selectors"; +import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "@/usersPermissions/selectors"; import type { Attributes, Methods } from "types"; -import type { UsersPermissions } from "usersPermissions/types"; +import type { UsersPermissions } from "@/usersPermissions/types"; function LeasePageAttributes(WrappedComponent: any) { type Props = { diff --git a/src/components/attributes/LeaseStatisticReportAttributes.tsx b/src/components/attributes/LeaseStatisticReportAttributes.tsx index 2df1f2346..3707b8caa 100644 --- a/src/components/attributes/LeaseStatisticReportAttributes.tsx +++ b/src/components/attributes/LeaseStatisticReportAttributes.tsx @@ -1,9 +1,9 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; -import { fetchAttributes as fetchLeaseStatisticReportAttributes } from "leaseStatisticReport/actions"; -import { fetchReports } from "leaseStatisticReport/actions"; -import { getAttributes as getLeaseStatisticReportAttributes, getIsFetchingAttributes as getIsFetchingLeaseStatisticReportAttributes, getReports, getIsFetchingReports, getIsFetchingReportData, getIsSendingMail } from "leaseStatisticReport/selectors"; +import { fetchAttributes as fetchLeaseStatisticReportAttributes } from "@/leaseStatisticReport/actions"; +import { fetchReports } from "@/leaseStatisticReport/actions"; +import { getAttributes as getLeaseStatisticReportAttributes, getIsFetchingAttributes as getIsFetchingLeaseStatisticReportAttributes, getReports, getIsFetchingReports, getIsFetchingReportData, getIsSendingMail } from "@/leaseStatisticReport/selectors"; import type { Attributes, Methods, Reports } from "types"; function LeaseStatisticReportTabAttributes(WrappedComponent: any) { diff --git a/src/components/attributes/LeaseholdTransferAttributes.tsx b/src/components/attributes/LeaseholdTransferAttributes.tsx index ff11da25e..b6409a67f 100644 --- a/src/components/attributes/LeaseholdTransferAttributes.tsx +++ b/src/components/attributes/LeaseholdTransferAttributes.tsx @@ -1,8 +1,8 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; -import { fetchAttributes as fetchLeaseholdTransferAttributes } from "leaseholdTransfer/actions"; -import { getAttributes as getLeaseholdTransferAttributes, getIsFetchingAttributes as getIsFetchingLeaseholdTransferAttributes, getMethods as getLeaseholdTransferMethods } from "leaseholdTransfer/selectors"; +import { fetchAttributes as fetchLeaseholdTransferAttributes } from "@/leaseholdTransfer/actions"; +import { getAttributes as getLeaseholdTransferAttributes, getIsFetchingAttributes as getIsFetchingLeaseholdTransferAttributes, getMethods as getLeaseholdTransferMethods } from "@/leaseholdTransfer/selectors"; import type { Attributes, Methods } from "types"; function LeaseholdTransferAttributes(WrappedComponent: any) { diff --git a/src/components/attributes/PlotApplicationsAttributes.tsx b/src/components/attributes/PlotApplicationsAttributes.tsx index e40346c1a..235e08350 100644 --- a/src/components/attributes/PlotApplicationsAttributes.tsx +++ b/src/components/attributes/PlotApplicationsAttributes.tsx @@ -2,8 +2,8 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; import type { Attributes, Methods } from "types"; -import { fetchAttributes as fetchPlotApplicationsAttributes } from "application/actions"; -import { getAttributes as getPlotApplicationsAttributes, getIsFetchingAttributes as getIsFetchingPlotApplicationsAttributes, getMethods } from "application/selectors"; +import { fetchAttributes as fetchPlotApplicationsAttributes } from "@/application/actions"; +import { getAttributes as getPlotApplicationsAttributes, getIsFetchingAttributes as getIsFetchingPlotApplicationsAttributes, getMethods } from "@/application/selectors"; function PlotApplicationsAttributes(WrappedComponent: any) { type Props = { diff --git a/src/components/attributes/PlotSearchAttributes.tsx b/src/components/attributes/PlotSearchAttributes.tsx index ab75b7c25..6557bf324 100644 --- a/src/components/attributes/PlotSearchAttributes.tsx +++ b/src/components/attributes/PlotSearchAttributes.tsx @@ -1,10 +1,10 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; -import { fetchAttributes as fetchPlotSearchAttributes, fetchPlotSearchSubtypes } from "plotSearch/actions"; -import { getAttributes as getPlotSearchAttributes, getIsFetchingAttributes as getIsFetchingPlotSearchAttributes, getPlotSearchMethods, getPlotSearchSubTypes, getIsFetching } from "plotSearch/selectors"; -import { getFormAttributes, getIsFetchingFormAttributes } from "application/selectors"; -import { fetchFormAttributes } from "application/actions"; +import { fetchAttributes as fetchPlotSearchAttributes, fetchPlotSearchSubtypes } from "@/plotSearch/actions"; +import { getAttributes as getPlotSearchAttributes, getIsFetchingAttributes as getIsFetchingPlotSearchAttributes, getPlotSearchMethods, getPlotSearchSubTypes, getIsFetching } from "@/plotSearch/selectors"; +import { getFormAttributes, getIsFetchingFormAttributes } from "@/application/selectors"; +import { fetchFormAttributes } from "@/application/actions"; import type { Attributes, Methods } from "types"; function PlotSearchAttributes(WrappedComponent: any) { diff --git a/src/components/attributes/RentBasisAttributes.tsx b/src/components/attributes/RentBasisAttributes.tsx index 7a83aa033..b72e3d3f0 100644 --- a/src/components/attributes/RentBasisAttributes.tsx +++ b/src/components/attributes/RentBasisAttributes.tsx @@ -1,8 +1,8 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; -import { fetchAttributes as fetchRentBasisAttributes } from "rentbasis/actions"; -import { getAttributes as getRentBasisAttributes, getIsFetchingAttributes as getIsFetchingRentBasisAttributes, getMethods as getRentBasisMethods } from "rentbasis/selectors"; +import { fetchAttributes as fetchRentBasisAttributes } from "@/rentbasis/actions"; +import { getAttributes as getRentBasisAttributes, getIsFetchingAttributes as getIsFetchingRentBasisAttributes, getMethods as getRentBasisMethods } from "@/rentbasis/selectors"; import type { Attributes, Methods } from "types"; function RentBasisAttributes(WrappedComponent: any) { diff --git a/src/components/attributes/SapInvoicesAttributes.tsx b/src/components/attributes/SapInvoicesAttributes.tsx index 1a9eb392e..e31acb93d 100644 --- a/src/components/attributes/SapInvoicesAttributes.tsx +++ b/src/components/attributes/SapInvoicesAttributes.tsx @@ -1,8 +1,8 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; -import { fetchAttributes as fetchInvoiceAttributes } from "invoices/actions"; -import { getAttributes as getInvoiceAttributes, getIsFetchingAttributes as getIsFetchingInvoiceAttributes, getMethods as getInvoiceMethods } from "invoices/selectors"; +import { fetchAttributes as fetchInvoiceAttributes } from "@/invoices/actions"; +import { getAttributes as getInvoiceAttributes, getIsFetchingAttributes as getIsFetchingInvoiceAttributes, getMethods as getInvoiceMethods } from "@/invoices/selectors"; import type { Attributes, Methods } from "types"; function SapInvoicesAttributes(WrappedComponent: any) { diff --git a/src/components/attributes/UsersPermissions.tsx b/src/components/attributes/UsersPermissions.tsx index 7d96587ef..85b336862 100644 --- a/src/components/attributes/UsersPermissions.tsx +++ b/src/components/attributes/UsersPermissions.tsx @@ -2,9 +2,9 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; -import { fetchUsersPermissions } from "usersPermissions/actions"; -import { getUsersPermissions, getIsFetching as getIsFetchingUsersPermissions } from "usersPermissions/selectors"; -import type { UsersPermissions } from "usersPermissions/types"; +import { fetchUsersPermissions } from "@/usersPermissions/actions"; +import { getUsersPermissions, getIsFetching as getIsFetchingUsersPermissions } from "@/usersPermissions/selectors"; +import type { UsersPermissions } from "@/usersPermissions/types"; function UsersPermissionsWrapper(WrappedComponent: any) { type Props = { diff --git a/src/components/auditLog/AuditLogTableItem.tsx b/src/components/auditLog/AuditLogTableItem.tsx index 47ba20324..82917c499 100644 --- a/src/components/auditLog/AuditLogTableItem.tsx +++ b/src/components/auditLog/AuditLogTableItem.tsx @@ -1,10 +1,10 @@ import React, { Fragment, PureComponent } from "react"; import classNames from "classnames"; -import AccordionIcon from "components/icons/AccordionIcon"; +import AccordionIcon from "@/components/icons/AccordionIcon"; import AuditLogTableItemChange from "./AuditLogTableItemChange"; -import { formatDate } from "util/helpers"; -import { getAuditLogActionTypeInFinnish } from "auditLog/helpers"; -import { getUserFullName } from "users/helpers"; +import { formatDate } from "@/util/helpers"; +import { getAuditLogActionTypeInFinnish } from "@/auditLog/helpers"; +import { getUserFullName } from "@/users/helpers"; type Props = { item: Record; }; diff --git a/src/components/auditLog/AuditLogTableItemChange.tsx b/src/components/auditLog/AuditLogTableItemChange.tsx index bca2b9ac0..eb699395c 100644 --- a/src/components/auditLog/AuditLogTableItemChange.tsx +++ b/src/components/auditLog/AuditLogTableItemChange.tsx @@ -1,12 +1,12 @@ import React from "react"; import { connect } from "react-redux"; -import ShowMore from "components/showMore/ShowMore"; -import { getAuditLogContentLabel } from "auditLog/helpers"; -import { getAttributes as getCommentAttributes } from "comments/selectors"; -import { getAttributes as getContactAttributes } from "contacts/selectors"; -import { getAttributes as getInfillDevelopmentCompensationAttributes } from "infillDevelopment/selectors"; -import { getAttributes as getInvoiceAttributes } from "invoices/selectors"; -import { getAttributes as getLeaseAttributes } from "leases/selectors"; +import ShowMore from "@/components/showMore/ShowMore"; +import { getAuditLogContentLabel } from "@/auditLog/helpers"; +import { getAttributes as getCommentAttributes } from "@/comments/selectors"; +import { getAttributes as getContactAttributes } from "@/contacts/selectors"; +import { getAttributes as getInfillDevelopmentCompensationAttributes } from "@/infillDevelopment/selectors"; +import { getAttributes as getInvoiceAttributes } from "@/invoices/selectors"; +import { getAttributes as getLeaseAttributes } from "@/leases/selectors"; import type { Attributes } from "types"; type Props = { change: { diff --git a/src/components/button/BackButton.tsx b/src/components/button/BackButton.tsx index de786654e..860aa0c6e 100644 --- a/src/components/button/BackButton.tsx +++ b/src/components/button/BackButton.tsx @@ -1,6 +1,6 @@ import React from "react"; import classNames from "classnames"; -import BackIcon from "components/icons/BackIcon"; +import BackIcon from "@/components/icons/BackIcon"; import IconButton from "./IconButton"; type Props = { className?: string; diff --git a/src/components/button/CloseButton.tsx b/src/components/button/CloseButton.tsx index d01a7c5f9..ee5db0e45 100644 --- a/src/components/button/CloseButton.tsx +++ b/src/components/button/CloseButton.tsx @@ -1,7 +1,5 @@ import React from "react"; import classNames from "classnames"; -// @ts-ignore: unable to find svg file. Handled by webpack? -import closeIcon from "../../../assets/icons/icon_close.svg"; type Props = { className?: string; onClick: (...args: Array) => any; @@ -31,7 +29,7 @@ const CloseButton = ({ }; return ; }; diff --git a/src/components/button/EditButton.tsx b/src/components/button/EditButton.tsx index e5033bba0..bd184026a 100644 --- a/src/components/button/EditButton.tsx +++ b/src/components/button/EditButton.tsx @@ -1,6 +1,6 @@ import React from "react"; import classNames from "classnames"; -import EditIcon from "components/icons/EditIcon"; +import EditIcon from "@/components/icons/EditIcon"; type Props = { className?: string; disabled?: boolean; diff --git a/src/components/button/SendupButton.tsx b/src/components/button/SendupButton.tsx index c70273a38..4e01dc0b5 100644 --- a/src/components/button/SendupButton.tsx +++ b/src/components/button/SendupButton.tsx @@ -1,6 +1,6 @@ import React from "react"; import classNames from "classnames"; -import SendupIcon from "components/icons/SendupIcon"; +import SendupIcon from "@/components/icons/SendupIcon"; type Props = { className?: string; onClick: (...args: Array) => any; diff --git a/src/components/collapse/Collapse.tsx b/src/components/collapse/Collapse.tsx index b797a2883..d44fc9c32 100644 --- a/src/components/collapse/Collapse.tsx +++ b/src/components/collapse/Collapse.tsx @@ -4,13 +4,13 @@ import ReactDOM from "react-dom"; import classNames from "classnames"; import { Row, Column } from "react-foundation"; import ReactResizeDetector from "react-resize-detector"; -import AccordionIcon from "../icons/AccordionIcon"; -import ArchiveButton from "../form/ArchiveButton"; +import AccordionIcon from "@/components/icons/AccordionIcon"; +import ArchiveButton from "@/components/form/ArchiveButton"; import CollapseHeaderTitle from "./CollapseHeaderTitle"; -import AttachButton from "../form/AttachButton"; -import CopyToClipboardButton from "../form/CopyToClipboardButton"; -import RemoveButton from "../form/RemoveButton"; -import UnarchiveButton from "../form/UnarchiveButton"; +import AttachButton from "@/components/form/AttachButton"; +import CopyToClipboardButton from "@/components/form/CopyToClipboardButton"; +import RemoveButton from "@/components/form/RemoveButton"; +import UnarchiveButton from "@/components/form/UnarchiveButton"; type Props = { archived?: boolean; children: any; diff --git a/src/components/collapse/CollapseHeaderTitle.tsx b/src/components/collapse/CollapseHeaderTitle.tsx index a7375902c..3dbbc5c00 100644 --- a/src/components/collapse/CollapseHeaderTitle.tsx +++ b/src/components/collapse/CollapseHeaderTitle.tsx @@ -2,7 +2,7 @@ import { $Shape } from "utility-types"; import React, { PureComponent } from "react"; import ReactDOM from "react-dom"; import classNames from "classnames"; -import UIDataTooltip from "components/tooltip/UIDataTooltip"; +import UIDataTooltip from "@/components/tooltip/UIDataTooltip"; type Props = { children?: any; enableUiDataEdit?: boolean; diff --git a/src/components/content/SubTitle.tsx b/src/components/content/SubTitle.tsx index 216c462ab..9754ee2ee 100644 --- a/src/components/content/SubTitle.tsx +++ b/src/components/content/SubTitle.tsx @@ -2,7 +2,7 @@ import { $Shape } from "utility-types"; import React, { PureComponent } from "react"; import ReactDOM from "react-dom"; import classNames from "classnames"; -import UIDataTooltip from "components/tooltip/UIDataTooltip"; +import UIDataTooltip from "@/components/tooltip/UIDataTooltip"; type Props = { children?: any; enableUiDataEdit?: boolean; diff --git a/src/components/content/Title.tsx b/src/components/content/Title.tsx index 8511c5499..6713fab6b 100644 --- a/src/components/content/Title.tsx +++ b/src/components/content/Title.tsx @@ -2,7 +2,7 @@ import { $Shape } from "utility-types"; import React, { PureComponent } from "react"; import ReactDOM from "react-dom"; import classNames from "classnames"; -import UIDataTooltip from "components/tooltip/UIDataTooltip"; +import UIDataTooltip from "@/components/tooltip/UIDataTooltip"; type Props = { children?: any; enableUiDataEdit?: boolean; diff --git a/src/components/content/TitleH3.tsx b/src/components/content/TitleH3.tsx index 464e05aa3..2dbac3e9c 100644 --- a/src/components/content/TitleH3.tsx +++ b/src/components/content/TitleH3.tsx @@ -2,7 +2,7 @@ import { $Shape } from "utility-types"; import React, { PureComponent } from "react"; import ReactDOM from "react-dom"; import classNames from "classnames"; -import UIDataTooltip from "components/tooltip/UIDataTooltip"; +import UIDataTooltip from "@/components/tooltip/UIDataTooltip"; type Props = { children?: any; enableUiDataEdit?: boolean; diff --git a/src/components/controlButtons/CommentButton.tsx b/src/components/controlButtons/CommentButton.tsx index 75e843bef..a0bb85b08 100644 --- a/src/components/controlButtons/CommentButton.tsx +++ b/src/components/controlButtons/CommentButton.tsx @@ -1,5 +1,5 @@ import React from "react"; -import CommentIcon from "components/icons/CommentIcon"; +import CommentIcon from "@/components/icons/CommentIcon"; type Props = { commentAmount: number; onClick: (...args: Array) => any; diff --git a/src/components/controlButtons/ControlButtonBar.tsx b/src/components/controlButtons/ControlButtonBar.tsx index 4c814af0a..c1bb121ac 100644 --- a/src/components/controlButtons/ControlButtonBar.tsx +++ b/src/components/controlButtons/ControlButtonBar.tsx @@ -1,9 +1,9 @@ import React from "react"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import BackButton from "components/button/BackButton"; -import { ConfirmationModalTexts } from "enums"; -import { ButtonColors } from "components/enums"; -import { hasAnyPageDirtyForms } from "util/forms"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import BackButton from "@/components/button/BackButton"; +import { ConfirmationModalTexts } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { hasAnyPageDirtyForms } from "@/util/forms"; type Props = { buttonComponent?: any; infoComponent?: any; diff --git a/src/components/controlButtons/ControlButtons.tsx b/src/components/controlButtons/ControlButtons.tsx index f861c939f..a3ba48a4c 100644 --- a/src/components/controlButtons/ControlButtons.tsx +++ b/src/components/controlButtons/ControlButtons.tsx @@ -1,11 +1,11 @@ import React from "react"; import Button from "../button/Button"; -import Authorization from "components/authorization/Authorization"; +import Authorization from "@/components/authorization/Authorization"; import CommentButton from "./CommentButton"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import { ConfirmationModalTexts } from "enums"; -import { hasAnyPageDirtyForms } from "util/forms"; -import { ButtonColors } from "components/enums"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import { ConfirmationModalTexts } from "@/enums"; +import { hasAnyPageDirtyForms } from "@/util/forms"; +import { ButtonColors } from "@/components/enums"; type Props = { allowComments?: boolean; allowCopy?: boolean; diff --git a/src/components/excel/ExcelLink.tsx b/src/components/excel/ExcelLink.tsx index c50c62d82..7b2681228 100644 --- a/src/components/excel/ExcelLink.tsx +++ b/src/components/excel/ExcelLink.tsx @@ -1,11 +1,11 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import { saveAs } from "file-saver"; -import ExcelIcon from "components/icons/ExcelIcon"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import { getApiToken } from "auth/selectors"; -import { displayUIMessage } from "util/helpers"; +import ExcelIcon from "@/components/icons/ExcelIcon"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import { getApiToken } from "@/auth/selectors"; +import { displayUIMessage } from "@/util/helpers"; type Props = { label: string; apiToken: string; diff --git a/src/components/file/FileDownloadButton.tsx b/src/components/file/FileDownloadButton.tsx index bc9a9a3ae..33c1f85bb 100644 --- a/src/components/file/FileDownloadButton.tsx +++ b/src/components/file/FileDownloadButton.tsx @@ -2,10 +2,10 @@ import React from "react"; import { connect } from "react-redux"; import debounce from "lodash/debounce"; import { saveAs } from "file-saver"; -import Button from "components/button/Button"; -import { ButtonColors } from "components/enums"; -import { displayUIMessage, getFileNameFromResponse } from "util/helpers"; -import { getApiToken } from "auth/selectors"; +import Button from "@/components/button/Button"; +import { ButtonColors } from "@/components/enums"; +import { displayUIMessage, getFileNameFromResponse } from "@/util/helpers"; +import { getApiToken } from "@/auth/selectors"; type OwnProps = { disabled: boolean; label: string; diff --git a/src/components/file/FileDownloadLink.tsx b/src/components/file/FileDownloadLink.tsx index 2a941945f..0755a7552 100644 --- a/src/components/file/FileDownloadLink.tsx +++ b/src/components/file/FileDownloadLink.tsx @@ -2,10 +2,10 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import { saveAs } from "file-saver"; import classNames from "classnames"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import { displayUIMessage, getFileNameFromResponse } from "util/helpers"; -import { getApiToken } from "auth/selectors"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import { displayUIMessage, getFileNameFromResponse } from "@/util/helpers"; +import { getApiToken } from "@/auth/selectors"; type Props = { apiToken: string; className?: string; diff --git a/src/components/form/AddButton.tsx b/src/components/form/AddButton.tsx index 88afdaccf..f4f2e1d77 100644 --- a/src/components/form/AddButton.tsx +++ b/src/components/form/AddButton.tsx @@ -1,6 +1,6 @@ import React from "react"; import classNames from "classnames"; -import AddIcon from "components/icons/AddIcon"; +import AddIcon from "@/components/icons/AddIcon"; type Props = { className?: string; disabled?: boolean; diff --git a/src/components/form/AddButtonSecondary.tsx b/src/components/form/AddButtonSecondary.tsx index 5b86699fa..85a97d32a 100644 --- a/src/components/form/AddButtonSecondary.tsx +++ b/src/components/form/AddButtonSecondary.tsx @@ -1,6 +1,6 @@ import React from "react"; import classNames from "classnames"; -import AddIcon from "components/icons/AddIcon"; +import AddIcon from "@/components/icons/AddIcon"; type Props = { className?: string; disabled?: boolean; diff --git a/src/components/form/AddButtonThird.tsx b/src/components/form/AddButtonThird.tsx index 469c1d07c..a72da49cb 100644 --- a/src/components/form/AddButtonThird.tsx +++ b/src/components/form/AddButtonThird.tsx @@ -1,6 +1,6 @@ import React from "react"; import classNames from "classnames"; -import AddIcon from "components/icons/AddIcon"; +import AddIcon from "@/components/icons/AddIcon"; type Props = { className?: string; disabled?: boolean; diff --git a/src/components/form/AddFileButton.tsx b/src/components/form/AddFileButton.tsx index a9da8417b..c7fd4c91f 100644 --- a/src/components/form/AddFileButton.tsx +++ b/src/components/form/AddFileButton.tsx @@ -1,5 +1,5 @@ import React from "react"; -import AddIcon from "components/icons/AddIcon"; +import AddIcon from "@/components/icons/AddIcon"; type Props = { label: string; name: string; diff --git a/src/components/form/ArchiveButton.tsx b/src/components/form/ArchiveButton.tsx index cad81d35b..9cafda983 100644 --- a/src/components/form/ArchiveButton.tsx +++ b/src/components/form/ArchiveButton.tsx @@ -1,6 +1,6 @@ import React from "react"; import classNames from "classnames"; -import ArchiveIcon from "components/icons/ArchiveIcon"; +import ArchiveIcon from "@/components/icons/ArchiveIcon"; type Props = { className?: string; disabled?: boolean; diff --git a/src/components/form/AsyncSelect.tsx b/src/components/form/AsyncSelect.tsx index 6610f991c..c11544e22 100644 --- a/src/components/form/AsyncSelect.tsx +++ b/src/components/form/AsyncSelect.tsx @@ -1,8 +1,8 @@ import React, { Component } from "react"; import Async from "react-select/async"; import classNames from "classnames"; -import DropdownIndicator from "components/inputs/DropdownIndicator"; -import LoadingIndicator from "components/inputs/SelectLoadingIndicator"; +import DropdownIndicator from "@/components/inputs/DropdownIndicator"; +import LoadingIndicator from "@/components/inputs/SelectLoadingIndicator"; type Props = { disabled?: boolean; displayError: boolean; diff --git a/src/components/form/AttachButton.tsx b/src/components/form/AttachButton.tsx index 19020b067..848dcbb65 100644 --- a/src/components/form/AttachButton.tsx +++ b/src/components/form/AttachButton.tsx @@ -1,6 +1,6 @@ import React from "react"; import classNames from "classnames"; -import AttachIcon from "components/icons/AttachIcon"; +import AttachIcon from "@/components/icons/AttachIcon"; type Props = { className?: string; disabled?: boolean; diff --git a/src/components/form/CopyToClipboardButton.tsx b/src/components/form/CopyToClipboardButton.tsx index 757f810db..d00f143a1 100644 --- a/src/components/form/CopyToClipboardButton.tsx +++ b/src/components/form/CopyToClipboardButton.tsx @@ -1,6 +1,6 @@ import React from "react"; import classNames from "classnames"; -import CopyToClipboardIcon from "components/icons/CopyToClipboardIcon"; +import CopyToClipboardIcon from "@/components/icons/CopyToClipboardIcon"; type Props = { className?: string; disabled?: boolean; diff --git a/src/components/form/DecisionSelectInput.tsx b/src/components/form/DecisionSelectInput.tsx index 3c3a6b4d8..bd34bd419 100644 --- a/src/components/form/DecisionSelectInput.tsx +++ b/src/components/form/DecisionSelectInput.tsx @@ -1,8 +1,8 @@ import React from "react"; import debounce from "lodash/debounce"; -import AsyncSelect from "components/form/AsyncSelect"; -import { fetchDecisions } from "leases/requestsAsync"; -import { formatDecisionName } from "plotSearch/helpers"; +import AsyncSelect from "@/components/form/AsyncSelect"; +import { fetchDecisions } from "@/leases/requestsAsync"; +import { formatDecisionName } from "@/plotSearch/helpers"; type Props = { disabled?: boolean; name: string; diff --git a/src/components/form/DocumentsButton.tsx b/src/components/form/DocumentsButton.tsx index e3d90c1ce..63c331f47 100644 --- a/src/components/form/DocumentsButton.tsx +++ b/src/components/form/DocumentsButton.tsx @@ -1,6 +1,6 @@ import React from "react"; import classNames from "classnames"; -import DocIcon from "components/icons/DocIcon"; +import DocIcon from "@/components/icons/DocIcon"; type Props = { className?: string; disabled?: boolean; diff --git a/src/components/form/EditButton.tsx b/src/components/form/EditButton.tsx index 0804762f1..a718facd2 100644 --- a/src/components/form/EditButton.tsx +++ b/src/components/form/EditButton.tsx @@ -1,6 +1,6 @@ import React from "react"; import classNames from "classnames"; -import EditIcon from "components/icons/EditIcon"; +import EditIcon from "@/components/icons/EditIcon"; type Props = { className?: string; disabled?: boolean; diff --git a/src/components/form/FieldTypeAddress.tsx b/src/components/form/FieldTypeAddress.tsx index 6b3cc493e..31bbb7b66 100644 --- a/src/components/form/FieldTypeAddress.tsx +++ b/src/components/form/FieldTypeAddress.tsx @@ -1,6 +1,6 @@ import React from "react"; import classNames from "classnames"; -import AddressSearchInput from "components/address-search/AddressSearchInput"; +import AddressSearchInput from "@/components/address-search/AddressSearchInput"; type Props = { autoComplete: string; disabled: boolean; diff --git a/src/components/form/FieldTypeContactSelect.tsx b/src/components/form/FieldTypeContactSelect.tsx index 9476b6b20..4afccd344 100644 --- a/src/components/form/FieldTypeContactSelect.tsx +++ b/src/components/form/FieldTypeContactSelect.tsx @@ -1,10 +1,10 @@ import React from "react"; import debounce from "lodash/debounce"; -import AsyncSelect from "components/form/AsyncSelect"; -import { getContentContact } from "contacts/helpers"; -import { addEmptyOption, sortStringByKeyAsc } from "util/helpers"; -import { fetchContacts } from "contacts/requestsAsync"; -import type { UserServiceUnit } from "usersPermissions/types"; +import AsyncSelect from "@/components/form/AsyncSelect"; +import { getContentContact } from "@/contacts/helpers"; +import { addEmptyOption, sortStringByKeyAsc } from "@/util/helpers"; +import { fetchContacts } from "@/contacts/requestsAsync"; +import type { UserServiceUnit } from "@/usersPermissions/types"; type Props = { disabled?: boolean; displayError: boolean; diff --git a/src/components/form/FieldTypeDatePicker.tsx b/src/components/form/FieldTypeDatePicker.tsx index 688ec5b0d..93b5618b5 100644 --- a/src/components/form/FieldTypeDatePicker.tsx +++ b/src/components/form/FieldTypeDatePicker.tsx @@ -3,7 +3,7 @@ import DatePicker, { registerLocale } from "react-datepicker"; import parse from "date-fns/parse"; import fi from "date-fns/locale/fi"; import classNames from "classnames"; -import { isValidDate } from "util/date"; +import { isValidDate } from "@/util/date"; registerLocale('fi', fi); type Props = { disabled: boolean; diff --git a/src/components/form/FieldTypeDecimal.tsx b/src/components/form/FieldTypeDecimal.tsx index f23d904ff..4e5057047 100644 --- a/src/components/form/FieldTypeDecimal.tsx +++ b/src/components/form/FieldTypeDecimal.tsx @@ -1,7 +1,7 @@ import React, { PureComponent } from "react"; import classNames from "classnames"; -import { formatNumber } from "util/helpers"; -import { convertStrToDecimalNumber, isDecimalNumberStr } from "util/helpers"; +import { formatNumber } from "@/util/helpers"; +import { convertStrToDecimalNumber, isDecimalNumberStr } from "@/util/helpers"; type Props = { autoBlur: boolean; autoComplete?: string; diff --git a/src/components/form/FieldTypeIntendedUseSelect.tsx b/src/components/form/FieldTypeIntendedUseSelect.tsx index 312c5ee08..ab9ed1192 100644 --- a/src/components/form/FieldTypeIntendedUseSelect.tsx +++ b/src/components/form/FieldTypeIntendedUseSelect.tsx @@ -1,10 +1,10 @@ import React from "react"; import debounce from "lodash/debounce"; -import AsyncSelect from "components/form/AsyncSelect"; -import { addEmptyOption, sortStringByKeyAsc } from "util/helpers"; -import { getContentIntendedUse } from "leases/helpers"; -import { fetchIntendedUses } from "leases/requestsAsync"; -import type { ServiceUnit } from "serviceUnits/types"; +import AsyncSelect from "@/components/form/AsyncSelect"; +import { addEmptyOption, sortStringByKeyAsc } from "@/util/helpers"; +import { getContentIntendedUse } from "@/leases/helpers"; +import { fetchIntendedUses } from "@/leases/requestsAsync"; +import type { ServiceUnit } from "@/serviceUnits/types"; type Props = { disabled?: boolean; displayError: boolean; diff --git a/src/components/form/FieldTypeLeaseSelect.tsx b/src/components/form/FieldTypeLeaseSelect.tsx index 253f82201..b98e929bc 100644 --- a/src/components/form/FieldTypeLeaseSelect.tsx +++ b/src/components/form/FieldTypeLeaseSelect.tsx @@ -1,10 +1,10 @@ import React from "react"; import debounce from "lodash/debounce"; -import AsyncSelect from "components/form/AsyncSelect"; -import { getContentLeaseOption } from "leases/helpers"; -import { addEmptyOption, sortStringByKeyAsc } from "util/helpers"; -import { fetchLeases } from "leases/requestsAsync"; -import type { UserServiceUnit } from "usersPermissions/types"; +import AsyncSelect from "@/components/form/AsyncSelect"; +import { getContentLeaseOption } from "@/leases/helpers"; +import { addEmptyOption, sortStringByKeyAsc } from "@/util/helpers"; +import { fetchLeases } from "@/leases/requestsAsync"; +import type { UserServiceUnit } from "@/usersPermissions/types"; type Props = { disabled?: boolean; displayError: boolean; diff --git a/src/components/form/FieldTypeLessorSelect.tsx b/src/components/form/FieldTypeLessorSelect.tsx index 8d098eb6e..56297685a 100644 --- a/src/components/form/FieldTypeLessorSelect.tsx +++ b/src/components/form/FieldTypeLessorSelect.tsx @@ -1,10 +1,10 @@ import React from "react"; import debounce from "lodash/debounce"; -import AsyncSelect from "components/form/AsyncSelect"; -import { getContentLessor } from "lessor/helpers"; -import { addEmptyOption, sortStringByKeyAsc } from "util/helpers"; -import { fetchContacts } from "contacts/requestsAsync"; -import type { UserServiceUnit } from "usersPermissions/types"; +import AsyncSelect from "@/components/form/AsyncSelect"; +import { getContentLessor } from "@/lessor/helpers"; +import { addEmptyOption, sortStringByKeyAsc } from "@/util/helpers"; +import { fetchContacts } from "@/contacts/requestsAsync"; +import type { UserServiceUnit } from "@/usersPermissions/types"; type Props = { disabled?: boolean; displayError: boolean; diff --git a/src/components/form/FieldTypeMultiSelect.tsx b/src/components/form/FieldTypeMultiSelect.tsx index d244205b4..6f91434bb 100644 --- a/src/components/form/FieldTypeMultiSelect.tsx +++ b/src/components/form/FieldTypeMultiSelect.tsx @@ -1,6 +1,6 @@ import React from "react"; import classNames from "classnames"; -import MultiSelect from "components/multi-select/MultiSelect"; +import MultiSelect from "@/components/multi-select/MultiSelect"; type Props = { disabled: boolean; displayError: boolean; diff --git a/src/components/form/FieldTypeSelect.tsx b/src/components/form/FieldTypeSelect.tsx index b9750fb23..5b9cf1e7e 100644 --- a/src/components/form/FieldTypeSelect.tsx +++ b/src/components/form/FieldTypeSelect.tsx @@ -1,8 +1,8 @@ import React, { PureComponent } from "react"; import Select from "react-select"; import classNames from "classnames"; -import DropdownIndicator from "components/inputs/DropdownIndicator"; -import LoadingIndicator from "components/inputs/SelectLoadingIndicator"; +import DropdownIndicator from "@/components/inputs/DropdownIndicator"; +import LoadingIndicator from "@/components/inputs/SelectLoadingIndicator"; type Props = { autoBlur: boolean; disabled: boolean; diff --git a/src/components/form/FieldTypeUserSelect.tsx b/src/components/form/FieldTypeUserSelect.tsx index 68c14d1de..7e124ab41 100644 --- a/src/components/form/FieldTypeUserSelect.tsx +++ b/src/components/form/FieldTypeUserSelect.tsx @@ -1,10 +1,10 @@ import React, { useEffect, useState, useRef } from "react"; import debounce from "lodash/debounce"; -import AsyncSelect from "components/form/AsyncSelect"; -import { getContentUser } from "users/helpers"; -import { addEmptyOption, sortStringByKeyAsc } from "util/helpers"; -import { fetchSingleUser, fetchUsers } from "users/requestsAsync"; -import type { UserServiceUnit } from "usersPermissions/types"; +import AsyncSelect from "@/components/form/AsyncSelect"; +import { getContentUser } from "@/users/helpers"; +import { addEmptyOption, sortStringByKeyAsc } from "@/util/helpers"; +import { fetchSingleUser, fetchUsers } from "@/users/requestsAsync"; +import type { UserServiceUnit } from "@/usersPermissions/types"; type Props = { disabled?: boolean; displayError: boolean; diff --git a/src/components/form/FormField.tsx b/src/components/form/FormField.tsx index 8be2c386e..435823216 100644 --- a/src/components/form/FormField.tsx +++ b/src/components/form/FormField.tsx @@ -4,39 +4,39 @@ import { Field } from "redux-form"; import classNames from "classnames"; import get from "lodash/get"; import ErrorBlock from "./ErrorBlock"; -import ExternalLink from "components/links/ExternalLink"; -import FieldTypeAddress from "components/form/FieldTypeAddress"; -import FieldTypeBasic from "components/form/FieldTypeBasic"; -import FieldTypeBoolean from "components/form/FieldTypeBoolean"; -import FieldTypeCheckbox from "components/form/FieldTypeCheckbox"; -import FieldTypeCheckboxDateTime from "components/form/FieldTypeCheckboxDateTime"; -import FieldTypeContactSelect from "components/form/FieldTypeContactSelect"; -import FieldTypeDatePicker from "components/form/FieldTypeDatePicker"; -import FieldTypeDecimal from "components/form/FieldTypeDecimal"; -import FieldTypeIntendedUseSelect from "components/form/FieldTypeIntendedUseSelect"; -import FieldTypeLeaseSelect from "components/form/FieldTypeLeaseSelect"; -import FieldTypeLessorSelect from "components/form/FieldTypeLessorSelect"; -import FieldTypeMultiSelect from "components/form/FieldTypeMultiSelect"; -import FieldTypeRadioWithField from "components/form/FieldTypeRadioWithField"; -import FieldTypeSearch from "components/form/FieldTypeSearch"; -import FieldTypeSelect from "components/form/FieldTypeSelect"; -import FieldTypeTextArea from "components/form/FieldTypeTextArea"; -import FieldTypeUserSelect from "components/form/FieldTypeUserSelect"; -import FormFieldLabel from "components/form/FormFieldLabel"; -import FieldTypeTime from "components/form/FieldTypeTime"; -import FieldTypeHidden from "components/form/FieldTypeHidden"; -import FieldTypeFractional from "components/form/FieldTypeFractional"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import { FieldTypes as FieldTypeOptions } from "enums"; -import { getContactFullName } from "contacts/helpers"; -import { formatDate, formatNumber, getFieldAttributeOptions, getLabelOfOption, isEmptyValue, getReferenceNumberLink } from "util/helpers"; -import { getUserFullName } from "users/helpers"; -import { genericNormalizer } from "components/form/normalizers"; -import { getRouteById, Routes } from "root/routes"; -import { genericValidator } from "components/form/validations"; -import { getHoursAndMinutes } from "util/date"; -import type { UserServiceUnit } from "usersPermissions/types"; +import ExternalLink from "@/components/links/ExternalLink"; +import FieldTypeAddress from "@/components/form/FieldTypeAddress"; +import FieldTypeBasic from "@/components/form/FieldTypeBasic"; +import FieldTypeBoolean from "@/components/form/FieldTypeBoolean"; +import FieldTypeCheckbox from "@/components/form/FieldTypeCheckbox"; +import FieldTypeCheckboxDateTime from "@/components/form/FieldTypeCheckboxDateTime"; +import FieldTypeContactSelect from "@/components/form/FieldTypeContactSelect"; +import FieldTypeDatePicker from "@/components/form/FieldTypeDatePicker"; +import FieldTypeDecimal from "@/components/form/FieldTypeDecimal"; +import FieldTypeIntendedUseSelect from "@/components/form/FieldTypeIntendedUseSelect"; +import FieldTypeLeaseSelect from "@/components/form/FieldTypeLeaseSelect"; +import FieldTypeLessorSelect from "@/components/form/FieldTypeLessorSelect"; +import FieldTypeMultiSelect from "@/components/form/FieldTypeMultiSelect"; +import FieldTypeRadioWithField from "@/components/form/FieldTypeRadioWithField"; +import FieldTypeSearch from "@/components/form/FieldTypeSearch"; +import FieldTypeSelect from "@/components/form/FieldTypeSelect"; +import FieldTypeTextArea from "@/components/form/FieldTypeTextArea"; +import FieldTypeUserSelect from "@/components/form/FieldTypeUserSelect"; +import FormFieldLabel from "@/components/form/FormFieldLabel"; +import FieldTypeTime from "@/components/form/FieldTypeTime"; +import FieldTypeHidden from "@/components/form/FieldTypeHidden"; +import FieldTypeFractional from "@/components/form/FieldTypeFractional"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import { FieldTypes as FieldTypeOptions } from "@/enums"; +import { getContactFullName } from "@/contacts/helpers"; +import { formatDate, formatNumber, getFieldAttributeOptions, getLabelOfOption, isEmptyValue, getReferenceNumberLink } from "@/util/helpers"; +import { getUserFullName } from "@/users/helpers"; +import { genericNormalizer } from "@/components/form/normalizers"; +import { getRouteById, Routes } from "@/root/routes"; +import { genericValidator } from "@/components/form/validations"; +import { getHoursAndMinutes } from "@/util/date"; +import type { UserServiceUnit } from "@/usersPermissions/types"; const FieldTypes = { [FieldTypeOptions.ADDRESS]: FieldTypeAddress, [FieldTypeOptions.BOOLEAN]: FieldTypeBoolean, diff --git a/src/components/form/FormFieldLabel.tsx b/src/components/form/FormFieldLabel.tsx index f75ddf4b5..aaf27186d 100644 --- a/src/components/form/FormFieldLabel.tsx +++ b/src/components/form/FormFieldLabel.tsx @@ -2,7 +2,7 @@ import { $Shape } from "utility-types"; import React, { PureComponent } from "react"; import ReactDOM from "react-dom"; import classNames from "classnames"; -import UIDataTooltip from "components/tooltip/UIDataTooltip"; +import UIDataTooltip from "@/components/tooltip/UIDataTooltip"; type Props = { children?: any; className?: string; diff --git a/src/components/form/FormTextTitle.tsx b/src/components/form/FormTextTitle.tsx index 79e2918f7..e5c206604 100644 --- a/src/components/form/FormTextTitle.tsx +++ b/src/components/form/FormTextTitle.tsx @@ -2,7 +2,7 @@ import { $Shape } from "utility-types"; import React, { PureComponent } from "react"; import ReactDOM from "react-dom"; import classNames from "classnames"; -import UIDataTooltip from "components/tooltip/UIDataTooltip"; +import UIDataTooltip from "@/components/tooltip/UIDataTooltip"; type Props = { children?: any; enableUiDataEdit?: boolean; diff --git a/src/components/form/FormTitleAndText.tsx b/src/components/form/FormTitleAndText.tsx index 663fcb6b6..29c084a1c 100644 --- a/src/components/form/FormTitleAndText.tsx +++ b/src/components/form/FormTitleAndText.tsx @@ -1,6 +1,6 @@ import React from "react"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; type Props = { text: any; textClassName?: string; diff --git a/src/components/form/RemoveButton.tsx b/src/components/form/RemoveButton.tsx index d8812b907..3a9654e47 100644 --- a/src/components/form/RemoveButton.tsx +++ b/src/components/form/RemoveButton.tsx @@ -1,6 +1,6 @@ import React from "react"; -import { createClassName, generalClassNames, GeneralPropTypes } from "foundation/utils"; -import TrashIcon from "components/icons/TrashIcon"; +import { createClassName, generalClassNames, GeneralPropTypes } from "@/foundation/utils"; +import TrashIcon from "@/components/icons/TrashIcon"; type Props = { className?: string; disabled?: boolean; diff --git a/src/components/form/UnarchiveButton.tsx b/src/components/form/UnarchiveButton.tsx index 9e37ec864..2736c90d5 100644 --- a/src/components/form/UnarchiveButton.tsx +++ b/src/components/form/UnarchiveButton.tsx @@ -1,6 +1,6 @@ import React from "react"; import classNames from "classnames"; -import UnarchiveIcon from "components/icons/UnarchiveIcon"; +import UnarchiveIcon from "@/components/icons/UnarchiveIcon"; type Props = { className?: string; disabled?: boolean; diff --git a/src/components/form/normalizers.ts b/src/components/form/normalizers.ts index 2f0e95116..e2d97774f 100644 --- a/src/components/form/normalizers.ts +++ b/src/components/form/normalizers.ts @@ -1,5 +1,5 @@ import format from "date-fns/format"; -import { FieldTypes } from "enums"; +import { FieldTypes } from "@/enums"; export const normalizeDate = (date: any): string | null => date && format(new Date(date), 'yyyy-MM-dd') || null; export const normalizeInteger = (value: any): any => value && Number.isInteger(Number(value)) ? Number(value) : value; export const genericNormalizer = (value: any, options: Record): any => { diff --git a/src/components/form/validations.ts b/src/components/form/validations.ts index b5d928a95..c0b05dd19 100644 --- a/src/components/form/validations.ts +++ b/src/components/form/validations.ts @@ -1,7 +1,7 @@ import isBefore from "date-fns/isBefore"; import isArray from "lodash/isArray"; -import { isValidDate } from "util/date"; -import { isEmptyValue } from "util/helpers"; +import { isValidDate } from "@/util/date"; +import { isEmptyValue } from "@/util/helpers"; const decimalPlaces = n => { let result = /^-?[0-9]+\.([0-9]+)$/.exec(n); diff --git a/src/components/formValidations.ts b/src/components/formValidations.ts index ae659f212..49c44c0fb 100644 --- a/src/components/formValidations.ts +++ b/src/components/formValidations.ts @@ -1,5 +1,5 @@ import { RentCalculatorTypes } from "./enums"; -import { isEmptyValue } from "util/helpers"; +import { isEmptyValue } from "@/util/helpers"; import { year } from "./form/validations"; export const validateRentCalculatorForm = (values: Record) => { const errors: any = {}; diff --git a/src/components/helpers.ts b/src/components/helpers.ts index ccd664908..47210c68e 100644 --- a/src/components/helpers.ts +++ b/src/components/helpers.ts @@ -1,9 +1,9 @@ import get from "lodash/get"; import { RentExplanationSubjectType, RentSubItemSubjectType, RentSubItemType } from "./enums"; -import { LeaseRentsFieldPaths, LeaseRentAdjustmentsFieldPaths, LeaseRentContractRentsFieldPaths, TenantContactType } from "leases/enums"; -import { formatNumber, getFieldOptions, getLabelOfOption } from "util/helpers"; +import { LeaseRentsFieldPaths, LeaseRentAdjustmentsFieldPaths, LeaseRentContractRentsFieldPaths, TenantContactType } from "@/leases/enums"; +import { formatNumber, getFieldOptions, getLabelOfOption } from "@/util/helpers"; import type { Attributes } from "types"; -import type { BillingPeriod, BillingPeriodInvoice, PreviewInvoices } from "previewInvoices/types"; +import type { BillingPeriod, BillingPeriodInvoice, PreviewInvoices } from "@/previewInvoices/types"; export const getRentsTotalAmount = (rents: Array>) => { let amount = 0; rents.forEach(rent => { diff --git a/src/components/inputs/EstateIdSelectInput.tsx b/src/components/inputs/EstateIdSelectInput.tsx index fa99bf974..2551fef3f 100644 --- a/src/components/inputs/EstateIdSelectInput.tsx +++ b/src/components/inputs/EstateIdSelectInput.tsx @@ -1,7 +1,7 @@ import React from "react"; import debounce from "lodash/debounce"; -import AsyncSelect from "components/form/AsyncSelect"; -import { fetchEstateIdList } from "landUseContract/requestsAsync"; +import AsyncSelect from "@/components/form/AsyncSelect"; +import { fetchEstateIdList } from "@/landUseContract/requestsAsync"; type Props = { disabled?: boolean; name: string; diff --git a/src/components/inputs/LeaseSelectInput.tsx b/src/components/inputs/LeaseSelectInput.tsx index 6629f6187..38e3460e0 100644 --- a/src/components/inputs/LeaseSelectInput.tsx +++ b/src/components/inputs/LeaseSelectInput.tsx @@ -1,14 +1,14 @@ import React from "react"; import debounce from "lodash/debounce"; -import AsyncSelect from "components/form/AsyncSelect"; -import { getContentLeaseIdentifier } from "leases/helpers"; -import { fetchLeases } from "leases/requestsAsync"; -import { fetchAreaSearches, fetchTargetStatuses, fetchPlotSearches } from "leases/requestsAsync"; -import { getLabelOfOption, getFieldOptions } from "util/helpers"; -import { getAttributes as getLeaseAttributes } from "leases/selectors"; -import { store } from "root/startApp"; -import { LeaseFieldPaths, LeaseHistoryItemTypes, LeaseHistoryContentTypes } from "leases/enums"; -import type { UserServiceUnit } from "usersPermissions/types"; +import AsyncSelect from "@/components/form/AsyncSelect"; +import { getContentLeaseIdentifier } from "@/leases/helpers"; +import { fetchLeases } from "@/leases/requestsAsync"; +import { fetchAreaSearches, fetchTargetStatuses, fetchPlotSearches } from "@/leases/requestsAsync"; +import { getLabelOfOption, getFieldOptions } from "@/util/helpers"; +import { getAttributes as getLeaseAttributes } from "@/leases/selectors"; +import { store } from "@/index"; +import { LeaseFieldPaths, LeaseHistoryItemTypes, LeaseHistoryContentTypes } from "@/leases/enums"; +import type { UserServiceUnit } from "@/usersPermissions/types"; type Props = { disabled?: boolean; name: string; diff --git a/src/components/inputs/PlanUnitSelectInput.tsx b/src/components/inputs/PlanUnitSelectInput.tsx index 95537db6a..27e91cb2b 100644 --- a/src/components/inputs/PlanUnitSelectInput.tsx +++ b/src/components/inputs/PlanUnitSelectInput.tsx @@ -1,8 +1,8 @@ import React from "react"; import debounce from "lodash/debounce"; -import AsyncSelect from "components/form/AsyncSelect"; -import { getContentPlanUnitIdentifier } from "plotSearch/helpers"; -import { fetchPlanUnitListWithIdentifiersList, fetchCustomDetailedPlanListWithIdentifiersList } from "plotSearch/requestsAsync"; +import AsyncSelect from "@/components/form/AsyncSelect"; +import { getContentPlanUnitIdentifier } from "@/plotSearch/helpers"; +import { fetchPlanUnitListWithIdentifiersList, fetchCustomDetailedPlanListWithIdentifiersList } from "@/plotSearch/requestsAsync"; type Props = { disabled?: boolean; name: string; diff --git a/src/components/inputs/SelectLoadingIndicator.tsx b/src/components/inputs/SelectLoadingIndicator.tsx index 97900477b..8f6ca7176 100644 --- a/src/components/inputs/SelectLoadingIndicator.tsx +++ b/src/components/inputs/SelectLoadingIndicator.tsx @@ -1,7 +1,7 @@ // flow import React from "react"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; const SelectLoadingIndicator = () => diff --git a/src/components/inputs/SingleRadioInput.tsx b/src/components/inputs/SingleRadioInput.tsx index 72f0cbb98..12abf2cf3 100644 --- a/src/components/inputs/SingleRadioInput.tsx +++ b/src/components/inputs/SingleRadioInput.tsx @@ -1,6 +1,6 @@ import React, { Fragment } from "react"; import classNames from "classnames"; -import { KeyCodes } from "enums"; +import { KeyCodes } from "@/enums"; type Props = { checked: boolean; disabled?: boolean; diff --git a/src/components/inputs/UserServiceUnitSelectInput.tsx b/src/components/inputs/UserServiceUnitSelectInput.tsx index 9c9f57b75..2cca1dfc6 100644 --- a/src/components/inputs/UserServiceUnitSelectInput.tsx +++ b/src/components/inputs/UserServiceUnitSelectInput.tsx @@ -3,12 +3,12 @@ import flowRight from "lodash/flowRight"; import { connect } from "react-redux"; import { reduxForm } from "redux-form"; import Select from "react-select"; -import FormFieldLabel from "components/form/FormFieldLabel"; -import DropdownIndicator from "components/inputs/DropdownIndicator"; -import LoadingIndicator from "components/inputs/SelectLoadingIndicator"; -import { FormNames } from "enums"; -import { setUserActiveServiceUnit } from "usersPermissions/actions"; -import type { UserServiceUnit, UserServiceUnits } from "usersPermissions/types"; +import FormFieldLabel from "@/components/form/FormFieldLabel"; +import DropdownIndicator from "@/components/inputs/DropdownIndicator"; +import LoadingIndicator from "@/components/inputs/SelectLoadingIndicator"; +import { FormNames } from "@/enums"; +import { setUserActiveServiceUnit } from "@/usersPermissions/actions"; +import type { UserServiceUnit, UserServiceUnits } from "@/usersPermissions/types"; type Props = { userServiceUnits: UserServiceUnits; userActiveServiceUnit: UserServiceUnit; diff --git a/src/components/invoice-simulator/InvoiceSimulator.tsx b/src/components/invoice-simulator/InvoiceSimulator.tsx index a50ed71fb..fc061923d 100644 --- a/src/components/invoice-simulator/InvoiceSimulator.tsx +++ b/src/components/invoice-simulator/InvoiceSimulator.tsx @@ -3,28 +3,28 @@ import { connect } from "react-redux"; import classNames from "classnames"; import { formValueSelector, isValid } from "redux-form"; import { Row, Column } from "react-foundation"; -import AuthorizationError from "components/authorization/AuthorizationError"; -import Button from "components/button/Button"; -import FormText from "components/form/FormText"; +import AuthorizationError from "@/components/authorization/AuthorizationError"; +import Button from "@/components/button/Button"; +import FormText from "@/components/form/FormText"; import InvoiceSimulatorBillingPeriod from "./InvoiceSimulatorBillingPeriods"; import InvoiceSimulatorForm from "./InvoiceSimulatorForm"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import { fetchPreviewInvoices } from "previewInvoices/actions"; -import { FormNames, PermissionMissingTexts } from "enums"; -import { ButtonColors } from "components/enums"; -import { InvoiceFieldPaths, InvoiceRowsFieldPaths } from "invoices/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getContentPreviewInvoiceBillingPeriods } from "components/helpers"; -import { getFieldOptions, hasPermissions } from "util/helpers"; -import { getAttributes as getInvoiceAttributes } from "invoices/selectors"; -import { getCurrentLease } from "leases/selectors"; -import { getIsFetching, getPreviewInvoices } from "previewInvoices/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import { fetchPreviewInvoices } from "@/previewInvoices/actions"; +import { FormNames, PermissionMissingTexts } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { InvoiceFieldPaths, InvoiceRowsFieldPaths } from "@/invoices/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getContentPreviewInvoiceBillingPeriods } from "@/components/helpers"; +import { getFieldOptions, hasPermissions } from "@/util/helpers"; +import { getAttributes as getInvoiceAttributes } from "@/invoices/selectors"; +import { getCurrentLease } from "@/leases/selectors"; +import { getIsFetching, getPreviewInvoices } from "@/previewInvoices/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; import type { Attributes } from "types"; -import type { Lease } from "leases/types"; -import type { PreviewInvoices } from "previewInvoices/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { Lease } from "@/leases/types"; +import type { PreviewInvoices } from "@/previewInvoices/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { currentLease: Lease; fetchPreviewInvoices: (...args: Array) => any; diff --git a/src/components/invoice-simulator/InvoiceSimulatorBillingPeriods.tsx b/src/components/invoice-simulator/InvoiceSimulatorBillingPeriods.tsx index 0d6ec14ae..f545538f4 100644 --- a/src/components/invoice-simulator/InvoiceSimulatorBillingPeriods.tsx +++ b/src/components/invoice-simulator/InvoiceSimulatorBillingPeriods.tsx @@ -1,13 +1,13 @@ import React, { Fragment } from "react"; import { Row, Column } from "react-foundation"; -import AmountWithVat from "components/vat/AmountWithVat"; -import Collapse from "components/collapse/Collapse"; -import CollapseHeaderSubtitle from "components/collapse/CollapseHeaderSubtitle"; -import RentCalculatorExplanation from "components/rent-calculator/RentCalculatorExplanation"; -import FormTitleAndText from "components/form/FormTitleAndText"; +import AmountWithVat from "@/components/vat/AmountWithVat"; +import Collapse from "@/components/collapse/Collapse"; +import CollapseHeaderSubtitle from "@/components/collapse/CollapseHeaderSubtitle"; +import RentCalculatorExplanation from "@/components/rent-calculator/RentCalculatorExplanation"; +import FormTitleAndText from "@/components/form/FormTitleAndText"; import InvoiceSimulatorInvoice from "./InvoiceSimulatorInvoice"; -import SubTitle from "components/content/SubTitle"; -import { formatDate, formatDateRange } from "util/helpers"; +import SubTitle from "@/components/content/SubTitle"; +import { formatDate, formatDateRange } from "@/util/helpers"; type Props = { dueDate: string; endDate: string; diff --git a/src/components/invoice-simulator/InvoiceSimulatorForm.tsx b/src/components/invoice-simulator/InvoiceSimulatorForm.tsx index d72255d7d..e433d8f6a 100644 --- a/src/components/invoice-simulator/InvoiceSimulatorForm.tsx +++ b/src/components/invoice-simulator/InvoiceSimulatorForm.tsx @@ -3,11 +3,11 @@ import { connect } from "react-redux"; import { change, formValueSelector, reduxForm } from "redux-form"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; -import FormField from "components/form/FormField"; -import { FormNames } from "enums"; -import { getCurrentYear } from "util/date"; -import { getCurrentLease } from "leases/selectors"; -import { getBillingPeriodsByLease } from "billingPeriods/selectors"; +import FormField from "@/components/form/FormField"; +import { FormNames } from "@/enums"; +import { getCurrentYear } from "@/util/date"; +import { getCurrentLease } from "@/leases/selectors"; +import { getBillingPeriodsByLease } from "@/billingPeriods/selectors"; type Props = { onSubmit: (...args: Array) => any; }; diff --git a/src/components/invoice-simulator/InvoiceSimulatorInvoice.tsx b/src/components/invoice-simulator/InvoiceSimulatorInvoice.tsx index afbe89dd7..fb40abe3f 100644 --- a/src/components/invoice-simulator/InvoiceSimulatorInvoice.tsx +++ b/src/components/invoice-simulator/InvoiceSimulatorInvoice.tsx @@ -1,14 +1,14 @@ import React, { Fragment } from "react"; import { Row, Column } from "react-foundation"; -import AmountWithVat from "components/vat/AmountWithVat"; -import Collapse from "components/collapse/Collapse"; -import CollapseHeaderSubtitle from "components/collapse/CollapseHeaderSubtitle"; -import FormText from "components/form/FormText"; -import FormTitleAndText from "components/form/FormTitleAndText"; +import AmountWithVat from "@/components/vat/AmountWithVat"; +import Collapse from "@/components/collapse/Collapse"; +import CollapseHeaderSubtitle from "@/components/collapse/CollapseHeaderSubtitle"; +import FormText from "@/components/form/FormText"; +import FormTitleAndText from "@/components/form/FormTitleAndText"; import InvoiceSimulatorInvoiceRows from "./InvoiceSimulatorInvoiceRows"; -import SubTitle from "components/content/SubTitle"; -import { getContactFullName } from "contacts/helpers"; -import { formatDate, formatDateRange, getLabelOfOption } from "util/helpers"; +import SubTitle from "@/components/content/SubTitle"; +import { getContactFullName } from "@/contacts/helpers"; +import { formatDate, formatDateRange, getLabelOfOption } from "@/util/helpers"; type Props = { billedAmount: number; dueDate: string; diff --git a/src/components/invoice-simulator/InvoiceSimulatorInvoiceRows.tsx b/src/components/invoice-simulator/InvoiceSimulatorInvoiceRows.tsx index 890f114ad..6f1aa5669 100644 --- a/src/components/invoice-simulator/InvoiceSimulatorInvoiceRows.tsx +++ b/src/components/invoice-simulator/InvoiceSimulatorInvoiceRows.tsx @@ -1,11 +1,11 @@ import React from "react"; import { Row, Column } from "react-foundation"; -import AmountWithVat from "components/vat/AmountWithVat"; -import Divider from "components/content/Divider"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import { getContactFullName } from "contacts/helpers"; -import { getLabelOfOption } from "util/helpers"; +import AmountWithVat from "@/components/vat/AmountWithVat"; +import Divider from "@/components/content/Divider"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import { getContactFullName } from "@/contacts/helpers"; +import { getLabelOfOption } from "@/util/helpers"; type Props = { dueDate: string; receivableTypeOptions: Array>; diff --git a/src/components/ktj/KtjLink.tsx b/src/components/ktj/KtjLink.tsx index 303b4e063..dd400568c 100644 --- a/src/components/ktj/KtjLink.tsx +++ b/src/components/ktj/KtjLink.tsx @@ -1,10 +1,10 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import { saveAs } from "file-saver"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import { getApiToken } from "auth/selectors"; -import { displayUIMessage, getApiUrlWithOutVersionSuffix } from "util/helpers"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import { getApiToken } from "@/auth/selectors"; +import { displayUIMessage, getApiUrlWithOutVersionSuffix } from "@/util/helpers"; type Props = { apiToken: string; fileKey: string; diff --git a/src/components/links/DecisionLink.tsx b/src/components/links/DecisionLink.tsx index 366a4ff2e..60a7fb79b 100644 --- a/src/components/links/DecisionLink.tsx +++ b/src/components/links/DecisionLink.tsx @@ -1,6 +1,6 @@ import React from "react"; -import { getLabelOfOption, getReferenceNumberLink } from "../../util/helpers"; -import FormText from "components/form/FormText"; +import { getLabelOfOption, getReferenceNumberLink } from "@/util/helpers"; +import FormText from "@/components/form/FormText"; type Props = { decision: Record | null | undefined; decisionOptions: Array>; diff --git a/src/components/links/ExternalLink.tsx b/src/components/links/ExternalLink.tsx index c5ec02d67..693a4b703 100644 --- a/src/components/links/ExternalLink.tsx +++ b/src/components/links/ExternalLink.tsx @@ -1,6 +1,6 @@ import React from "react"; import classNames from "classnames"; -import ExternalLinkIcon from "components/icons/ExternalLinkIcon"; +import ExternalLinkIcon from "@/components/icons/ExternalLinkIcon"; type Props = { className?: string; href: string | null | undefined; diff --git a/src/components/modal/ConfirmationModal.tsx b/src/components/modal/ConfirmationModal.tsx index 208901b60..ac7267ea9 100644 --- a/src/components/modal/ConfirmationModal.tsx +++ b/src/components/modal/ConfirmationModal.tsx @@ -1,7 +1,7 @@ import React, { Component } from "react"; -import Button from "components/button/Button"; -import Modal from "components/modal/Modal"; -import { ButtonColors } from "components/enums"; +import Button from "@/components/button/Button"; +import Modal from "@/components/modal/Modal"; +import { ButtonColors } from "@/components/enums"; type Props = { confirmButtonClassName?: string | null | undefined; confirmButtonLabel?: string | null | undefined; diff --git a/src/components/modal/Modal.tsx b/src/components/modal/Modal.tsx index 586e23524..2ad84d4b6 100644 --- a/src/components/modal/Modal.tsx +++ b/src/components/modal/Modal.tsx @@ -1,6 +1,6 @@ import React, { Component } from "react"; import classnames from "classnames"; -import CloseButton from "../button/CloseButton"; +import CloseButton from "@/components/button/CloseButton"; type Props = { children?: any; className?: string; diff --git a/src/components/rent-calculator/RentCalculator.tsx b/src/components/rent-calculator/RentCalculator.tsx index b760de2f2..f04655856 100644 --- a/src/components/rent-calculator/RentCalculator.tsx +++ b/src/components/rent-calculator/RentCalculator.tsx @@ -3,29 +3,29 @@ import { connect } from "react-redux"; import { formValueSelector, isValid } from "redux-form"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; -import Button from "components/button/Button"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; +import Button from "@/components/button/Button"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; import RentCalculatorForm from "./RentCalculatorForm"; import RentForPeriod from "./RentForPeriod"; -import SubTitle from "components/content/SubTitle"; -import { fetchBillingPeriodsByLease } from "billingPeriods/actions"; -import { deleteRentForPeriodByLease, fetchRentForPeriodByLease, receiveIsSaveClicked } from "rentForPeriod/actions"; -import { FormNames } from "enums"; -import { ButtonColors, RentCalculatorFieldPaths, RentCalculatorFieldTitles, RentCalculatorTypes } from "components/enums"; -import { RentCycles } from "leases/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getContentRents } from "leases/helpers"; -import { hasPermissions } from "util/helpers"; -import { getCurrentYear } from "util/date"; -import { getUiDataRentCalculatorKey } from "uiData/helpers"; -import { getBillingPeriodsByLease } from "billingPeriods/selectors"; -import { getCurrentLease, getIsEditMode } from "leases/selectors"; -import { getIsFetching, getIsSaveClicked, getRentForPeriodArrayByLease } from "rentForPeriod/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import type { Lease } from "leases/types"; -import type { RentForPeriodId } from "rentForPeriod/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import SubTitle from "@/components/content/SubTitle"; +import { fetchBillingPeriodsByLease } from "@/billingPeriods/actions"; +import { deleteRentForPeriodByLease, fetchRentForPeriodByLease, receiveIsSaveClicked } from "@/rentForPeriod/actions"; +import { FormNames } from "@/enums"; +import { ButtonColors, RentCalculatorFieldPaths, RentCalculatorFieldTitles, RentCalculatorTypes } from "@/components/enums"; +import { RentCycles } from "@/leases/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getContentRents } from "@/leases/helpers"; +import { hasPermissions } from "@/util/helpers"; +import { getCurrentYear } from "@/util/date"; +import { getUiDataRentCalculatorKey } from "@/uiData/helpers"; +import { getBillingPeriodsByLease } from "@/billingPeriods/selectors"; +import { getCurrentLease, getIsEditMode } from "@/leases/selectors"; +import { getIsFetching, getIsSaveClicked, getRentForPeriodArrayByLease } from "@/rentForPeriod/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import type { Lease } from "@/leases/types"; +import type { RentForPeriodId } from "@/rentForPeriod/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; let rentForPeriodId = 1; type Props = { billingPeriod: number; diff --git a/src/components/rent-calculator/RentCalculatorExplanation.tsx b/src/components/rent-calculator/RentCalculatorExplanation.tsx index 33d30d2ca..1d7221aef 100644 --- a/src/components/rent-calculator/RentCalculatorExplanation.tsx +++ b/src/components/rent-calculator/RentCalculatorExplanation.tsx @@ -3,13 +3,13 @@ import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; import classNames from "classnames"; import get from "lodash/get"; -import AmountWithVat from "components/vat/AmountWithVat"; -import FormText from "components/form/FormText"; +import AmountWithVat from "@/components/vat/AmountWithVat"; +import FormText from "@/components/form/FormText"; import RentCalculatorSubItem from "./RentCalculatorSubItem"; -import { RentExplanationSubjectType } from "../enums"; -import { formatDateRange, formatNumber } from "util/helpers"; -import { getRentExplanationAmount, getRentExplanationDescription } from "../helpers"; -import { getAttributes } from "leases/selectors"; +import { RentExplanationSubjectType } from "@/components/enums"; +import { formatDateRange, formatNumber } from "@/util/helpers"; +import { getRentExplanationAmount, getRentExplanationDescription } from "@/components/helpers"; +import { getAttributes } from "@/leases/selectors"; import type { Attributes } from "types"; type Props = { attributes: Attributes; diff --git a/src/components/rent-calculator/RentCalculatorForm.tsx b/src/components/rent-calculator/RentCalculatorForm.tsx index 7e881c718..8ce94f880 100644 --- a/src/components/rent-calculator/RentCalculatorForm.tsx +++ b/src/components/rent-calculator/RentCalculatorForm.tsx @@ -3,16 +3,16 @@ import { connect } from "react-redux"; import { change, Field, formValueSelector, reduxForm } from "redux-form"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; -import ErrorField from "components/form/ErrorField"; -import FormField from "components/form/FormField"; -import { FieldTypes, FormNames } from "enums"; -import { RentCalculatorTypes } from "components/enums"; -import { validateRentCalculatorForm } from "components/formValidations"; -import { formatDateRange } from "util/helpers"; -import { getCurrentYear } from "util/date"; -import { getCurrentLease } from "leases/selectors"; -import { getBillingPeriodsByLease } from "billingPeriods/selectors"; -import type { BillingPeriodList } from "billingPeriods/types"; +import ErrorField from "@/components/form/ErrorField"; +import FormField from "@/components/form/FormField"; +import { FieldTypes, FormNames } from "@/enums"; +import { RentCalculatorTypes } from "@/components/enums"; +import { validateRentCalculatorForm } from "@/components/formValidations"; +import { formatDateRange } from "@/util/helpers"; +import { getCurrentYear } from "@/util/date"; +import { getCurrentLease } from "@/leases/selectors"; +import { getBillingPeriodsByLease } from "@/billingPeriods/selectors"; +import type { BillingPeriodList } from "@/billingPeriods/types"; type Props = { billingPeriod: number | null | undefined; billingPeriods: BillingPeriodList; diff --git a/src/components/rent-calculator/RentCalculatorSubItem.tsx b/src/components/rent-calculator/RentCalculatorSubItem.tsx index e25a68f27..05a9186dc 100644 --- a/src/components/rent-calculator/RentCalculatorSubItem.tsx +++ b/src/components/rent-calculator/RentCalculatorSubItem.tsx @@ -3,11 +3,11 @@ import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; import classNames from "classnames"; import get from "lodash/get"; -import FormText from "components/form/FormText"; -import { RentSubItemSubjectType } from "components/enums"; -import { formatDateRange, formatNumber } from "util/helpers"; -import { getRentSubItemAmount, getRentSubItemDescription } from "../helpers"; -import { getAttributes } from "leases/selectors"; +import FormText from "@/components/form/FormText"; +import { RentSubItemSubjectType } from "@/components/enums"; +import { formatDateRange, formatNumber } from "@/util/helpers"; +import { getRentSubItemAmount, getRentSubItemDescription } from "@/components/helpers"; +import { getAttributes } from "@/leases/selectors"; import type { Attributes } from "types"; type Props = { attributes: Attributes; diff --git a/src/components/rent-calculator/RentCalculatorTotalRow.tsx b/src/components/rent-calculator/RentCalculatorTotalRow.tsx index 5443d493b..47d42ff9d 100644 --- a/src/components/rent-calculator/RentCalculatorTotalRow.tsx +++ b/src/components/rent-calculator/RentCalculatorTotalRow.tsx @@ -2,10 +2,10 @@ import React from "react"; import { Row, Column } from "react-foundation"; import isAfter from "date-fns/isAfter"; import get from "lodash/get"; -import AmountWithVat from "components/vat/AmountWithVat"; -import Divider from "components/content/Divider"; -import FormText from "components/form/FormText"; -import { getRentsTotalAmount } from "../helpers"; +import AmountWithVat from "@/components/vat/AmountWithVat"; +import Divider from "@/components/content/Divider"; +import FormText from "@/components/form/FormText"; +import { getRentsTotalAmount } from "@/components/helpers"; type Props = { rents: Array>; }; diff --git a/src/components/rent-calculator/RentForPeriod.tsx b/src/components/rent-calculator/RentForPeriod.tsx index cb20257bc..8716c6a03 100644 --- a/src/components/rent-calculator/RentForPeriod.tsx +++ b/src/components/rent-calculator/RentForPeriod.tsx @@ -1,13 +1,13 @@ import React from "react"; import { Row, Column } from "react-foundation"; import get from "lodash/get"; -import FormText from "components/form/FormText"; -import RemoveButton from "components/form/RemoveButton"; +import FormText from "@/components/form/FormText"; +import RemoveButton from "@/components/form/RemoveButton"; import RentCalculatorRent from "./RentCalculatorRent"; import RentCalculatorTotalRow from "./RentCalculatorTotalRow"; -import { RentCalculatorTypeOptions } from "components/constants"; -import { RentCalculatorTypes } from "components/enums"; -import { formatDateRange, getLabelOfOption } from "util/helpers"; +import { RentCalculatorTypeOptions } from "@/components/constants"; +import { RentCalculatorTypes } from "@/components/enums"; +import { formatDateRange, getLabelOfOption } from "@/util/helpers"; type Props = { onRemove: (...args: Array) => any; rentForPeriod: Record; diff --git a/src/components/resize/WindowResizeHandler.tsx b/src/components/resize/WindowResizeHandler.tsx index 86f8777de..3fce73801 100644 --- a/src/components/resize/WindowResizeHandler.tsx +++ b/src/components/resize/WindowResizeHandler.tsx @@ -1,6 +1,6 @@ import React, { PureComponent } from "react"; import throttle from "lodash/throttle"; -import { isLargeScreen } from "util/helpers"; +import { isLargeScreen } from "@/util/helpers"; export function withWindowResize(WrappedComponent: any) { type Props = Record; type State = { diff --git a/src/components/sideMenu/SideMenu.tsx b/src/components/sideMenu/SideMenu.tsx index c751f3276..cbd479285 100644 --- a/src/components/sideMenu/SideMenu.tsx +++ b/src/components/sideMenu/SideMenu.tsx @@ -5,19 +5,19 @@ import { withRouter } from "react-router"; import classnames from "classnames"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; -import Authorization from "components/authorization/Authorization"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; +import Authorization from "@/components/authorization/Authorization"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; import SubMenu from "./SubMenu"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import { ConfirmationModalTexts } from "enums"; -import { ButtonColors } from "components/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { hasAnyPageDirtyForms } from "util/forms"; -import { hasPermissions } from "util/helpers"; -import { getRouteById, Routes } from "root/routes"; -import { withUsersPermissions } from "components/attributes/UsersPermissions"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import { ConfirmationModalTexts } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { hasAnyPageDirtyForms } from "@/util/forms"; +import { hasPermissions } from "@/util/helpers"; +import { getRouteById, Routes } from "@/root/routes"; +import { withUsersPermissions } from "@/components/attributes/UsersPermissions"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type OwnProps = { isOpen: boolean; onLinkClick: (...args: Array) => any; diff --git a/src/components/sideMenu/SubMenu.tsx b/src/components/sideMenu/SubMenu.tsx index 67a23a5c7..40e90bc62 100644 --- a/src/components/sideMenu/SubMenu.tsx +++ b/src/components/sideMenu/SubMenu.tsx @@ -2,9 +2,9 @@ import React, { PureComponent } from "react"; import ReactDOM from "react-dom"; import { Link } from "react-router-dom"; import classNames from "classnames"; -import BackIcon from "components/icons/BackIcon"; -import Authorization from "components/authorization/Authorization"; -import { KeyCodes } from "enums"; +import BackIcon from "@/components/icons/BackIcon"; +import Authorization from "@/components/authorization/Authorization"; +import { KeyCodes } from "@/enums"; type Props = { header: string; isOpen: boolean; diff --git a/src/components/spec.ts b/src/components/spec.ts index 385dc057c..46bbc5480 100644 --- a/src/components/spec.ts +++ b/src/components/spec.ts @@ -1,7 +1,7 @@ import { expect } from "chai"; -import ErrorIcon from "components/icons/ErrorIcon"; -import SuccessIcon from "components/icons/SuccessIcon"; -import ToastrIcons from "components/toastr/ToastrIcons"; +import ErrorIcon from "@/components/icons/ErrorIcon"; +import SuccessIcon from "@/components/icons/SuccessIcon"; +import ToastrIcons from "@/components/toastr/ToastrIcons"; describe('components', () => { describe('ErrorIcon', () => { diff --git a/src/components/table/MultiItemCollapse.tsx b/src/components/table/MultiItemCollapse.tsx index 7e40c2404..5033b1c8c 100644 --- a/src/components/table/MultiItemCollapse.tsx +++ b/src/components/table/MultiItemCollapse.tsx @@ -1,6 +1,6 @@ import React, { PureComponent } from "react"; import classNames from "classnames"; -import ListItem from "components/content/ListItem"; +import ListItem from "@/components/content/ListItem"; type Props = { items: Array; itemRenderer: (...args: Array) => any; diff --git a/src/components/table/SortableTable.tsx b/src/components/table/SortableTable.tsx index 7ce400088..04af63259 100644 --- a/src/components/table/SortableTable.tsx +++ b/src/components/table/SortableTable.tsx @@ -8,8 +8,8 @@ import isEmpty from "lodash/isEmpty"; import SortableTableHeader from "./SortableTableHeader"; import SortableTableGroup from "./SortableTableGroup"; import SortableTableRow from "./SortableTableRow"; -import { sortStringByKeyAsc, sortStringByKeyDesc } from "util/helpers"; -import { TableSortOrder } from "enums"; +import { sortStringByKeyAsc, sortStringByKeyDesc } from "@/util/helpers"; +import { TableSortOrder } from "@/enums"; export type Column = { arrayRenderer?: (...args: Array) => any; dataClassName?: string; diff --git a/src/components/table/SortableTableGroup.tsx b/src/components/table/SortableTableGroup.tsx index 31a436da9..ccca5d946 100644 --- a/src/components/table/SortableTableGroup.tsx +++ b/src/components/table/SortableTableGroup.tsx @@ -3,7 +3,7 @@ import React, { PureComponent, KeyboardEventHandler } from "react"; import classNames from "classnames"; import get from "lodash/get"; import isArray from "lodash/isArray"; -import AccordionIcon from "components/icons/AccordionIcon"; +import AccordionIcon from "@/components/icons/AccordionIcon"; import MultiItemCollapse from "./MultiItemCollapse"; import SortableTableRow from "./SortableTableRow"; import type { Column } from "./SortableTable"; diff --git a/src/components/table/SortableTableHeader.tsx b/src/components/table/SortableTableHeader.tsx index 881d96e00..f452b29e4 100644 --- a/src/components/table/SortableTableHeader.tsx +++ b/src/components/table/SortableTableHeader.tsx @@ -1,8 +1,8 @@ import React from "react"; import classNames from "classnames"; import kebabCase from "lodash/kebabCase"; -import { SortIconBoth, SortIconDesc, SortIconAsc } from "components/table/Icons"; -import { TableSortOrder } from "enums"; +import { SortIconBoth, SortIconDesc, SortIconAsc } from "@/components/table/Icons"; +import { TableSortOrder } from "@/enums"; import type { Column } from "./SortableTable"; type Props = { columns: Array; diff --git a/src/components/table/SortableTableRow.tsx b/src/components/table/SortableTableRow.tsx index 6abaa6e3f..42fb87504 100644 --- a/src/components/table/SortableTableRow.tsx +++ b/src/components/table/SortableTableRow.tsx @@ -3,7 +3,7 @@ import React, { PureComponent, KeyboardEventHandler } from "react"; import classNames from "classnames"; import get from "lodash/get"; import isArray from "lodash/isArray"; -import AccordionIcon from "components/icons/AccordionIcon"; +import AccordionIcon from "@/components/icons/AccordionIcon"; import MultiItemCollapse from "./MultiItemCollapse"; import type { Column } from "./SortableTable"; type Props = { diff --git a/src/components/table/TableFilters.tsx b/src/components/table/TableFilters.tsx index 9589ceef1..81329210a 100644 --- a/src/components/table/TableFilters.tsx +++ b/src/components/table/TableFilters.tsx @@ -1,6 +1,6 @@ import React from "react"; import classNames from "classnames"; -import CheckboxInput from "components/inputs/CheckboxInput"; +import CheckboxInput from "@/components/inputs/CheckboxInput"; type Props = { alignFiltersRight?: boolean; amountText: React.ReactNode; diff --git a/src/components/table/TablePanel.tsx b/src/components/table/TablePanel.tsx index 145c8843e..d4bb0e25d 100644 --- a/src/components/table/TablePanel.tsx +++ b/src/components/table/TablePanel.tsx @@ -1,5 +1,5 @@ import React from "react"; -import CloseButton from "components/button/CloseButton"; +import CloseButton from "@/components/button/CloseButton"; type Props = { children: any; onClose: (...args: Array) => any; diff --git a/src/components/table/TablePanelContainer.tsx b/src/components/table/TablePanelContainer.tsx index dbbe33d27..9ac8079ff 100644 --- a/src/components/table/TablePanelContainer.tsx +++ b/src/components/table/TablePanelContainer.tsx @@ -1,6 +1,6 @@ import React from "react"; import classNames from "classnames"; -import CloseButton from "components/button/CloseButton"; +import CloseButton from "@/components/button/CloseButton"; type Props = { footer?: any; children: any; diff --git a/src/components/tabs/Tabs.tsx b/src/components/tabs/Tabs.tsx index 09dca17a0..ebdbdf5b1 100644 --- a/src/components/tabs/Tabs.tsx +++ b/src/components/tabs/Tabs.tsx @@ -1,6 +1,6 @@ import React, { PureComponent } from "react"; import classNames from "classnames"; -import Authorization from "components/authorization/Authorization"; +import Authorization from "@/components/authorization/Authorization"; type Props = { active: number | null | undefined; className?: string; diff --git a/src/components/tooltip/Tooltip.tsx b/src/components/tooltip/Tooltip.tsx index fb8efcd6a..6b5eb39fa 100644 --- a/src/components/tooltip/Tooltip.tsx +++ b/src/components/tooltip/Tooltip.tsx @@ -1,7 +1,7 @@ import React, { Component, Fragment } from "react"; import classNames from "classnames"; -import CloseButton from "components/button/CloseButton"; -import type { TooltipPosition } from "components/tooltip/types"; +import CloseButton from "@/components/button/CloseButton"; +import type { TooltipPosition } from "@/components/tooltip/types"; import ReactDOM from "react-dom"; type Props = { isOpen: boolean; diff --git a/src/components/tooltip/UIDataTooltip.tsx b/src/components/tooltip/UIDataTooltip.tsx index 1ce078ec8..e2d07b50f 100644 --- a/src/components/tooltip/UIDataTooltip.tsx +++ b/src/components/tooltip/UIDataTooltip.tsx @@ -1,29 +1,29 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import isEmpty from "lodash/isEmpty"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import AddIcon from "components/icons/AddIcon"; -import Button from "components/button/Button"; -import ErrorBlock from "components/form/ErrorBlock"; -import FormFieldLabel from "components/form/FormFieldLabel"; -import InfoIcon from "components/icons/InfoIcon"; -import ModalButtonWrapper from "components/modal/ModalButtonWrapper"; -import TextAreaInput from "components/inputs/TextAreaInput"; -import { createUiData, deleteUiData, editUiData } from "uiData/actions"; -import { ConfirmationModalTexts } from "enums"; -import { ButtonColors } from "components/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getFieldAttributes, hasPermissions } from "util/helpers"; -import { getUiDataByKey } from "uiData/helpers"; -import { getAttributes as getUiDataAttributes, getUiDataList } from "uiData/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import { genericValidator } from "components/form/validations"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import AddIcon from "@/components/icons/AddIcon"; +import Button from "@/components/button/Button"; +import ErrorBlock from "@/components/form/ErrorBlock"; +import FormFieldLabel from "@/components/form/FormFieldLabel"; +import InfoIcon from "@/components/icons/InfoIcon"; +import ModalButtonWrapper from "@/components/modal/ModalButtonWrapper"; +import TextAreaInput from "@/components/inputs/TextAreaInput"; +import { createUiData, deleteUiData, editUiData } from "@/uiData/actions"; +import { ConfirmationModalTexts } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getFieldAttributes, hasPermissions } from "@/util/helpers"; +import { getUiDataByKey } from "@/uiData/helpers"; +import { getAttributes as getUiDataAttributes, getUiDataList } from "@/uiData/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import { genericValidator } from "@/components/form/validations"; import type { Attributes } from "types"; -import type { UiDataList } from "uiData/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; -import Tooltip from "components/tooltip/Tooltip"; -import TooltipWrapper from "components/tooltip/TooltipWrapper"; -import TooltipToggleButton from "components/tooltip/TooltipToggleButton"; +import type { UiDataList } from "@/uiData/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; +import Tooltip from "@/components/tooltip/Tooltip"; +import TooltipWrapper from "@/components/tooltip/TooltipWrapper"; +import TooltipToggleButton from "@/components/tooltip/TooltipToggleButton"; type OwnProps = { relativeTo?: Element; enableUiDataEdit?: boolean; diff --git a/src/components/topNavigation/TopNavigation.tsx b/src/components/topNavigation/TopNavigation.tsx index e92f3076a..dbea6059d 100644 --- a/src/components/topNavigation/TopNavigation.tsx +++ b/src/components/topNavigation/TopNavigation.tsx @@ -3,17 +3,17 @@ import classNames from "classnames"; import { withRouter } from "react-router"; import { Link } from "react-router-dom"; import { IconMenuDots } from "hds-react"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import MainMenuIcon from "../icons/MainMenuIcon"; -import SearchInput from "../inputs/SearchInput"; -import UserServiceUnitSelectInput from "../inputs/UserServiceUnitSelectInput"; -import { ConfirmationModalTexts } from "enums"; -import { ButtonColors } from "components/enums"; -import { hasAnyPageDirtyForms } from "util/forms"; -import { getSearchQuery, getUrlParams } from "util/helpers"; -import { getRouteById, Routes } from "root/routes"; - -import type { UserGroups, UserServiceUnit, UserServiceUnits } from "usersPermissions/types"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import MainMenuIcon from "@/components/icons/MainMenuIcon"; +import SearchInput from "@/components/inputs/SearchInput"; +import UserServiceUnitSelectInput from "@/components/inputs/UserServiceUnitSelectInput"; +import { ConfirmationModalTexts } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { hasAnyPageDirtyForms } from "@/util/forms"; +import { getSearchQuery, getUrlParams } from "@/util/helpers"; +import { getRouteById, Routes } from "@/root/routes"; + +import type { UserGroups, UserServiceUnit, UserServiceUnits } from "@/usersPermissions/types"; type Props = { history: Record; diff --git a/src/components/uiData/UiDataListHOC.tsx b/src/components/uiData/UiDataListHOC.tsx index a0df98b20..1cef06b34 100644 --- a/src/components/uiData/UiDataListHOC.tsx +++ b/src/components/uiData/UiDataListHOC.tsx @@ -2,10 +2,10 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; -import { fetchAttributes as fetchUiDataAttributes, fetchUiDataList } from "uiData/actions"; -import { getAttributes as getUiDataAttributes, getIsFetching, getIsFetchingAttributes as getIsFetchingUiDataAttributes, getMethods as getUiDataMethods, getUiDataList } from "uiData/selectors"; +import { fetchAttributes as fetchUiDataAttributes, fetchUiDataList } from "@/uiData/actions"; +import { getAttributes as getUiDataAttributes, getIsFetching, getIsFetchingAttributes as getIsFetchingUiDataAttributes, getMethods as getUiDataMethods, getUiDataList } from "@/uiData/selectors"; import type { Attributes, Methods } from "types"; -import type { UiDataList } from "uiData/types"; +import type { UiDataList } from "@/uiData/types"; function UiDataListHOC(WrappedComponent: any) { type Props = { diff --git a/src/components/vat/AmountWithVat.tsx b/src/components/vat/AmountWithVat.tsx index d4a9e5d4e..8535617b7 100644 --- a/src/components/vat/AmountWithVat.tsx +++ b/src/components/vat/AmountWithVat.tsx @@ -2,10 +2,10 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import isAfter from "date-fns/isAfter"; import isBefore from "date-fns/isBefore"; -import { formatNumber } from "util/helpers"; -import { getCurrentLease } from "leases/selectors"; -import { getVats } from "vat/selectors"; -import type { VatList } from "vat/types"; +import { formatNumber } from "@/util/helpers"; +import { getCurrentLease } from "@/leases/selectors"; +import { getVats } from "@/vat/selectors"; +import type { VatList } from "@/vat/types"; type Props = { amount: number; date: string; diff --git a/src/contacts/components/ContactAuditLog.tsx b/src/contacts/components/ContactAuditLog.tsx index 671be79a2..2f8187073 100644 --- a/src/contacts/components/ContactAuditLog.tsx +++ b/src/contacts/components/ContactAuditLog.tsx @@ -1,16 +1,16 @@ import React, { Fragment, PureComponent } from "react"; import { connect } from "react-redux"; import isEmpty from "lodash/isEmpty"; -import AuditLogTable from "components/auditLog/AuditLogTable"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import Pagination from "components/table/Pagination"; -import TableWrapper from "components/table/TableWrapper"; -import { fetchAuditLogByContact } from "auditLog/actions"; -import { LIST_TABLE_PAGE_SIZE } from "util/constants"; -import { getApiResponseCount, getApiResponseMaxPage, getApiResponseResults } from "util/helpers"; -import { getAuditLogByContact, getIsFetchingByContact } from "auditLog/selectors"; -import type { AuditLogList } from "auditLog/types"; +import AuditLogTable from "@/components/auditLog/AuditLogTable"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import Pagination from "@/components/table/Pagination"; +import TableWrapper from "@/components/table/TableWrapper"; +import { fetchAuditLogByContact } from "@/auditLog/actions"; +import { LIST_TABLE_PAGE_SIZE } from "@/util/constants"; +import { getApiResponseCount, getApiResponseMaxPage, getApiResponseResults } from "@/util/helpers"; +import { getAuditLogByContact, getIsFetchingByContact } from "@/auditLog/selectors"; +import type { AuditLogList } from "@/auditLog/types"; type Props = { auditLogList: AuditLogList; contactId: string; diff --git a/src/contacts/components/ContactEdit.tsx b/src/contacts/components/ContactEdit.tsx index 00e926c71..fb63dd1a8 100644 --- a/src/contacts/components/ContactEdit.tsx +++ b/src/contacts/components/ContactEdit.tsx @@ -1,6 +1,6 @@ import React from "react"; import ContactForm from "./forms/ContactForm"; -import GreenBox from "components/content/GreenBox"; +import GreenBox from "@/components/content/GreenBox"; const ContactEdit = () => { return diff --git a/src/contacts/components/ContactModal.tsx b/src/contacts/components/ContactModal.tsx index eb1e35746..b4202a030 100644 --- a/src/contacts/components/ContactModal.tsx +++ b/src/contacts/components/ContactModal.tsx @@ -1,15 +1,15 @@ import React from "react"; import { connect } from "react-redux"; -import Button from "components/button/Button"; +import Button from "@/components/button/Button"; import ContactForm from "./forms/ContactForm"; -import GreenBox from "components/content/GreenBox"; -import Modal from "components/modal/Modal"; -import { ButtonColors } from "components/enums"; -import { Methods } from "enums"; -import { isMethodAllowed } from "util/helpers"; -import { getIsContactFormValid, getIsSaveClicked, getMethods as getContactMethods } from "contacts/selectors"; +import GreenBox from "@/components/content/GreenBox"; +import Modal from "@/components/modal/Modal"; +import { ButtonColors } from "@/components/enums"; +import { Methods } from "@/enums"; +import { isMethodAllowed } from "@/util/helpers"; +import { getIsContactFormValid, getIsSaveClicked, getMethods as getContactMethods } from "@/contacts/selectors"; import type { Methods as MethodsType } from "types"; -import type { RootState } from "root/types"; +import type { RootState } from "@/root/types"; type Props = { contactMethods: MethodsType; isContactFormValid: boolean; diff --git a/src/contacts/components/ContactPage.tsx b/src/contacts/components/ContactPage.tsx index 7998bc659..249f411d8 100644 --- a/src/contacts/components/ContactPage.tsx +++ b/src/contacts/components/ContactPage.tsx @@ -4,46 +4,46 @@ import { change, formValueSelector, getFormValues, isDirty } from "redux-form"; import { withRouter } from "react-router"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; -import Authorization from "components/authorization/Authorization"; -import AuthorizationError from "components/authorization/AuthorizationError"; -import ConfirmationModal from "components/modal/ConfirmationModal"; +import Authorization from "@/components/authorization/Authorization"; +import AuthorizationError from "@/components/authorization/AuthorizationError"; +import ConfirmationModal from "@/components/modal/ConfirmationModal"; import ContactAuditLog from "./ContactAuditLog"; import ContactEdit from "./ContactEdit"; import ContactReadonly from "./ContactReadonly"; -import ContentContainer from "components/content/ContentContainer"; -import ControlButtonBar from "components/controlButtons/ControlButtonBar"; -import ControlButtons from "components/controlButtons/ControlButtons"; -import CreditDecisionTemplate from "../../creditDecision/components/CreditDecisionTemplate"; -import Divider from "components/content/Divider"; -import FullWidthContainer from "components/content/FullWidthContainer"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import PageContainer from "components/content/PageContainer"; -import PageNavigationWrapper from "components/content/PageNavigationWrapper"; -import Tabs from "components/tabs/Tabs"; -import TabPane from "components/tabs/TabPane"; -import TabContent from "components/tabs/TabContent"; -import Title from "components/content/Title"; -import TradeRegisterTemplate from "tradeRegister/components/TradeRegisterTemplate"; -import { editContact, fetchSingleContact, hideEditMode, initializeContactForm, receiveIsSaveClicked, receiveSingleContact, showEditMode } from "contacts/actions"; -import { receiveTopNavigationSettings } from "components/topNavigation/actions"; -import { ConfirmationModalTexts, FormNames, Methods, PermissionMissingTexts } from "enums"; -import { ContactFieldPaths, ContactFieldTitles, ContactTypes } from "contacts/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { clearUnsavedChanges, getContactFullName } from "contacts/helpers"; -import { getUiDataContactKey } from "uiData/helpers"; -import { hasPermissions, getSearchQuery, getUrlParams, isMethodAllowed, scrollToTopPage, setPageTitle } from "util/helpers"; -import { getRouteById, Routes } from "root/routes"; -import { getCurrentContact, getIsContactFormValid, getIsEditMode, getIsFetching, getIsSaveClicked, getIsSaving } from "contacts/selectors"; -import { getSessionStorageItem, removeSessionStorageItem, setSessionStorageItem } from "util/storage"; -import { withContactAttributes } from "components/attributes/ContactAttributes"; -import { withUiDataList } from "components/uiData/UiDataListHOC"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import { getUserActiveServiceUnit } from "usersPermissions/selectors"; +import ContentContainer from "@/components/content/ContentContainer"; +import ControlButtonBar from "@/components/controlButtons/ControlButtonBar"; +import ControlButtons from "@/components/controlButtons/ControlButtons"; +import CreditDecisionTemplate from "@/creditDecision/components/CreditDecisionTemplate"; +import Divider from "@/components/content/Divider"; +import FullWidthContainer from "@/components/content/FullWidthContainer"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import PageContainer from "@/components/content/PageContainer"; +import PageNavigationWrapper from "@/components/content/PageNavigationWrapper"; +import Tabs from "@/components/tabs/Tabs"; +import TabPane from "@/components/tabs/TabPane"; +import TabContent from "@/components/tabs/TabContent"; +import Title from "@/components/content/Title"; +import TradeRegisterTemplate from "@/tradeRegister/components/TradeRegisterTemplate"; +import { editContact, fetchSingleContact, hideEditMode, initializeContactForm, receiveIsSaveClicked, receiveSingleContact, showEditMode } from "@/contacts/actions"; +import { receiveTopNavigationSettings } from "@/components/topNavigation/actions"; +import { ConfirmationModalTexts, FormNames, Methods, PermissionMissingTexts } from "@/enums"; +import { ContactFieldPaths, ContactFieldTitles, ContactTypes } from "@/contacts/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { clearUnsavedChanges, getContactFullName } from "@/contacts/helpers"; +import { getUiDataContactKey } from "@/uiData/helpers"; +import { hasPermissions, getSearchQuery, getUrlParams, isMethodAllowed, scrollToTopPage, setPageTitle } from "@/util/helpers"; +import { getRouteById, Routes } from "@/root/routes"; +import { getCurrentContact, getIsContactFormValid, getIsEditMode, getIsFetching, getIsSaveClicked, getIsSaving } from "@/contacts/selectors"; +import { getSessionStorageItem, removeSessionStorageItem, setSessionStorageItem } from "@/util/storage"; +import { withContactAttributes } from "@/components/attributes/ContactAttributes"; +import { withUiDataList } from "@/components/uiData/UiDataListHOC"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import { getUserActiveServiceUnit } from "@/usersPermissions/selectors"; import type { Methods as MethodsType } from "types"; -import type { RootState } from "root/types"; -import type { UsersPermissions as UsersPermissionsType, UserServiceUnit } from "usersPermissions/types"; -import type { Contact } from "../types"; +import type { RootState } from "@/root/types"; +import type { UsersPermissions as UsersPermissionsType, UserServiceUnit } from "@/usersPermissions/types"; +import type { Contact } from "@/contacts/types"; type Props = { change: (...args: Array) => any; contact: Contact; diff --git a/src/contacts/components/ContactReadonly.tsx b/src/contacts/components/ContactReadonly.tsx index 87f837391..2dd54f882 100644 --- a/src/contacts/components/ContactReadonly.tsx +++ b/src/contacts/components/ContactReadonly.tsx @@ -1,7 +1,7 @@ import React from "react"; -import ContactTemplate from "contacts/components/templates/ContactTemplate"; -import GreenBox from "components/content/GreenBox"; -import type { Contact } from "../types"; +import ContactTemplate from "@/contacts/components/templates/ContactTemplate"; +import GreenBox from "@/components/content/GreenBox"; +import type { Contact } from "@/types"; type Props = { contact: Contact; }; diff --git a/src/contacts/components/ContactsListPage.tsx b/src/contacts/components/ContactsListPage.tsx index 49c84611a..d32853fa0 100644 --- a/src/contacts/components/ContactsListPage.tsx +++ b/src/contacts/components/ContactsListPage.tsx @@ -4,33 +4,33 @@ import { withRouter } from "react-router"; import { initialize } from "redux-form"; import flowRight from "lodash/flowRight"; import { Row, Column } from "react-foundation"; -import AddButtonSecondary from "components/form/AddButtonSecondary"; -import Authorization from "components/authorization/Authorization"; -import AuthorizationError from "components/authorization/AuthorizationError"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import PageContainer from "components/content/PageContainer"; -import Pagination from "components/table/Pagination"; +import AddButtonSecondary from "@/components/form/AddButtonSecondary"; +import Authorization from "@/components/authorization/Authorization"; +import AuthorizationError from "@/components/authorization/AuthorizationError"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import PageContainer from "@/components/content/PageContainer"; +import Pagination from "@/components/table/Pagination"; import Search from "./search/Search"; -import SortableTable from "components/table/SortableTable"; -import TableFilters from "components/table/TableFilters"; -import TableWrapper from "components/table/TableWrapper"; -import { fetchContacts, initializeContactForm } from "../actions"; -import { receiveTopNavigationSettings } from "components/topNavigation/actions"; -import { LIST_TABLE_PAGE_SIZE } from "util/constants"; -import { DEFAULT_SORT_KEY, DEFAULT_SORT_ORDER } from "contacts/constants"; -import { FormNames, Methods, PermissionMissingTexts } from "enums"; -import { ContactFieldPaths, ContactFieldTitles } from "contacts/enums"; -import { getContactFullName, mapContactSearchFilters } from "contacts/helpers"; -import { getApiResponseCount, getApiResponseMaxPage, getApiResponseResults, getFieldOptions, getLabelOfOption, getSearchQuery, getUrlParams, isFieldAllowedToRead, isMethodAllowed, setPageTitle } from "util/helpers"; -import { getRouteById, Routes } from "root/routes"; -import { getContactList, getIsFetching } from "../selectors"; -import { withContactAttributes } from "components/attributes/ContactAttributes"; -import { getUserActiveServiceUnit } from "usersPermissions/selectors"; -import type { ContactList } from "../types"; +import SortableTable from "@/components/table/SortableTable"; +import TableFilters from "@/components/table/TableFilters"; +import TableWrapper from "@/components/table/TableWrapper"; +import { fetchContacts, initializeContactForm } from "@/contacts/actions"; +import { receiveTopNavigationSettings } from "@/components/topNavigation/actions"; +import { LIST_TABLE_PAGE_SIZE } from "@/util/constants"; +import { DEFAULT_SORT_KEY, DEFAULT_SORT_ORDER } from "@/contacts/constants"; +import { FormNames, Methods, PermissionMissingTexts } from "@/enums"; +import { ContactFieldPaths, ContactFieldTitles } from "@/contacts/enums"; +import { getContactFullName, mapContactSearchFilters } from "@/contacts/helpers"; +import { getApiResponseCount, getApiResponseMaxPage, getApiResponseResults, getFieldOptions, getLabelOfOption, getSearchQuery, getUrlParams, isFieldAllowedToRead, isMethodAllowed, setPageTitle } from "@/util/helpers"; +import { getRouteById, Routes } from "@/root/routes"; +import { getContactList, getIsFetching } from "@/contacts/selectors"; +import { withContactAttributes } from "@/components/attributes/ContactAttributes"; +import { getUserActiveServiceUnit } from "@/usersPermissions/selectors"; +import type { ContactList } from "@/contacts/types"; import type { Attributes, Methods as MethodsType } from "types"; -import type { RootState } from "root/types"; -import type { UserServiceUnit } from "usersPermissions/types"; +import type { RootState } from "@/root/types"; +import type { UserServiceUnit } from "@/usersPermissions/types"; type Props = { contactAttributes: Attributes; contactList: ContactList; diff --git a/src/contacts/components/NewContactPage.tsx b/src/contacts/components/NewContactPage.tsx index f7eb31799..613c0e1d4 100644 --- a/src/contacts/components/NewContactPage.tsx +++ b/src/contacts/components/NewContactPage.tsx @@ -3,31 +3,31 @@ import { connect } from "react-redux"; import { getFormValues, isDirty } from "redux-form"; import { withRouter } from "react-router"; import flowRight from "lodash/flowRight"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import AuthorizationError from "components/authorization/AuthorizationError"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import AuthorizationError from "@/components/authorization/AuthorizationError"; import ContactForm from "./forms/ContactForm"; -import ContentContainer from "components/content/ContentContainer"; -import ControlButtonBar from "components/controlButtons/ControlButtonBar"; -import ControlButtons from "components/controlButtons/ControlButtons"; -import FullWidthContainer from "components/content/FullWidthContainer"; -import GreenBox from "components/content/GreenBox"; -import Loader from "components/loader/Loader"; -import PageContainer from "components/content/PageContainer"; -import PageNavigationWrapper from "components/content/PageNavigationWrapper"; -import { createContact, hideEditMode, receiveIsSaveClicked, showEditMode } from "contacts/actions"; -import { receiveTopNavigationSettings } from "components/topNavigation/actions"; -import { ConfirmationModalTexts, FormNames, Methods, PermissionMissingTexts } from "enums"; -import { ButtonColors } from "components/enums"; -import { ContactTypes } from "contacts/enums"; -import { isEmptyValue, isMethodAllowed, setPageTitle } from "util/helpers"; -import { contactExists } from "contacts/requestsAsync"; -import { getRouteById, Routes } from "root/routes"; -import { getIsContactFormValid, getIsSaveClicked } from "contacts/selectors"; -import { withContactAttributes } from "components/attributes/ContactAttributes"; -import { withUiDataList } from "components/uiData/UiDataListHOC"; +import ContentContainer from "@/components/content/ContentContainer"; +import ControlButtonBar from "@/components/controlButtons/ControlButtonBar"; +import ControlButtons from "@/components/controlButtons/ControlButtons"; +import FullWidthContainer from "@/components/content/FullWidthContainer"; +import GreenBox from "@/components/content/GreenBox"; +import Loader from "@/components/loader/Loader"; +import PageContainer from "@/components/content/PageContainer"; +import PageNavigationWrapper from "@/components/content/PageNavigationWrapper"; +import { createContact, hideEditMode, receiveIsSaveClicked, showEditMode } from "@/contacts/actions"; +import { receiveTopNavigationSettings } from "@/components/topNavigation/actions"; +import { ConfirmationModalTexts, FormNames, Methods, PermissionMissingTexts } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { ContactTypes } from "@/contacts/enums"; +import { isEmptyValue, isMethodAllowed, setPageTitle } from "@/util/helpers"; +import { contactExists } from "@/contacts/requestsAsync"; +import { getRouteById, Routes } from "@/root/routes"; +import { getIsContactFormValid, getIsSaveClicked } from "@/contacts/selectors"; +import { withContactAttributes } from "@/components/attributes/ContactAttributes"; +import { withUiDataList } from "@/components/uiData/UiDataListHOC"; import type { Methods as MethodsType } from "types"; -import type { RootState } from "root/types"; -import type { Contact } from "../types"; +import type { RootState } from "@/root/types"; +import type { Contact } from "@/types"; type Props = { contactFormValues: Contact; contactMethods: MethodsType; diff --git a/src/contacts/components/forms/ContactForm.tsx b/src/contacts/components/forms/ContactForm.tsx index 198020814..24af4e905 100644 --- a/src/contacts/components/forms/ContactForm.tsx +++ b/src/contacts/components/forms/ContactForm.tsx @@ -4,26 +4,26 @@ import { Row, Column } from "react-foundation"; import { change, formValueSelector, reduxForm } from "redux-form"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; -import Authorization from "components/authorization/Authorization"; -import FormField from "components/form/FormField"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import FormWrapper from "components/form/FormWrapper"; -import FormWrapperLeft from "components/form/FormWrapperLeft"; -import FormWrapperRight from "components/form/FormWrapperRight"; -import { receiveContactFormValid } from "contacts/actions"; -import { FieldTypes, FormNames } from "enums"; -import WarningContainer from "components/content/WarningContainer"; -import WarningField from "components/form/WarningField"; -import { getContactBusinessIdFieldError } from "contacts/helpers"; -import { ContactFieldPaths, ContactFieldTitles, ContactTypes } from "contacts/enums"; -import { getUiDataContactKey } from "uiData/helpers"; -import { getFieldAttributes, isEmptyValue, isFieldAllowedToRead } from "util/helpers"; -import { getAttributes, getInitialContactFormValues, getIsContactFormValid, getIsSaveClicked } from "contacts/selectors"; -import { getUserActiveServiceUnit } from "usersPermissions/selectors"; +import Authorization from "@/components/authorization/Authorization"; +import FormField from "@/components/form/FormField"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import FormWrapper from "@/components/form/FormWrapper"; +import FormWrapperLeft from "@/components/form/FormWrapperLeft"; +import FormWrapperRight from "@/components/form/FormWrapperRight"; +import { receiveContactFormValid } from "@/contacts/actions"; +import { FieldTypes, FormNames } from "@/enums"; +import WarningContainer from "@/components/content/WarningContainer"; +import WarningField from "@/components/form/WarningField"; +import { getContactBusinessIdFieldError } from "@/contacts/helpers"; +import { ContactFieldPaths, ContactFieldTitles, ContactTypes } from "@/contacts/enums"; +import { getUiDataContactKey } from "@/uiData/helpers"; +import { getFieldAttributes, isEmptyValue, isFieldAllowedToRead } from "@/util/helpers"; +import { getAttributes, getInitialContactFormValues, getIsContactFormValid, getIsSaveClicked } from "@/contacts/selectors"; +import { getUserActiveServiceUnit } from "@/usersPermissions/selectors"; import type { Attributes } from "types"; -import type { RootState } from "root/types"; -import type { UserServiceUnit } from "usersPermissions/types"; +import type { RootState } from "@/root/types"; +import type { UserServiceUnit } from "@/usersPermissions/types"; type Props = { attributes: Attributes; change: (...args: Array) => any; diff --git a/src/contacts/components/search/Search.tsx b/src/contacts/components/search/Search.tsx index e5391e1fb..1eff8d652 100644 --- a/src/contacts/components/search/Search.tsx +++ b/src/contacts/components/search/Search.tsx @@ -6,13 +6,13 @@ import debounce from "lodash/debounce"; import flowRight from "lodash/flowRight"; import isEqual from "lodash/isEqual"; import isEmpty from "lodash/isEmpty"; -import FormField from "components/form/FormField"; -import SearchClearLink from "components/search/SearchClearLink"; -import SearchContainer from "components/search/SearchContainer"; -import { FieldTypes, FormNames } from "enums"; -import { fetchServiceUnits } from "serviceUnits/actions"; -import { getServiceUnits, getIsFetching as getIsFetchingServiceUnits } from "serviceUnits/selectors"; -import type { ServiceUnits } from "serviceUnits/types"; +import FormField from "@/components/form/FormField"; +import SearchClearLink from "@/components/search/SearchClearLink"; +import SearchContainer from "@/components/search/SearchContainer"; +import { FieldTypes, FormNames } from "@/enums"; +import { fetchServiceUnits } from "@/serviceUnits/actions"; +import { getServiceUnits, getIsFetching as getIsFetchingServiceUnits } from "@/serviceUnits/selectors"; +import type { ServiceUnits } from "@/serviceUnits/types"; type Props = { formValues: Record; fetchServiceUnits: (...args: Array) => any; diff --git a/src/contacts/components/templates/ContactTemplate.tsx b/src/contacts/components/templates/ContactTemplate.tsx index 51b1c89ac..6dd168ece 100644 --- a/src/contacts/components/templates/ContactTemplate.tsx +++ b/src/contacts/components/templates/ContactTemplate.tsx @@ -1,17 +1,17 @@ import React from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; -import Authorization from "components/authorization/Authorization"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import FormWrapper from "components/form/FormWrapper"; -import FormWrapperLeft from "components/form/FormWrapperLeft"; -import FormWrapperRight from "components/form/FormWrapperRight"; -import { ContactFieldPaths, ContactFieldTitles } from "contacts/enums"; -import { getUiDataContactKey } from "uiData/helpers"; -import { getFieldOptions, getLabelOfOption, isFieldAllowedToRead } from "util/helpers"; -import { getAttributes } from "contacts/selectors"; -import { ContactTypes } from "contacts/enums"; +import Authorization from "@/components/authorization/Authorization"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import FormWrapper from "@/components/form/FormWrapper"; +import FormWrapperLeft from "@/components/form/FormWrapperLeft"; +import FormWrapperRight from "@/components/form/FormWrapperRight"; +import { ContactFieldPaths, ContactFieldTitles } from "@/contacts/enums"; +import { getUiDataContactKey } from "@/uiData/helpers"; +import { getFieldOptions, getLabelOfOption, isFieldAllowedToRead } from "@/util/helpers"; +import { getAttributes } from "@/contacts/selectors"; +import { ContactTypes } from "@/contacts/enums"; import type { Attributes } from "types"; type Props = { attributes: Attributes; diff --git a/src/contacts/constants.ts b/src/contacts/constants.ts index 71ef3a8d1..5f983a052 100644 --- a/src/contacts/constants.ts +++ b/src/contacts/constants.ts @@ -1,4 +1,4 @@ -import { TableSortOrder } from "enums"; +import { TableSortOrder } from "@/enums"; /** * Default sort key of contact list page diff --git a/src/contacts/helpers.ts b/src/contacts/helpers.ts index 789831350..7191ba09f 100644 --- a/src/contacts/helpers.ts +++ b/src/contacts/helpers.ts @@ -1,8 +1,8 @@ import { isDirty } from "redux-form"; -import { FormNames, TableSortOrder } from "enums"; +import { FormNames, TableSortOrder } from "@/enums"; import { ContactTypes } from "./enums"; -import { getIsEditMode } from "contacts/selectors"; -import { removeSessionStorageItem } from "util/storage"; +import { getIsEditMode } from "@/contacts/selectors"; +import { removeSessionStorageItem } from "@/util/storage"; /** * Get full name of contact diff --git a/src/contacts/reducer.ts b/src/contacts/reducer.ts index 0cb650bae..1c9f73a9d 100644 --- a/src/contacts/reducer.ts +++ b/src/contacts/reducer.ts @@ -1,6 +1,6 @@ import { combineReducers } from "redux"; import { handleActions } from "redux-actions"; -import type { Attributes, Methods, Reducer } from "../types"; +import type { Attributes, Methods, Reducer } from "@/types"; import type { Contact, ContactList, ContactModalSettings, InitializeContactFormValuesAction, ReceiveAttributesAction, ReceiveMethodsAction, ReceiveContactsAction, ReceiveSingleContactAction, ReceiveContactFormValidAction, ReceiveContactModalSettingsAction, ReceiveIsSaveClickedAction } from "./types"; const isEditModeReducer: Reducer = handleActions({ 'mvj/contacts/HIDE_EDIT': () => false, diff --git a/src/contacts/requests.ts b/src/contacts/requests.ts index 274b3e071..c12557d17 100644 --- a/src/contacts/requests.ts +++ b/src/contacts/requests.ts @@ -1,5 +1,5 @@ -import callApi from "../api/callApi"; -import createUrl from "../api/createUrl"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; import type { Contact, ContactId } from "./types"; export const fetchAttributes = (): Generator => { return callApi(new Request(createUrl(`contact/`), { diff --git a/src/contacts/requestsAsync.ts b/src/contacts/requestsAsync.ts index 174772570..f10f004d4 100644 --- a/src/contacts/requestsAsync.ts +++ b/src/contacts/requestsAsync.ts @@ -1,5 +1,5 @@ -import createUrl from "api/createUrl"; -import callApiAsync from "api/callApiAsync"; +import createUrl from "@/api/createUrl"; +import callApiAsync from "@/api/callApiAsync"; import { ContactExistsResponse } from "./types"; export const fetchContacts = async (query?: Record) => { const { diff --git a/src/contacts/saga.ts b/src/contacts/saga.ts index 44d329101..07a4f4e8e 100644 --- a/src/contacts/saga.ts +++ b/src/contacts/saga.ts @@ -2,10 +2,10 @@ import { all, call, fork, put, select, takeLatest } from "redux-saga/effects"; import { push } from "react-router-redux"; import { SubmissionError } from "redux-form"; import { hideContactModal, hideEditMode, receiveAttributes, receiveMethods, attributesNotFound, receiveContacts, receiveContactModalSettings, receiveSingleContact, notFound } from "./actions"; -import { receiveError } from "api/actions"; -import { displayUIMessage } from "util/helpers"; +import { receiveError } from "@/api/actions"; +import { displayUIMessage } from "@/util/helpers"; import { createContact, editContact, fetchAttributes, fetchContacts, fetchSingleContact } from "./requests"; -import { getRouteById, Routes } from "../root/routes"; +import { getRouteById, Routes } from "@/root/routes"; import { getContactModalSettings } from "./selectors"; function* fetchAttributesSaga(): Generator { diff --git a/src/contacts/selectors.ts b/src/contacts/selectors.ts index 47afd2f1f..aec078770 100644 --- a/src/contacts/selectors.ts +++ b/src/contacts/selectors.ts @@ -1,5 +1,5 @@ import type { Attributes, Methods, Selector } from "types"; -import type { RootState } from "root/types"; +import type { RootState } from "@/root/types"; import type { Contact, ContactList, ContactModalSettings } from "./types"; export const getInitialContactFormValues: Selector = (state: RootState): Contact => state.contact.initialContactFormValues; export const getIsContactFormValid: Selector = (state: RootState): boolean => state.contact.isContactFormValid; diff --git a/src/contacts/types.ts b/src/contacts/types.ts index e5b3abe2f..05d230414 100644 --- a/src/contacts/types.ts +++ b/src/contacts/types.ts @@ -1,4 +1,4 @@ -import type { Action, Attributes, Methods } from "../types"; +import type { Action, Attributes, Methods } from "@/types"; export type ContactState = { attributes: Attributes; contactModalSettings: ContactModalSettings; diff --git a/src/contractFile/reducer.ts b/src/contractFile/reducer.ts index ef6db02a9..9004f811e 100644 --- a/src/contractFile/reducer.ts +++ b/src/contractFile/reducer.ts @@ -1,7 +1,7 @@ import { combineReducers } from "redux"; import { handleActions } from "redux-actions"; import type { Reducer } from "types"; -import type { FetchContractFilesByIdAction, ReceiveContractFilesByIdAction, NotFoundByIdAction } from "contractFile/types"; +import type { FetchContractFilesByIdAction, ReceiveContractFilesByIdAction, NotFoundByIdAction } from "@/contractFile/types"; const isFetchingByIdReducer: Reducer> = handleActions({ ['mvj/contractFile/FETCH_BY_ID']: (state: Record, { payload: contractId diff --git a/src/contractFile/requests.ts b/src/contractFile/requests.ts index 86697df50..ba5e8fcc5 100644 --- a/src/contractFile/requests.ts +++ b/src/contractFile/requests.ts @@ -1,5 +1,5 @@ -import callApi from "../api/callApi"; -import createUrlWithoutVersionSuffix from "../api/createUrlWithoutVersionSuffix"; +import callApi from "@/api/callApi"; +import createUrlWithoutVersionSuffix from "@/api/createUrlWithoutVersionSuffix"; import type { ContractId } from "./types"; export const fetchContractFiles = (id: ContractId): Generator => { return callApi(new Request(createUrlWithoutVersionSuffix(`contract_file/${id}/`))); diff --git a/src/contractFile/saga.ts b/src/contractFile/saga.ts index 39386e4a2..27f2c0103 100644 --- a/src/contractFile/saga.ts +++ b/src/contractFile/saga.ts @@ -1,6 +1,6 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects"; import { SubmissionError } from "redux-form"; -import { receiveError } from "api/actions"; +import { receiveError } from "@/api/actions"; import { receiveContractFilesById, notFoundById } from "./actions"; import { fetchContractFiles } from "./requests"; diff --git a/src/contractFile/selectors.ts b/src/contractFile/selectors.ts index 2252894cf..79a1a277c 100644 --- a/src/contractFile/selectors.ts +++ b/src/contractFile/selectors.ts @@ -1,4 +1,4 @@ -import type { RootState } from "root/types"; +import type { RootState } from "@/root/types"; import type { Selector } from "types"; import type { ContractId } from "./types"; export const getContractFilesById: Selector>, ContractId> = (state: RootState, id: ContractId): Array> => state.contractFile.byId[id]; diff --git a/src/contractFile/types.ts b/src/contractFile/types.ts index 941d05dea..646a2fbff 100644 --- a/src/contractFile/types.ts +++ b/src/contractFile/types.ts @@ -1,4 +1,4 @@ -import type { Action } from "../types"; +import type { Action } from "@/types"; export type ContractId = number; export type ReceiveContractFilePayload = { contractId: ContractId; diff --git a/src/createCollectionLetter/reducer.ts b/src/createCollectionLetter/reducer.ts index 101c7a32a..6a524a9f7 100644 --- a/src/createCollectionLetter/reducer.ts +++ b/src/createCollectionLetter/reducer.ts @@ -1,6 +1,6 @@ import { combineReducers } from "redux"; import { handleActions } from "redux-actions"; -import type { Attributes, Reducer } from "../types"; +import type { Attributes, Reducer } from "@/types"; import type { ReceiveAttributesAction } from "./types"; const isFetchingAttributesReducer: Reducer = handleActions({ 'mvj/createCollectionLetter/FETCH_ATTRIBUTES': () => true, diff --git a/src/createCollectionLetter/requests.ts b/src/createCollectionLetter/requests.ts index ff03846a5..f89215fad 100644 --- a/src/createCollectionLetter/requests.ts +++ b/src/createCollectionLetter/requests.ts @@ -1,5 +1,5 @@ -import callApi from "../api/callApi"; -import createUrl from "../api/createUrl"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; export const fetchAttributes = (): Generator => { return callApi(new Request(createUrl(`lease_create_collection_letter/`), { method: 'OPTIONS' diff --git a/src/createCollectionLetter/saga.ts b/src/createCollectionLetter/saga.ts index bfee5a589..6062ff7a8 100644 --- a/src/createCollectionLetter/saga.ts +++ b/src/createCollectionLetter/saga.ts @@ -1,7 +1,7 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects"; import { receiveAttributes, attributesNotFound } from "./actions"; import { fetchAttributes } from "./requests"; -import { receiveError } from "../api/actions"; +import { receiveError } from "@/api/actions"; function* fetchAttributesSaga(): Generator { try { diff --git a/src/createCollectionLetter/selectors.ts b/src/createCollectionLetter/selectors.ts index 13322d195..55132793e 100644 --- a/src/createCollectionLetter/selectors.ts +++ b/src/createCollectionLetter/selectors.ts @@ -1,4 +1,4 @@ import type { Attributes, Selector } from "types"; -import type { RootState } from "root/types"; +import type { RootState } from "@/root/types"; export const getIsFetchingAttributes: Selector = (state: RootState): boolean => state.createCollectionLetter.isFetchingAttributes; export const getAttributes: Selector = (state: RootState): Attributes => state.createCollectionLetter.attributes; \ No newline at end of file diff --git a/src/createCollectionLetter/types.ts b/src/createCollectionLetter/types.ts index 0aaa57568..469458415 100644 --- a/src/createCollectionLetter/types.ts +++ b/src/createCollectionLetter/types.ts @@ -1,4 +1,4 @@ -import type { Action, Attributes } from "../types"; +import type { Action, Attributes } from "@/types"; export type CreateCollectionLetterState = { attributes: Attributes; isFetchingAttributes: boolean; diff --git a/src/creditDecision/actions.ts b/src/creditDecision/actions.ts index db52165ae..6a993d203 100644 --- a/src/creditDecision/actions.ts +++ b/src/creditDecision/actions.ts @@ -1,5 +1,5 @@ import { createAction } from "redux-actions"; -import type { CreditDecisionNotFoundByBusinessIdAction, CreditDecisionNotFoundByContactIdAction, CreditDecisionNotFoundByNinAction, FetchCreditDecisionByBusinessIdAction, FetchCreditDecisionByContactIdAction, FetchCreditDecisionByNinAction, FetchHistoryByBusinessIdAction, FetchHistoryByContactIdAction, HistoryDataMap, HistoryNotFoundByBusinessIdAction, HistoryNotFoundByContactIdAction, ReceiveCreditDecisionByBusinessIdAction, ReceiveCreditDecisionByContactIdAction, ReceiveCreditDecisionByNinAction, ReceiveHistoryByBusinessIdAction, ReceiveHistoryByContactIdAction } from "creditDecision/types"; +import type { CreditDecisionNotFoundByBusinessIdAction, CreditDecisionNotFoundByContactIdAction, CreditDecisionNotFoundByNinAction, FetchCreditDecisionByBusinessIdAction, FetchCreditDecisionByContactIdAction, FetchCreditDecisionByNinAction, FetchHistoryByBusinessIdAction, FetchHistoryByContactIdAction, HistoryDataMap, HistoryNotFoundByBusinessIdAction, HistoryNotFoundByContactIdAction, ReceiveCreditDecisionByBusinessIdAction, ReceiveCreditDecisionByContactIdAction, ReceiveCreditDecisionByNinAction, ReceiveHistoryByBusinessIdAction, ReceiveHistoryByContactIdAction } from "@/creditDecision/types"; export const fetchHistoryByBusinessId = (id: string): FetchHistoryByBusinessIdAction => createAction('mvj/creditDecision/FETCH_HISTORY_BY_BUSINESS_ID')(id); export const receiveHistoryByBusinessId = (payload: HistoryDataMap): ReceiveHistoryByBusinessIdAction => createAction('mvj/creditDecision/RECEIVE_HISTORY_BY_BUSINESS_ID')(payload); export const historyNotFoundByBusinessId = (id: string): HistoryNotFoundByBusinessIdAction => createAction('mvj/creditDecision/HISTORY_NOT_FOUND_BY_BUSINESS_ID')(id); diff --git a/src/creditDecision/components/CreditDecisionHistory.tsx b/src/creditDecision/components/CreditDecisionHistory.tsx index c5716265e..9d8ed6b2a 100644 --- a/src/creditDecision/components/CreditDecisionHistory.tsx +++ b/src/creditDecision/components/CreditDecisionHistory.tsx @@ -2,17 +2,17 @@ import React, { Fragment, PureComponent } from "react"; import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; -import InfoIcon from "components/icons/InfoIcon"; -import GreenBox from "components/content/GreenBox"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import StatusText from "creditDecision/components/StatusText"; -import WhiteBox from "components/content/WhiteBox"; -import { CreditDecisionText } from "creditDecision/enums"; -import { formatDate } from "util/helpers"; -import { getHoursAndMinutes } from "util/date"; -import { fetchHistoryByBusinessId, fetchHistoryByContactId } from "creditDecision/actions"; -import { getHistoryByBusinessId, getIsFetchingHistoryByBusinessId, getHistoryByContactId, getIsFetchingHistoryByContactId } from "creditDecision/selectors"; +import InfoIcon from "@/components/icons/InfoIcon"; +import GreenBox from "@/components/content/GreenBox"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import StatusText from "@/creditDecision/components/StatusText"; +import WhiteBox from "@/components/content/WhiteBox"; +import { CreditDecisionText } from "@/creditDecision/enums"; +import { formatDate } from "@/util/helpers"; +import { getHoursAndMinutes } from "@/util/date"; +import { fetchHistoryByBusinessId, fetchHistoryByContactId } from "@/creditDecision/actions"; +import { getHistoryByBusinessId, getIsFetchingHistoryByBusinessId, getHistoryByContactId, getIsFetchingHistoryByContactId } from "@/creditDecision/selectors"; type Props = { businessId?: string; contactId?: string; diff --git a/src/creditDecision/components/CreditDecisionRequest.tsx b/src/creditDecision/components/CreditDecisionRequest.tsx index 1e683db6d..e8d2e8eff 100644 --- a/src/creditDecision/components/CreditDecisionRequest.tsx +++ b/src/creditDecision/components/CreditDecisionRequest.tsx @@ -1,26 +1,26 @@ import React, { Fragment, PureComponent } from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; -import Button from "components/button/Button"; -import ErrorIcon from "components/icons/ErrorIcon"; -import GreenBox from "components/content/GreenBox"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import StatusText from "creditDecision/components/StatusText"; -import WhiteBox from "components/content/WhiteBox"; -import { ContactTypes } from "contacts/enums"; -import { CreditDecisionText } from "creditDecision/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { hasPermissions } from "util/helpers"; -import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "usersPermissions/selectors"; -import { formatDate } from "util/helpers"; -import { getHoursAndMinutes } from "util/date"; -import { fetchCreditDecisionByBusinessId, fetchCreditDecisionByContactId, fetchCreditDecisionByNin } from "creditDecision/actions"; -import { getCreditDecisionByBusinessId, getCreditDecisionByContactId, getCreditDecisionByNin, getIsFetchingCreditDecisionByBusinessId, getIsFetchingCreditDecisionByContactId, getIsFetchingCreditDecisionByNin } from "creditDecision/selectors"; +import Button from "@/components/button/Button"; +import ErrorIcon from "@/components/icons/ErrorIcon"; +import GreenBox from "@/components/content/GreenBox"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import StatusText from "@/creditDecision/components/StatusText"; +import WhiteBox from "@/components/content/WhiteBox"; +import { ContactTypes } from "@/contacts/enums"; +import { CreditDecisionText } from "@/creditDecision/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { hasPermissions } from "@/util/helpers"; +import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "@/usersPermissions/selectors"; +import { formatDate } from "@/util/helpers"; +import { getHoursAndMinutes } from "@/util/date"; +import { fetchCreditDecisionByBusinessId, fetchCreditDecisionByContactId, fetchCreditDecisionByNin } from "@/creditDecision/actions"; +import { getCreditDecisionByBusinessId, getCreditDecisionByContactId, getCreditDecisionByNin, getIsFetchingCreditDecisionByBusinessId, getIsFetchingCreditDecisionByContactId, getIsFetchingCreditDecisionByNin } from "@/creditDecision/selectors"; type Props = { businessId: string; contactId: string; diff --git a/src/creditDecision/components/CreditDecisionSearchPage.tsx b/src/creditDecision/components/CreditDecisionSearchPage.tsx index 627391d03..ded004170 100644 --- a/src/creditDecision/components/CreditDecisionSearchPage.tsx +++ b/src/creditDecision/components/CreditDecisionSearchPage.tsx @@ -4,22 +4,22 @@ import { initialize } from "redux-form"; import { withRouter } from "react-router"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; -import AuthorizationError from "components/authorization/AuthorizationError"; -import ContentContainer from "components/content/ContentContainer"; -import Divider from "components/content/Divider"; -import Loader from "components/loader/Loader"; -import PageContainer from "components/content/PageContainer"; -import SearchForm from "creditDecision/components/SearchForm"; -import CreditDecisionTemplate from "creditDecision/components/CreditDecisionTemplate"; -import { ContactTypes } from "contacts/enums"; -import { CreditDecisionText } from "creditDecision/enums"; -import { receiveTopNavigationSettings } from "components/topNavigation/actions"; -import { FormNames, PermissionMissingTexts } from "enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { hasPermissions, getSearchQuery, getUrlParams, setPageTitle } from "util/helpers"; -import { getRouteById, Routes } from "root/routes"; -import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "usersPermissions/selectors"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import AuthorizationError from "@/components/authorization/AuthorizationError"; +import ContentContainer from "@/components/content/ContentContainer"; +import Divider from "@/components/content/Divider"; +import Loader from "@/components/loader/Loader"; +import PageContainer from "@/components/content/PageContainer"; +import SearchForm from "@/creditDecision/components/SearchForm"; +import CreditDecisionTemplate from "@/creditDecision/components/CreditDecisionTemplate"; +import { ContactTypes } from "@/contacts/enums"; +import { CreditDecisionText } from "@/creditDecision/enums"; +import { receiveTopNavigationSettings } from "@/components/topNavigation/actions"; +import { FormNames, PermissionMissingTexts } from "@/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { hasPermissions, getSearchQuery, getUrlParams, setPageTitle } from "@/util/helpers"; +import { getRouteById, Routes } from "@/root/routes"; +import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "@/usersPermissions/selectors"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { history: Record; initialize: (...args: Array) => any; diff --git a/src/creditDecision/components/CreditDecisionTemplate.tsx b/src/creditDecision/components/CreditDecisionTemplate.tsx index f37c336c0..999ecefa0 100644 --- a/src/creditDecision/components/CreditDecisionTemplate.tsx +++ b/src/creditDecision/components/CreditDecisionTemplate.tsx @@ -1,7 +1,7 @@ import React, { Fragment } from "react"; -import CreditDecisionRequest from "creditDecision/components/CreditDecisionRequest"; -import CreditDecisionHistory from "creditDecision/components/CreditDecisionHistory"; -import { ContactTypes } from "contacts/enums"; +import CreditDecisionRequest from "@/creditDecision/components/CreditDecisionRequest"; +import CreditDecisionHistory from "@/creditDecision/components/CreditDecisionHistory"; +import { ContactTypes } from "@/contacts/enums"; type Props = { businessId?: string; contactId?: string; diff --git a/src/creditDecision/components/SearchForm.tsx b/src/creditDecision/components/SearchForm.tsx index 907e27170..0c80a1f82 100644 --- a/src/creditDecision/components/SearchForm.tsx +++ b/src/creditDecision/components/SearchForm.tsx @@ -2,17 +2,17 @@ import React, { Fragment } from "react"; import { connect } from "react-redux"; import { getFormValues, formValueSelector, reduxForm } from "redux-form"; import flowRight from "lodash/flowRight"; -import Button from "components/button/Button"; -import FormField from "components/form/FormField"; -import GreenBox from "components/content/GreenBox"; -import SearchInputColumn from "components/search/SearchInputColumn"; -import SearchLabel from "components/search/SearchLabel"; -import SearchLabelColumn from "components/search/SearchLabelColumn"; -import SearchRow from "components/search/SearchRow"; -import { ButtonColors } from "components/enums"; -import { ContactTypes } from "contacts/enums"; -import { FieldTypes, FormNames } from "enums"; -import { CreditDecisionText, SearchLabels } from "creditDecision/enums"; +import Button from "@/components/button/Button"; +import FormField from "@/components/form/FormField"; +import GreenBox from "@/components/content/GreenBox"; +import SearchInputColumn from "@/components/search/SearchInputColumn"; +import SearchLabel from "@/components/search/SearchLabel"; +import SearchLabelColumn from "@/components/search/SearchLabelColumn"; +import SearchRow from "@/components/search/SearchRow"; +import { ButtonColors } from "@/components/enums"; +import { ContactTypes } from "@/contacts/enums"; +import { FieldTypes, FormNames } from "@/enums"; +import { CreditDecisionText, SearchLabels } from "@/creditDecision/enums"; type Props = { formSelectedType: String; formValues: Record; diff --git a/src/creditDecision/components/StatusText.tsx b/src/creditDecision/components/StatusText.tsx index 47ad0e161..d809ce071 100644 --- a/src/creditDecision/components/StatusText.tsx +++ b/src/creditDecision/components/StatusText.tsx @@ -1,9 +1,9 @@ import React from "react"; import classNames from "classnames"; -import QuestionIcon from "components/icons/QuestionIcon"; -import SuccessIcon from "components/icons/SuccessIcon"; -import CancelIcon from "components/icons/CancelIcon"; -import { CreditDecisionStatus, CreditDecisionStatusLabels } from "creditDecision/enums"; +import QuestionIcon from "@/components/icons/QuestionIcon"; +import SuccessIcon from "@/components/icons/SuccessIcon"; +import CancelIcon from "@/components/icons/CancelIcon"; +import { CreditDecisionStatus, CreditDecisionStatusLabels } from "@/creditDecision/enums"; type Props = { status: String; className?: String; diff --git a/src/creditDecision/reducer.ts b/src/creditDecision/reducer.ts index b72a074a0..5643238af 100644 --- a/src/creditDecision/reducer.ts +++ b/src/creditDecision/reducer.ts @@ -1,7 +1,7 @@ import { combineReducers } from "redux"; import { handleActions } from "redux-actions"; import type { Reducer } from "types"; -import type { CreditDecisionDataMap, CreditDecisionNotFoundByBusinessIdAction, CreditDecisionNotFoundByContactIdAction, CreditDecisionNotFoundByNinAction, FetchCreditDecisionByBusinessIdAction, FetchCreditDecisionByContactIdAction, FetchCreditDecisionByNinAction, FetchHistoryByBusinessIdAction, FetchHistoryByContactIdAction, HistoryDataMap, HistoryNotFoundByBusinessIdAction, HistoryNotFoundByContactIdAction, IsFetchingCreditDecisionMap, IsFetchingHistoryMap, ReceiveCreditDecisionByBusinessIdAction, ReceiveCreditDecisionByContactIdAction, ReceiveCreditDecisionByNinAction, ReceiveHistoryByBusinessIdAction, ReceiveHistoryByContactIdAction } from "creditDecision/types"; +import type { CreditDecisionDataMap, CreditDecisionNotFoundByBusinessIdAction, CreditDecisionNotFoundByContactIdAction, CreditDecisionNotFoundByNinAction, FetchCreditDecisionByBusinessIdAction, FetchCreditDecisionByContactIdAction, FetchCreditDecisionByNinAction, FetchHistoryByBusinessIdAction, FetchHistoryByContactIdAction, HistoryDataMap, HistoryNotFoundByBusinessIdAction, HistoryNotFoundByContactIdAction, IsFetchingCreditDecisionMap, IsFetchingHistoryMap, ReceiveCreditDecisionByBusinessIdAction, ReceiveCreditDecisionByContactIdAction, ReceiveCreditDecisionByNinAction, ReceiveHistoryByBusinessIdAction, ReceiveHistoryByContactIdAction } from "@/creditDecision/types"; const isFetchingHistoryByBusinessIdReducer: Reducer = handleActions({ ['mvj/creditDecision/FETCH_HISTORY_BY_BUSINESS_ID']: (state: IsFetchingHistoryMap, { payload: id diff --git a/src/creditDecision/requests.ts b/src/creditDecision/requests.ts index b8f1df23a..bb8ff3b29 100644 --- a/src/creditDecision/requests.ts +++ b/src/creditDecision/requests.ts @@ -1,5 +1,5 @@ -import callApi from "api/callApi"; -import createUrl from "../api/createUrl"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; export const fetchHistoryBusinessId = (id: string): Generator => { return callApi(new Request(createUrl(`get_credit_decisions?business_id=${id}`))); }; diff --git a/src/creditDecision/saga.ts b/src/creditDecision/saga.ts index d61f22bfd..15192b213 100644 --- a/src/creditDecision/saga.ts +++ b/src/creditDecision/saga.ts @@ -1,5 +1,5 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects"; -import { receiveError } from "api/actions"; +import { receiveError } from "@/api/actions"; import { creditDecisionNotFoundByBusinessId, creditDecisionNotFoundByContactId, creditDecisionNotFoundByNin, fetchHistoryByBusinessId, fetchHistoryByContactId, historyNotFoundByBusinessId, historyNotFoundByContactId, receiveCreditDecisionByBusinessId, receiveCreditDecisionByContactId, receiveCreditDecisionByNin, receiveHistoryByBusinessId, receiveHistoryByContactId } from "./actions"; import { fetchHistoryBusinessId, fetchHistoryContactId, fetchCreditDecisionContactId, fetchCreditDecisionBusinessId, fetchCreditDecisionNin } from "./requests"; diff --git a/src/creditDecision/selectors.ts b/src/creditDecision/selectors.ts index 687d055ae..56d466a95 100644 --- a/src/creditDecision/selectors.ts +++ b/src/creditDecision/selectors.ts @@ -1,4 +1,4 @@ -import type { RootState } from "root/types"; +import type { RootState } from "@/root/types"; import type { Selector } from "types"; export const getIsFetchingHistoryByBusinessId: Selector = (state: RootState, id: string): boolean => state.creditDecision.isFetchingHistoryByBusinessId[id]; export const getIsFetchingHistoryByContactId: Selector = (state: RootState, id: string): boolean => state.creditDecision.isFetchingHistoryByContactId[id]; diff --git a/src/district/helpers.ts b/src/district/helpers.ts index 303f936fd..d9bf3cbf2 100644 --- a/src/district/helpers.ts +++ b/src/district/helpers.ts @@ -1,4 +1,4 @@ -import { addEmptyOption } from "util/helpers"; +import { addEmptyOption } from "@/util/helpers"; /** * Get district options diff --git a/src/district/reducer.ts b/src/district/reducer.ts index 2ff1474df..978111ad9 100644 --- a/src/district/reducer.ts +++ b/src/district/reducer.ts @@ -1,6 +1,6 @@ import { combineReducers } from "redux"; import { handleActions } from "redux-actions"; -import type { Reducer } from "../types"; +import type { Reducer } from "@/types"; import type { DistrictListMap, ReceiveDistrictsByMunicipalityAction } from "./types"; const isFetchingReducer: Reducer = handleActions({ 'mvj/district/FETCH_BY_MUNICIPALITY': () => true, diff --git a/src/district/requests.ts b/src/district/requests.ts index a15f74e2f..2156d6941 100644 --- a/src/district/requests.ts +++ b/src/district/requests.ts @@ -1,5 +1,5 @@ -import callApi from "../api/callApi"; -import createUrl from "../api/createUrl"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; export const fetchDistricts = (search: string) => { return callApi(new Request(createUrl(`district/${search || ''}`))); }; \ No newline at end of file diff --git a/src/district/saga.ts b/src/district/saga.ts index dfd0e648f..ccf5f41de 100644 --- a/src/district/saga.ts +++ b/src/district/saga.ts @@ -1,7 +1,7 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects"; import { notFound, receiveDistrictsByMunicipality } from "./actions"; import { fetchDistricts } from "./requests"; -import { receiveError } from "../api/actions"; +import { receiveError } from "@/api/actions"; function* fetchDistrictsByMunicipalitySaga({ payload: municipalityId, diff --git a/src/district/selectors.ts b/src/district/selectors.ts index 7be306ed9..64ebe463d 100644 --- a/src/district/selectors.ts +++ b/src/district/selectors.ts @@ -1,5 +1,5 @@ import type { Selector } from "types"; -import type { RootState } from "root/types"; +import type { RootState } from "@/root/types"; import type { DistrictList } from "./types"; export const getIsFetching: Selector = (state: RootState): boolean => state.district.isFetching; export const getDistrictsByMunicipality: Selector = (state: RootState, municipalityId: number): DistrictList | null | undefined => { diff --git a/src/district/types.ts b/src/district/types.ts index 7be035d58..7835a7ce4 100644 --- a/src/district/types.ts +++ b/src/district/types.ts @@ -1,4 +1,4 @@ -import type { Action } from "../types"; +import type { Action } from "@/types"; export type DistrictState = { byMunicipality: DistrictListMap; isFetching: boolean; diff --git a/src/enums.tsx b/src/enums.tsx index eea0b7dff..cf23d0dda 100644 --- a/src/enums.tsx +++ b/src/enums.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { DELETE_MODAL_BUTTON_TEXT } from "util/constants"; +import { DELETE_MODAL_BUTTON_TEXT } from './util/constants'; /** * Table sort order enumerable. diff --git a/src/index/actions.ts b/src/index/actions.ts index c30ecf620..5cb120aef 100644 --- a/src/index/actions.ts +++ b/src/index/actions.ts @@ -1,5 +1,5 @@ import { createAction } from "redux-actions"; -import type { IndexList, FetchIndexListAction, ReceiveIndexListAction, NotFoundAction } from "index/types"; +import type { IndexList, FetchIndexListAction, ReceiveIndexListAction, NotFoundAction } from "@/index/types"; export const fetchIndexList = (query: Record): FetchIndexListAction => createAction('mvj/index/FETCH_ALL')(query); export const receiveIndexList = (indexList: IndexList): ReceiveIndexListAction => createAction('mvj/index/RECEIVE_ALL')(indexList); export const notFound = (): NotFoundAction => createAction('mvj/index/NOT_FOUND')(); \ No newline at end of file diff --git a/src/index/components/IndexListPage.tsx b/src/index/components/IndexListPage.tsx index 38bf3b6a0..cd3cb7e7e 100644 --- a/src/index/components/IndexListPage.tsx +++ b/src/index/components/IndexListPage.tsx @@ -2,21 +2,21 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; -import AuthorizationError from "components/authorization/AuthorizationError"; +import AuthorizationError from "@/components/authorization/AuthorizationError"; import IndexTable from "./IndexTable"; -import Loader from "components/loader/Loader"; -import PageContainer from "components/content/PageContainer"; -import { fetchIndexList } from "index/actions"; -import { receiveTopNavigationSettings } from "components/topNavigation/actions"; -import { PermissionMissingTexts } from "enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getContentYearlyIndexes } from "index/helpers"; -import { hasPermissions, setPageTitle } from "util/helpers"; -import { getRouteById, Routes } from "root/routes"; -import { getIndexList, getIsFetching } from "index/selectors"; -import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "usersPermissions/selectors"; -import type { IndexList } from "index/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import Loader from "@/components/loader/Loader"; +import PageContainer from "@/components/content/PageContainer"; +import { fetchIndexList } from "@/index/actions"; +import { receiveTopNavigationSettings } from "@/components/topNavigation/actions"; +import { PermissionMissingTexts } from "@/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getContentYearlyIndexes } from "@/index/helpers"; +import { hasPermissions, setPageTitle } from "@/util/helpers"; +import { getRouteById, Routes } from "@/root/routes"; +import { getIndexList, getIsFetching } from "@/index/selectors"; +import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "@/usersPermissions/selectors"; +import type { IndexList } from "@/index/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { fetchIndexList: (...args: Array) => any; indexList: IndexList; diff --git a/src/index/helpers.ts b/src/index/helpers.ts index 226e9be13..3e3e8d818 100644 --- a/src/index/helpers.ts +++ b/src/index/helpers.ts @@ -1,4 +1,4 @@ -import { sortNumberByKeyDesc } from "util/helpers"; +import { sortNumberByKeyDesc } from "@/util/helpers"; /** * Get content yearly indexes to display on index table diff --git a/src/index/reducer.ts b/src/index/reducer.ts index e73e373d6..5a5262564 100644 --- a/src/index/reducer.ts +++ b/src/index/reducer.ts @@ -1,7 +1,7 @@ import { combineReducers } from "redux"; import { handleActions } from "redux-actions"; import type { Reducer } from "types"; -import type { IndexList, ReceiveIndexListAction } from "index/types"; +import type { IndexList, ReceiveIndexListAction } from "@/index/types"; const isFetchingReducer: Reducer = handleActions({ 'mvj/index/FETCH_ALL': () => true, 'mvj/index/RECEIVE_ALL': () => false, diff --git a/src/index/requests.ts b/src/index/requests.ts index 21ec4e7f9..5a29f8386 100644 --- a/src/index/requests.ts +++ b/src/index/requests.ts @@ -1,5 +1,5 @@ -import callApi from "../api/callApi"; -import createUrl from "../api/createUrl"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; export const fetchIndexList = (query: Record): Generator => { return callApi(new Request(createUrl('index/', query))); }; \ No newline at end of file diff --git a/src/index/selectors.ts b/src/index/selectors.ts index 8b5e2040f..fb4a99cb5 100644 --- a/src/index/selectors.ts +++ b/src/index/selectors.ts @@ -1,5 +1,5 @@ import type { Selector } from "types"; -import type { RootState } from "root/types"; -import type { IndexList } from "index/types"; +import type { RootState } from "@/root/types"; +import type { IndexList } from "@/index/types"; export const getIsFetching: Selector = (state: RootState): boolean => state.index.isFetching; export const getIndexList: Selector = (state: RootState): IndexList => state.index.list; \ No newline at end of file diff --git a/src/infillDevelopment/components/InfillDevelopmentListPage.tsx b/src/infillDevelopment/components/InfillDevelopmentListPage.tsx index 7e0301929..a32b3263d 100644 --- a/src/infillDevelopment/components/InfillDevelopmentListPage.tsx +++ b/src/infillDevelopment/components/InfillDevelopmentListPage.tsx @@ -5,30 +5,30 @@ import { initialize } from "redux-form"; import { withRouter } from "react-router"; import flowRight from "lodash/flowRight"; import isArray from "lodash/isArray"; -import AddButtonSecondary from "components/form/AddButtonSecondary"; -import Authorization from "components/authorization/Authorization"; -import AuthorizationError from "components/authorization/AuthorizationError"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import PageContainer from "components/content/PageContainer"; -import Pagination from "components/table/Pagination"; +import AddButtonSecondary from "@/components/form/AddButtonSecondary"; +import Authorization from "@/components/authorization/Authorization"; +import AuthorizationError from "@/components/authorization/AuthorizationError"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import PageContainer from "@/components/content/PageContainer"; +import Pagination from "@/components/table/Pagination"; import Search from "./search/Search"; -import SortableTable from "components/table/SortableTable"; -import TableFilters from "components/table/TableFilters"; -import TableWrapper from "components/table/TableWrapper"; -import { receiveTopNavigationSettings } from "components/topNavigation/actions"; -import { fetchInfillDevelopments, receiveFormInitialValues } from "infillDevelopment/actions"; -import { LIST_TABLE_PAGE_SIZE } from "util/constants"; -import { DEFAULT_SORT_KEY, DEFAULT_SORT_ORDER } from "infillDevelopment/constants"; -import { FormNames, Methods, PermissionMissingTexts } from "enums"; -import { InfillDevelopmentCompensationFieldPaths, InfillDevelopmentCompensationLeasesFieldPaths } from "infillDevelopment/enums"; -import { getContentInfillDevelopmentListResults, mapInfillDevelopmentSearchFilters } from "infillDevelopment/helpers"; -import { getApiResponseCount, getApiResponseMaxPage, getFieldOptions, getLabelOfOption, getSearchQuery, getUrlParams, isFieldAllowedToRead, isMethodAllowed, setPageTitle } from "util/helpers"; -import { getRouteById, Routes } from "root/routes"; -import { getInfillDevelopments, getIsFetching } from "infillDevelopment/selectors"; -import { withInfillDevelopmentListPageAttributes } from "components/attributes/InfillDevelopmentListPageAttributes"; +import SortableTable from "@/components/table/SortableTable"; +import TableFilters from "@/components/table/TableFilters"; +import TableWrapper from "@/components/table/TableWrapper"; +import { receiveTopNavigationSettings } from "@/components/topNavigation/actions"; +import { fetchInfillDevelopments, receiveFormInitialValues } from "@/infillDevelopment/actions"; +import { LIST_TABLE_PAGE_SIZE } from "@/util/constants"; +import { DEFAULT_SORT_KEY, DEFAULT_SORT_ORDER } from "@/infillDevelopment/constants"; +import { FormNames, Methods, PermissionMissingTexts } from "@/enums"; +import { InfillDevelopmentCompensationFieldPaths, InfillDevelopmentCompensationLeasesFieldPaths } from "@/infillDevelopment/enums"; +import { getContentInfillDevelopmentListResults, mapInfillDevelopmentSearchFilters } from "@/infillDevelopment/helpers"; +import { getApiResponseCount, getApiResponseMaxPage, getFieldOptions, getLabelOfOption, getSearchQuery, getUrlParams, isFieldAllowedToRead, isMethodAllowed, setPageTitle } from "@/util/helpers"; +import { getRouteById, Routes } from "@/root/routes"; +import { getInfillDevelopments, getIsFetching } from "@/infillDevelopment/selectors"; +import { withInfillDevelopmentListPageAttributes } from "@/components/attributes/InfillDevelopmentListPageAttributes"; import type { Attributes, Methods as MethodsType } from "types"; -import type { InfillDevelopmentList } from "infillDevelopment/types"; +import type { InfillDevelopmentList } from "@/infillDevelopment/types"; type Props = { fetchInfillDevelopments: (...args: Array) => any; history: Record; diff --git a/src/infillDevelopment/components/InfillDevelopmentPage.tsx b/src/infillDevelopment/components/InfillDevelopmentPage.tsx index 70b34c989..2d2ca20f7 100644 --- a/src/infillDevelopment/components/InfillDevelopmentPage.tsx +++ b/src/infillDevelopment/components/InfillDevelopmentPage.tsx @@ -5,41 +5,41 @@ import { connect } from "react-redux"; import { change, destroy, getFormValues, isDirty } from "redux-form"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; -import Authorization from "components/authorization/Authorization"; -import AuthorizationError from "components/authorization/AuthorizationError"; -import ConfirmationModal from "components/modal/ConfirmationModal"; -import ContentContainer from "components/content/ContentContainer"; -import ControlButtonBar from "components/controlButtons/ControlButtonBar"; -import ControlButtons from "components/controlButtons/ControlButtons"; -import Divider from "components/content/Divider"; -import FullWidthContainer from "components/content/FullWidthContainer"; +import Authorization from "@/components/authorization/Authorization"; +import AuthorizationError from "@/components/authorization/AuthorizationError"; +import ConfirmationModal from "@/components/modal/ConfirmationModal"; +import ContentContainer from "@/components/content/ContentContainer"; +import ControlButtonBar from "@/components/controlButtons/ControlButtonBar"; +import ControlButtons from "@/components/controlButtons/ControlButtons"; +import Divider from "@/components/content/Divider"; +import FullWidthContainer from "@/components/content/FullWidthContainer"; import InfillDevelopmentForm from "./forms/InfillDevelopmentForm"; import InfillDevelopmentTemplate from "./sections/basicInfo/InfillDevelopmentTemplate"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import PageContainer from "components/content/PageContainer"; -import PageNavigationWrapper from "components/content/PageNavigationWrapper"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import PageContainer from "@/components/content/PageContainer"; +import PageNavigationWrapper from "@/components/content/PageNavigationWrapper"; import SingleInfillDevelopmentMap from "./sections/map/SingleInfillDevelopmentMap"; -import Tabs from "components/tabs/Tabs"; -import TabContent from "components/tabs/TabContent"; -import TabPane from "components/tabs/TabPane"; -import Title from "components/content/Title"; -import { clearFormValidFlags, editInfillDevelopment, fetchSingleInfillDevelopment, hideEditMode, receiveFormInitialValues, receiveSingleInfillDevelopment, receiveIsSaveClicked, showEditMode } from "infillDevelopment/actions"; -import { receiveTopNavigationSettings } from "components/topNavigation/actions"; -import { ConfirmationModalTexts, FormNames, Methods, PermissionMissingTexts } from "enums"; -import { InfillDevelopmentCompensationFieldPaths, InfillDevelopmentCompensationFieldTitles, InfillDevelopmentCompensationLeasesFieldPaths } from "infillDevelopment/enums"; -import { clearUnsavedChanges, getContentInfillDevelopment, getCopyOfInfillDevelopment, getPayloadInfillDevelopment } from "infillDevelopment/helpers"; -import { getUiDataInfillDevelopmentKey } from "uiData/helpers"; -import { getSearchQuery, getUrlParams, isFieldAllowedToRead, isMethodAllowed, scrollToTopPage, setPageTitle } from "util/helpers"; -import { getRouteById, Routes } from "root/routes"; -import { getCurrentInfillDevelopment, getIsEditMode, getIsFetching, getIsFormValidById, getIsSaveClicked, getIsSaving } from "infillDevelopment/selectors"; -import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "usersPermissions/selectors"; -import { getSessionStorageItem, removeSessionStorageItem, setSessionStorageItem } from "util/storage"; -import { withInfillDevelopmentPageAttributes } from "components/attributes/InfillDevelopmentPageAttributes"; -import { withUiDataList } from "components/uiData/UiDataListHOC"; +import Tabs from "@/components/tabs/Tabs"; +import TabContent from "@/components/tabs/TabContent"; +import TabPane from "@/components/tabs/TabPane"; +import Title from "@/components/content/Title"; +import { clearFormValidFlags, editInfillDevelopment, fetchSingleInfillDevelopment, hideEditMode, receiveFormInitialValues, receiveSingleInfillDevelopment, receiveIsSaveClicked, showEditMode } from "@/infillDevelopment/actions"; +import { receiveTopNavigationSettings } from "@/components/topNavigation/actions"; +import { ConfirmationModalTexts, FormNames, Methods, PermissionMissingTexts } from "@/enums"; +import { InfillDevelopmentCompensationFieldPaths, InfillDevelopmentCompensationFieldTitles, InfillDevelopmentCompensationLeasesFieldPaths } from "@/infillDevelopment/enums"; +import { clearUnsavedChanges, getContentInfillDevelopment, getCopyOfInfillDevelopment, getPayloadInfillDevelopment } from "@/infillDevelopment/helpers"; +import { getUiDataInfillDevelopmentKey } from "@/uiData/helpers"; +import { getSearchQuery, getUrlParams, isFieldAllowedToRead, isMethodAllowed, scrollToTopPage, setPageTitle } from "@/util/helpers"; +import { getRouteById, Routes } from "@/root/routes"; +import { getCurrentInfillDevelopment, getIsEditMode, getIsFetching, getIsFormValidById, getIsSaveClicked, getIsSaving } from "@/infillDevelopment/selectors"; +import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "@/usersPermissions/selectors"; +import { getSessionStorageItem, removeSessionStorageItem, setSessionStorageItem } from "@/util/storage"; +import { withInfillDevelopmentPageAttributes } from "@/components/attributes/InfillDevelopmentPageAttributes"; +import { withUiDataList } from "@/components/uiData/UiDataListHOC"; import type { Attributes, Methods as MethodsType } from "types"; -import type { InfillDevelopment } from "infillDevelopment/types"; -import type { UsersPermissions } from "usersPermissions/types"; +import type { InfillDevelopment } from "@/infillDevelopment/types"; +import type { UsersPermissions } from "@/usersPermissions/types"; type Props = { change: (...args: Array) => any; clearFormValidFlags: (...args: Array) => any; diff --git a/src/infillDevelopment/components/NewInfillDevelopmentPage.tsx b/src/infillDevelopment/components/NewInfillDevelopmentPage.tsx index c28965470..cc3ef569c 100644 --- a/src/infillDevelopment/components/NewInfillDevelopmentPage.tsx +++ b/src/infillDevelopment/components/NewInfillDevelopmentPage.tsx @@ -3,27 +3,27 @@ import { connect } from "react-redux"; import { withRouter } from "react-router"; import { getFormValues, isDirty } from "redux-form"; import flowRight from "lodash/flowRight"; -import AuthorizationError from "components/authorization/AuthorizationError"; -import ContentContainer from "components/content/ContentContainer"; -import ControlButtonBar from "components/controlButtons/ControlButtonBar"; -import ControlButtons from "components/controlButtons/ControlButtons"; -import FullWidthContainer from "components/content/FullWidthContainer"; +import AuthorizationError from "@/components/authorization/AuthorizationError"; +import ContentContainer from "@/components/content/ContentContainer"; +import ControlButtonBar from "@/components/controlButtons/ControlButtonBar"; +import ControlButtons from "@/components/controlButtons/ControlButtons"; +import FullWidthContainer from "@/components/content/FullWidthContainer"; import InfillDevelopmentForm from "./forms/InfillDevelopmentForm"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import PageContainer from "components/content/PageContainer"; -import PageNavigationWrapper from "components/content/PageNavigationWrapper"; -import { clearFormValidFlags, createInfillDevelopment, hideEditMode, receiveIsSaveClicked, showEditMode } from "infillDevelopment/actions"; -import { receiveTopNavigationSettings } from "components/topNavigation/actions"; -import { FormNames, Methods, PermissionMissingTexts } from "enums"; -import { getPayloadInfillDevelopment } from "infillDevelopment/helpers"; -import { isMethodAllowed, setPageTitle } from "util/helpers"; -import { getRouteById, Routes } from "root/routes"; -import { getIsFormValidById, getIsSaveClicked, getIsSaving } from "infillDevelopment/selectors"; -import { withInfillDevelopmentPageAttributes } from "components/attributes/InfillDevelopmentPageAttributes"; -import { withUiDataList } from "components/uiData/UiDataListHOC"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import PageContainer from "@/components/content/PageContainer"; +import PageNavigationWrapper from "@/components/content/PageNavigationWrapper"; +import { clearFormValidFlags, createInfillDevelopment, hideEditMode, receiveIsSaveClicked, showEditMode } from "@/infillDevelopment/actions"; +import { receiveTopNavigationSettings } from "@/components/topNavigation/actions"; +import { FormNames, Methods, PermissionMissingTexts } from "@/enums"; +import { getPayloadInfillDevelopment } from "@/infillDevelopment/helpers"; +import { isMethodAllowed, setPageTitle } from "@/util/helpers"; +import { getRouteById, Routes } from "@/root/routes"; +import { getIsFormValidById, getIsSaveClicked, getIsSaving } from "@/infillDevelopment/selectors"; +import { withInfillDevelopmentPageAttributes } from "@/components/attributes/InfillDevelopmentPageAttributes"; +import { withUiDataList } from "@/components/uiData/UiDataListHOC"; import type { Methods as MethodsType } from "types"; -import type { RootState } from "root/types"; +import type { RootState } from "@/root/types"; type Props = { clearFormValidFlags: (...args: Array) => any; createInfillDevelopment: (...args: Array) => any; diff --git a/src/infillDevelopment/components/forms/InfillDevelopmentForm.tsx b/src/infillDevelopment/components/forms/InfillDevelopmentForm.tsx index 98f226a40..43d6f06da 100644 --- a/src/infillDevelopment/components/forms/InfillDevelopmentForm.tsx +++ b/src/infillDevelopment/components/forms/InfillDevelopmentForm.tsx @@ -3,20 +3,20 @@ import { connect } from "react-redux"; import { FieldArray, reduxForm } from "redux-form"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; -import Authorization from "components/authorization/Authorization"; -import FormField from "components/form/FormField"; -import GreenBox from "components/content/GreenBox"; +import Authorization from "@/components/authorization/Authorization"; +import FormField from "@/components/form/FormField"; +import GreenBox from "@/components/content/GreenBox"; import LeaseItemsEdit from "./LeaseItemsEdit"; -import SubTitle from "components/content/SubTitle"; -import { receiveFormValidFlags } from "infillDevelopment/actions"; -import { FieldTypes, FormNames } from "enums"; -import { InfillDevelopmentCompensationFieldPaths, InfillDevelopmentCompensationFieldTitles, InfillDevelopmentCompensationLeasesFieldPaths, InfillDevelopmentCompensationLeasesFieldTitles } from "infillDevelopment/enums"; -import { getUiDataInfillDevelopmentKey } from "uiData/helpers"; -import { getFieldAttributes, isFieldAllowedToRead } from "util/helpers"; -import { getAttributes as getInfillDevelopmentAttributes, getFormInitialValues, getIsSaveClicked } from "infillDevelopment/selectors"; -import { referenceNumber } from "components/form/validations"; +import SubTitle from "@/components/content/SubTitle"; +import { receiveFormValidFlags } from "@/infillDevelopment/actions"; +import { FieldTypes, FormNames } from "@/enums"; +import { InfillDevelopmentCompensationFieldPaths, InfillDevelopmentCompensationFieldTitles, InfillDevelopmentCompensationLeasesFieldPaths, InfillDevelopmentCompensationLeasesFieldTitles } from "@/infillDevelopment/enums"; +import { getUiDataInfillDevelopmentKey } from "@/uiData/helpers"; +import { getFieldAttributes, isFieldAllowedToRead } from "@/util/helpers"; +import { getAttributes as getInfillDevelopmentAttributes, getFormInitialValues, getIsSaveClicked } from "@/infillDevelopment/selectors"; +import { referenceNumber } from "@/components/form/validations"; import type { Attributes } from "types"; -import type { InfillDevelopment } from "infillDevelopment/types"; +import type { InfillDevelopment } from "@/infillDevelopment/types"; type Props = { infillDevelopment: InfillDevelopment; infillDevelopmentAttributes: Attributes; diff --git a/src/infillDevelopment/components/forms/LeaseItemEdit.tsx b/src/infillDevelopment/components/forms/LeaseItemEdit.tsx index 1713b1855..c51d2c631 100644 --- a/src/infillDevelopment/components/forms/LeaseItemEdit.tsx +++ b/src/infillDevelopment/components/forms/LeaseItemEdit.tsx @@ -5,45 +5,45 @@ import { Row, Column } from "react-foundation"; import isEmpty from "lodash/isEmpty"; import flowRight from "lodash/flowRight"; import get from "lodash/get"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import AddButtonThird from "components/form/AddButtonThird"; -import AddFileButton from "components/form/AddFileButton"; -import Authorization from "components/authorization/Authorization"; -import BoxContentWrapper from "components/content/BoxContentWrapper"; -import Collapse from "components/collapse/Collapse"; -import ExternalLink from "components/links/ExternalLink"; -import FileDownloadLink from "components/file/FileDownloadLink"; -import FormField from "components/form/FormField"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import ListItem from "components/content/ListItem"; -import ListItems from "components/content/ListItems"; -import RemoveButton from "components/form/RemoveButton"; -import SubTitle from "components/content/SubTitle"; -import { receiveCollapseStates } from "infillDevelopment/actions"; -import { createInfillDevelopmentAttachment, deleteInfillDevelopmentAttachment } from "infillDevelopmentAttachment/actions"; -import { fetchLeaseById } from "leases/actions"; -import { ConfirmationModalTexts, FieldTypes, FormNames, Methods, ViewModes } from "enums"; -import { ButtonColors } from "components/enums"; -import { InfillDevelopmentCompensationLeasesFieldPaths, InfillDevelopmentCompensationLeasesFieldTitles, InfillDevelopmentCompensationLeaseDecisionsFieldPaths, InfillDevelopmentCompensationLeaseDecisionsFieldTitles, InfillDevelopmentCompensationLeaseIntendedUsesFieldPaths, InfillDevelopmentCompensationLeaseIntendedUsesFieldTitles } from "infillDevelopment/enums"; -import { InfillDevelopmentCompensationAttachmentFieldPaths, InfillDevelopmentCompensationAttachmentFieldTitles } from "infillDevelopmentAttachment/enums"; -import { LeasePlanUnitsFieldPaths, LeasePlotsFieldPaths, LeaseTenantsFieldPaths } from "leases/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getUiDataInfillDevelopmentKey, getUiDataInfillDevelopmentAttachmentKey } from "uiData/helpers"; -import { convertStrToDecimalNumber, formatDate, formatNumber, getFieldAttributes, hasPermissions, isActive, isFieldAllowedToRead, isFieldRequired, isMethodAllowed } from "util/helpers"; -import { getContactFullName } from "contacts/helpers"; -import { getContentLeaseAreas, getContentLeaseIdentifier, getContentTenants } from "leases/helpers"; -import { getUserFullName } from "users/helpers"; -import { getRouteById, Routes } from "root/routes"; -import { getAttributes as getInfillDevelopmentAttributes, getCollapseStateByKey } from "infillDevelopment/selectors"; -import { getAttributes as getInfillDevelopmentAttachmentAttributes, getMethods as getInfillDevelopmentAttachmentMethods } from "infillDevelopmentAttachment/selectors"; -import { getAttributes as getLeaseAttributes, getIsFetchingById, getLeaseById } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import { referenceNumber } from "components/form/validations"; -import { getUserActiveServiceUnit } from "usersPermissions/selectors"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import AddButtonThird from "@/components/form/AddButtonThird"; +import AddFileButton from "@/components/form/AddFileButton"; +import Authorization from "@/components/authorization/Authorization"; +import BoxContentWrapper from "@/components/content/BoxContentWrapper"; +import Collapse from "@/components/collapse/Collapse"; +import ExternalLink from "@/components/links/ExternalLink"; +import FileDownloadLink from "@/components/file/FileDownloadLink"; +import FormField from "@/components/form/FormField"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import ListItem from "@/components/content/ListItem"; +import ListItems from "@/components/content/ListItems"; +import RemoveButton from "@/components/form/RemoveButton"; +import SubTitle from "@/components/content/SubTitle"; +import { receiveCollapseStates } from "@/infillDevelopment/actions"; +import { createInfillDevelopmentAttachment, deleteInfillDevelopmentAttachment } from "@/infillDevelopmentAttachment/actions"; +import { fetchLeaseById } from "@/leases/actions"; +import { ConfirmationModalTexts, FieldTypes, FormNames, Methods, ViewModes } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { InfillDevelopmentCompensationLeasesFieldPaths, InfillDevelopmentCompensationLeasesFieldTitles, InfillDevelopmentCompensationLeaseDecisionsFieldPaths, InfillDevelopmentCompensationLeaseDecisionsFieldTitles, InfillDevelopmentCompensationLeaseIntendedUsesFieldPaths, InfillDevelopmentCompensationLeaseIntendedUsesFieldTitles } from "@/infillDevelopment/enums"; +import { InfillDevelopmentCompensationAttachmentFieldPaths, InfillDevelopmentCompensationAttachmentFieldTitles } from "@/infillDevelopmentAttachment/enums"; +import { LeasePlanUnitsFieldPaths, LeasePlotsFieldPaths, LeaseTenantsFieldPaths } from "@/leases/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getUiDataInfillDevelopmentKey, getUiDataInfillDevelopmentAttachmentKey } from "@/uiData/helpers"; +import { convertStrToDecimalNumber, formatDate, formatNumber, getFieldAttributes, hasPermissions, isActive, isFieldAllowedToRead, isFieldRequired, isMethodAllowed } from "@/util/helpers"; +import { getContactFullName } from "@/contacts/helpers"; +import { getContentLeaseAreas, getContentLeaseIdentifier, getContentTenants } from "@/leases/helpers"; +import { getUserFullName } from "@/users/helpers"; +import { getRouteById, Routes } from "@/root/routes"; +import { getAttributes as getInfillDevelopmentAttributes, getCollapseStateByKey } from "@/infillDevelopment/selectors"; +import { getAttributes as getInfillDevelopmentAttachmentAttributes, getMethods as getInfillDevelopmentAttachmentMethods } from "@/infillDevelopmentAttachment/selectors"; +import { getAttributes as getLeaseAttributes, getIsFetchingById, getLeaseById } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import { referenceNumber } from "@/components/form/validations"; +import { getUserActiveServiceUnit } from "@/usersPermissions/selectors"; import type { Attributes, Methods as MethodsType } from "types"; -import type { Lease, LeaseId } from "leases/types"; -import type { UsersPermissions as UsersPermissionsType, UserServiceUnit } from "usersPermissions/types"; +import type { Lease, LeaseId } from "@/leases/types"; +import type { UsersPermissions as UsersPermissionsType, UserServiceUnit } from "@/usersPermissions/types"; type DecisionsProps = { fields: any; infillDevelopmentAttributes: Attributes; diff --git a/src/infillDevelopment/components/forms/LeaseItemsEdit.tsx b/src/infillDevelopment/components/forms/LeaseItemsEdit.tsx index d4df7cb2a..889aacc64 100644 --- a/src/infillDevelopment/components/forms/LeaseItemsEdit.tsx +++ b/src/infillDevelopment/components/forms/LeaseItemsEdit.tsx @@ -1,18 +1,18 @@ import React, { Fragment, ReactElement } from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import AddButtonSecondary from "components/form/AddButtonSecondary"; -import Authorization from "components/authorization/Authorization"; -import FormText from "components/form/FormText"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import AddButtonSecondary from "@/components/form/AddButtonSecondary"; +import Authorization from "@/components/authorization/Authorization"; +import FormText from "@/components/form/FormText"; import LeaseItemEdit from "./LeaseItemEdit"; -import { ConfirmationModalTexts } from "enums"; -import { ButtonColors } from "components/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { hasPermissions } from "util/helpers"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; -import type { InfillDevelopment } from "infillDevelopment/types"; +import { ConfirmationModalTexts } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { hasPermissions } from "@/util/helpers"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; +import type { InfillDevelopment } from "@/infillDevelopment/types"; type Props = { fields: any; infillDevelopment: InfillDevelopment; diff --git a/src/infillDevelopment/components/search/Search.tsx b/src/infillDevelopment/components/search/Search.tsx index 04e36679b..298607b67 100644 --- a/src/infillDevelopment/components/search/Search.tsx +++ b/src/infillDevelopment/components/search/Search.tsx @@ -7,18 +7,18 @@ import debounce from "lodash/debounce"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; import isEqual from "lodash/isEqual"; -import FormField from "components/form/FormField"; -import SearchChangeTypeLink from "components/search/SearchChangeTypeLink"; -import SearchClearLink from "components/search/SearchClearLink"; -import SearchContainer from "components/search/SearchContainer"; -import SearchLabel from "components/search/SearchLabel"; -import SearchLabelColumn from "components/search/SearchLabelColumn"; -import SearchInputColumn from "components/search/SearchInputColumn"; -import SearchRow from "components/search/SearchRow"; -import { FieldTypes, FormNames } from "enums"; -import { InfillDevelopmentCompensationLeaseDecisionsFieldPaths } from "infillDevelopment/enums"; -import { getFieldOptions, getUrlParams } from "util/helpers"; -import { getAttributes as getInfillDevelopmentAttributes } from "infillDevelopment/selectors"; +import FormField from "@/components/form/FormField"; +import SearchChangeTypeLink from "@/components/search/SearchChangeTypeLink"; +import SearchClearLink from "@/components/search/SearchClearLink"; +import SearchContainer from "@/components/search/SearchContainer"; +import SearchLabel from "@/components/search/SearchLabel"; +import SearchLabelColumn from "@/components/search/SearchLabelColumn"; +import SearchInputColumn from "@/components/search/SearchInputColumn"; +import SearchRow from "@/components/search/SearchRow"; +import { FieldTypes, FormNames } from "@/enums"; +import { InfillDevelopmentCompensationLeaseDecisionsFieldPaths } from "@/infillDevelopment/enums"; +import { getFieldOptions, getUrlParams } from "@/util/helpers"; +import { getAttributes as getInfillDevelopmentAttributes } from "@/infillDevelopment/selectors"; import type { Attributes } from "types"; type Props = { formValues: Record; diff --git a/src/infillDevelopment/components/sections/basicInfo/InfillDevelopmentTemplate.tsx b/src/infillDevelopment/components/sections/basicInfo/InfillDevelopmentTemplate.tsx index 88ff99dc5..b9570ae2a 100644 --- a/src/infillDevelopment/components/sections/basicInfo/InfillDevelopmentTemplate.tsx +++ b/src/infillDevelopment/components/sections/basicInfo/InfillDevelopmentTemplate.tsx @@ -2,20 +2,20 @@ import React, { Fragment } from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; import get from "lodash/get"; -import Authorization from "components/authorization/Authorization"; -import ExternalLink from "components/links/ExternalLink"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import GreenBox from "components/content/GreenBox"; +import Authorization from "@/components/authorization/Authorization"; +import ExternalLink from "@/components/links/ExternalLink"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import GreenBox from "@/components/content/GreenBox"; import LeaseItem from "./LeaseItem"; -import SubTitle from "components/content/SubTitle"; -import { InfillDevelopmentCompensationFieldPaths, InfillDevelopmentCompensationFieldTitles, InfillDevelopmentCompensationLeasesFieldPaths, InfillDevelopmentCompensationLeasesFieldTitles } from "infillDevelopment/enums"; -import { getUiDataInfillDevelopmentKey } from "uiData/helpers"; -import { formatDate, getFieldOptions, getLabelOfOption, getReferenceNumberLink, isFieldAllowedToRead } from "util/helpers"; -import { getUserFullName } from "users/helpers"; -import { getAttributes as getInfillDevelopmentAttributes } from "infillDevelopment/selectors"; +import SubTitle from "@/components/content/SubTitle"; +import { InfillDevelopmentCompensationFieldPaths, InfillDevelopmentCompensationFieldTitles, InfillDevelopmentCompensationLeasesFieldPaths, InfillDevelopmentCompensationLeasesFieldTitles } from "@/infillDevelopment/enums"; +import { getUiDataInfillDevelopmentKey } from "@/uiData/helpers"; +import { formatDate, getFieldOptions, getLabelOfOption, getReferenceNumberLink, isFieldAllowedToRead } from "@/util/helpers"; +import { getUserFullName } from "@/users/helpers"; +import { getAttributes as getInfillDevelopmentAttributes } from "@/infillDevelopment/selectors"; import type { Attributes } from "types"; -import type { InfillDevelopment } from "infillDevelopment/types"; +import type { InfillDevelopment } from "@/infillDevelopment/types"; type Props = { infillDevelopment: InfillDevelopment; infillDevelopmentAttributes: Attributes; diff --git a/src/infillDevelopment/components/sections/basicInfo/LeaseInfo.tsx b/src/infillDevelopment/components/sections/basicInfo/LeaseInfo.tsx index b6b36d238..cecc9cffc 100644 --- a/src/infillDevelopment/components/sections/basicInfo/LeaseInfo.tsx +++ b/src/infillDevelopment/components/sections/basicInfo/LeaseInfo.tsx @@ -5,22 +5,22 @@ import { withRouter } from "react-router"; import { Link } from "react-router-dom"; import flowRight from "lodash/flowRight"; import get from "lodash/get"; -import Authorization from "components/authorization/Authorization"; -import ExternalLink from "components/links/ExternalLink"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import ListItem from "components/content/ListItem"; -import ListItems from "components/content/ListItems"; -import { getRouteById, Routes } from "root/routes"; -import { InfillDevelopmentCompensationLeasesFieldPaths, InfillDevelopmentCompensationLeasesFieldTitles } from "infillDevelopment/enums"; -import { LeasePlanUnitsFieldPaths, LeasePlotsFieldPaths, LeaseTenantsFieldPaths } from "leases/enums"; -import { getContactFullName } from "contacts/helpers"; -import { getUiDataInfillDevelopmentKey } from "uiData/helpers"; -import { getSearchQuery, getUrlParams, isFieldAllowedToRead } from "util/helpers"; -import { getAttributes as getInfillDevelopmentAttributes } from "infillDevelopment/selectors"; -import { getAttributes as getLeaseAttributes } from "leases/selectors"; +import Authorization from "@/components/authorization/Authorization"; +import ExternalLink from "@/components/links/ExternalLink"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import ListItem from "@/components/content/ListItem"; +import ListItems from "@/components/content/ListItems"; +import { getRouteById, Routes } from "@/root/routes"; +import { InfillDevelopmentCompensationLeasesFieldPaths, InfillDevelopmentCompensationLeasesFieldTitles } from "@/infillDevelopment/enums"; +import { LeasePlanUnitsFieldPaths, LeasePlotsFieldPaths, LeaseTenantsFieldPaths } from "@/leases/enums"; +import { getContactFullName } from "@/contacts/helpers"; +import { getUiDataInfillDevelopmentKey } from "@/uiData/helpers"; +import { getSearchQuery, getUrlParams, isFieldAllowedToRead } from "@/util/helpers"; +import { getAttributes as getInfillDevelopmentAttributes } from "@/infillDevelopment/selectors"; +import { getAttributes as getLeaseAttributes } from "@/leases/selectors"; import type { Attributes } from "types"; -import type { LeaseId } from "leases/types"; +import type { LeaseId } from "@/leases/types"; type Props = { identifier: string | null | undefined; infillDevelopmentAttributes: Attributes; diff --git a/src/infillDevelopment/components/sections/basicInfo/LeaseItem.tsx b/src/infillDevelopment/components/sections/basicInfo/LeaseItem.tsx index 04c3963ee..0d5320c29 100644 --- a/src/infillDevelopment/components/sections/basicInfo/LeaseItem.tsx +++ b/src/infillDevelopment/components/sections/basicInfo/LeaseItem.tsx @@ -4,33 +4,33 @@ import { Row, Column } from "react-foundation"; import isEmpty from "lodash/isEmpty"; import flowRight from "lodash/flowRight"; import get from "lodash/get"; -import Authorization from "components/authorization/Authorization"; -import Collapse from "components/collapse/Collapse"; -import ExternalLink from "components/links/ExternalLink"; -import FileDownloadLink from "components/file/FileDownloadLink"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; +import Authorization from "@/components/authorization/Authorization"; +import Collapse from "@/components/collapse/Collapse"; +import ExternalLink from "@/components/links/ExternalLink"; +import FileDownloadLink from "@/components/file/FileDownloadLink"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; import LeaseInfo from "./LeaseInfo"; -import ListItem from "components/content/ListItem"; -import ListItems from "components/content/ListItems"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import SubTitle from "components/content/SubTitle"; -import { receiveCollapseStates } from "infillDevelopment/actions"; -import { fetchLeaseById } from "leases/actions"; -import { FormNames, Methods, ViewModes } from "enums"; -import { InfillDevelopmentCompensationLeasesFieldPaths, InfillDevelopmentCompensationLeasesFieldTitles, InfillDevelopmentCompensationLeaseDecisionsFieldPaths, InfillDevelopmentCompensationLeaseDecisionsFieldTitles, InfillDevelopmentCompensationLeaseIntendedUsesFieldPaths, InfillDevelopmentCompensationLeaseIntendedUsesFieldTitles } from "infillDevelopment/enums"; -import { InfillDevelopmentCompensationAttachmentFieldPaths, InfillDevelopmentCompensationAttachmentFieldTitles } from "infillDevelopmentAttachment/enums"; -import { LeaseFieldPaths } from "leases/enums"; -import { getContentLeaseAreas, getContentLeaseIdentifier, getContentTenants } from "leases/helpers"; -import { getUiDataInfillDevelopmentKey, getUiDataInfillDevelopmentAttachmentKey } from "uiData/helpers"; -import { getUserFullName } from "users/helpers"; -import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, getReferenceNumberLink, isActive, isEmptyValue, isFieldAllowedToRead, isMethodAllowed } from "util/helpers"; -import { getAttributes as getInfillDevelopmentAttributes, getCollapseStateByKey } from "infillDevelopment/selectors"; -import { getAttributes as getInfillDevelopmentAttachmentAttributes, getMethods as getInfillDevelopmentAttachmentMethods } from "infillDevelopmentAttachment/selectors"; -import { getAttributes as getLeaseAttributes, getIsFetchingById, getLeaseById } from "leases/selectors"; +import ListItem from "@/components/content/ListItem"; +import ListItems from "@/components/content/ListItems"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import SubTitle from "@/components/content/SubTitle"; +import { receiveCollapseStates } from "@/infillDevelopment/actions"; +import { fetchLeaseById } from "@/leases/actions"; +import { FormNames, Methods, ViewModes } from "@/enums"; +import { InfillDevelopmentCompensationLeasesFieldPaths, InfillDevelopmentCompensationLeasesFieldTitles, InfillDevelopmentCompensationLeaseDecisionsFieldPaths, InfillDevelopmentCompensationLeaseDecisionsFieldTitles, InfillDevelopmentCompensationLeaseIntendedUsesFieldPaths, InfillDevelopmentCompensationLeaseIntendedUsesFieldTitles } from "@/infillDevelopment/enums"; +import { InfillDevelopmentCompensationAttachmentFieldPaths, InfillDevelopmentCompensationAttachmentFieldTitles } from "@/infillDevelopmentAttachment/enums"; +import { LeaseFieldPaths } from "@/leases/enums"; +import { getContentLeaseAreas, getContentLeaseIdentifier, getContentTenants } from "@/leases/helpers"; +import { getUiDataInfillDevelopmentKey, getUiDataInfillDevelopmentAttachmentKey } from "@/uiData/helpers"; +import { getUserFullName } from "@/users/helpers"; +import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, getReferenceNumberLink, isActive, isEmptyValue, isFieldAllowedToRead, isMethodAllowed } from "@/util/helpers"; +import { getAttributes as getInfillDevelopmentAttributes, getCollapseStateByKey } from "@/infillDevelopment/selectors"; +import { getAttributes as getInfillDevelopmentAttachmentAttributes, getMethods as getInfillDevelopmentAttachmentMethods } from "@/infillDevelopmentAttachment/selectors"; +import { getAttributes as getLeaseAttributes, getIsFetchingById, getLeaseById } from "@/leases/selectors"; import type { Attributes, Methods as MethodsType } from "types"; -import type { Lease, LeaseId } from "leases/types"; +import type { Lease, LeaseId } from "@/leases/types"; type Props = { collapseState: boolean; fetchLeaseById: (...args: Array) => any; diff --git a/src/infillDevelopment/components/sections/map/InfillDevelopmentLeaseLayer.tsx b/src/infillDevelopment/components/sections/map/InfillDevelopmentLeaseLayer.tsx index 9d5e137ac..8178ccbf6 100644 --- a/src/infillDevelopment/components/sections/map/InfillDevelopmentLeaseLayer.tsx +++ b/src/infillDevelopment/components/sections/map/InfillDevelopmentLeaseLayer.tsx @@ -1,8 +1,8 @@ import React, { PureComponent } from "react"; import { GeoJSON } from "react-leaflet"; -import { MAP_COLORS } from "util/constants"; -import { LeaseAreasFieldTitles, LeasePlanUnitsFieldTitles, LeasePlotsFieldTitles } from "leases/enums"; -import { formatDate, formatNumber, getLabelOfOption, isEmptyValue } from "util/helpers"; +import { MAP_COLORS } from "@/util/constants"; +import { LeaseAreasFieldTitles, LeasePlanUnitsFieldTitles, LeasePlotsFieldTitles } from "@/leases/enums"; +import { formatDate, formatNumber, getLabelOfOption, isEmptyValue } from "@/util/helpers"; type Props = { areaLocationOptions: Array>; areaTypeOptions: Array>; diff --git a/src/infillDevelopment/components/sections/map/SingleInfillDevelopmentMap.tsx b/src/infillDevelopment/components/sections/map/SingleInfillDevelopmentMap.tsx index dc769f2e8..8d28ba312 100644 --- a/src/infillDevelopment/components/sections/map/SingleInfillDevelopmentMap.tsx +++ b/src/infillDevelopment/components/sections/map/SingleInfillDevelopmentMap.tsx @@ -4,29 +4,29 @@ import { withRouter } from "react-router"; import flowRight from "lodash/flowRight"; import get from "lodash/get"; import isEmpty from "lodash/isEmpty"; -import AreaNotesEditMap from "areaNote/components/AreaNotesEditMap"; -import AreaNotesLayer from "areaNote/components/AreaNotesLayer"; +import AreaNotesEditMap from "@/areaNote/components/AreaNotesEditMap"; +import AreaNotesLayer from "@/areaNote/components/AreaNotesLayer"; import InfillDevelopmentLeaseLayer from "./InfillDevelopmentLeaseLayer"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import { fetchAreaNoteList } from "areaNote/actions"; -import { fetchLeaseById } from "leases/actions"; -import { MAP_COLORS } from "util/constants"; -import { LeaseAreasFieldPaths, LeasePlanUnitsFieldPaths, LeasePlotsFieldPaths } from "leases/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getContentLeaseIdentifier, getLeaseCoordinates } from "leases/helpers"; -import { getContentInfillDevelopmentLeaseGeoJson } from "infillDevelopment/helpers"; -import { getFieldOptions, getUrlParams, hasPermissions } from "util/helpers"; -import { getBoundsFromCoordinates, getCenterFromCoordinates } from "util/map"; -import { getAreaNoteList } from "areaNote/selectors"; -import { getCurrentInfillDevelopment } from "infillDevelopment/selectors"; -import { getAllLeases, getAttributes as getLeaseAttributes, getIsFetchingAllLeases } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import { fetchAreaNoteList } from "@/areaNote/actions"; +import { fetchLeaseById } from "@/leases/actions"; +import { MAP_COLORS } from "@/util/constants"; +import { LeaseAreasFieldPaths, LeasePlanUnitsFieldPaths, LeasePlotsFieldPaths } from "@/leases/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getContentLeaseIdentifier, getLeaseCoordinates } from "@/leases/helpers"; +import { getContentInfillDevelopmentLeaseGeoJson } from "@/infillDevelopment/helpers"; +import { getFieldOptions, getUrlParams, hasPermissions } from "@/util/helpers"; +import { getBoundsFromCoordinates, getCenterFromCoordinates } from "@/util/map"; +import { getAreaNoteList } from "@/areaNote/selectors"; +import { getCurrentInfillDevelopment } from "@/infillDevelopment/selectors"; +import { getAllLeases, getAttributes as getLeaseAttributes, getIsFetchingAllLeases } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; import type { Attributes } from "types"; -import type { AreaNoteList } from "areaNote/types"; -import type { InfillDevelopment } from "infillDevelopment/types"; -import type { Lease } from "leases/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { AreaNoteList } from "@/areaNote/types"; +import type { InfillDevelopment } from "@/infillDevelopment/types"; +import type { Lease } from "@/leases/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { allLeases: Array; areaNotes: AreaNoteList; diff --git a/src/infillDevelopment/constants.ts b/src/infillDevelopment/constants.ts index 4bafbd24d..6ade639a3 100644 --- a/src/infillDevelopment/constants.ts +++ b/src/infillDevelopment/constants.ts @@ -1,4 +1,4 @@ -import { TableSortOrder } from "enums"; +import { TableSortOrder } from "@/enums"; /** * Default sort key of infill development compensation list page diff --git a/src/infillDevelopment/helpers.ts b/src/infillDevelopment/helpers.ts index 7f894d17b..35d195c6a 100644 --- a/src/infillDevelopment/helpers.ts +++ b/src/infillDevelopment/helpers.ts @@ -1,14 +1,14 @@ import get from "lodash/get"; import { isDirty } from "redux-form"; -import { FormNames, TableSortOrder } from "enums"; -import { getContentLeaseIdentifier, getContentLeaseOption } from "leases/helpers"; -import { getContentUser } from "users/helpers"; -import { convertStrToDecimalNumber, getApiResponseResults } from "util/helpers"; -import { getIsEditMode } from "infillDevelopment/selectors"; -import { removeSessionStorageItem } from "util/storage"; -import { getContentLeaseAreasFeatures, getContentPlanUnitFeatures, getContentLeasePlotsFeatures } from "leases/helpers"; +import { FormNames, TableSortOrder } from "@/enums"; +import { getContentLeaseIdentifier, getContentLeaseOption } from "@/leases/helpers"; +import { getContentUser } from "@/users/helpers"; +import { convertStrToDecimalNumber, getApiResponseResults } from "@/util/helpers"; +import { getIsEditMode } from "@/infillDevelopment/selectors"; +import { removeSessionStorageItem } from "@/util/storage"; +import { getContentLeaseAreasFeatures, getContentPlanUnitFeatures, getContentLeasePlotsFeatures } from "@/leases/helpers"; import type { LeafletGeoJson } from "types"; -import type { RootState } from "root/types"; +import type { RootState } from "@/root/types"; /** * Get infill development compensation list results diff --git a/src/infillDevelopment/reducer.ts b/src/infillDevelopment/reducer.ts index 95a73f7ca..ba177f640 100644 --- a/src/infillDevelopment/reducer.ts +++ b/src/infillDevelopment/reducer.ts @@ -1,8 +1,8 @@ import { combineReducers } from "redux"; import { handleActions } from "redux-actions"; import merge from "lodash/merge"; -import { FormNames } from "enums"; -import type { Attributes, Methods, Reducer } from "../types"; +import { FormNames } from "@/enums"; +import type { Attributes, Methods, Reducer } from "@/types"; import type { InfillDevelopment, InfillDevelopmentList, ReceiveAttributesAction, ReceiveMethodsAction, ReceiveFormInitialValuesAction, ReceiveFormValidFlagsAction, ReceiveInfillDevelopmentListAction, ReceiveIsSaveClickedAction, ReceiveSingleInfillDevelopmentAction, ReceiveCollapseStatesAction } from "./types"; const isEditModeReducer: Reducer = handleActions({ 'mvj/infillDevelopment/HIDE_EDIT': () => false, diff --git a/src/infillDevelopment/requests.ts b/src/infillDevelopment/requests.ts index 36b727fa0..f968fef62 100644 --- a/src/infillDevelopment/requests.ts +++ b/src/infillDevelopment/requests.ts @@ -1,5 +1,5 @@ -import callApi from "../api/callApi"; -import createUrl from "../api/createUrl"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; import type { InfillDevelopment, InfillDevelopmentId } from "./types"; export const fetchAttributes = (): Generator => { return callApi(new Request(createUrl(`infill_development_compensation/`), { diff --git a/src/infillDevelopment/saga.ts b/src/infillDevelopment/saga.ts index 7948b7b8d..7936147b8 100644 --- a/src/infillDevelopment/saga.ts +++ b/src/infillDevelopment/saga.ts @@ -2,10 +2,10 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects"; import { push } from "react-router-redux"; import { SubmissionError } from "redux-form"; import { fetchSingleInfillDevelopment as fetchSingleInfillDevelopmentAction, hideEditMode, attributesNotFound, notFound, receiveIsSaveClicked, receiveAttributes, receiveMethods, receiveInfillDevelopments, receiveSingleInfillDevelopment } from "./actions"; -import { receiveError } from "api/actions"; -import { displayUIMessage } from "util/helpers"; +import { receiveError } from "@/api/actions"; +import { displayUIMessage } from "@/util/helpers"; import { createInfillDevelopment, editInfillDevelopment, fetchAttributes, fetchInfillDevelopments, fetchSingleInfillDevelopment } from "./requests"; -import { getRouteById, Routes } from "root/routes"; +import { getRouteById, Routes } from "@/root/routes"; function* fetchAttributesSaga(): Generator { try { diff --git a/src/infillDevelopment/selectors.ts b/src/infillDevelopment/selectors.ts index 7592ccee5..475452437 100644 --- a/src/infillDevelopment/selectors.ts +++ b/src/infillDevelopment/selectors.ts @@ -1,6 +1,6 @@ import get from "lodash/get"; import type { Attributes, Methods, Selector } from "types"; -import type { RootState } from "root/types"; +import type { RootState } from "@/root/types"; import type { InfillDevelopment, InfillDevelopmentList } from "./types"; export const getAttributes: Selector = (state: RootState): Attributes => state.infillDevelopment.attributes; export const getMethods: Selector = (state: RootState): Methods => state.infillDevelopment.methods; diff --git a/src/infillDevelopment/types.ts b/src/infillDevelopment/types.ts index 36b1049bc..51c93681d 100644 --- a/src/infillDevelopment/types.ts +++ b/src/infillDevelopment/types.ts @@ -1,4 +1,4 @@ -import type { Action, Attributes, Methods } from "../types"; +import type { Action, Attributes, Methods } from "@/types"; export type InfillDevelopmentState = { attributes: Attributes; collapseStates: Record; diff --git a/src/infillDevelopmentAttachment/reducer.ts b/src/infillDevelopmentAttachment/reducer.ts index c4a3570fe..2a1683736 100644 --- a/src/infillDevelopmentAttachment/reducer.ts +++ b/src/infillDevelopmentAttachment/reducer.ts @@ -1,6 +1,6 @@ import { combineReducers } from "redux"; import { handleActions } from "redux-actions"; -import type { Attributes, Methods, Reducer } from "../types"; +import type { Attributes, Methods, Reducer } from "@/types"; import type { ReceiveAttributesAction, ReceiveMethodsAction } from "./types"; const isFetchingAttributesReducer: Reducer = handleActions({ 'mvj/infillDevelopmentAttachment/FETCH_ATTRIBUTES': () => true, diff --git a/src/infillDevelopmentAttachment/requests.ts b/src/infillDevelopmentAttachment/requests.ts index 33061c4d8..1c2f2cc3c 100644 --- a/src/infillDevelopmentAttachment/requests.ts +++ b/src/infillDevelopmentAttachment/requests.ts @@ -1,6 +1,6 @@ -import callApi from "../api/callApi"; -import createUrl from "../api/createUrl"; -import callUploadRequest from "api/callUploadRequest"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; +import callUploadRequest from "@/api/callUploadRequest"; import type { CreateInfillDevelopmentAttachmentPayload } from "./types"; export const fetchAttributes = (): Generator => { return callApi(new Request(createUrl(`infill_development_compensation_attachment/`), { diff --git a/src/infillDevelopmentAttachment/saga.ts b/src/infillDevelopmentAttachment/saga.ts index 5de29ffc1..9724dea37 100644 --- a/src/infillDevelopmentAttachment/saga.ts +++ b/src/infillDevelopmentAttachment/saga.ts @@ -1,9 +1,9 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects"; import { SubmissionError } from "redux-form"; import { attributesNotFound, receiveAttributes, receiveMethods } from "./actions"; -import { fetchSingleInfillDevelopment } from "infillDevelopment/actions"; -import { receiveError } from "api/actions"; -import { displayUIMessage } from "util/helpers"; +import { fetchSingleInfillDevelopment } from "@/infillDevelopment/actions"; +import { receiveError } from "@/api/actions"; +import { displayUIMessage } from "@/util/helpers"; import { fetchAttributes, createInfillDevelopmentAttachment, deleteInfillDevelopmentAttachment } from "./requests"; function* fetchAttributesSaga(): Generator { diff --git a/src/infillDevelopmentAttachment/selectors.ts b/src/infillDevelopmentAttachment/selectors.ts index d0ea22164..5eafbd1b3 100644 --- a/src/infillDevelopmentAttachment/selectors.ts +++ b/src/infillDevelopmentAttachment/selectors.ts @@ -1,5 +1,5 @@ import type { Attributes, Methods, Selector } from "types"; -import type { RootState } from "root/types"; +import type { RootState } from "@/root/types"; export const getAttributes: Selector = (state: RootState): Attributes => state.infillDevelopmentAttachment.attributes; export const getMethods: Selector = (state: RootState): Methods => state.infillDevelopmentAttachment.methods; export const getIsFetchingAttributes: Selector = (state: RootState): boolean => state.infillDevelopmentAttachment.isFetchingAttributes; \ No newline at end of file diff --git a/src/infillDevelopmentAttachment/types.ts b/src/infillDevelopmentAttachment/types.ts index c44b1f69d..b61d632cc 100644 --- a/src/infillDevelopmentAttachment/types.ts +++ b/src/infillDevelopmentAttachment/types.ts @@ -1,5 +1,5 @@ -import type { Action, Attributes, Methods } from "../types"; -import type { InfillDevelopmentId } from "infillDevelopment/types"; +import type { Action, Attributes, Methods } from "@/types"; +import type { InfillDevelopmentId } from "@/infillDevelopment/types"; export type InfillDevelopmentAttachmentState = { attributes: Attributes; isFetchingAttributes: boolean; diff --git a/src/invoiceNote/components/CreateInvoiceNoteModal.tsx b/src/invoiceNote/components/CreateInvoiceNoteModal.tsx index 518a00325..9f8b0b882 100644 --- a/src/invoiceNote/components/CreateInvoiceNoteModal.tsx +++ b/src/invoiceNote/components/CreateInvoiceNoteModal.tsx @@ -3,18 +3,18 @@ import { reduxForm } from "redux-form"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; -import Button from "components/button/Button"; -import FormField from "components/form/FormField"; -import Modal from "components/modal/Modal"; -import ModalButtonWrapper from "components/modal/ModalButtonWrapper"; -import { FieldTypes, FormNames } from "enums"; -import { InvoiceNoteFieldPaths, InvoiceNoteFieldTitles } from "invoiceNote/enums"; -import { ButtonColors } from "components/enums"; -import { getFieldAttributes } from "util/helpers"; -import { getAttributes } from "invoiceNote/selectors"; -import { getUserActiveServiceUnit } from "usersPermissions/selectors"; +import Button from "@/components/button/Button"; +import FormField from "@/components/form/FormField"; +import Modal from "@/components/modal/Modal"; +import ModalButtonWrapper from "@/components/modal/ModalButtonWrapper"; +import { FieldTypes, FormNames } from "@/enums"; +import { InvoiceNoteFieldPaths, InvoiceNoteFieldTitles } from "@/invoiceNote/enums"; +import { ButtonColors } from "@/components/enums"; +import { getFieldAttributes } from "@/util/helpers"; +import { getAttributes } from "@/invoiceNote/selectors"; +import { getUserActiveServiceUnit } from "@/usersPermissions/selectors"; import type { Attributes } from "types"; -import type { UserServiceUnit } from "usersPermissions/types"; +import type { UserServiceUnit } from "@/usersPermissions/types"; type Props = { handleSubmit: (...args: Array) => any; initialize: (...args: Array) => any; diff --git a/src/invoiceNote/components/InvoiceNoteListPage.tsx b/src/invoiceNote/components/InvoiceNoteListPage.tsx index d6efc99b3..70d4d66d8 100644 --- a/src/invoiceNote/components/InvoiceNoteListPage.tsx +++ b/src/invoiceNote/components/InvoiceNoteListPage.tsx @@ -5,34 +5,34 @@ import { withRouter } from "react-router"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; -import AddButtonSecondary from "components/form/AddButtonSecondary"; -import Authorization from "components/authorization/Authorization"; -import AuthorizationError from "components/authorization/AuthorizationError"; +import AddButtonSecondary from "@/components/form/AddButtonSecondary"; +import Authorization from "@/components/authorization/Authorization"; +import AuthorizationError from "@/components/authorization/AuthorizationError"; import CreateInvoiceNoteModal from "./CreateInvoiceNoteModal"; -import ExternalLink from "components/links/ExternalLink"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import PageContainer from "components/content/PageContainer"; -import Pagination from "components/table/Pagination"; +import ExternalLink from "@/components/links/ExternalLink"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import PageContainer from "@/components/content/PageContainer"; +import Pagination from "@/components/table/Pagination"; import Search from "./Search"; -import ShowMore from "components/showMore/ShowMore"; -import SortableTable from "components/table/SortableTable"; -import TableFilters from "components/table/TableFilters"; -import TableWrapper from "components/table/TableWrapper"; -import { createInvoiceNoteAndFetchList, fetchInvoiceNoteList, hideCreateInvoiceNoteModal, receiveInvoiceNoteList, showCreateInvoiceNoteModal } from "invoiceNote/actions"; -import { receiveTopNavigationSettings } from "components/topNavigation/actions"; -import { LIST_TABLE_PAGE_SIZE } from "util/constants"; -import { FormNames, Methods, PermissionMissingTexts } from "enums"; -import { InvoiceNoteFieldPaths, InvoiceNoteFieldTitles } from "invoiceNote/enums"; -import { getContentLeaseIdentifier } from "leases/helpers"; -import { formatDate, getApiResponseCount, getApiResponseResults, getApiResponseMaxPage, getSearchQuery, getUrlParams, isFieldAllowedToRead, isMethodAllowed } from "util/helpers"; -import { getRouteById, Routes } from "root/routes"; -import { getInvoiceNoteList, getIsCreateModalOpen, getIsFetching } from "invoiceNote/selectors"; -import { withInvoiceNoteAttributes } from "components/attributes/InvoiceNoteAttributes"; -import { getUserActiveServiceUnit } from "usersPermissions/selectors"; +import ShowMore from "@/components/showMore/ShowMore"; +import SortableTable from "@/components/table/SortableTable"; +import TableFilters from "@/components/table/TableFilters"; +import TableWrapper from "@/components/table/TableWrapper"; +import { createInvoiceNoteAndFetchList, fetchInvoiceNoteList, hideCreateInvoiceNoteModal, receiveInvoiceNoteList, showCreateInvoiceNoteModal } from "@/invoiceNote/actions"; +import { receiveTopNavigationSettings } from "@/components/topNavigation/actions"; +import { LIST_TABLE_PAGE_SIZE } from "@/util/constants"; +import { FormNames, Methods, PermissionMissingTexts } from "@/enums"; +import { InvoiceNoteFieldPaths, InvoiceNoteFieldTitles } from "@/invoiceNote/enums"; +import { getContentLeaseIdentifier } from "@/leases/helpers"; +import { formatDate, getApiResponseCount, getApiResponseResults, getApiResponseMaxPage, getSearchQuery, getUrlParams, isFieldAllowedToRead, isMethodAllowed } from "@/util/helpers"; +import { getRouteById, Routes } from "@/root/routes"; +import { getInvoiceNoteList, getIsCreateModalOpen, getIsFetching } from "@/invoiceNote/selectors"; +import { withInvoiceNoteAttributes } from "@/components/attributes/InvoiceNoteAttributes"; +import { getUserActiveServiceUnit } from "@/usersPermissions/selectors"; import type { Attributes, Methods as MethodsType } from "types"; -import type { InvoiceNoteList } from "invoiceNote/types"; -import type { UserServiceUnit } from "usersPermissions/types"; +import type { InvoiceNoteList } from "@/invoiceNote/types"; +import type { UserServiceUnit } from "@/usersPermissions/types"; const getColumns = (invoiceNoteAttributes: Attributes) => { const columns = []; diff --git a/src/invoiceNote/components/Search.tsx b/src/invoiceNote/components/Search.tsx index f049b3976..fbe7950e3 100644 --- a/src/invoiceNote/components/Search.tsx +++ b/src/invoiceNote/components/Search.tsx @@ -5,12 +5,12 @@ import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; import isEqual from "lodash/isEqual"; import isEmpty from "lodash/isEmpty"; -import FormField from "components/form/FormField"; -import SearchContainer from "components/search/SearchContainer"; -import { FieldTypes, FormNames } from "enums"; -import { fetchServiceUnits } from "serviceUnits/actions"; -import { getServiceUnits, getIsFetching as getIsFetchingServiceUnits } from "serviceUnits/selectors"; -import type { ServiceUnits } from "serviceUnits/types"; +import FormField from "@/components/form/FormField"; +import SearchContainer from "@/components/search/SearchContainer"; +import { FieldTypes, FormNames } from "@/enums"; +import { fetchServiceUnits } from "@/serviceUnits/actions"; +import { getServiceUnits, getIsFetching as getIsFetchingServiceUnits } from "@/serviceUnits/selectors"; +import type { ServiceUnits } from "@/serviceUnits/types"; type Props = { formValues: Record; fetchServiceUnits: (...args: Array) => any; diff --git a/src/invoiceNote/requests.ts b/src/invoiceNote/requests.ts index 5965cb497..f1ba6cbb6 100644 --- a/src/invoiceNote/requests.ts +++ b/src/invoiceNote/requests.ts @@ -1,5 +1,5 @@ -import callApi from "api/callApi"; -import createUrl from "api/createUrl"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; export const fetchAttributes = (): Generator => { return callApi(new Request(createUrl('invoice_note/'), { method: 'OPTIONS' diff --git a/src/invoiceNote/saga.ts b/src/invoiceNote/saga.ts index c2fdf1735..e43758e82 100644 --- a/src/invoiceNote/saga.ts +++ b/src/invoiceNote/saga.ts @@ -1,8 +1,8 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects"; import { SubmissionError } from "redux-form"; -import { receiveError } from "api/actions"; +import { receiveError } from "@/api/actions"; import { attributesNotFound, fetchInvoiceNoteList, hideCreateInvoiceNoteModal, notFound, receiveAttributes, receiveInvoiceNoteList, receiveMethods } from "./actions"; -import { displayUIMessage } from "util/helpers"; +import { displayUIMessage } from "@/util/helpers"; import { createInvoiceNote, fetchAttributes, fetchInvoiceNotes } from "./requests"; function* fetchAttributesSaga(): Generator { diff --git a/src/invoiceNote/selectors.ts b/src/invoiceNote/selectors.ts index 8d9cce6be..8ad5be3b3 100644 --- a/src/invoiceNote/selectors.ts +++ b/src/invoiceNote/selectors.ts @@ -1,6 +1,6 @@ -import type { Attributes, Methods, Selector } from "../types"; -import type { RootState } from "root/types"; -import type { InvoiceNoteList } from "invoiceNote/types"; +import type { Attributes, Methods, Selector } from "@/types"; +import type { RootState } from "@/root/types"; +import type { InvoiceNoteList } from "@/invoiceNote/types"; export const getIsFetchingAttributes: Selector = (state: RootState): boolean => state.invoiceNote.isFetchingAttributes; export const getAttributes: Selector = (state: RootState): Attributes => state.invoiceNote.attributes; export const getMethods: Selector = (state: RootState): Methods => state.invoiceNote.methods; diff --git a/src/invoiceSets/actions.ts b/src/invoiceSets/actions.ts index 8c3d0420e..8e7263580 100644 --- a/src/invoiceSets/actions.ts +++ b/src/invoiceSets/actions.ts @@ -1,5 +1,5 @@ import { createAction } from "redux-actions"; -import type { LeaseId } from "leases/types"; +import type { LeaseId } from "@/leases/types"; import type { FetchInvoiceSetsByLeaseAction, ReceiveInvoiceSetsByLeaseAction, CreditInvoiceSetAction, InvoiceSetsNotFoundAction } from "./types"; export const fetchInvoiceSetsByLease = (leaseId: LeaseId): FetchInvoiceSetsByLeaseAction => createAction('mvj/invoiceSets/FETCH_BY_LEASE')(leaseId); export const receiveInvoiceSetsByLease = (payload: Record): ReceiveInvoiceSetsByLeaseAction => createAction('mvj/invoiceSets/RECEIVE_BY_LEASE')(payload); diff --git a/src/invoiceSets/helpers.ts b/src/invoiceSets/helpers.ts index 61f32a08f..b9df79074 100644 --- a/src/invoiceSets/helpers.ts +++ b/src/invoiceSets/helpers.ts @@ -1,5 +1,5 @@ -import { CreditInvoiceOptions } from "leases/enums"; -import { convertStrToDecimalNumber } from "util/helpers"; +import { CreditInvoiceOptions } from "@/leases/enums"; +import { convertStrToDecimalNumber } from "@/util/helpers"; /** * Get credit invoice set payload for API diff --git a/src/invoiceSets/reducer.ts b/src/invoiceSets/reducer.ts index 43a672a10..b1b559279 100644 --- a/src/invoiceSets/reducer.ts +++ b/src/invoiceSets/reducer.ts @@ -1,6 +1,6 @@ import { combineReducers } from "redux"; import { handleActions } from "redux-actions"; -import type { Reducer } from "../types"; +import type { Reducer } from "@/types"; import type { InvoiceSetListMap, ReceiveInvoiceSetsByLeaseAction } from "./types"; const isFetchingReducer: Reducer = handleActions({ ['mvj/invoiceSets/FETCH_BY_LEASE']: () => true, diff --git a/src/invoiceSets/requests.ts b/src/invoiceSets/requests.ts index eb642f5e2..88b450d30 100644 --- a/src/invoiceSets/requests.ts +++ b/src/invoiceSets/requests.ts @@ -1,6 +1,6 @@ -import callApi from "../api/callApi"; -import createUrl from "../api/createUrl"; -import type { LeaseId } from "leases/types"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; +import type { LeaseId } from "@/leases/types"; export const fetchInvoiceSetsByLease = (leaseId: LeaseId): Generator => { return callApi(new Request(createUrl(`invoice_set/?lease=${leaseId}&limit=10000`))); }; diff --git a/src/invoiceSets/saga.ts b/src/invoiceSets/saga.ts index f8ab16572..ae5d29890 100644 --- a/src/invoiceSets/saga.ts +++ b/src/invoiceSets/saga.ts @@ -1,9 +1,9 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects"; import { SubmissionError } from "redux-form"; -import { fetchInvoicesByLease, receiveInvoiceToCredit, receiveIsCreditInvoicePanelOpen } from "invoices/actions"; +import { fetchInvoicesByLease, receiveInvoiceToCredit, receiveIsCreditInvoicePanelOpen } from "@/invoices/actions"; import { fetchInvoiceSetsByLease as fetchInvoiceSetsByLeaseAction, notFound, receiveInvoiceSetsByLease } from "./actions"; -import { receiveError } from "api/actions"; -import { displayUIMessage } from "util/helpers"; +import { receiveError } from "@/api/actions"; +import { displayUIMessage } from "@/util/helpers"; import { creditInvoiceSet, fetchInvoiceSetsByLease } from "./requests"; function* fetchInvoiceSetsByLeaseSaga({ diff --git a/src/invoiceSets/selectors.ts b/src/invoiceSets/selectors.ts index 24fb137a6..b62c4f8b2 100644 --- a/src/invoiceSets/selectors.ts +++ b/src/invoiceSets/selectors.ts @@ -1,7 +1,7 @@ import type { Selector } from "types"; -import type { RootState } from "root/types"; +import type { RootState } from "@/root/types"; import type { InvoiceSetList } from "./types"; -import type { LeaseId } from "leases/types"; +import type { LeaseId } from "@/leases/types"; export const getIsFetching: Selector = (state: RootState): boolean => state.invoiceSet.isFetching; export const getInvoiceSetsByLease: Selector = (state: RootState, leaseId: LeaseId): InvoiceSetList => { return state.invoiceSet.byLease[leaseId]; diff --git a/src/invoiceSets/types.ts b/src/invoiceSets/types.ts index 5e41f2a6c..17f252ecd 100644 --- a/src/invoiceSets/types.ts +++ b/src/invoiceSets/types.ts @@ -1,5 +1,5 @@ -import type { Action } from "../types"; -import type { LeaseId } from "leases/types"; +import type { Action } from "@/types"; +import type { LeaseId } from "@/leases/types"; export type InvoiceSetState = { byLease: InvoiceSetListMap; isFetching: boolean; diff --git a/src/invoices/actions.ts b/src/invoices/actions.ts index b98bd84bd..5e02899ec 100644 --- a/src/invoices/actions.ts +++ b/src/invoices/actions.ts @@ -1,7 +1,7 @@ import { createAction } from "redux-actions"; import type { Attributes, Methods } from "types"; import type { FetchAttributesAction, ReceiveAttributesAction, ReceiveMethodsAction, InvoiceAttributesNotFoundAction, Invoice, InvoiceListMap, FetchInvoicesByLeaseAction, ReceiveInvoicesByLeaseAction, CreateInvoiceAction, CreditInvoiceAction, PatchInvoiceAction, ExportInvoiceToLaskeAndUpdateListAction, ExportInvoiceToLaskeAndUpdateListPayload, ReceivePatchedInvoiceAction, ClearPatchedInvoiceAction, InvoiceNotFoundAction, ReceiveInvoiceToCreditAction, ReceiveIsCreateInvoicePanelOpenAction, ReceiveIsCreditInvoicePanelOpenAction, ReceiveIsCreateClickedAction, ReceiveIsCreditClickedAction, ReceiveIsEditClickedAction, DeleteInvoiceAction } from "./types"; -import type { LeaseId } from "leases/types"; +import type { LeaseId } from "@/leases/types"; export const fetchAttributes = (): FetchAttributesAction => createAction('mvj/invoices/FETCH_ATTRIBUTES')(); export const receiveAttributes = (attributes: Attributes): ReceiveAttributesAction => createAction('mvj/invoices/RECEIVE_ATTRIBUTES')(attributes); export const receiveMethods = (methods: Methods): ReceiveMethodsAction => createAction('mvj/invoices/RECEIVE_METHODS')(methods); diff --git a/src/invoices/helpers.ts b/src/invoices/helpers.ts index dec624de1..78b00f8a9 100644 --- a/src/invoices/helpers.ts +++ b/src/invoices/helpers.ts @@ -1,9 +1,9 @@ import isPast from "date-fns/isPast"; import forEach from "lodash/forEach"; import get from "lodash/get"; -import { CreditInvoiceOptions } from "leases/enums"; +import { CreditInvoiceOptions } from "@/leases/enums"; import { InvoiceState, InvoiceType, ReceivableTypes } from "./enums"; -import { convertStrToDecimalNumber, getLabelOfOption, sortStringAsc } from "util/helpers"; +import { convertStrToDecimalNumber, getLabelOfOption, sortStringAsc } from "@/util/helpers"; /** * Get payments of single invoice to show on UI diff --git a/src/invoices/reducer.ts b/src/invoices/reducer.ts index 9a0af705a..9412f93b6 100644 --- a/src/invoices/reducer.ts +++ b/src/invoices/reducer.ts @@ -1,6 +1,6 @@ import { combineReducers } from "redux"; import { handleActions } from "redux-actions"; -import type { Attributes, Methods, Reducer } from "../types"; +import type { Attributes, Methods, Reducer } from "@/types"; import type { ReceiveAttributesAction, ReceiveMethodsAction, Invoice, InvoiceListMap, ReceiveInvoicesByLeaseAction, ReceiveInvoiceToCreditAction, ReceiveIsCreateInvoicePanelOpenAction, ReceiveIsCreditInvoicePanelOpenAction, ReceiveIsCreateClickedAction, ReceiveIsCreditClickedAction, ReceiveIsEditClickedAction, ReceivePatchedInvoiceAction } from "./types"; const isFetchingReducer: Reducer = handleActions({ 'mvj/invoices/CREATE': () => true, diff --git a/src/invoices/requests.ts b/src/invoices/requests.ts index 40a8e08af..f563ffa6a 100644 --- a/src/invoices/requests.ts +++ b/src/invoices/requests.ts @@ -1,5 +1,5 @@ -import callApi from "../api/callApi"; -import createUrl from "../api/createUrl"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; import type { Invoice, InvoiceId } from "./types"; export const fetchAttributes = () => { return callApi(new Request(createUrl('invoice/'), { diff --git a/src/invoices/saga.ts b/src/invoices/saga.ts index ff65d3ef6..fe42750b2 100644 --- a/src/invoices/saga.ts +++ b/src/invoices/saga.ts @@ -1,8 +1,8 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects"; import { SubmissionError } from "redux-form"; import { fetchInvoicesByLease, receiveAttributes, receiveMethods, attributesNotFound, receiveInvoicesByLease, receiveInvoiceToCredit, receiveIsCreateInvoicePanelOpen, receiveIsCreditInvoicePanelOpen, receiveIsEditClicked, receivePatchedInvoice, notFound } from "./actions"; -import { receiveError } from "api/actions"; -import { displayUIMessage } from "util/helpers"; +import { receiveError } from "@/api/actions"; +import { displayUIMessage } from "@/util/helpers"; import { exportInvoiceToLaske, fetchAttributes, fetchInvoices, createInvoice, creditInvoice, patchInvoice, deleteInvoice } from "./requests"; function* fetchAttributesSaga(): Generator { diff --git a/src/invoices/selectors.ts b/src/invoices/selectors.ts index afa103be5..6fbc015c7 100644 --- a/src/invoices/selectors.ts +++ b/src/invoices/selectors.ts @@ -1,7 +1,7 @@ import type { Attributes, Methods, Selector } from "types"; -import type { RootState } from "root/types"; +import type { RootState } from "@/root/types"; import type { Invoice, InvoiceList } from "./types"; -import type { LeaseId } from "leases/types"; +import type { LeaseId } from "@/leases/types"; export const getIsFetching: Selector = (state: RootState): boolean => state.invoice.isFetching; export const getIsSaving: Selector = (state: RootState): boolean => state.invoice.isSaving; export const getIsCreateInvoicePanelOpen: Selector = (state: RootState): boolean => state.invoice.isCreatePanelOpen; diff --git a/src/invoices/types.ts b/src/invoices/types.ts index 7b2117c11..ba904404c 100644 --- a/src/invoices/types.ts +++ b/src/invoices/types.ts @@ -1,5 +1,5 @@ import type { Action, Attributes, Methods } from "types"; -import type { LeaseId } from "leases/types"; +import type { LeaseId } from "@/leases/types"; export type InvoiceState = { attributes: Attributes; byLease: InvoiceListMap; diff --git a/src/landUseAgreementAttachment/reducer.ts b/src/landUseAgreementAttachment/reducer.ts index 50fa18838..975ca5622 100644 --- a/src/landUseAgreementAttachment/reducer.ts +++ b/src/landUseAgreementAttachment/reducer.ts @@ -1,6 +1,6 @@ import { combineReducers } from "redux"; import { handleActions } from "redux-actions"; -import type { Attributes, Methods, Reducer } from "../types"; +import type { Attributes, Methods, Reducer } from "@/types"; import type { ReceiveAttributesAction, ReceiveMethodsAction } from "./types"; const isFetchingAttributesReducer: Reducer = handleActions({ 'mvj/landUseAgreementAttachment/FETCH_ATTRIBUTES': () => true, diff --git a/src/landUseAgreementAttachment/requests.ts b/src/landUseAgreementAttachment/requests.ts index 02775b987..0a2880b9f 100644 --- a/src/landUseAgreementAttachment/requests.ts +++ b/src/landUseAgreementAttachment/requests.ts @@ -1,6 +1,6 @@ -import callApi from "../api/callApi"; -import createUrl from "../api/createUrl"; -import callUploadRequest from "api/callUploadRequest"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; +import callUploadRequest from "@/api/callUploadRequest"; import type { CreateLandUseAgreementAttachmentPayload } from "./types"; export const fetchAttributes = (): Generator => { return callApi(new Request(createUrl(`land_use_agreement_attachment/`), { diff --git a/src/landUseAgreementAttachment/saga.ts b/src/landUseAgreementAttachment/saga.ts index 4955e828e..0b2689e46 100644 --- a/src/landUseAgreementAttachment/saga.ts +++ b/src/landUseAgreementAttachment/saga.ts @@ -1,9 +1,9 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects"; import { SubmissionError } from "redux-form"; import { attributesNotFound, receiveAttributes, receiveMethods } from "./actions"; -import { fetchSingleLandUseContract } from "landUseContract/actions"; -import { receiveError } from "api/actions"; -import { displayUIMessage } from "util/helpers"; +import { fetchSingleLandUseContract } from "@/landUseContract/actions"; +import { receiveError } from "@/api/actions"; +import { displayUIMessage } from "@/util/helpers"; import { fetchAttributes, createLandUseAgreementAttachment, deleteLandUseAgreementAttachment } from "./requests"; function* fetchAttributesSaga(): Generator { diff --git a/src/landUseAgreementAttachment/selectors.ts b/src/landUseAgreementAttachment/selectors.ts index 5661caf87..bb3cecc88 100644 --- a/src/landUseAgreementAttachment/selectors.ts +++ b/src/landUseAgreementAttachment/selectors.ts @@ -1,5 +1,5 @@ import type { Attributes, Methods, Selector } from "types"; -import type { RootState } from "root/types"; +import type { RootState } from "@/root/types"; export const getAttributes: Selector = (state: RootState): Attributes => state.landUseAgreementAttachment.attributes; export const getMethods: Selector = (state: RootState): Methods => state.landUseAgreementAttachment.methods; export const getIsFetchingAttributes: Selector = (state: RootState): boolean => state.landUseAgreementAttachment.isFetchingAttributes; \ No newline at end of file diff --git a/src/landUseAgreementAttachment/types.ts b/src/landUseAgreementAttachment/types.ts index 7fde2e4af..48a43729e 100644 --- a/src/landUseAgreementAttachment/types.ts +++ b/src/landUseAgreementAttachment/types.ts @@ -1,4 +1,4 @@ -import type { Action, Attributes, Methods } from "../types"; +import type { Action, Attributes, Methods } from "@/types"; export type LandUseAgreementAttachmentState = { attributes: Attributes; isFetchingAttributes: boolean; diff --git a/src/landUseContract/components/LandUseContractListPage.tsx b/src/landUseContract/components/LandUseContractListPage.tsx index c9e61d073..42c3d30dc 100644 --- a/src/landUseContract/components/LandUseContractListPage.tsx +++ b/src/landUseContract/components/LandUseContractListPage.tsx @@ -5,29 +5,29 @@ import { connect } from "react-redux"; import { initialize } from "redux-form"; import flowRight from "lodash/flowRight"; import isArray from "lodash/isArray"; -import Authorization from "components/authorization/Authorization"; -import AuthorizationError from "components/authorization/AuthorizationError"; -import { FormNames, Methods, PermissionMissingTexts } from "enums"; -import AddButtonSecondary from "components/form/AddButtonSecondary"; +import Authorization from "@/components/authorization/Authorization"; +import AuthorizationError from "@/components/authorization/AuthorizationError"; +import { FormNames, Methods, PermissionMissingTexts } from "@/enums"; +import AddButtonSecondary from "@/components/form/AddButtonSecondary"; import CreateLandUseContractModal from "./createLandUseContract/CreateLandUseContractModal"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import PageContainer from "components/content/PageContainer"; -import Pagination from "components/table/Pagination"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import PageContainer from "@/components/content/PageContainer"; +import Pagination from "@/components/table/Pagination"; import Search from "./search/Search"; -import SortableTable from "components/table/SortableTable"; -import TableFilters from "components/table/TableFilters"; -import TableWrapper from "components/table/TableWrapper"; -import { receiveTopNavigationSettings } from "components/topNavigation/actions"; -import { createLandUseContract, fetchLandUseContractList } from "landUseContract/actions"; -import { LIST_TABLE_PAGE_SIZE } from "util/constants"; -import { getContentLandUseContractListResults } from "landUseContract/helpers"; -import { getApiResponseCount, getApiResponseMaxPage, getFieldOptions, getLabelOfOption, getSearchQuery, getUrlParams, setPageTitle, isMethodAllowed } from "util/helpers"; -import { getRouteById, Routes } from "root/routes"; -import { getIsFetching, getLandUseContractList } from "landUseContract/selectors"; -import { withLandUseContractAttributes } from "components/attributes/LandUseContractAttributes"; +import SortableTable from "@/components/table/SortableTable"; +import TableFilters from "@/components/table/TableFilters"; +import TableWrapper from "@/components/table/TableWrapper"; +import { receiveTopNavigationSettings } from "@/components/topNavigation/actions"; +import { createLandUseContract, fetchLandUseContractList } from "@/landUseContract/actions"; +import { LIST_TABLE_PAGE_SIZE } from "@/util/constants"; +import { getContentLandUseContractListResults } from "@/landUseContract/helpers"; +import { getApiResponseCount, getApiResponseMaxPage, getFieldOptions, getLabelOfOption, getSearchQuery, getUrlParams, setPageTitle, isMethodAllowed } from "@/util/helpers"; +import { getRouteById, Routes } from "@/root/routes"; +import { getIsFetching, getLandUseContractList } from "@/landUseContract/selectors"; +import { withLandUseContractAttributes } from "@/components/attributes/LandUseContractAttributes"; import type { Attributes, Methods as MethodType } from "types"; -import type { LandUseContract, LandUseContractList } from "landUseContract/types"; +import type { LandUseContract, LandUseContractList } from "@/landUseContract/types"; type Props = { createLandUseContract: (...args: Array) => any; fetchLandUseContractList: (...args: Array) => any; diff --git a/src/landUseContract/components/LandUseContractPage.tsx b/src/landUseContract/components/LandUseContractPage.tsx index a2901c95e..41bf97900 100644 --- a/src/landUseContract/components/LandUseContractPage.tsx +++ b/src/landUseContract/components/LandUseContractPage.tsx @@ -4,53 +4,53 @@ import { withRouter } from "react-router"; import { change, destroy, getFormValues, initialize, isDirty } from "redux-form"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; -import { withUiDataList } from "components/uiData/UiDataListHOC"; +import { withUiDataList } from "@/components/uiData/UiDataListHOC"; import BasicInformation from "./sections/BasicInformation"; import BasicInformationEdit from "./sections/BasicInformationEdit"; import Conditions from "./sections/Conditions"; import ConditionsEdit from "./sections/ConditionsEdit"; import Compensations from "./sections/Compensations"; import CompensationsEdit from "./sections/CompensationsEdit"; -import ConfirmationModal from "components/modal/ConfirmationModal"; -import ContentContainer from "components/content/ContentContainer"; +import ConfirmationModal from "@/components/modal/ConfirmationModal"; +import ContentContainer from "@/components/content/ContentContainer"; import Contracts from "./sections/Contracts"; import ContractsEdit from "./sections/ContractsEdit"; -import ControlButtonBar from "components/controlButtons/ControlButtonBar"; -import ControlButtons from "components/controlButtons/ControlButtons"; +import ControlButtonBar from "@/components/controlButtons/ControlButtonBar"; +import ControlButtons from "@/components/controlButtons/ControlButtons"; import Decisions from "./sections/Decisions"; import DecisionsEdit from "./sections/DecisionsEdit"; -import Divider from "components/content/Divider"; -import FullWidthContainer from "components/content/FullWidthContainer"; +import Divider from "@/components/content/Divider"; +import FullWidthContainer from "@/components/content/FullWidthContainer"; import InvoicesR from "./sections/InvoicesR"; // import Invoices from './sections/Invoices'; // import InvoicesEdit from './sections/InvoicesEdit'; -import { ButtonColors } from "components/enums"; -import { fetchAttributes as fetchLandUseInvoiceAttributes } from "landUseInvoices/actions"; +import { ButtonColors } from "@/components/enums"; +import { fetchAttributes as fetchLandUseInvoiceAttributes } from "@/landUseInvoices/actions"; import LandUseContractMap from "./sections/LandUseContractMap"; import Litigants from "./sections/Litigants"; import LitigantsEdit from "./sections/LitigantsEdit"; -import Loader from "components/loader/Loader"; -import PageContainer from "components/content/PageContainer"; -import PageNavigationWrapper from "components/content/PageNavigationWrapper"; -import Tabs from "components/tabs/Tabs"; -import TabContent from "components/tabs/TabContent"; -import TabPane from "components/tabs/TabPane"; -import { receiveTopNavigationSettings } from "components/topNavigation/actions"; -import { fetchInvoicesByLandUseContract } from "landUseInvoices/actions"; -import { getInvoicesByLandUseContractId, getIsFetchingAttributes as getIsFetchingLandUseInvoiceAttributes, getAttributes as getLandUseInvoiceAttributes } from "landUseInvoices/selectors"; -import { clearFormValidFlags, editLandUseContract, fetchSingleLandUseContract, hideEditMode, receiveFormValidFlags, receiveIsSaveClicked, receiveSingleLandUseContract, showEditMode, deleteLandUseContract } from "landUseContract/actions"; -import { ConfirmationModalTexts, FormNames } from "enums"; -import { addLitigantsFormValuesToPayload, clearUnsavedChanges, getContentLandUseContractIdentifier, getContentBasicInformation, getContentCompensations, getContentContracts, getContentDecisions, getContentInvoices, getContentLitigants, getContentConditions, convertCompensationValuesToDecimalNumber } from "landUseContract/helpers"; -import { getSearchQuery, getUrlParams, isArchived, scrollToTopPage, setPageTitle } from "util/helpers"; -import { getRouteById, Routes } from "root/routes"; -import { getCurrentLandUseContract, getIsEditMode, getIsFormValidById, getIsFormValidFlags, getIsSaveClicked, getIsFetching } from "landUseContract/selectors"; -import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "usersPermissions/selectors"; -import { getSessionStorageItem, removeSessionStorageItem, setSessionStorageItem } from "util/storage"; -import { withLandUseContractAttributes } from "components/attributes/LandUseContractAttributes"; +import Loader from "@/components/loader/Loader"; +import PageContainer from "@/components/content/PageContainer"; +import PageNavigationWrapper from "@/components/content/PageNavigationWrapper"; +import Tabs from "@/components/tabs/Tabs"; +import TabContent from "@/components/tabs/TabContent"; +import TabPane from "@/components/tabs/TabPane"; +import { receiveTopNavigationSettings } from "@/components/topNavigation/actions"; +import { fetchInvoicesByLandUseContract } from "@/landUseInvoices/actions"; +import { getInvoicesByLandUseContractId, getIsFetchingAttributes as getIsFetchingLandUseInvoiceAttributes, getAttributes as getLandUseInvoiceAttributes } from "@/landUseInvoices/selectors"; +import { clearFormValidFlags, editLandUseContract, fetchSingleLandUseContract, hideEditMode, receiveFormValidFlags, receiveIsSaveClicked, receiveSingleLandUseContract, showEditMode, deleteLandUseContract } from "@/landUseContract/actions"; +import { ConfirmationModalTexts, FormNames } from "@/enums"; +import { addLitigantsFormValuesToPayload, clearUnsavedChanges, getContentLandUseContractIdentifier, getContentBasicInformation, getContentCompensations, getContentContracts, getContentDecisions, getContentInvoices, getContentLitigants, getContentConditions, convertCompensationValuesToDecimalNumber } from "@/landUseContract/helpers"; +import { getSearchQuery, getUrlParams, isArchived, scrollToTopPage, setPageTitle } from "@/util/helpers"; +import { getRouteById, Routes } from "@/root/routes"; +import { getCurrentLandUseContract, getIsEditMode, getIsFormValidById, getIsFormValidFlags, getIsSaveClicked, getIsFetching } from "@/landUseContract/selectors"; +import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "@/usersPermissions/selectors"; +import { getSessionStorageItem, removeSessionStorageItem, setSessionStorageItem } from "@/util/storage"; +import { withLandUseContractAttributes } from "@/components/attributes/LandUseContractAttributes"; import type { Attributes } from "types"; -import type { LandUseContract } from "landUseContract/types"; -import type { UsersPermissions } from "usersPermissions/types"; -import type { InvoiceList } from "landUseInvoices/types"; +import type { LandUseContract } from "@/landUseContract/types"; +import type { UsersPermissions } from "@/usersPermissions/types"; +import type { InvoiceList } from "@/landUseInvoices/types"; type Props = { basicInformationFormValues: Record; change: (...args: Array) => any; diff --git a/src/landUseContract/components/createLandUseContract/CreateLandUseContractForm.tsx b/src/landUseContract/components/createLandUseContract/CreateLandUseContractForm.tsx index 7ce73de64..79d5f5ad2 100644 --- a/src/landUseContract/components/createLandUseContract/CreateLandUseContractForm.tsx +++ b/src/landUseContract/components/createLandUseContract/CreateLandUseContractForm.tsx @@ -4,18 +4,18 @@ import { change, formValueSelector, reduxForm } from "redux-form"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; import get from "lodash/get"; -import { getDistrictsByMunicipality } from "district/selectors"; -import Button from "components/button/Button"; -import FormField from "components/form/FormField"; -import ModalButtonWrapper from "components/modal/ModalButtonWrapper"; -import { fetchDistrictsByMunicipality } from "district/actions"; -import { FormNames } from "enums"; -import { ButtonColors } from "components/enums"; -import { getAttributes } from "landUseContract/selectors"; -import { getDistrictOptions } from "district/helpers"; -import { getFieldOptions } from "util/helpers"; +import { getDistrictsByMunicipality } from "@/district/selectors"; +import Button from "@/components/button/Button"; +import FormField from "@/components/form/FormField"; +import ModalButtonWrapper from "@/components/modal/ModalButtonWrapper"; +import { fetchDistrictsByMunicipality } from "@/district/actions"; +import { FormNames } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { getAttributes } from "@/landUseContract/selectors"; +import { getDistrictOptions } from "@/district/helpers"; +import { getFieldOptions } from "@/util/helpers"; import type { Attributes } from "types"; -import type { DistrictList } from "district/types"; +import type { DistrictList } from "@/district/types"; type Props = { attributes: Attributes; change: (...args: Array) => any; diff --git a/src/landUseContract/components/createLandUseContract/CreateLandUseContractModal.tsx b/src/landUseContract/components/createLandUseContract/CreateLandUseContractModal.tsx index 9abeee854..656be0c5f 100644 --- a/src/landUseContract/components/createLandUseContract/CreateLandUseContractModal.tsx +++ b/src/landUseContract/components/createLandUseContract/CreateLandUseContractModal.tsx @@ -1,6 +1,6 @@ import React, { Component } from "react"; import CreateLandUseContractForm from "./CreateLandUseContractForm"; -import Modal from "components/modal/Modal"; +import Modal from "@/components/modal/Modal"; type Props = { isOpen: boolean; onClose: (...args: Array) => any; diff --git a/src/landUseContract/components/search/Search.tsx b/src/landUseContract/components/search/Search.tsx index 7eceefe40..d221457a7 100644 --- a/src/landUseContract/components/search/Search.tsx +++ b/src/landUseContract/components/search/Search.tsx @@ -5,10 +5,10 @@ import { Row, Column } from "react-foundation"; import debounce from "lodash/debounce"; import flowRight from "lodash/flowRight"; import isEqual from "lodash/isEqual"; -import FormField from "components/form/FormField"; -import SearchClearLink from "components/search/SearchClearLink"; -import SearchContainer from "components/search/SearchContainer"; -import { FieldTypes, FormNames } from "enums"; +import FormField from "@/components/form/FormField"; +import SearchClearLink from "@/components/search/SearchClearLink"; +import SearchContainer from "@/components/search/SearchContainer"; +import { FieldTypes, FormNames } from "@/enums"; type Props = { formValues: Record; handleSubmit: (...args: Array) => any; diff --git a/src/landUseContract/components/sections/AddressItemEdit.tsx b/src/landUseContract/components/sections/AddressItemEdit.tsx index 01e81f329..0eb7d42b4 100644 --- a/src/landUseContract/components/sections/AddressItemEdit.tsx +++ b/src/landUseContract/components/sections/AddressItemEdit.tsx @@ -4,14 +4,14 @@ import { formValueSelector, change, reduxForm } from "redux-form"; import flowRight from "lodash/flowRight"; import { Row, Column } from "react-foundation"; import get from "lodash/get"; -import Authorization from "components/authorization/Authorization"; -import FormField from "components/form/FormField"; -import { FieldTypes, FormNames } from "enums"; -import RemoveButton from "components/form/RemoveButton"; -import { getUsersPermissions } from "usersPermissions/selectors"; +import Authorization from "@/components/authorization/Authorization"; +import FormField from "@/components/form/FormField"; +import { FieldTypes, FormNames } from "@/enums"; +import RemoveButton from "@/components/form/RemoveButton"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; import type { Attributes } from "types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; -import { isFieldAllowedToRead, isEmptyValue } from "util/helpers"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; +import { isFieldAllowedToRead, isEmptyValue } from "@/util/helpers"; type Props = { attributes: Attributes; disabled: boolean; diff --git a/src/landUseContract/components/sections/BasicInformation.tsx b/src/landUseContract/components/sections/BasicInformation.tsx index 2c0598345..6c8492e49 100644 --- a/src/landUseContract/components/sections/BasicInformation.tsx +++ b/src/landUseContract/components/sections/BasicInformation.tsx @@ -2,27 +2,27 @@ import React, { Fragment } from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; import get from "lodash/get"; -import Authorization from "components/authorization/Authorization"; -import Collapse from "components/collapse/Collapse"; -import Divider from "components/content/Divider"; -import ExternalLink from "components/links/ExternalLink"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import ListItem from "components/content/ListItem"; -import ListItems from "components/content/ListItems"; -import SubTitle from "components/content/SubTitle"; -import { receiveCollapseStates } from "landUseContract/actions"; -import { FormNames, ViewModes } from "enums"; -import { LandUseAgreementAttachmentFieldPaths } from "landUseAgreementAttachment/enums"; -import { getContentBasicInformation } from "landUseContract/helpers"; -import { getUserFullName } from "users/helpers"; -import { formatDate, getFieldOptions, getLabelOfOption, getReferenceNumberLink, isFieldAllowedToRead } from "util/helpers"; -import { getAttributes, getCollapseStateByKey, getCurrentLandUseContract } from "landUseContract/selectors"; -import { getUiDataLandUseContractKey, getUiDataLandUseAgreementAttachmentKey } from "uiData/helpers"; -import { getAttributes as getLandUseAgreementAttachmentAttributes } from "landUseAgreementAttachment/selectors"; +import Authorization from "@/components/authorization/Authorization"; +import Collapse from "@/components/collapse/Collapse"; +import Divider from "@/components/content/Divider"; +import ExternalLink from "@/components/links/ExternalLink"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import ListItem from "@/components/content/ListItem"; +import ListItems from "@/components/content/ListItems"; +import SubTitle from "@/components/content/SubTitle"; +import { receiveCollapseStates } from "@/landUseContract/actions"; +import { FormNames, ViewModes } from "@/enums"; +import { LandUseAgreementAttachmentFieldPaths } from "@/landUseAgreementAttachment/enums"; +import { getContentBasicInformation } from "@/landUseContract/helpers"; +import { getUserFullName } from "@/users/helpers"; +import { formatDate, getFieldOptions, getLabelOfOption, getReferenceNumberLink, isFieldAllowedToRead } from "@/util/helpers"; +import { getAttributes, getCollapseStateByKey, getCurrentLandUseContract } from "@/landUseContract/selectors"; +import { getUiDataLandUseContractKey, getUiDataLandUseAgreementAttachmentKey } from "@/uiData/helpers"; +import { getAttributes as getLandUseAgreementAttachmentAttributes } from "@/landUseAgreementAttachment/selectors"; import type { Attributes } from "types"; -import type { LandUseContract } from "landUseContract/types"; -import FileDownloadLink from "components/file/FileDownloadLink"; +import type { LandUseContract } from "@/landUseContract/types"; +import FileDownloadLink from "@/components/file/FileDownloadLink"; type Props = { attributes: Attributes; basicInformationCollapseState: boolean; diff --git a/src/landUseContract/components/sections/BasicInformationEdit.tsx b/src/landUseContract/components/sections/BasicInformationEdit.tsx index 0300ecf6a..340b57f27 100644 --- a/src/landUseContract/components/sections/BasicInformationEdit.tsx +++ b/src/landUseContract/components/sections/BasicInformationEdit.tsx @@ -4,34 +4,34 @@ import { change, FieldArray, reduxForm } from "redux-form"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; import get from "lodash/get"; -import AddFileButton from "components/form/AddFileButton"; -import EstateIdSelectInput from "components/inputs/EstateIdSelectInput"; -import Authorization from "components/authorization/Authorization"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import AddButtonThird from "components/form/AddButtonThird"; -import Collapse from "components/collapse/Collapse"; -import Divider from "components/content/Divider"; -import FieldAndRemoveButtonWrapper from "components/form/FieldAndRemoveButtonWrapper"; -import FormField from "components/form/FormField"; -import FormText from "components/form/FormText"; -import FileDownloadLink from "components/file/FileDownloadLink"; -import FormTextTitle from "components/form/FormTextTitle"; -import RemoveButton from "components/form/RemoveButton"; -import SubTitle from "components/content/SubTitle"; -import { receiveCollapseStates, receiveFormValidFlags } from "landUseContract/actions"; -import { createLandUseAgreementAttachment, deleteLandUseAgreementAttachment } from "landUseAgreementAttachment/actions"; -import { ConfirmationModalTexts, FieldTypes, FormNames, ViewModes, Methods } from "enums"; -import { ButtonColors } from "components/enums"; -import { getAttributes, getCollapseStateByKey, getIsSaveClicked, getCurrentLandUseContract } from "landUseContract/selectors"; -import { referenceNumber } from "components/form/validations"; +import AddFileButton from "@/components/form/AddFileButton"; +import EstateIdSelectInput from "@/components/inputs/EstateIdSelectInput"; +import Authorization from "@/components/authorization/Authorization"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import AddButtonThird from "@/components/form/AddButtonThird"; +import Collapse from "@/components/collapse/Collapse"; +import Divider from "@/components/content/Divider"; +import FieldAndRemoveButtonWrapper from "@/components/form/FieldAndRemoveButtonWrapper"; +import FormField from "@/components/form/FormField"; +import FormText from "@/components/form/FormText"; +import FileDownloadLink from "@/components/file/FileDownloadLink"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import RemoveButton from "@/components/form/RemoveButton"; +import SubTitle from "@/components/content/SubTitle"; +import { receiveCollapseStates, receiveFormValidFlags } from "@/landUseContract/actions"; +import { createLandUseAgreementAttachment, deleteLandUseAgreementAttachment } from "@/landUseAgreementAttachment/actions"; +import { ConfirmationModalTexts, FieldTypes, FormNames, ViewModes, Methods } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { getAttributes, getCollapseStateByKey, getIsSaveClicked, getCurrentLandUseContract } from "@/landUseContract/selectors"; +import { referenceNumber } from "@/components/form/validations"; import AddressItemEdit from "./AddressItemEdit"; import type { Attributes, Methods as MethodsType } from "types"; -import { getUiDataLandUseContractKey, getUiDataLandUseAgreementAttachmentKey } from "uiData/helpers"; -import { LandUseAgreementAttachmentFieldPaths } from "landUseAgreementAttachment/enums"; -import { getUserFullName } from "users/helpers"; -import { isFieldAllowedToRead, isMethodAllowed, formatDate } from "util/helpers"; -import { getMethods as getLandUseAgreementAttachmentMethods, getAttributes as getLandUseAgreementAttachmentAttributes } from "landUseAgreementAttachment/selectors"; -import type { LandUseContract } from "landUseContract/types"; +import { getUiDataLandUseContractKey, getUiDataLandUseAgreementAttachmentKey } from "@/uiData/helpers"; +import { LandUseAgreementAttachmentFieldPaths } from "@/landUseAgreementAttachment/enums"; +import { getUserFullName } from "@/users/helpers"; +import { isFieldAllowedToRead, isMethodAllowed, formatDate } from "@/util/helpers"; +import { getMethods as getLandUseAgreementAttachmentMethods, getAttributes as getLandUseAgreementAttachmentAttributes } from "@/landUseAgreementAttachment/selectors"; +import type { LandUseContract } from "@/landUseContract/types"; type AddressesProps = { fields: any; formName: string; diff --git a/src/landUseContract/components/sections/Changes.tsx b/src/landUseContract/components/sections/Changes.tsx index 93fb2b30b..819004d26 100644 --- a/src/landUseContract/components/sections/Changes.tsx +++ b/src/landUseContract/components/sections/Changes.tsx @@ -2,18 +2,18 @@ import React from "react"; import { Row, Column } from "react-foundation"; import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; -import FormTextTitle from "components/form/FormTextTitle"; -import BoxItemContainer from "components/content/BoxItemContainer"; -import Collapse from "components/collapse/Collapse"; -import FormText from "components/form/FormText"; -import { receiveCollapseStates } from "landUseContract/actions"; -import { FormNames, ViewModes } from "enums"; -import { formatDate } from "util/helpers"; -import { getCollapseStateByKey } from "landUseContract/selectors"; -import { withWindowResize } from "components/resize/WindowResizeHandler"; -import { getDecisionById, getDecisionOptions } from "landUseContract/helpers"; -import type { LandUseContract } from "landUseContract/types"; -import DecisionLink from "components/links/DecisionLink"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import BoxItemContainer from "@/components/content/BoxItemContainer"; +import Collapse from "@/components/collapse/Collapse"; +import FormText from "@/components/form/FormText"; +import { receiveCollapseStates } from "@/landUseContract/actions"; +import { FormNames, ViewModes } from "@/enums"; +import { formatDate } from "@/util/helpers"; +import { getCollapseStateByKey } from "@/landUseContract/selectors"; +import { withWindowResize } from "@/components/resize/WindowResizeHandler"; +import { getDecisionById, getDecisionOptions } from "@/landUseContract/helpers"; +import type { LandUseContract } from "@/landUseContract/types"; +import DecisionLink from "@/components/links/DecisionLink"; import type { Attributes } from "types"; type Props = { attributes: Attributes; diff --git a/src/landUseContract/components/sections/Compensations.tsx b/src/landUseContract/components/sections/Compensations.tsx index af31a025a..ff4c819a5 100644 --- a/src/landUseContract/components/sections/Compensations.tsx +++ b/src/landUseContract/components/sections/Compensations.tsx @@ -2,25 +2,25 @@ import React, { Fragment } from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; import get from "lodash/get"; -import Authorization from "components/authorization/Authorization"; -import Divider from "components/content/Divider"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import GreenBox from "components/content/GreenBox"; -import SubTitle from "components/content/SubTitle"; -import WhiteBox from "components/content/WhiteBox"; -import { getContentCompensations } from "landUseContract/helpers"; -import { formatNumber } from "util/helpers"; -import { getUserFullName } from "users/helpers"; -import { getCurrentLandUseContract } from "landUseContract/selectors"; -import { LandUseAgreementAttachmentFieldPaths } from "landUseAgreementAttachment/enums"; -import type { LandUseContract } from "landUseContract/types"; -import { getUiDataLandUseAgreementAttachmentKey } from "uiData/helpers"; -import { getAttributes as getLandUseAgreementAttachmentAttributes } from "landUseAgreementAttachment/selectors"; -import { formatDate, isFieldAllowedToRead } from "util/helpers"; +import Authorization from "@/components/authorization/Authorization"; +import Divider from "@/components/content/Divider"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import GreenBox from "@/components/content/GreenBox"; +import SubTitle from "@/components/content/SubTitle"; +import WhiteBox from "@/components/content/WhiteBox"; +import { getContentCompensations } from "@/landUseContract/helpers"; +import { formatNumber } from "@/util/helpers"; +import { getUserFullName } from "@/users/helpers"; +import { getCurrentLandUseContract } from "@/landUseContract/selectors"; +import { LandUseAgreementAttachmentFieldPaths } from "@/landUseAgreementAttachment/enums"; +import type { LandUseContract } from "@/landUseContract/types"; +import { getUiDataLandUseAgreementAttachmentKey } from "@/uiData/helpers"; +import { getAttributes as getLandUseAgreementAttachmentAttributes } from "@/landUseAgreementAttachment/selectors"; +import { formatDate, isFieldAllowedToRead } from "@/util/helpers"; import type { Attributes } from "types"; -import FileDownloadLink from "components/file/FileDownloadLink"; -import { getUsedPrice, getSum } from "landUseContract/helpers"; +import FileDownloadLink from "@/components/file/FileDownloadLink"; +import { getUsedPrice, getSum } from "@/landUseContract/helpers"; type Props = { currentLandUseContract: LandUseContract; landUseAgreementAttachmentAttributes: Attributes; diff --git a/src/landUseContract/components/sections/CompensationsEdit.tsx b/src/landUseContract/components/sections/CompensationsEdit.tsx index d1f1d65d7..a14517be0 100644 --- a/src/landUseContract/components/sections/CompensationsEdit.tsx +++ b/src/landUseContract/components/sections/CompensationsEdit.tsx @@ -4,35 +4,35 @@ import { Row, Column } from "react-foundation"; import { FieldArray, formValueSelector, reduxForm, change } from "redux-form"; import flowRight from "lodash/flowRight"; import get from "lodash/get"; -import Authorization from "components/authorization/Authorization"; -import AddFileButton from "components/form/AddFileButton"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import AddButtonThird from "components/form/AddButtonThird"; -import Divider from "components/content/Divider"; -import FormField from "components/form/FormField"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import GreenBox from "components/content/GreenBox"; -import SubTitle from "components/content/SubTitle"; -import WhiteBox from "components/content/WhiteBox"; -import { receiveFormValidFlags } from "landUseContract/actions"; -import { getCurrentLandUseContract } from "landUseContract/selectors"; -import type { LandUseContract } from "landUseContract/types"; -import { FormNames } from "enums"; -import RemoveButton from "components/form/RemoveButton"; -import { ButtonColors } from "components/enums"; -import { convertStrToDecimalNumber, formatNumber } from "util/helpers"; -import { getAttributes, getIsSaveClicked } from "landUseContract/selectors"; +import Authorization from "@/components/authorization/Authorization"; +import AddFileButton from "@/components/form/AddFileButton"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import AddButtonThird from "@/components/form/AddButtonThird"; +import Divider from "@/components/content/Divider"; +import FormField from "@/components/form/FormField"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import GreenBox from "@/components/content/GreenBox"; +import SubTitle from "@/components/content/SubTitle"; +import WhiteBox from "@/components/content/WhiteBox"; +import { receiveFormValidFlags } from "@/landUseContract/actions"; +import { getCurrentLandUseContract } from "@/landUseContract/selectors"; +import type { LandUseContract } from "@/landUseContract/types"; +import { FormNames } from "@/enums"; +import RemoveButton from "@/components/form/RemoveButton"; +import { ButtonColors } from "@/components/enums"; +import { convertStrToDecimalNumber, formatNumber } from "@/util/helpers"; +import { getAttributes, getIsSaveClicked } from "@/landUseContract/selectors"; import UnitPricesUsedInCalculations from "./UnitPricesUsedInCalculations"; import type { Attributes, Methods as MethodsType } from "types"; -import { getUserFullName } from "users/helpers"; -import { ConfirmationModalTexts, Methods } from "enums"; -import { formatDate, isFieldAllowedToRead, isMethodAllowed } from "util/helpers"; -import FileDownloadLink from "components/file/FileDownloadLink"; -import { getUiDataLandUseAgreementAttachmentKey } from "uiData/helpers"; -import { getMethods as getLandUseAgreementAttachmentMethods, getAttributes as getLandUseAgreementAttachmentAttributes } from "landUseAgreementAttachment/selectors"; -import { LandUseAgreementAttachmentFieldPaths } from "landUseAgreementAttachment/enums"; -import { createLandUseAgreementAttachment, deleteLandUseAgreementAttachment } from "landUseAgreementAttachment/actions"; +import { getUserFullName } from "@/users/helpers"; +import { ConfirmationModalTexts, Methods } from "@/enums"; +import { formatDate, isFieldAllowedToRead, isMethodAllowed } from "@/util/helpers"; +import FileDownloadLink from "@/components/file/FileDownloadLink"; +import { getUiDataLandUseAgreementAttachmentKey } from "@/uiData/helpers"; +import { getMethods as getLandUseAgreementAttachmentMethods, getAttributes as getLandUseAgreementAttachmentAttributes } from "@/landUseAgreementAttachment/selectors"; +import { LandUseAgreementAttachmentFieldPaths } from "@/landUseAgreementAttachment/enums"; +import { createLandUseAgreementAttachment, deleteLandUseAgreementAttachment } from "@/landUseAgreementAttachment/actions"; type InvoicesProps = { attributes: Attributes; fields: any; diff --git a/src/landUseContract/components/sections/ConditionItemEdit.tsx b/src/landUseContract/components/sections/ConditionItemEdit.tsx index 93ccd3ad5..d0270f877 100644 --- a/src/landUseContract/components/sections/ConditionItemEdit.tsx +++ b/src/landUseContract/components/sections/ConditionItemEdit.tsx @@ -3,11 +3,11 @@ import { connect } from "react-redux"; import { formValueSelector } from "redux-form"; import { Row, Column } from "react-foundation"; import get from "lodash/get"; -import FormField from "components/form/FormField"; -import RemoveButton from "components/form/RemoveButton"; -import { getUsersPermissions } from "usersPermissions/selectors"; +import FormField from "@/components/form/FormField"; +import RemoveButton from "@/components/form/RemoveButton"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; import type { Attributes } from "types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { attributes: Attributes; disabled: boolean; diff --git a/src/landUseContract/components/sections/Conditions.tsx b/src/landUseContract/components/sections/Conditions.tsx index 73b7b804b..d113a6310 100644 --- a/src/landUseContract/components/sections/Conditions.tsx +++ b/src/landUseContract/components/sections/Conditions.tsx @@ -1,17 +1,17 @@ import React, { Fragment } from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; -import Collapse from "components/collapse/Collapse"; -import Divider from "components/content/Divider"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import { receiveCollapseStates } from "landUseContract/actions"; -import { FormNames, ViewModes } from "enums"; -import { getAttributes, getCollapseStateByKey, getCurrentLandUseContract } from "landUseContract/selectors"; +import Collapse from "@/components/collapse/Collapse"; +import Divider from "@/components/content/Divider"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import { receiveCollapseStates } from "@/landUseContract/actions"; +import { FormNames, ViewModes } from "@/enums"; +import { getAttributes, getCollapseStateByKey, getCurrentLandUseContract } from "@/landUseContract/selectors"; import type { Attributes } from "types"; -import type { LandUseContract } from "landUseContract/types"; -import { getContentConditions } from "landUseContract/helpers"; -import { getFieldOptions, getLabelOfOption, formatDate } from "util/helpers"; +import type { LandUseContract } from "@/landUseContract/types"; +import { getContentConditions } from "@/landUseContract/helpers"; +import { getFieldOptions, getLabelOfOption, formatDate } from "@/util/helpers"; type Props = { attributes: Attributes; ConditionsCollapseState: boolean; diff --git a/src/landUseContract/components/sections/ConditionsEdit.tsx b/src/landUseContract/components/sections/ConditionsEdit.tsx index 129e46ee6..e2486463f 100644 --- a/src/landUseContract/components/sections/ConditionsEdit.tsx +++ b/src/landUseContract/components/sections/ConditionsEdit.tsx @@ -3,15 +3,15 @@ import { connect } from "react-redux"; import { FieldArray, reduxForm } from "redux-form"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; -import { ButtonColors } from "components/enums"; -import FormTextTitle from "components/form/FormTextTitle"; -import AddButtonThird from "components/form/AddButtonThird"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import Collapse from "components/collapse/Collapse"; -import Divider from "components/content/Divider"; -import { receiveCollapseStates, receiveFormValidFlags } from "landUseContract/actions"; -import { FormNames, ViewModes } from "enums"; -import { getAttributes, getCollapseStateByKey, getIsSaveClicked } from "landUseContract/selectors"; +import { ButtonColors } from "@/components/enums"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import AddButtonThird from "@/components/form/AddButtonThird"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import Collapse from "@/components/collapse/Collapse"; +import Divider from "@/components/content/Divider"; +import { receiveCollapseStates, receiveFormValidFlags } from "@/landUseContract/actions"; +import { FormNames, ViewModes } from "@/enums"; +import { getAttributes, getCollapseStateByKey, getIsSaveClicked } from "@/landUseContract/selectors"; import type { Attributes } from "types"; import ConditionItemEdit from "./ConditionItemEdit"; type ConditionsProps = { diff --git a/src/landUseContract/components/sections/ContractItem.tsx b/src/landUseContract/components/sections/ContractItem.tsx index e88642838..c8aa8de9e 100644 --- a/src/landUseContract/components/sections/ContractItem.tsx +++ b/src/landUseContract/components/sections/ContractItem.tsx @@ -1,15 +1,15 @@ import React from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; -import Collapse from "components/collapse/Collapse"; -import FormTitleAndText from "components/form/FormTitleAndText"; -import { receiveCollapseStates } from "landUseContract/actions"; -import { FormNames, ViewModes } from "enums"; -import { formatDate, getLabelOfOption } from "util/helpers"; -import { getCollapseStateByKey } from "landUseContract/selectors"; +import Collapse from "@/components/collapse/Collapse"; +import FormTitleAndText from "@/components/form/FormTitleAndText"; +import { receiveCollapseStates } from "@/landUseContract/actions"; +import { FormNames, ViewModes } from "@/enums"; +import { formatDate, getLabelOfOption } from "@/util/helpers"; +import { getCollapseStateByKey } from "@/landUseContract/selectors"; import Warrants from "./Warrants"; import Changes from "./Changes"; -import type { LandUseContract } from "landUseContract/types"; +import type { LandUseContract } from "@/landUseContract/types"; type Props = { attributes: Record; collapseState: boolean; diff --git a/src/landUseContract/components/sections/ContractItemEdit.tsx b/src/landUseContract/components/sections/ContractItemEdit.tsx index 1ae07c46f..5e6d62366 100644 --- a/src/landUseContract/components/sections/ContractItemEdit.tsx +++ b/src/landUseContract/components/sections/ContractItemEdit.tsx @@ -4,26 +4,26 @@ import { FieldArray, formValueSelector } from "redux-form"; import { Row, Column } from "react-foundation"; import get from "lodash/get"; import isEmpty from "lodash/isEmpty"; -import { ButtonColors } from "components/enums"; -import FormText from "components/form/FormText"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import ActionButtonWrapper from "components/form/ActionButtonWrapper"; -import AddButtonSecondary from "components/form/AddButtonSecondary"; -import BoxContentWrapper from "components/content/BoxContentWrapper"; -import BoxItem from "components/content/BoxItem"; -import BoxItemContainer from "components/content/BoxItemContainer"; -import Collapse from "components/collapse/Collapse"; -import FormField from "components/form/FormField"; -import { receiveCollapseStates } from "landUseContract/actions"; -import RemoveButton from "components/form/RemoveButton"; -import { FormNames, ViewModes, ConfirmationModalTexts } from "enums"; -import { getLabelOfOption } from "util/helpers"; -import { getCollapseStateByKey } from "landUseContract/selectors"; -import { getFieldAttributes } from "util/helpers"; -import DecisionLink from "components/links/DecisionLink"; -import type { LandUseContract } from "landUseContract/types"; +import { ButtonColors } from "@/components/enums"; +import FormText from "@/components/form/FormText"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import ActionButtonWrapper from "@/components/form/ActionButtonWrapper"; +import AddButtonSecondary from "@/components/form/AddButtonSecondary"; +import BoxContentWrapper from "@/components/content/BoxContentWrapper"; +import BoxItem from "@/components/content/BoxItem"; +import BoxItemContainer from "@/components/content/BoxItemContainer"; +import Collapse from "@/components/collapse/Collapse"; +import FormField from "@/components/form/FormField"; +import { receiveCollapseStates } from "@/landUseContract/actions"; +import RemoveButton from "@/components/form/RemoveButton"; +import { FormNames, ViewModes, ConfirmationModalTexts } from "@/enums"; +import { getLabelOfOption } from "@/util/helpers"; +import { getCollapseStateByKey } from "@/landUseContract/selectors"; +import { getFieldAttributes } from "@/util/helpers"; +import DecisionLink from "@/components/links/DecisionLink"; +import type { LandUseContract } from "@/landUseContract/types"; import type { Attributes } from "types"; -import { getDecisionById } from "landUseContract/helpers"; +import { getDecisionById } from "@/landUseContract/helpers"; type ContractChangesProps = { attributes: Attributes; collapseState: boolean; diff --git a/src/landUseContract/components/sections/Contracts.tsx b/src/landUseContract/components/sections/Contracts.tsx index 0043acdd2..7c65a31bb 100644 --- a/src/landUseContract/components/sections/Contracts.tsx +++ b/src/landUseContract/components/sections/Contracts.tsx @@ -1,12 +1,12 @@ import React from "react"; import { connect } from "react-redux"; import ContractItem from "./ContractItem"; -import FormText from "components/form/FormText"; -import { getContentContracts } from "landUseContract/helpers"; -import { getFieldOptions } from "util/helpers"; -import { getAttributes, getCurrentLandUseContract } from "landUseContract/selectors"; +import FormText from "@/components/form/FormText"; +import { getContentContracts } from "@/landUseContract/helpers"; +import { getFieldOptions } from "@/util/helpers"; +import { getAttributes, getCurrentLandUseContract } from "@/landUseContract/selectors"; import type { Attributes } from "types"; -import type { LandUseContract } from "landUseContract/types"; +import type { LandUseContract } from "@/landUseContract/types"; type Props = { attributes: Attributes; currentLandUseContract: LandUseContract; diff --git a/src/landUseContract/components/sections/ContractsEdit.tsx b/src/landUseContract/components/sections/ContractsEdit.tsx index 44e9737b1..f1359d835 100644 --- a/src/landUseContract/components/sections/ContractsEdit.tsx +++ b/src/landUseContract/components/sections/ContractsEdit.tsx @@ -3,18 +3,18 @@ import { connect } from "react-redux"; import { FieldArray, reduxForm } from "redux-form"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import AddButton from "components/form/AddButton"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import AddButton from "@/components/form/AddButton"; import ContractItemEdit from "./ContractItemEdit"; -import { receiveFormValidFlags } from "landUseContract/actions"; -import { ConfirmationModalTexts, FormNames } from "enums"; -import { ButtonColors } from "components/enums"; -import { getContentContracts } from "landUseContract/helpers"; -import { getFieldOptions } from "util/helpers"; -import { getAttributes, getCurrentLandUseContract, getErrorsByFormName, getIsSaveClicked } from "landUseContract/selectors"; -import { getDecisionOptions } from "landUseContract/helpers"; +import { receiveFormValidFlags } from "@/landUseContract/actions"; +import { ConfirmationModalTexts, FormNames } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { getContentContracts } from "@/landUseContract/helpers"; +import { getFieldOptions } from "@/util/helpers"; +import { getAttributes, getCurrentLandUseContract, getErrorsByFormName, getIsSaveClicked } from "@/landUseContract/selectors"; +import { getDecisionOptions } from "@/landUseContract/helpers"; import type { Attributes } from "types"; -import type { LandUseContract } from "landUseContract/types"; +import type { LandUseContract } from "@/landUseContract/types"; type ContractsProps = { attributes: Attributes; contractsData: Array>; diff --git a/src/landUseContract/components/sections/CreateAndCreditInvoiceR.tsx b/src/landUseContract/components/sections/CreateAndCreditInvoiceR.tsx index 0f9bb610a..ae9c5ae0a 100644 --- a/src/landUseContract/components/sections/CreateAndCreditInvoiceR.tsx +++ b/src/landUseContract/components/sections/CreateAndCreditInvoiceR.tsx @@ -3,27 +3,27 @@ import { connect } from "react-redux"; import scrollToComponent from "react-scroll-to-component"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; -import AddButton from "components/form/AddButton"; -import Authorization from "components/authorization/Authorization"; -import Button from "components/button/Button"; +import AddButton from "@/components/form/AddButton"; +import Authorization from "@/components/authorization/Authorization"; +import Button from "@/components/button/Button"; import CreditInvoiceForm from "./forms/CreditInvoiceForm"; import NewInvoiceForm from "./forms/NewInvoiceForm"; -import { createCharge } from "landUseInvoices/actions"; -import { createInvoice, creditInvoice, deleteInvoice, receiveIsCreateClicked, receiveIsCreateInvoicePanelOpen, receiveIsCreditClicked, receiveIsCreditInvoicePanelOpen } from "landUseInvoices/actions"; -import { creditInvoiceSet } from "invoiceSets/actions"; -import { ButtonColors } from "components/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getPayloadCreditInvoice } from "invoices/helpers"; -import { getCreditInvoiceSetPayload } from "invoiceSets/helpers"; -import { getPayloadCreateInvoice } from "landUseContract/helpers"; -import { hasPermissions } from "util/helpers"; -import { getCurrentLandUseContract } from "landUseContract/selectors"; -import { getIsCreateInvoicePanelOpen, getIsCreditInvoicePanelOpen, getInvoicesByLandUseContractId } from "landUseInvoices/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import { AppConsumer, ActionTypes } from "app/AppContext"; -import { ConfirmationModalTexts } from "enums"; -import type { LandUseContract } from "landUseInvoices/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import { createCharge } from "@/landUseInvoices/actions"; +import { createInvoice, creditInvoice, deleteInvoice, receiveIsCreateClicked, receiveIsCreateInvoicePanelOpen, receiveIsCreditClicked, receiveIsCreditInvoicePanelOpen } from "@/landUseInvoices/actions"; +import { creditInvoiceSet } from "@/invoiceSets/actions"; +import { ButtonColors } from "@/components/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getPayloadCreditInvoice } from "@/invoices/helpers"; +import { getCreditInvoiceSetPayload } from "@/invoiceSets/helpers"; +import { getPayloadCreateInvoice } from "@/landUseContract/helpers"; +import { hasPermissions } from "@/util/helpers"; +import { getCurrentLandUseContract } from "@/landUseContract/selectors"; +import { getIsCreateInvoicePanelOpen, getIsCreditInvoicePanelOpen, getInvoicesByLandUseContractId } from "@/landUseInvoices/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import { AppConsumer, ActionTypes } from "@/app/AppContext"; +import { ConfirmationModalTexts } from "@/enums"; +import type { LandUseContract } from "@/landUseInvoices/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { createCharge: (...args: Array) => any; createInvoice: (...args: Array) => any; diff --git a/src/landUseContract/components/sections/DecisionConditions.tsx b/src/landUseContract/components/sections/DecisionConditions.tsx index 3e0f21c3d..d57adb2da 100644 --- a/src/landUseContract/components/sections/DecisionConditions.tsx +++ b/src/landUseContract/components/sections/DecisionConditions.tsx @@ -2,17 +2,17 @@ import React from "react"; import { Row, Column } from "react-foundation"; import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; -import BoxItem from "components/content/BoxItem"; -import BoxItemContainer from "components/content/BoxItemContainer"; -import Collapse from "components/collapse/Collapse"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import FormTitleAndText from "components/form/FormTitleAndText"; -import { receiveCollapseStates } from "landUseContract/actions"; -import { FormNames, ViewModes } from "enums"; -import { formatDate, getFieldOptions, getLabelOfOption } from "util/helpers"; -import { getCollapseStateByKey } from "landUseContract/selectors"; -import { withWindowResize } from "components/resize/WindowResizeHandler"; +import BoxItem from "@/components/content/BoxItem"; +import BoxItemContainer from "@/components/content/BoxItemContainer"; +import Collapse from "@/components/collapse/Collapse"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import FormTitleAndText from "@/components/form/FormTitleAndText"; +import { receiveCollapseStates } from "@/landUseContract/actions"; +import { FormNames, ViewModes } from "@/enums"; +import { formatDate, getFieldOptions, getLabelOfOption } from "@/util/helpers"; +import { getCollapseStateByKey } from "@/landUseContract/selectors"; +import { withWindowResize } from "@/components/resize/WindowResizeHandler"; import type { Attributes } from "types"; type Props = { attributes: Attributes; diff --git a/src/landUseContract/components/sections/DecisionItem.tsx b/src/landUseContract/components/sections/DecisionItem.tsx index 7eee1ca1f..05e42bea7 100644 --- a/src/landUseContract/components/sections/DecisionItem.tsx +++ b/src/landUseContract/components/sections/DecisionItem.tsx @@ -1,14 +1,14 @@ import React from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; -import Collapse from "components/collapse/Collapse"; +import Collapse from "@/components/collapse/Collapse"; import DecisionConditions from "./DecisionConditions"; -import ExternalLink from "components/links/ExternalLink"; -import FormTitleAndText from "components/form/FormTitleAndText"; -import { receiveCollapseStates } from "landUseContract/actions"; -import { FormNames, ViewModes } from "enums"; -import { formatDate, getFieldOptions, getLabelOfOption, getReferenceNumberLink } from "util/helpers"; -import { getCollapseStateByKey } from "landUseContract/selectors"; +import ExternalLink from "@/components/links/ExternalLink"; +import FormTitleAndText from "@/components/form/FormTitleAndText"; +import { receiveCollapseStates } from "@/landUseContract/actions"; +import { FormNames, ViewModes } from "@/enums"; +import { formatDate, getFieldOptions, getLabelOfOption, getReferenceNumberLink } from "@/util/helpers"; +import { getCollapseStateByKey } from "@/landUseContract/selectors"; import type { Attributes } from "types"; type Props = { attributes: Attributes; diff --git a/src/landUseContract/components/sections/DecisionItemEdit.tsx b/src/landUseContract/components/sections/DecisionItemEdit.tsx index 8a8251863..84d672b5c 100644 --- a/src/landUseContract/components/sections/DecisionItemEdit.tsx +++ b/src/landUseContract/components/sections/DecisionItemEdit.tsx @@ -5,24 +5,24 @@ import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; import get from "lodash/get"; import isEmpty from "lodash/isEmpty"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import ActionButtonWrapper from "components/form/ActionButtonWrapper"; -import AddButtonSecondary from "components/form/AddButtonSecondary"; -import BoxContentWrapper from "components/content/BoxContentWrapper"; -import BoxItem from "components/content/BoxItem"; -import BoxItemContainer from "components/content/BoxItemContainer"; -import Collapse from "components/collapse/Collapse"; -import FieldAndRemoveButtonWrapper from "components/form/FieldAndRemoveButtonWrapper"; -import FormField from "components/form/FormField"; -import FormTextTitle from "components/form/FormTextTitle"; -import RemoveButton from "components/form/RemoveButton"; -import { receiveCollapseStates } from "landUseContract/actions"; -import { ConfirmationModalTexts, FieldTypes, FormNames, ViewModes } from "enums"; -import { ButtonColors } from "components/enums"; -import { getFieldAttributes, getFieldOptions, getLabelOfOption, isFieldRequired } from "util/helpers"; -import { getCollapseStateByKey } from "landUseContract/selectors"; -import { referenceNumber } from "components/form/validations"; -import { withWindowResize } from "components/resize/WindowResizeHandler"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import ActionButtonWrapper from "@/components/form/ActionButtonWrapper"; +import AddButtonSecondary from "@/components/form/AddButtonSecondary"; +import BoxContentWrapper from "@/components/content/BoxContentWrapper"; +import BoxItem from "@/components/content/BoxItem"; +import BoxItemContainer from "@/components/content/BoxItemContainer"; +import Collapse from "@/components/collapse/Collapse"; +import FieldAndRemoveButtonWrapper from "@/components/form/FieldAndRemoveButtonWrapper"; +import FormField from "@/components/form/FormField"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import RemoveButton from "@/components/form/RemoveButton"; +import { receiveCollapseStates } from "@/landUseContract/actions"; +import { ConfirmationModalTexts, FieldTypes, FormNames, ViewModes } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { getFieldAttributes, getFieldOptions, getLabelOfOption, isFieldRequired } from "@/util/helpers"; +import { getCollapseStateByKey } from "@/landUseContract/selectors"; +import { referenceNumber } from "@/components/form/validations"; +import { withWindowResize } from "@/components/resize/WindowResizeHandler"; import type { Attributes } from "types"; type DecisionConditionsProps = { attributes: Attributes; diff --git a/src/landUseContract/components/sections/Decisions.tsx b/src/landUseContract/components/sections/Decisions.tsx index c835c9f74..e34d5b026 100644 --- a/src/landUseContract/components/sections/Decisions.tsx +++ b/src/landUseContract/components/sections/Decisions.tsx @@ -1,10 +1,10 @@ import React from "react"; import { connect } from "react-redux"; import DecisionItem from "./DecisionItem"; -import { getContentDecisions } from "landUseContract/helpers"; -import { getAttributes, getCurrentLandUseContract } from "landUseContract/selectors"; +import { getContentDecisions } from "@/landUseContract/helpers"; +import { getAttributes, getCurrentLandUseContract } from "@/landUseContract/selectors"; import type { Attributes } from "types"; -import type { LandUseContract } from "landUseContract/types"; +import type { LandUseContract } from "@/landUseContract/types"; type Props = { attributes: Attributes; currentLandUseContract: LandUseContract; diff --git a/src/landUseContract/components/sections/DecisionsEdit.tsx b/src/landUseContract/components/sections/DecisionsEdit.tsx index ce3da30a6..534babd44 100644 --- a/src/landUseContract/components/sections/DecisionsEdit.tsx +++ b/src/landUseContract/components/sections/DecisionsEdit.tsx @@ -3,16 +3,16 @@ import { connect } from "react-redux"; import { FieldArray, getFormValues, reduxForm } from "redux-form"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import AddButton from "components/form/AddButton"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import AddButton from "@/components/form/AddButton"; import DecisionItemEdit from "./DecisionItemEdit"; -import { receiveFormValidFlags } from "landUseContract/actions"; -import { ConfirmationModalTexts, FormNames } from "enums"; -import { ButtonColors } from "components/enums"; -import { getContentDecisions } from "landUseContract/helpers"; -import { getAttributes, getCurrentLandUseContract, getErrorsByFormName, getIsSaveClicked } from "landUseContract/selectors"; +import { receiveFormValidFlags } from "@/landUseContract/actions"; +import { ConfirmationModalTexts, FormNames } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { getContentDecisions } from "@/landUseContract/helpers"; +import { getAttributes, getCurrentLandUseContract, getErrorsByFormName, getIsSaveClicked } from "@/landUseContract/selectors"; import type { Attributes } from "types"; -import type { LandUseContract } from "landUseContract/types"; +import type { LandUseContract } from "@/landUseContract/types"; type DecisionsProps = { attributes: Attributes; decisionsData: Array>; diff --git a/src/landUseContract/components/sections/InvoiceNotesR.tsx b/src/landUseContract/components/sections/InvoiceNotesR.tsx index 8463e1a4a..8ec030a89 100644 --- a/src/landUseContract/components/sections/InvoiceNotesR.tsx +++ b/src/landUseContract/components/sections/InvoiceNotesR.tsx @@ -3,27 +3,27 @@ import { Row, Column } from "react-foundation"; import { connect } from "react-redux"; import { FieldArray, formValueSelector, reduxForm } from "redux-form"; import flowRight from "lodash/flowRight"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import AddButton from "components/form/AddButton"; -import Authorization from "components/authorization/Authorization"; -import Button from "components/button/Button"; -import ButtonWrapper from "components/content/ButtonWrapper"; -import FieldAndRemoveButtonWrapper from "components/form/FieldAndRemoveButtonWrapper"; -import FormField from "components/form/FormField"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import ListItem from "components/content/ListItem"; -import ListItems from "components/content/ListItems"; -import RemoveButton from "components/form/RemoveButton"; -import { patchLeaseInvoiceNotes } from "leases/actions"; -import { ConfirmationModalTexts, FieldTypes, FormNames, Methods } from "enums"; -import { ButtonColors } from "components/enums"; -import { InvoiceNoteFieldPaths, InvoiceNoteFieldTitles } from "invoiceNote/enums"; -import { formatDate, getFieldAttributes, isFieldAllowedToRead, isMethodAllowed } from "util/helpers"; -import { getAttributes as getInvoiceNoteAttributes, getMethods as getInvoiceNoteMethods } from "invoiceNote/selectors"; -import { getCurrentLease } from "leases/selectors"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import AddButton from "@/components/form/AddButton"; +import Authorization from "@/components/authorization/Authorization"; +import Button from "@/components/button/Button"; +import ButtonWrapper from "@/components/content/ButtonWrapper"; +import FieldAndRemoveButtonWrapper from "@/components/form/FieldAndRemoveButtonWrapper"; +import FormField from "@/components/form/FormField"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import ListItem from "@/components/content/ListItem"; +import ListItems from "@/components/content/ListItems"; +import RemoveButton from "@/components/form/RemoveButton"; +import { patchLeaseInvoiceNotes } from "@/leases/actions"; +import { ConfirmationModalTexts, FieldTypes, FormNames, Methods } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { InvoiceNoteFieldPaths, InvoiceNoteFieldTitles } from "@/invoiceNote/enums"; +import { formatDate, getFieldAttributes, isFieldAllowedToRead, isMethodAllowed } from "@/util/helpers"; +import { getAttributes as getInvoiceNoteAttributes, getMethods as getInvoiceNoteMethods } from "@/invoiceNote/selectors"; +import { getCurrentLease } from "@/leases/selectors"; import type { Attributes, Methods as MethodsType } from "types"; -import type { Lease } from "leases/types"; +import type { Lease } from "@/leases/types"; type ReadOnlyProps = { invoiceNoteAttributes: Attributes; invoiceNotes: Array>; diff --git a/src/landUseContract/components/sections/InvoicePanelR.tsx b/src/landUseContract/components/sections/InvoicePanelR.tsx index 8aff982a4..522da1025 100644 --- a/src/landUseContract/components/sections/InvoicePanelR.tsx +++ b/src/landUseContract/components/sections/InvoicePanelR.tsx @@ -2,19 +2,19 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import { getFormValues, isValid } from "redux-form"; import isEmpty from "lodash/isEmpty"; -import Authorization from "components/authorization/Authorization"; -import Button from "components/button/Button"; +import Authorization from "@/components/authorization/Authorization"; +import Button from "@/components/button/Button"; import EditInvoiceForm from "./forms/EditInvoiceForm"; import InvoiceTemplateR from "./InvoiceTemplateR"; -import TablePanelContainer from "components/table/TablePanelContainer"; -import { receiveIsEditClicked } from "invoices/actions"; -import { FormNames, Methods } from "enums"; -import { ButtonColors } from "components/enums"; -import { isMethodAllowed } from "util/helpers"; -import { getInvoicesByLandUseContractId, getIsEditClicked, getMethods as getInvoiceMethods } from "landUseInvoices/selectors"; -import { getCurrentLandUseContract } from "landUseContract/selectors"; +import TablePanelContainer from "@/components/table/TablePanelContainer"; +import { receiveIsEditClicked } from "@/invoices/actions"; +import { FormNames, Methods } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { isMethodAllowed } from "@/util/helpers"; +import { getInvoicesByLandUseContractId, getIsEditClicked, getMethods as getInvoiceMethods } from "@/landUseInvoices/selectors"; +import { getCurrentLandUseContract } from "@/landUseContract/selectors"; import type { Methods as MethodsType } from "types"; -import type { Invoice, InvoiceList } from "invoices/types"; +import type { Invoice, InvoiceList } from "@/invoices/types"; type Props = { formValues: Record; invoice: Invoice | null | undefined; diff --git a/src/landUseContract/components/sections/InvoiceTableAndPanelR.tsx b/src/landUseContract/components/sections/InvoiceTableAndPanelR.tsx index 1aec18c4b..b638d3393 100644 --- a/src/landUseContract/components/sections/InvoiceTableAndPanelR.tsx +++ b/src/landUseContract/components/sections/InvoiceTableAndPanelR.tsx @@ -4,26 +4,26 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import { withRouter } from "react-router"; import { initialize } from "redux-form"; -import AmountWithVat from "components/vat/AmountWithVat"; -import FormText from "components/form/FormText"; +import AmountWithVat from "@/components/vat/AmountWithVat"; +import FormText from "@/components/form/FormText"; import InvoicePanelR from "./InvoicePanelR"; -import SingleRadioInput from "components/inputs/SingleRadioInput"; -import SortableTable from "components/table/SortableTable"; -import TableAndPanelWrapper from "components/table/TableAndPanelWrapper"; -import { clearPatchedInvoice, patchInvoice } from "landUseInvoices/actions"; -import { FormNames, KeyCodes, TableSortOrder } from "enums"; -import { getCurrentLandUseContract } from "landUseContract/selectors"; -import { InvoiceFieldPaths, InvoiceFieldTitles, InvoiceRowsFieldPaths, InvoiceRowsFieldTitles, InvoiceType } from "landUseInvoices/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getContactFullName } from "contacts/helpers"; -import { formatReceivableTypesString, getContentIncoive, getContentInvoices, getPayloadEditInvoice, isInvoiceOverdue } from "landUseInvoices/helpers"; -import { findReactById, formatDate, getFieldOptions, getLabelOfOption, hasPermissions, isFieldAllowedToRead, sortByOptionsAsc, sortByOptionsDesc, sortNumberByKeyAsc, sortNumberByKeyDesc, sortStringAsc, sortStringDesc } from "util/helpers"; -import { getAttributes as getInvoiceAttributes, getPatchedInvoice } from "landUseInvoices/selectors"; -import { getInvoicesByLandUseContractId } from "landUseInvoices/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import type { Invoice, InvoiceList } from "invoices/types"; +import SingleRadioInput from "@/components/inputs/SingleRadioInput"; +import SortableTable from "@/components/table/SortableTable"; +import TableAndPanelWrapper from "@/components/table/TableAndPanelWrapper"; +import { clearPatchedInvoice, patchInvoice } from "@/landUseInvoices/actions"; +import { FormNames, KeyCodes, TableSortOrder } from "@/enums"; +import { getCurrentLandUseContract } from "@/landUseContract/selectors"; +import { InvoiceFieldPaths, InvoiceFieldTitles, InvoiceRowsFieldPaths, InvoiceRowsFieldTitles, InvoiceType } from "@/landUseInvoices/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getContactFullName } from "@/contacts/helpers"; +import { formatReceivableTypesString, getContentIncoive, getContentInvoices, getPayloadEditInvoice, isInvoiceOverdue } from "@/landUseInvoices/helpers"; +import { findReactById, formatDate, getFieldOptions, getLabelOfOption, hasPermissions, isFieldAllowedToRead, sortByOptionsAsc, sortByOptionsDesc, sortNumberByKeyAsc, sortNumberByKeyDesc, sortStringAsc, sortStringDesc } from "@/util/helpers"; +import { getAttributes as getInvoiceAttributes, getPatchedInvoice } from "@/landUseInvoices/selectors"; +import { getInvoicesByLandUseContractId } from "@/landUseInvoices/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import type { Invoice, InvoiceList } from "@/invoices/types"; import type { Attributes } from "types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { clearPatchedInvoice: (...args: Array) => any; initialize: (...args: Array) => any; diff --git a/src/landUseContract/components/sections/InvoiceTemplateR.tsx b/src/landUseContract/components/sections/InvoiceTemplateR.tsx index 25847b816..7bae9339c 100644 --- a/src/landUseContract/components/sections/InvoiceTemplateR.tsx +++ b/src/landUseContract/components/sections/InvoiceTemplateR.tsx @@ -2,19 +2,19 @@ import React, { Fragment } from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; -import AmountWithVat from "components/vat/AmountWithVat"; -import Authorization from "components/authorization/Authorization"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; +import AmountWithVat from "@/components/vat/AmountWithVat"; +import Authorization from "@/components/authorization/Authorization"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; import InvoiceRows from "./forms/InvoiceRows"; -import ListItem from "components/content/ListItem"; -import ListItems from "components/content/ListItems"; -import SubTitle from "components/content/SubTitle"; -import { InvoiceCreditInvoicesFieldPaths, InvoiceCreditInvoicesFieldTitles, InvoiceFieldPaths, InvoiceFieldTitles, InvoiceInterestInvoicesFieldPaths, InvoiceInterestInvoicesFieldTitles, InvoicePaymentsFieldPaths, InvoicePaymentsFieldTitles, InvoiceRowsFieldPaths, InvoiceType } from "invoices/enums"; -import { getUiDataInvoiceKey } from "uiData/helpers"; -import { formatDate, formatDateRange, formatNumber, getFieldOptions, getLabelOfOption, isEmptyValue, isFieldAllowedToRead } from "util/helpers"; -import { getContactFullName } from "contacts/helpers"; -import { getAttributes as getInvoiceAttributes } from "invoices/selectors"; +import ListItem from "@/components/content/ListItem"; +import ListItems from "@/components/content/ListItems"; +import SubTitle from "@/components/content/SubTitle"; +import { InvoiceCreditInvoicesFieldPaths, InvoiceCreditInvoicesFieldTitles, InvoiceFieldPaths, InvoiceFieldTitles, InvoiceInterestInvoicesFieldPaths, InvoiceInterestInvoicesFieldTitles, InvoicePaymentsFieldPaths, InvoicePaymentsFieldTitles, InvoiceRowsFieldPaths, InvoiceType } from "@/invoices/enums"; +import { getUiDataInvoiceKey } from "@/uiData/helpers"; +import { formatDate, formatDateRange, formatNumber, getFieldOptions, getLabelOfOption, isEmptyValue, isFieldAllowedToRead } from "@/util/helpers"; +import { getContactFullName } from "@/contacts/helpers"; +import { getAttributes as getInvoiceAttributes } from "@/invoices/selectors"; import type { Attributes } from "types"; type Props = { creditedInvoice: Record | null | undefined; diff --git a/src/landUseContract/components/sections/Invoices.tsx b/src/landUseContract/components/sections/Invoices.tsx index 6a7616a3b..ab7d9fdd4 100644 --- a/src/landUseContract/components/sections/Invoices.tsx +++ b/src/landUseContract/components/sections/Invoices.tsx @@ -1,14 +1,14 @@ import React from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; -import FormTextTitle from "components/form/FormTextTitle"; -import GreenBox from "components/content/GreenBox"; -import ListItem from "components/content/ListItem"; -import ListItems from "components/content/ListItems"; -import { getContentInvoices } from "landUseContract/helpers"; -import { formatDate, formatNumber } from "util/helpers"; -import { getCurrentLandUseContract } from "landUseContract/selectors"; -import type { LandUseContract } from "landUseContract/types"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import GreenBox from "@/components/content/GreenBox"; +import ListItem from "@/components/content/ListItem"; +import ListItems from "@/components/content/ListItems"; +import { getContentInvoices } from "@/landUseContract/helpers"; +import { formatDate, formatNumber } from "@/util/helpers"; +import { getCurrentLandUseContract } from "@/landUseContract/selectors"; +import type { LandUseContract } from "@/landUseContract/types"; type Props = { currentLandUseContract: LandUseContract; }; diff --git a/src/landUseContract/components/sections/InvoicesEdit.tsx b/src/landUseContract/components/sections/InvoicesEdit.tsx index ebce43c99..811b508cc 100644 --- a/src/landUseContract/components/sections/InvoicesEdit.tsx +++ b/src/landUseContract/components/sections/InvoicesEdit.tsx @@ -4,17 +4,17 @@ import { FieldArray, reduxForm } from "redux-form"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; import get from "lodash/get"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import AddButtonThird from "components/form/AddButtonThird"; -import FieldAndRemoveButtonWrapper from "components/form/FieldAndRemoveButtonWrapper"; -import FormField from "components/form/FormField"; -import FormTextTitle from "components/form/FormTextTitle"; -import GreenBox from "components/content/GreenBox"; -import RemoveButton from "../../../components/form/RemoveButton"; -import { receiveFormValidFlags } from "landUseContract/actions"; -import { ConfirmationModalTexts, FormNames } from "enums"; -import { ButtonColors } from "components/enums"; -import { getAttributes, getIsSaveClicked } from "landUseContract/selectors"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import AddButtonThird from "@/components/form/AddButtonThird"; +import FieldAndRemoveButtonWrapper from "@/components/form/FieldAndRemoveButtonWrapper"; +import FormField from "@/components/form/FormField"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import GreenBox from "@/components/content/GreenBox"; +import RemoveButton from "@/../../components/form/RemoveButton"; +import { receiveFormValidFlags } from "@/landUseContract/actions"; +import { ConfirmationModalTexts, FormNames } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { getAttributes, getIsSaveClicked } from "@/landUseContract/selectors"; import type { Attributes } from "types"; type InvoicesProps = { attributes: Attributes; diff --git a/src/landUseContract/components/sections/InvoicesR.tsx b/src/landUseContract/components/sections/InvoicesR.tsx index 6eefd1c59..3cfb96e36 100644 --- a/src/landUseContract/components/sections/InvoicesR.tsx +++ b/src/landUseContract/components/sections/InvoicesR.tsx @@ -3,25 +3,25 @@ import { connect } from "react-redux"; import { withRouter } from "react-router"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; -import { AppConsumer } from "app/AppContext"; -import Authorization from "components/authorization/Authorization"; -import AuthorizationError from "components/authorization/AuthorizationError"; -import Collapse from "components/collapse/Collapse"; +import { AppConsumer } from "@/app/AppContext"; +import Authorization from "@/components/authorization/Authorization"; +import AuthorizationError from "@/components/authorization/AuthorizationError"; +import Collapse from "@/components/collapse/Collapse"; import CreateAndCreditInvoiceR from "./CreateAndCreditInvoiceR"; -import Divider from "components/content/Divider"; +import Divider from "@/components/content/Divider"; import InvoiceTableAndPanelR from "./InvoiceTableAndPanelR"; -import Title from "components/content/Title"; -import { receiveCollapseStates, receiveInvoiceToCredit } from "landUseInvoices/actions"; -import { PermissionMissingTexts, ViewModes } from "enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { hasPermissions } from "util/helpers"; -import { LeaseInvoicingFieldTitles } from "leases/enums"; +import Title from "@/components/content/Title"; +import { receiveCollapseStates, receiveInvoiceToCredit } from "@/landUseInvoices/actions"; +import { PermissionMissingTexts, ViewModes } from "@/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { hasPermissions } from "@/util/helpers"; +import { LeaseInvoicingFieldTitles } from "@/leases/enums"; // TODO -import { getCurrentLandUseContract } from "landUseContract/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import type { LandUseContract } from "landUseContract/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; -import { getInvoiceToCredit } from "landUseInvoices/selectors"; +import { getCurrentLandUseContract } from "@/landUseContract/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import type { LandUseContract } from "@/landUseContract/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; +import { getInvoiceToCredit } from "@/landUseInvoices/selectors"; type Props = { currentLandUseContract: LandUseContract; invoicesCollapseState: boolean; diff --git a/src/landUseContract/components/sections/LandUseContractMap.tsx b/src/landUseContract/components/sections/LandUseContractMap.tsx index 8f59ce25c..eabbf69cf 100644 --- a/src/landUseContract/components/sections/LandUseContractMap.tsx +++ b/src/landUseContract/components/sections/LandUseContractMap.tsx @@ -2,16 +2,16 @@ import React, { Component } from "react"; import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; -import AreaNotesEditMap from "areaNote/components/AreaNotesEditMap"; -import AreaNotesLayer from "areaNote/components/AreaNotesLayer"; -import { fetchAreaNoteList } from "areaNote/actions"; -import { UsersPermissions } from "usersPermissions/enums"; -import { hasPermissions } from "util/helpers"; -import { getAreaNoteList } from "areaNote/selectors"; -import { getAttributes as getRentBasisAttributes, getRentBasis } from "rentbasis/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import type { AreaNoteList } from "areaNote/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import AreaNotesEditMap from "@/areaNote/components/AreaNotesEditMap"; +import AreaNotesLayer from "@/areaNote/components/AreaNotesLayer"; +import { fetchAreaNoteList } from "@/areaNote/actions"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { hasPermissions } from "@/util/helpers"; +import { getAreaNoteList } from "@/areaNote/selectors"; +import { getAttributes as getRentBasisAttributes, getRentBasis } from "@/rentbasis/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import type { AreaNoteList } from "@/areaNote/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { areaNotes: AreaNoteList; fetchAreaNoteList: (...args: Array) => any; diff --git a/src/landUseContract/components/sections/Litigant.tsx b/src/landUseContract/components/sections/Litigant.tsx index defc42aa9..ec267bd2c 100644 --- a/src/landUseContract/components/sections/Litigant.tsx +++ b/src/landUseContract/components/sections/Litigant.tsx @@ -2,15 +2,15 @@ import React, { Fragment } from "react"; import { connect } from "react-redux"; import get from "lodash/get"; import { Column } from "react-foundation"; -import Collapse from "components/collapse/Collapse"; -import CollapseHeaderSubtitle from "components/collapse/CollapseHeaderSubtitle"; +import Collapse from "@/components/collapse/Collapse"; +import CollapseHeaderSubtitle from "@/components/collapse/CollapseHeaderSubtitle"; import LitigantBillingPerson from "./LitigantBillingPerson"; import LitigantItem from "./LitigantItem"; -import { receiveCollapseStates } from "landUseContract/actions"; -import { FormNames, ViewModes } from "enums"; -import { getContactFullName } from "contacts/helpers"; -import { formatDateRange, isActive, isArchived } from "util/helpers"; -import { getCollapseStateByKey } from "landUseContract/selectors"; +import { receiveCollapseStates } from "@/landUseContract/actions"; +import { FormNames, ViewModes } from "@/enums"; +import { getContactFullName } from "@/contacts/helpers"; +import { formatDateRange, isActive, isArchived } from "@/util/helpers"; +import { getCollapseStateByKey } from "@/landUseContract/selectors"; type Props = { collapseState: boolean; litigant: Record; diff --git a/src/landUseContract/components/sections/LitigantBillingPerson.tsx b/src/landUseContract/components/sections/LitigantBillingPerson.tsx index 11d3b6bf8..39fd929c4 100644 --- a/src/landUseContract/components/sections/LitigantBillingPerson.tsx +++ b/src/landUseContract/components/sections/LitigantBillingPerson.tsx @@ -1,21 +1,21 @@ import React, { Fragment } from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; -import Collapse from "components/collapse/Collapse"; -import CollapseHeaderSubtitle from "components/collapse/CollapseHeaderSubtitle"; -import ContactTemplate from "contacts/components/templates/ContactTemplate"; -import ExternalLink from "components/links/ExternalLink"; -import FormTitleAndText from "components/form/FormTitleAndText"; -import FormWrapper from "components/form/FormWrapper"; -import FormWrapperLeft from "components/form/FormWrapperLeft"; -import FormWrapperRight from "components/form/FormWrapperRight"; -import SubTitle from "components/content/SubTitle"; -import { receiveCollapseStates } from "landUseContract/actions"; -import { FormNames, ViewModes } from "enums"; -import { getContactFullName } from "contacts/helpers"; -import { formatDate, formatDateRange, isActive, isArchived } from "util/helpers"; -import { getRouteById, Routes } from "root/routes"; -import { getCollapseStateByKey } from "landUseContract/selectors"; +import Collapse from "@/components/collapse/Collapse"; +import CollapseHeaderSubtitle from "@/components/collapse/CollapseHeaderSubtitle"; +import ContactTemplate from "@/contacts/components/templates/ContactTemplate"; +import ExternalLink from "@/components/links/ExternalLink"; +import FormTitleAndText from "@/components/form/FormTitleAndText"; +import FormWrapper from "@/components/form/FormWrapper"; +import FormWrapperLeft from "@/components/form/FormWrapperLeft"; +import FormWrapperRight from "@/components/form/FormWrapperRight"; +import SubTitle from "@/components/content/SubTitle"; +import { receiveCollapseStates } from "@/landUseContract/actions"; +import { FormNames, ViewModes } from "@/enums"; +import { getContactFullName } from "@/contacts/helpers"; +import { formatDate, formatDateRange, isActive, isArchived } from "@/util/helpers"; +import { getRouteById, Routes } from "@/root/routes"; +import { getCollapseStateByKey } from "@/landUseContract/selectors"; type Props = { billingPerson: Record; collapseState: boolean; diff --git a/src/landUseContract/components/sections/LitigantBillingPersonEdit.tsx b/src/landUseContract/components/sections/LitigantBillingPersonEdit.tsx index eb8a0c9fd..145400181 100644 --- a/src/landUseContract/components/sections/LitigantBillingPersonEdit.tsx +++ b/src/landUseContract/components/sections/LitigantBillingPersonEdit.tsx @@ -4,22 +4,22 @@ import { Row, Column } from "react-foundation"; import { connect } from "react-redux"; import get from "lodash/get"; import isEmpty from "lodash/isEmpty"; -import AddButtonThird from "components/form/AddButtonThird"; -import BoxContentWrapper from "components/content/BoxContentWrapper"; -import Collapse from "components/collapse/Collapse"; -import CollapseHeaderSubtitle from "components/collapse/CollapseHeaderSubtitle"; -import ContactTemplate from "contacts/components/templates/ContactTemplate"; -import EditButton from "components/form/EditButton"; -import FormField from "components/form/FormField"; -import FormWrapper from "components/form/FormWrapper"; -import FormWrapperLeft from "components/form/FormWrapperLeft"; -import FormWrapperRight from "components/form/FormWrapperRight"; -import SubTitle from "components/content/SubTitle"; -import { initializeContactForm, receiveContactModalSettings, receiveIsSaveClicked, showContactModal } from "contacts/actions"; -import { receiveCollapseStates } from "landUseContract/actions"; -import { FieldTypes, FormNames, ViewModes } from "enums"; -import { findItemById, formatDateRange, getFieldAttributes, isActive, isArchived } from "util/helpers"; -import { getAttributes, getCollapseStateByKey, getErrorsByFormName, getIsSaveClicked } from "landUseContract/selectors"; +import AddButtonThird from "@/components/form/AddButtonThird"; +import BoxContentWrapper from "@/components/content/BoxContentWrapper"; +import Collapse from "@/components/collapse/Collapse"; +import CollapseHeaderSubtitle from "@/components/collapse/CollapseHeaderSubtitle"; +import ContactTemplate from "@/contacts/components/templates/ContactTemplate"; +import EditButton from "@/components/form/EditButton"; +import FormField from "@/components/form/FormField"; +import FormWrapper from "@/components/form/FormWrapper"; +import FormWrapperLeft from "@/components/form/FormWrapperLeft"; +import FormWrapperRight from "@/components/form/FormWrapperRight"; +import SubTitle from "@/components/content/SubTitle"; +import { initializeContactForm, receiveContactModalSettings, receiveIsSaveClicked, showContactModal } from "@/contacts/actions"; +import { receiveCollapseStates } from "@/landUseContract/actions"; +import { FieldTypes, FormNames, ViewModes } from "@/enums"; +import { findItemById, formatDateRange, getFieldAttributes, isActive, isArchived } from "@/util/helpers"; +import { getAttributes, getCollapseStateByKey, getErrorsByFormName, getIsSaveClicked } from "@/landUseContract/selectors"; import type { Attributes } from "types"; type Props = { attributes: Attributes; diff --git a/src/landUseContract/components/sections/LitigantItem.tsx b/src/landUseContract/components/sections/LitigantItem.tsx index 9327ce8fc..16600cb89 100644 --- a/src/landUseContract/components/sections/LitigantItem.tsx +++ b/src/landUseContract/components/sections/LitigantItem.tsx @@ -1,16 +1,16 @@ import React, { Fragment } from "react"; import { Row, Column } from "react-foundation"; import get from "lodash/get"; -import ContactTemplate from "contacts/components/templates/ContactTemplate"; -import ExternalLink from "components/links/ExternalLink"; -import FormTitleAndText from "components/form/FormTitleAndText"; -import FormWrapper from "components/form/FormWrapper"; -import FormWrapperLeft from "components/form/FormWrapperLeft"; -import FormWrapperRight from "components/form/FormWrapperRight"; -import SubTitle from "components/content/SubTitle"; -import { getContactFullName } from "contacts/helpers"; -import { formatDate } from "util/helpers"; -import { getRouteById, Routes } from "root/routes"; +import ContactTemplate from "@/contacts/components/templates/ContactTemplate"; +import ExternalLink from "@/components/links/ExternalLink"; +import FormTitleAndText from "@/components/form/FormTitleAndText"; +import FormWrapper from "@/components/form/FormWrapper"; +import FormWrapperLeft from "@/components/form/FormWrapperLeft"; +import FormWrapperRight from "@/components/form/FormWrapperRight"; +import SubTitle from "@/components/content/SubTitle"; +import { getContactFullName } from "@/contacts/helpers"; +import { formatDate } from "@/util/helpers"; +import { getRouteById, Routes } from "@/root/routes"; type Props = { contact: Record | null | undefined; litigant: Record; diff --git a/src/landUseContract/components/sections/LitigantItemEdit.tsx b/src/landUseContract/components/sections/LitigantItemEdit.tsx index d91a37970..e4858f5cb 100644 --- a/src/landUseContract/components/sections/LitigantItemEdit.tsx +++ b/src/landUseContract/components/sections/LitigantItemEdit.tsx @@ -4,26 +4,26 @@ import { FieldArray, formValueSelector } from "redux-form"; import { Row, Column } from "react-foundation"; import get from "lodash/get"; import isEmpty from "lodash/isEmpty"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import AddButtonSecondary from "components/form/AddButtonSecondary"; -import AddButtonThird from "components/form/AddButtonThird"; -import BoxContentWrapper from "components/content/BoxContentWrapper"; -import Collapse from "components/collapse/Collapse"; -import ContactTemplate from "contacts/components/templates/ContactTemplate"; -import EditButton from "components/form/EditButton"; -import FormField from "components/form/FormField"; -import FormWrapper from "components/form/FormWrapper"; -import FormWrapperLeft from "components/form/FormWrapperLeft"; -import FormWrapperRight from "components/form/FormWrapperRight"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import AddButtonSecondary from "@/components/form/AddButtonSecondary"; +import AddButtonThird from "@/components/form/AddButtonThird"; +import BoxContentWrapper from "@/components/content/BoxContentWrapper"; +import Collapse from "@/components/collapse/Collapse"; +import ContactTemplate from "@/contacts/components/templates/ContactTemplate"; +import EditButton from "@/components/form/EditButton"; +import FormField from "@/components/form/FormField"; +import FormWrapper from "@/components/form/FormWrapper"; +import FormWrapperLeft from "@/components/form/FormWrapperLeft"; +import FormWrapperRight from "@/components/form/FormWrapperRight"; import LitigantBillingPersonEdit from "./LitigantBillingPersonEdit"; -import SubTitle from "components/content/SubTitle"; -import { initializeContactForm, receiveContactModalSettings, receiveIsSaveClicked, showContactModal } from "contacts/actions"; -import { receiveCollapseStates } from "landUseContract/actions"; -import { ConfirmationModalTexts, FieldTypes, FormNames, ViewModes } from "enums"; -import { ButtonColors } from "components/enums"; -import { getContactFullName } from "contacts/helpers"; -import { findItemById, isActive, isArchived } from "util/helpers"; -import { getAttributes, getCollapseStateByKey, getErrorsByFormName, getIsSaveClicked } from "landUseContract/selectors"; +import SubTitle from "@/components/content/SubTitle"; +import { initializeContactForm, receiveContactModalSettings, receiveIsSaveClicked, showContactModal } from "@/contacts/actions"; +import { receiveCollapseStates } from "@/landUseContract/actions"; +import { ConfirmationModalTexts, FieldTypes, FormNames, ViewModes } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { getContactFullName } from "@/contacts/helpers"; +import { findItemById, isActive, isArchived } from "@/util/helpers"; +import { getAttributes, getCollapseStateByKey, getErrorsByFormName, getIsSaveClicked } from "@/landUseContract/selectors"; import type { Attributes } from "types"; type BillingPersonsProps = { fields: any; diff --git a/src/landUseContract/components/sections/Litigants.tsx b/src/landUseContract/components/sections/Litigants.tsx index 026049301..0dabf92de 100644 --- a/src/landUseContract/components/sections/Litigants.tsx +++ b/src/landUseContract/components/sections/Litigants.tsx @@ -1,15 +1,15 @@ import React, { Fragment, PureComponent } from "react"; import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; -import FormText from "components/form/FormText"; +import FormText from "@/components/form/FormText"; import Litigant from "./Litigant"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import { isArchived } from "util/helpers"; -import { getContentLitigants } from "landUseContract/helpers"; -import { getCurrentLandUseContract } from "landUseContract/selectors"; -import { withContactAttributes } from "components/attributes/ContactAttributes"; -import type { LandUseContract } from "landUseContract/types"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import { isArchived } from "@/util/helpers"; +import { getContentLitigants } from "@/landUseContract/helpers"; +import { getCurrentLandUseContract } from "@/landUseContract/selectors"; +import { withContactAttributes } from "@/components/attributes/ContactAttributes"; +import type { LandUseContract } from "@/landUseContract/types"; type Props = { currentLandUseContract: LandUseContract; isFetchingContactAttributes: boolean; diff --git a/src/landUseContract/components/sections/LitigantsEdit.tsx b/src/landUseContract/components/sections/LitigantsEdit.tsx index 2ab3bb730..f3fa92b1f 100644 --- a/src/landUseContract/components/sections/LitigantsEdit.tsx +++ b/src/landUseContract/components/sections/LitigantsEdit.tsx @@ -3,27 +3,27 @@ import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; import { FieldArray, getFormValues, reduxForm } from "redux-form"; import { Row, Column } from "react-foundation"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import AddButton from "components/form/AddButton"; -import ContactModal from "contacts/components/ContactModal"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import AddButton from "@/components/form/AddButton"; +import ContactModal from "@/contacts/components/ContactModal"; import LitigantItemEdit from "./LitigantItemEdit"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import { createContactOnModal as createContact, editContactOnModal as editContact, hideContactModal, receiveContactModalSettings, receiveIsSaveClicked } from "contacts/actions"; -import { receiveFormValidFlags } from "landUseContract/actions"; -import { ConfirmationModalTexts, FormNames } from "enums"; -import { ContactTypes } from "contacts/enums"; -import { ButtonColors } from "components/enums"; -import { validateLitigantForm } from "landUseContract/formValidators"; -import { getContentContact } from "contacts/helpers"; -import { getContentLitigants } from "landUseContract/helpers"; -import { isEmptyValue } from "util/helpers"; -import { contactExists } from "contacts/requestsAsync"; -import { getContactModalSettings, getIsContactFormValid, getIsContactModalOpen, getIsFetching as getIsFetchingContact } from "contacts/selectors"; -import { getCurrentLandUseContract } from "landUseContract/selectors"; -import { withContactAttributes } from "components/attributes/ContactAttributes"; -import type { ContactModalSettings } from "contacts/types"; -import type { LandUseContract } from "landUseContract/types"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import { createContactOnModal as createContact, editContactOnModal as editContact, hideContactModal, receiveContactModalSettings, receiveIsSaveClicked } from "@/contacts/actions"; +import { receiveFormValidFlags } from "@/landUseContract/actions"; +import { ConfirmationModalTexts, FormNames } from "@/enums"; +import { ContactTypes } from "@/contacts/enums"; +import { ButtonColors } from "@/components/enums"; +import { validateLitigantForm } from "@/landUseContract/formValidators"; +import { getContentContact } from "@/contacts/helpers"; +import { getContentLitigants } from "@/landUseContract/helpers"; +import { isEmptyValue } from "@/util/helpers"; +import { contactExists } from "@/contacts/requestsAsync"; +import { getContactModalSettings, getIsContactFormValid, getIsContactModalOpen, getIsFetching as getIsFetchingContact } from "@/contacts/selectors"; +import { getCurrentLandUseContract } from "@/landUseContract/selectors"; +import { withContactAttributes } from "@/components/attributes/ContactAttributes"; +import type { ContactModalSettings } from "@/contacts/types"; +import type { LandUseContract } from "@/landUseContract/types"; type LitigantsProps = { archived: boolean; fields: any; diff --git a/src/landUseContract/components/sections/UnitPricesUsedInCalculations.tsx b/src/landUseContract/components/sections/UnitPricesUsedInCalculations.tsx index 9b7568240..82c34a0b7 100644 --- a/src/landUseContract/components/sections/UnitPricesUsedInCalculations.tsx +++ b/src/landUseContract/components/sections/UnitPricesUsedInCalculations.tsx @@ -3,12 +3,12 @@ import { connect } from "react-redux"; import { formValueSelector, change } from "redux-form"; import { Row, Column } from "react-foundation"; import get from "lodash/get"; -import FormField from "components/form/FormField"; -import RemoveButton from "components/form/RemoveButton"; +import FormField from "@/components/form/FormField"; +import RemoveButton from "@/components/form/RemoveButton"; import type { Attributes } from "types"; -import { getUsedPrice, getSum } from "landUseContract/helpers"; -import FormText from "components/form/FormText"; -import { formatNumber } from "util/helpers"; +import { getUsedPrice, getSum } from "@/landUseContract/helpers"; +import FormText from "@/components/form/FormText"; +import { formatNumber } from "@/util/helpers"; type Props = { attributes: Attributes; field: any; diff --git a/src/landUseContract/components/sections/Warrants.tsx b/src/landUseContract/components/sections/Warrants.tsx index af91718f1..ed2e17914 100644 --- a/src/landUseContract/components/sections/Warrants.tsx +++ b/src/landUseContract/components/sections/Warrants.tsx @@ -2,15 +2,15 @@ import React from "react"; import { Row, Column } from "react-foundation"; import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; -import FormTextTitle from "components/form/FormTextTitle"; -import BoxItemContainer from "components/content/BoxItemContainer"; -import Collapse from "components/collapse/Collapse"; -import FormText from "components/form/FormText"; -import { receiveCollapseStates } from "landUseContract/actions"; -import { FormNames, ViewModes } from "enums"; -import { formatDate, formatNumber, isEmptyValue, getFieldOptions, getLabelOfOption } from "util/helpers"; -import { getCollapseStateByKey } from "landUseContract/selectors"; -import { withWindowResize } from "components/resize/WindowResizeHandler"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import BoxItemContainer from "@/components/content/BoxItemContainer"; +import Collapse from "@/components/collapse/Collapse"; +import FormText from "@/components/form/FormText"; +import { receiveCollapseStates } from "@/landUseContract/actions"; +import { FormNames, ViewModes } from "@/enums"; +import { formatDate, formatNumber, isEmptyValue, getFieldOptions, getLabelOfOption } from "@/util/helpers"; +import { getCollapseStateByKey } from "@/landUseContract/selectors"; +import { withWindowResize } from "@/components/resize/WindowResizeHandler"; import type { Attributes } from "types"; type Props = { attributes: Attributes; diff --git a/src/landUseContract/components/sections/forms/CreditInvoiceForm.tsx b/src/landUseContract/components/sections/forms/CreditInvoiceForm.tsx index cd6716f09..a427d1578 100644 --- a/src/landUseContract/components/sections/forms/CreditInvoiceForm.tsx +++ b/src/landUseContract/components/sections/forms/CreditInvoiceForm.tsx @@ -3,21 +3,21 @@ import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; import { formValueSelector, getFormValues, reduxForm } from "redux-form"; import flowRight from "lodash/flowRight"; -import Authorization from "components/authorization/Authorization"; -import BoxContentWrapper from "components/content/BoxContentWrapper"; -import Button from "components/button/Button"; -import CloseButton from "components/button/CloseButton"; -import FormField from "components/form/FormField"; -import WhiteBox from "components/content/WhiteBox"; -import { receiveIsCreditClicked } from "invoices/actions"; -import { CreditInvoiceOptions, CreditInvoiceSetOptions } from "landUseContract/constants"; -import { FormNames } from "enums"; -import { ButtonColors } from "components/enums"; -import { InvoiceFieldPaths, InvoiceFieldTitles, InvoiceRowsFieldPaths, InvoiceRowsFieldTitles } from "landUseInvoices/enums"; -import { CreditInvoiceOptions as CreditInvoiceOptionsEnum } from "landUseContract/enums"; -import { getUiDataCreditInvoiceKey } from "uiData/helpers"; -import { addEmptyOption, getFieldAttributes, getFieldOptions, getLabelOfOption, isFieldAllowedToEdit, sortStringByKeyAsc } from "util/helpers"; -import { getAttributes as getInvoiceAttributes, getIsCreditClicked } from "landUseInvoices/selectors"; +import Authorization from "@/components/authorization/Authorization"; +import BoxContentWrapper from "@/components/content/BoxContentWrapper"; +import Button from "@/components/button/Button"; +import CloseButton from "@/components/button/CloseButton"; +import FormField from "@/components/form/FormField"; +import WhiteBox from "@/components/content/WhiteBox"; +import { receiveIsCreditClicked } from "@/invoices/actions"; +import { CreditInvoiceOptions, CreditInvoiceSetOptions } from "@/landUseContract/constants"; +import { FormNames } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { InvoiceFieldPaths, InvoiceFieldTitles, InvoiceRowsFieldPaths, InvoiceRowsFieldTitles } from "@/landUseInvoices/enums"; +import { CreditInvoiceOptions as CreditInvoiceOptionsEnum } from "@/landUseContract/enums"; +import { getUiDataCreditInvoiceKey } from "@/uiData/helpers"; +import { addEmptyOption, getFieldAttributes, getFieldOptions, getLabelOfOption, isFieldAllowedToEdit, sortStringByKeyAsc } from "@/util/helpers"; +import { getAttributes as getInvoiceAttributes, getIsCreditClicked } from "@/landUseInvoices/selectors"; import type { Attributes } from "types"; type Props = { formValues: Record; diff --git a/src/landUseContract/components/sections/forms/EditInvoiceForm.tsx b/src/landUseContract/components/sections/forms/EditInvoiceForm.tsx index fca23a80f..7bb078b3a 100644 --- a/src/landUseContract/components/sections/forms/EditInvoiceForm.tsx +++ b/src/landUseContract/components/sections/forms/EditInvoiceForm.tsx @@ -3,35 +3,35 @@ import { Row, Column } from "react-foundation"; import { connect } from "react-redux"; import { FieldArray, formValueSelector, reduxForm } from "redux-form"; import flowRight from "lodash/flowRight"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import AddButtonThird from "components/form/AddButtonThird"; -import AmountWithVat from "components/vat/AmountWithVat"; -import Authorization from "components/authorization/Authorization"; -import FieldAndRemoveButtonWrapper from "components/form/FieldAndRemoveButtonWrapper"; -import FormField from "components/form/FormField"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import AddButtonThird from "@/components/form/AddButtonThird"; +import AmountWithVat from "@/components/vat/AmountWithVat"; +import Authorization from "@/components/authorization/Authorization"; +import FieldAndRemoveButtonWrapper from "@/components/form/FieldAndRemoveButtonWrapper"; +import FormField from "@/components/form/FormField"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; import InvoiceRowsEdit from "./InvoiceRowsEdit"; -import RemoveButton from "components/form/RemoveButton"; -import SubTitle from "components/content/SubTitle"; -import { ConfirmationModalTexts, FieldTypes, FormNames } from "enums"; -import SendupButton from "components/button/SendupButton"; -import { ButtonColors } from "components/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getRecipientOptionsFromLitigants } from "landUseContract/helpers"; -import { exportInvoiceToLaskeAndUpdateList } from "landUseInvoices/actions"; -import { InvoiceCreditInvoicesFieldPaths, InvoiceCreditInvoicesFieldTitles, InvoiceFieldPaths, InvoiceFieldTitles, InvoiceInterestInvoicesFieldPaths, InvoiceInterestInvoicesFieldTitles, InvoicePaymentsFieldPaths, InvoicePaymentsFieldTitles, InvoiceRowsFieldPaths, InvoiceType } from "landUseInvoices/enums"; -import { validateInvoiceForm } from "leases/formValidators"; -import { getContactFullName } from "contacts/helpers"; -import { isInvoiceBillingPeriodRequired } from "landUseInvoices/helpers"; -import { getUiDataInvoiceKey } from "uiData/helpers"; -import { formatDate, formatNumber, getFieldAttributes, getFieldOptions, getLabelOfOption, isEmptyValue, isFieldAllowedToEdit, isFieldAllowedToRead, isFieldRequired, hasPermissions } from "util/helpers"; -import { getAttributes as getInvoiceAttributes, getIsEditClicked } from "landUseInvoices/selectors"; -import { getCurrentLandUseContract } from "landUseContract/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; +import RemoveButton from "@/components/form/RemoveButton"; +import SubTitle from "@/components/content/SubTitle"; +import { ConfirmationModalTexts, FieldTypes, FormNames } from "@/enums"; +import SendupButton from "@/components/button/SendupButton"; +import { ButtonColors } from "@/components/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getRecipientOptionsFromLitigants } from "@/landUseContract/helpers"; +import { exportInvoiceToLaskeAndUpdateList } from "@/landUseInvoices/actions"; +import { InvoiceCreditInvoicesFieldPaths, InvoiceCreditInvoicesFieldTitles, InvoiceFieldPaths, InvoiceFieldTitles, InvoiceInterestInvoicesFieldPaths, InvoiceInterestInvoicesFieldTitles, InvoicePaymentsFieldPaths, InvoicePaymentsFieldTitles, InvoiceRowsFieldPaths, InvoiceType } from "@/landUseInvoices/enums"; +import { validateInvoiceForm } from "@/leases/formValidators"; +import { getContactFullName } from "@/contacts/helpers"; +import { isInvoiceBillingPeriodRequired } from "@/landUseInvoices/helpers"; +import { getUiDataInvoiceKey } from "@/uiData/helpers"; +import { formatDate, formatNumber, getFieldAttributes, getFieldOptions, getLabelOfOption, isEmptyValue, isFieldAllowedToEdit, isFieldAllowedToRead, isFieldRequired, hasPermissions } from "@/util/helpers"; +import { getAttributes as getInvoiceAttributes, getIsEditClicked } from "@/landUseInvoices/selectors"; +import { getCurrentLandUseContract } from "@/landUseContract/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; import type { Attributes } from "types"; -import type { LandUseContract } from "landUseContract/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { LandUseContract } from "@/landUseContract/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type PaymentsProps = { attributes: Attributes; fields: any; diff --git a/src/landUseContract/components/sections/forms/InvoiceRows.tsx b/src/landUseContract/components/sections/forms/InvoiceRows.tsx index e1848d230..1dc58e7b5 100644 --- a/src/landUseContract/components/sections/forms/InvoiceRows.tsx +++ b/src/landUseContract/components/sections/forms/InvoiceRows.tsx @@ -1,18 +1,18 @@ import React from "react"; import { Row, Column } from "react-foundation"; import get from "lodash/get"; -import AmountWithVat from "components/vat/AmountWithVat"; -import Authorization from "components/authorization/Authorization"; -import BoxItem from "components/content/BoxItem"; -import BoxItemContainer from "components/content/BoxItemContainer"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import SubTitle from "components/content/SubTitle"; -import { InvoiceRowsFieldPaths, InvoiceRowsFieldTitles } from "invoices/enums"; -import { getContactFullName } from "contacts/helpers"; -import { getContentTenant } from "leases/helpers"; -import { getUiDataInvoiceKey } from "uiData/helpers"; -import { formatDate, getLabelOfOption, isFieldAllowedToRead } from "util/helpers"; +import AmountWithVat from "@/components/vat/AmountWithVat"; +import Authorization from "@/components/authorization/Authorization"; +import BoxItem from "@/components/content/BoxItem"; +import BoxItemContainer from "@/components/content/BoxItemContainer"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import SubTitle from "@/components/content/SubTitle"; +import { InvoiceRowsFieldPaths, InvoiceRowsFieldTitles } from "@/invoices/enums"; +import { getContactFullName } from "@/contacts/helpers"; +import { getContentTenant } from "@/leases/helpers"; +import { getUiDataInvoiceKey } from "@/uiData/helpers"; +import { formatDate, getLabelOfOption, isFieldAllowedToRead } from "@/util/helpers"; import type { Attributes } from "types"; type Props = { invoiceAttributes: Attributes; diff --git a/src/landUseContract/components/sections/forms/InvoiceRowsEdit.tsx b/src/landUseContract/components/sections/forms/InvoiceRowsEdit.tsx index 1c7278898..281bae07b 100644 --- a/src/landUseContract/components/sections/forms/InvoiceRowsEdit.tsx +++ b/src/landUseContract/components/sections/forms/InvoiceRowsEdit.tsx @@ -2,21 +2,21 @@ import React, { Fragment, ReactElement } from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; import { formValueSelector } from "redux-form"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import ActionButtonWrapper from "components/form/ActionButtonWrapper"; -import AddButtonThird from "components/form/AddButtonThird"; -import Authorization from "components/authorization/Authorization"; -import BoxItem from "components/content/BoxItem"; -import BoxItemContainer from "components/content/BoxItemContainer"; -import FormField from "components/form/FormField"; -import RemoveButton from "components/form/RemoveButton"; -import SubTitle from "components/content/SubTitle"; -import { ConfirmationModalTexts, FormNames } from "enums"; -import { ButtonColors } from "components/enums"; -import { InvoiceRowsFieldPaths, InvoiceRowsFieldTitles } from "landUseInvoices/enums"; -import { getUiDataInvoiceKey } from "uiData/helpers"; -import { getFieldAttributes, isFieldAllowedToEdit, isFieldAllowedToRead } from "util/helpers"; -import { getAttributes as getInvoiceAttributes } from "landUseInvoices/selectors"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import ActionButtonWrapper from "@/components/form/ActionButtonWrapper"; +import AddButtonThird from "@/components/form/AddButtonThird"; +import Authorization from "@/components/authorization/Authorization"; +import BoxItem from "@/components/content/BoxItem"; +import BoxItemContainer from "@/components/content/BoxItemContainer"; +import FormField from "@/components/form/FormField"; +import RemoveButton from "@/components/form/RemoveButton"; +import SubTitle from "@/components/content/SubTitle"; +import { ConfirmationModalTexts, FormNames } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { InvoiceRowsFieldPaths, InvoiceRowsFieldTitles } from "@/landUseInvoices/enums"; +import { getUiDataInvoiceKey } from "@/uiData/helpers"; +import { getFieldAttributes, isFieldAllowedToEdit, isFieldAllowedToRead } from "@/util/helpers"; +import { getAttributes as getInvoiceAttributes } from "@/landUseInvoices/selectors"; // import {getReceivableTypes} from 'src/leaseCreateCharge/selectors'; import type { Attributes } from "types"; // import {receivableTypesFromAttributes, receivableTypeFromRows} from 'src/leaseCreateCharge/helpers'; diff --git a/src/landUseContract/components/sections/forms/NewInvoiceForm.tsx b/src/landUseContract/components/sections/forms/NewInvoiceForm.tsx index 8f53082bd..c9375c0ba 100644 --- a/src/landUseContract/components/sections/forms/NewInvoiceForm.tsx +++ b/src/landUseContract/components/sections/forms/NewInvoiceForm.tsx @@ -3,27 +3,27 @@ import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; import { getFormValues, reduxForm, FieldArray } from "redux-form"; import flowRight from "lodash/flowRight"; -import Authorization from "components/authorization/Authorization"; -import BoxContentWrapper from "components/content/BoxContentWrapper"; -import Button from "components/button/Button"; -import CloseButton from "components/button/CloseButton"; -import RemoveButton from "components/form/RemoveButton"; -import FormField from "components/form/FormField"; -import WhiteBox from "components/content/WhiteBox"; -import { receiveIsCreateClicked } from "landUseInvoices/actions"; -import { ConfirmationModalTexts, FormNames } from "enums"; -import { ButtonColors } from "components/enums"; -import SubTitle from "components/content/SubTitle"; +import Authorization from "@/components/authorization/Authorization"; +import BoxContentWrapper from "@/components/content/BoxContentWrapper"; +import Button from "@/components/button/Button"; +import CloseButton from "@/components/button/CloseButton"; +import RemoveButton from "@/components/form/RemoveButton"; +import FormField from "@/components/form/FormField"; +import WhiteBox from "@/components/content/WhiteBox"; +import { receiveIsCreateClicked } from "@/landUseInvoices/actions"; +import { ConfirmationModalTexts, FormNames } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import SubTitle from "@/components/content/SubTitle"; // import {InvoiceFieldPaths, InvoiceFieldTitles} from 'src/invoices/enums'; // TODO MAKE OWN ENUMS -import { validateLandUseInvoiceForm } from "landUseContract/formValidators"; -import { getFieldAttributes, isFieldAllowedToEdit } from "util/helpers"; -import { getAttributes as getInvoiceAttributes, getIsCreateClicked } from "landUseInvoices/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import { getRecipientOptionsFromLitigants } from "landUseContract/helpers"; +import { validateLandUseInvoiceForm } from "@/landUseContract/formValidators"; +import { getFieldAttributes, isFieldAllowedToEdit } from "@/util/helpers"; +import { getAttributes as getInvoiceAttributes, getIsCreateClicked } from "@/landUseInvoices/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import { getRecipientOptionsFromLitigants } from "@/landUseContract/helpers"; import type { Attributes } from "types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import AddButtonThird from "components/form/AddButtonThird"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import AddButtonThird from "@/components/form/AddButtonThird"; type InvoiceRowsProps = { fields: any; invoiceAttributes: Attributes; diff --git a/src/landUseContract/formValidators.ts b/src/landUseContract/formValidators.ts index ad797ed54..707cca28b 100644 --- a/src/landUseContract/formValidators.ts +++ b/src/landUseContract/formValidators.ts @@ -1,7 +1,7 @@ import get from "lodash/get"; import isEmpty from "lodash/isEmpty"; -import { dateGreaterOrEqual } from "components/form/validations"; -import { required } from "components/form/validations"; +import { dateGreaterOrEqual } from "@/components/form/validations"; +import { required } from "@/components/form/validations"; /** * Get litigant errors diff --git a/src/landUseContract/helpers.ts b/src/landUseContract/helpers.ts index 28b9ac285..c9e0a9f63 100644 --- a/src/landUseContract/helpers.ts +++ b/src/landUseContract/helpers.ts @@ -1,15 +1,15 @@ import get from "lodash/get"; import isEmpty from "lodash/isEmpty"; import { isDirty } from "redux-form"; -import { FormNames } from "enums"; +import { FormNames } from "@/enums"; import { LitigantContactType } from "./enums"; -import { getContentUser } from "users/helpers"; -import { fixedLengthNumber, getApiResponseResults, isArchived, sortStringByKeyDesc, addEmptyOption, formatDate, convertStrToDecimalNumber } from "util/helpers"; -import { getIsEditMode } from "landUseContract/selectors"; -import { removeSessionStorageItem } from "util/storage"; -import { getContactFullName, getContentContact } from "contacts/helpers"; +import { getContentUser } from "@/users/helpers"; +import { fixedLengthNumber, getApiResponseResults, isArchived, sortStringByKeyDesc, addEmptyOption, formatDate, convertStrToDecimalNumber } from "@/util/helpers"; +import { getIsEditMode } from "@/landUseContract/selectors"; +import { removeSessionStorageItem } from "@/util/storage"; +import { getContactFullName, getContentContact } from "@/contacts/helpers"; import type { LandUseContract } from "./types"; -import type { RootState } from "root/types"; +import type { RootState } from "@/root/types"; /** * Get land use contract identifier diff --git a/src/landUseContract/reducer.ts b/src/landUseContract/reducer.ts index 2998acbcf..2ee612934 100644 --- a/src/landUseContract/reducer.ts +++ b/src/landUseContract/reducer.ts @@ -1,7 +1,7 @@ import { combineReducers } from "redux"; import { handleActions } from "redux-actions"; import merge from "lodash/merge"; -import { FormNames } from "enums"; +import { FormNames } from "@/enums"; import type { Attributes, Reducer, Methods } from "types"; import type { LandUseContract, LandUseContractList, ReceiveAttributesAction, ReceiveFormValidFlagsAction, ReceiveLandUseContractListAction, ReceiveSingleLandUseContractAction, ReceiveIsSaveClickedAction, ReceiveCollapseStatesAction, ReceiveMethodsAction } from "./types"; const attributesReducer: Reducer = handleActions({ diff --git a/src/landUseContract/requests.ts b/src/landUseContract/requests.ts index 41354e828..728d5b763 100644 --- a/src/landUseContract/requests.ts +++ b/src/landUseContract/requests.ts @@ -1,5 +1,5 @@ -import callApi from "../api/callApi"; -import createUrl from "../api/createUrl"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; import type { LandUseContract } from "./types"; export const createLandUseContract = (landUseContract: LandUseContract): Generator => { const body = JSON.stringify(landUseContract); diff --git a/src/landUseContract/requestsAsync.ts b/src/landUseContract/requestsAsync.ts index df1a5de91..2cd6fd1bc 100644 --- a/src/landUseContract/requestsAsync.ts +++ b/src/landUseContract/requestsAsync.ts @@ -1,5 +1,5 @@ -import createUrl from "api/createUrl"; -import callApiAsync from "api/callApiAsync"; +import createUrl from "@/api/createUrl"; +import callApiAsync from "@/api/callApiAsync"; export const fetchEstateIdList = async (query?: Record) => { const { response: { diff --git a/src/landUseContract/saga.ts b/src/landUseContract/saga.ts index 8c22cf16e..322127b56 100644 --- a/src/landUseContract/saga.ts +++ b/src/landUseContract/saga.ts @@ -1,10 +1,10 @@ import { all, fork, put, takeLatest, call } from "redux-saga/effects"; import { push } from "react-router-redux"; import { SubmissionError } from "redux-form"; -import { displayUIMessage, getSearchQuery, getUrlParams } from "util/helpers"; +import { displayUIMessage, getSearchQuery, getUrlParams } from "@/util/helpers"; import { hideEditMode, receiveAttributes, receiveLandUseContractList, receiveSingleLandUseContract, notFound, receiveIsSaveClicked, attributesNotFound, receiveMethods, fetchSingleLandUseContractAfterEdit } from "./actions"; -import { receiveError } from "api/actions"; -import { getRouteById, Routes } from "root/routes"; +import { receiveError } from "@/api/actions"; +import { getRouteById, Routes } from "@/root/routes"; import { createLandUseContract, fetchAttributes, fetchLandUseContracts, fetchSingleLandUseContract, editLandUseContract, deleteLandUseContract } from "./requests"; // import attributesMockData from './attributes-mock-data.json'; diff --git a/src/landUseContract/selectors.ts b/src/landUseContract/selectors.ts index 5c222e773..48bf0ce4a 100644 --- a/src/landUseContract/selectors.ts +++ b/src/landUseContract/selectors.ts @@ -1,7 +1,7 @@ import get from "lodash/get"; import isEmpty from "lodash/isEmpty"; -import type { Attributes, Selector, Methods } from "../types"; -import type { RootState } from "root/types"; +import type { Attributes, Selector, Methods } from "@/types"; +import type { RootState } from "@/root/types"; import type { LandUseContract, LandUseContractList } from "./types"; export const getAttributes: Selector = (state: RootState): Attributes => state.landUseContract.attributes; export const getMethods: Selector = (state: RootState): Methods => state.landUseContract.methods; diff --git a/src/landUseContract/types.ts b/src/landUseContract/types.ts index 4f04f007b..3170ddd0a 100644 --- a/src/landUseContract/types.ts +++ b/src/landUseContract/types.ts @@ -1,4 +1,4 @@ -import type { Action, Attributes, Methods } from "../types"; +import type { Action, Attributes, Methods } from "@/types"; export type LandUseContractState = { attributes: Attributes; current: LandUseContract; diff --git a/src/landUseInvoices/actions.ts b/src/landUseInvoices/actions.ts index 23207a30d..d3ea17faa 100644 --- a/src/landUseInvoices/actions.ts +++ b/src/landUseInvoices/actions.ts @@ -1,7 +1,7 @@ import { createAction } from "redux-actions"; import type { Attributes, Methods } from "types"; import type { CreateChargePayload, FetchAttributesAction, ReceiveAttributesAction, ReceiveMethodsAction, InvoiceAttributesNotFoundAction, Invoice, InvoiceListMap, FetchInvoicesByLandUseContractAction, ReceiveInvoicesByLandUseContractAction, CreateInvoiceAction, CreditInvoiceAction, PatchInvoiceAction, ExportInvoiceToLaskeAndUpdateListAction, ExportInvoiceToLaskeAndUpdateListPayload, ReceivePatchedInvoiceAction, ClearPatchedInvoiceAction, InvoiceNotFoundAction, ReceiveInvoiceToCreditAction, ReceiveIsCreateInvoicePanelOpenAction, ReceiveIsCreditInvoicePanelOpenAction, ReceiveIsCreateClickedAction, ReceiveIsCreditClickedAction, ReceiveIsEditClickedAction, DeleteInvoiceAction, ReceiveCollapseStatesAction, StartInvoicingAction, StopInvoicingAction, CreateChargeAction } from "./types"; -import type { LandUseContractId } from "landUseInvoices/types"; +import type { LandUseContractId } from "@/landUseInvoices/types"; export const fetchAttributes = (): FetchAttributesAction => createAction('mvj/landUseInvoices/FETCH_ATTRIBUTES')(); export const receiveAttributes = (attributes: Attributes): ReceiveAttributesAction => createAction('mvj/landUseInvoices/RECEIVE_ATTRIBUTES')(attributes); export const receiveMethods = (methods: Methods): ReceiveMethodsAction => createAction('mvj/landUseInvoices/RECEIVE_METHODS')(methods); diff --git a/src/landUseInvoices/helpers.ts b/src/landUseInvoices/helpers.ts index 1563300f0..dc07f05a5 100644 --- a/src/landUseInvoices/helpers.ts +++ b/src/landUseInvoices/helpers.ts @@ -1,9 +1,9 @@ import isPast from "date-fns/isPast"; import forEach from "lodash/forEach"; import get from "lodash/get"; -import { CreditInvoiceOptions } from "leases/enums"; +import { CreditInvoiceOptions } from "@/leases/enums"; import { InvoiceState, InvoiceType, ReceivableTypes } from "./enums"; -import { convertStrToDecimalNumber, getLabelOfOption, sortStringAsc } from "util/helpers"; +import { convertStrToDecimalNumber, getLabelOfOption, sortStringAsc } from "@/util/helpers"; /** * Get payments of single invoice to show on UI diff --git a/src/landUseInvoices/reducer.ts b/src/landUseInvoices/reducer.ts index 800cdde08..f2cb3cb9c 100644 --- a/src/landUseInvoices/reducer.ts +++ b/src/landUseInvoices/reducer.ts @@ -1,7 +1,7 @@ import { combineReducers } from "redux"; import { handleActions } from "redux-actions"; import merge from "lodash/merge"; -import type { Attributes, Methods, Reducer } from "../types"; +import type { Attributes, Methods, Reducer } from "@/types"; import type { ReceiveAttributesAction, ReceiveMethodsAction, Invoice, InvoiceListMap, ReceiveInvoicesByLandUseContractAction, ReceiveInvoiceToCreditAction, ReceiveIsCreateInvoicePanelOpenAction, ReceiveIsCreditInvoicePanelOpenAction, ReceiveIsCreateClickedAction, ReceiveIsCreditClickedAction, ReceiveIsEditClickedAction, ReceivePatchedInvoiceAction, ReceiveCollapseStatesAction } from "./types"; const isFetchingReducer: Reducer = handleActions({ 'mvj/landUseInvoices/CREATE': () => true, diff --git a/src/landUseInvoices/requests.ts b/src/landUseInvoices/requests.ts index 1be8fbfaa..e98196dd1 100644 --- a/src/landUseInvoices/requests.ts +++ b/src/landUseInvoices/requests.ts @@ -1,5 +1,5 @@ -import callApi from "../api/callApi"; -import createUrl from "../api/createUrl"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; import type { Invoice, InvoiceId } from "./types"; export const fetchAttributes = () => { return callApi(new Request(createUrl('land_use_agreement_invoice/'), { diff --git a/src/landUseInvoices/saga.ts b/src/landUseInvoices/saga.ts index 0a1f0a794..2ae7d6daf 100644 --- a/src/landUseInvoices/saga.ts +++ b/src/landUseInvoices/saga.ts @@ -1,11 +1,11 @@ import { all, call, fork, put, select, takeLatest } from "redux-saga/effects"; import { SubmissionError } from "redux-form"; -import { receiveSingleLandUseContract } from "landUseContract/actions"; +import { receiveSingleLandUseContract } from "@/landUseContract/actions"; import { fetchInvoicesByLandUseContract, receiveAttributes, receiveMethods, attributesNotFound, receiveInvoicesByLandUseContract, receiveIsCreateInvoicePanelOpen, receiveIsEditClicked, receivePatchedInvoice, notFound, receiveIsCreditInvoicePanelOpen, receiveInvoiceToCredit } from "./actions"; -import { receiveError } from "api/actions"; -import { displayUIMessage } from "util/helpers"; +import { receiveError } from "@/api/actions"; +import { displayUIMessage } from "@/util/helpers"; import { fetchAttributes, createInvoice, patchInvoice, deleteInvoice, fetchInvoices, exportInvoiceToLaske, creditInvoice } from "./requests"; -import { getCurrentLandUseContract } from "landUseContract/selectors"; +import { getCurrentLandUseContract } from "@/landUseContract/selectors"; function* fetchAttributesSaga(): Generator { try { diff --git a/src/landUseInvoices/selectors.ts b/src/landUseInvoices/selectors.ts index cd0be5ceb..2119a6ba7 100644 --- a/src/landUseInvoices/selectors.ts +++ b/src/landUseInvoices/selectors.ts @@ -1,6 +1,6 @@ import get from "lodash/get"; import type { Attributes, Methods, Selector } from "types"; -import type { RootState } from "root/types"; +import type { RootState } from "@/root/types"; import type { Invoice, InvoiceList } from "./types"; export type LandUseContractId = number; export const getIsFetching: Selector = (state: RootState): boolean => state.landUseInvoice.isFetching; diff --git a/src/leaseAreaAttachment/requests.ts b/src/leaseAreaAttachment/requests.ts index 3cb185cd3..a346e7b76 100644 --- a/src/leaseAreaAttachment/requests.ts +++ b/src/leaseAreaAttachment/requests.ts @@ -1,6 +1,6 @@ -import callApi from "../api/callApi"; -import createUrl from "../api/createUrl"; -import callUploadRequest from "api/callUploadRequest"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; +import callUploadRequest from "@/api/callUploadRequest"; import type { CreateLeaseAreaAttachmentPayload } from "./types"; export const createLeaseAreaAttachment = (payload: CreateLeaseAreaAttachmentPayload): Generator => { const formData = new FormData(); diff --git a/src/leaseAreaAttachment/saga.ts b/src/leaseAreaAttachment/saga.ts index 64c40e9c2..6e8675099 100644 --- a/src/leaseAreaAttachment/saga.ts +++ b/src/leaseAreaAttachment/saga.ts @@ -1,8 +1,8 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects"; import { SubmissionError } from "redux-form"; -import { fetchSingleLeaseAfterEdit } from "leases/actions"; -import { receiveError } from "api/actions"; -import { displayUIMessage } from "util/helpers"; +import { fetchSingleLeaseAfterEdit } from "@/leases/actions"; +import { receiveError } from "@/api/actions"; +import { displayUIMessage } from "@/util/helpers"; import { createLeaseAreaAttachment, deleteLeaseAreaAttachment } from "./requests"; function* createLeaseAreaAttachmentSaga({ diff --git a/src/leaseAreaAttachment/types.ts b/src/leaseAreaAttachment/types.ts index f742e6246..dd164597c 100644 --- a/src/leaseAreaAttachment/types.ts +++ b/src/leaseAreaAttachment/types.ts @@ -1,5 +1,5 @@ import type { Action } from "types"; -import type { LeaseId } from "leases/types"; +import type { LeaseId } from "@/leases/types"; export type CreateLeaseAreaAttachmentPayload = { lease: LeaseId; data: { diff --git a/src/leaseCreateCharge/helpers.ts b/src/leaseCreateCharge/helpers.ts index 3fd23d54b..f4d5d946e 100644 --- a/src/leaseCreateCharge/helpers.ts +++ b/src/leaseCreateCharge/helpers.ts @@ -1,5 +1,5 @@ import get from "lodash/get"; -import { convertStrToDecimalNumber } from "util/helpers"; +import { convertStrToDecimalNumber } from "@/util/helpers"; /** * Get lease create charge rows payload data for API diff --git a/src/leaseCreateCharge/reducer.ts b/src/leaseCreateCharge/reducer.ts index 7ad4fcca8..3ac82b922 100644 --- a/src/leaseCreateCharge/reducer.ts +++ b/src/leaseCreateCharge/reducer.ts @@ -1,7 +1,7 @@ import { combineReducers } from "redux"; import { handleActions } from "redux-actions"; import type { Attributes, Reducer } from "types"; -import type { ReceiveAttributesAction, ReceiveReceivableTypesAction } from "leaseCreateCharge/types"; +import type { ReceiveAttributesAction, ReceiveReceivableTypesAction } from "@/leaseCreateCharge/types"; const isFetchingAttributesReducer: Reducer = handleActions({ 'mvj/leaseCreateCharge/FETCH_ATTRIBUTES': () => true, 'mvj/leaseCreateCharge/RECEIVE_ATTRIBUTES': () => false, diff --git a/src/leaseCreateCharge/requests.ts b/src/leaseCreateCharge/requests.ts index a34c4ae6b..022b65d92 100644 --- a/src/leaseCreateCharge/requests.ts +++ b/src/leaseCreateCharge/requests.ts @@ -1,6 +1,6 @@ -import callApi from "../api/callApi"; -import createUrl from "../api/createUrl"; -import { store } from "../root/startApp"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; +import { store } from "@/index"; import { getCurrentLease } from '../leases/selectors'; export const fetchAttributes = (): Generator => { return callApi(new Request(createUrl(`lease_create_charge/`), { diff --git a/src/leaseCreateCharge/saga.ts b/src/leaseCreateCharge/saga.ts index 26b8807fb..37d4cb5a7 100644 --- a/src/leaseCreateCharge/saga.ts +++ b/src/leaseCreateCharge/saga.ts @@ -1,6 +1,6 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects"; import { receiveAttributes, attributesNotFound, receiveReceivableTypes, receivableTypesNotFound } from "./actions"; -import { receiveError } from "api/actions"; +import { receiveError } from "@/api/actions"; import { fetchAttributes, fetchReceivableTypes } from "./requests"; function* fetchAttributesSaga(): Generator { diff --git a/src/leaseCreateCharge/selectors.ts b/src/leaseCreateCharge/selectors.ts index efe486e57..6b1f837af 100644 --- a/src/leaseCreateCharge/selectors.ts +++ b/src/leaseCreateCharge/selectors.ts @@ -1,5 +1,5 @@ import type { Attributes, Selector } from "types"; -import type { RootState } from "root/types"; +import type { RootState } from "@/root/types"; export const getIsFetchingAttributes: Selector = (state: RootState): boolean => state.leaseCreateCharge.isFetchingAttributes; export const getAttributes: Selector = (state: RootState): Attributes => state.leaseCreateCharge.attributes; export const getIsFetchingReceivableTypes: Selector = (state: RootState): boolean => state.leaseCreateCharge.isFetchingReceivableTypes; diff --git a/src/leaseInspectionAttachment/requests.ts b/src/leaseInspectionAttachment/requests.ts index a219d92da..03b0acc40 100644 --- a/src/leaseInspectionAttachment/requests.ts +++ b/src/leaseInspectionAttachment/requests.ts @@ -1,6 +1,6 @@ -import callApi from "../api/callApi"; -import createUrl from "../api/createUrl"; -import callUploadRequest from "api/callUploadRequest"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; +import callUploadRequest from "@/api/callUploadRequest"; import type { CreateLeaseInspectionAttachmentPayload } from "./types"; export const createLeaseInspectionAttachment = (payload: CreateLeaseInspectionAttachmentPayload): Generator => { const formData = new FormData(); diff --git a/src/leaseInspectionAttachment/saga.ts b/src/leaseInspectionAttachment/saga.ts index 5e52b92ed..c45e320f8 100644 --- a/src/leaseInspectionAttachment/saga.ts +++ b/src/leaseInspectionAttachment/saga.ts @@ -1,8 +1,8 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects"; import { SubmissionError } from "redux-form"; -import { fetchSingleLeaseAfterEdit } from "leases/actions"; -import { receiveError } from "api/actions"; -import { displayUIMessage } from "util/helpers"; +import { fetchSingleLeaseAfterEdit } from "@/leases/actions"; +import { receiveError } from "@/api/actions"; +import { displayUIMessage } from "@/util/helpers"; import { createLeaseInspectionAttachment, deleteLeaseInspectionAttachment } from "./requests"; function* createLeaseInspectionAttachmentSaga({ diff --git a/src/leaseInspectionAttachment/types.ts b/src/leaseInspectionAttachment/types.ts index 9d3bb9b09..87fa2e18c 100644 --- a/src/leaseInspectionAttachment/types.ts +++ b/src/leaseInspectionAttachment/types.ts @@ -1,5 +1,5 @@ import type { Action } from "types"; -import type { LeaseId } from "leases/types"; +import type { LeaseId } from "@/leases/types"; export type CreateLeaseInspectionAttachmentPayload = { lease: LeaseId; data: { diff --git a/src/leaseStatisticReport/components/LeaseInvoicingConfirmationReport.tsx b/src/leaseStatisticReport/components/LeaseInvoicingConfirmationReport.tsx index 2944f90ed..cf2129b33 100644 --- a/src/leaseStatisticReport/components/LeaseInvoicingConfirmationReport.tsx +++ b/src/leaseStatisticReport/components/LeaseInvoicingConfirmationReport.tsx @@ -3,25 +3,25 @@ import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; -import { TableSortOrder } from "enums"; -import AuthorizationError from "components/authorization/AuthorizationError"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import SortableTable from "components/table/SortableTable"; -import FormText from "components/form/FormText"; -import ExcelLink from "components/excel/ExcelLink"; -import { getApiResponseResults, hasPermissions, getLabelOfOption, sortNumberByKeyAsc, sortNumberByKeyDesc, sortStringByKeyAsc, sortStringByKeyDesc } from "util/helpers"; -import { LeaseStatisticReportFormatOptions } from "leaseStatisticReport/enums"; -import { getDisplayName, getFormattedValue, getOutputFields, getReportTypeOptions } from "leaseStatisticReport/helpers"; -import { getIsFetchingLeaseInvoicingConfirmationReport, getLeaseInvoicingConfirmationReport, getPayload } from "leaseStatisticReport/selectors"; +import { TableSortOrder } from "@/enums"; +import AuthorizationError from "@/components/authorization/AuthorizationError"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import SortableTable from "@/components/table/SortableTable"; +import FormText from "@/components/form/FormText"; +import ExcelLink from "@/components/excel/ExcelLink"; +import { getApiResponseResults, hasPermissions, getLabelOfOption, sortNumberByKeyAsc, sortNumberByKeyDesc, sortStringByKeyAsc, sortStringByKeyDesc } from "@/util/helpers"; +import { LeaseStatisticReportFormatOptions } from "@/leaseStatisticReport/enums"; +import { getDisplayName, getFormattedValue, getOutputFields, getReportTypeOptions } from "@/leaseStatisticReport/helpers"; +import { getIsFetchingLeaseInvoicingConfirmationReport, getLeaseInvoicingConfirmationReport, getPayload } from "@/leaseStatisticReport/selectors"; import type { Attributes, Reports } from "types"; -import type { LeaseInvoicingConfirmationReport as LeaseInvoicingConfirmationReportsType } from "leaseStatisticReport/types"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import { UsersPermissions } from "usersPermissions/enums"; -import { PermissionMissingTexts } from "enums"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; -import { withLeaseInvoicingConfirmationReportAttributes } from "components/attributes/LeaseInvoicingConfirmationReportAttributes"; -import type { ReportOptions } from "leaseStatisticReport/types"; +import type { LeaseInvoicingConfirmationReport as LeaseInvoicingConfirmationReportsType } from "@/leaseStatisticReport/types"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { PermissionMissingTexts } from "@/enums"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; +import { withLeaseInvoicingConfirmationReportAttributes } from "@/components/attributes/LeaseInvoicingConfirmationReportAttributes"; +import type { ReportOptions } from "@/leaseStatisticReport/types"; type Props = { isFetchingLeaseInvoicingConfirmationReportAttributes: boolean; leaseInvoicingConfirmationReportAttributes: Attributes; diff --git a/src/leaseStatisticReport/components/LeaseStatisticReportForm.tsx b/src/leaseStatisticReport/components/LeaseStatisticReportForm.tsx index c05c5f4d7..999ecb977 100644 --- a/src/leaseStatisticReport/components/LeaseStatisticReportForm.tsx +++ b/src/leaseStatisticReport/components/LeaseStatisticReportForm.tsx @@ -3,19 +3,19 @@ import { connect } from "react-redux"; import { formValueSelector, destroy, getFormValues, reduxForm } from "redux-form"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; -import Button from "components/button/Button"; -import { ButtonColors } from "components/enums"; -import FormField from "components/form/FormField"; -import { FieldTypes, FormNames } from "enums"; -import { withLeaseStatisticReportAttributes } from "components/attributes/LeaseStatisticReportAttributes"; -import Authorization from "components/authorization/Authorization"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import { getFieldAttributes, isFieldAllowedToEdit } from "util/helpers"; -import { LeaseStatisticReportPaths, LeaseStatisticReportTitles } from "leaseStatisticReport/enums"; -import { getReportTypeOptions, getReportUrl, getPayload, getFields, getQueryParams, formatType } from "leaseStatisticReport/helpers"; -import { fetchReportData, setOptions, sendReportToMail, fetchOptions, setPayload } from "leaseStatisticReport/actions"; -import { getAttributes as getLeaseStatisticReportAttributes, getOptions, getIsFetchingOptions } from "leaseStatisticReport/selectors"; +import Button from "@/components/button/Button"; +import { ButtonColors } from "@/components/enums"; +import FormField from "@/components/form/FormField"; +import { FieldTypes, FormNames } from "@/enums"; +import { withLeaseStatisticReportAttributes } from "@/components/attributes/LeaseStatisticReportAttributes"; +import Authorization from "@/components/authorization/Authorization"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import { getFieldAttributes, isFieldAllowedToEdit } from "@/util/helpers"; +import { LeaseStatisticReportPaths, LeaseStatisticReportTitles } from "@/leaseStatisticReport/enums"; +import { getReportTypeOptions, getReportUrl, getPayload, getFields, getQueryParams, formatType } from "@/leaseStatisticReport/helpers"; +import { fetchReportData, setOptions, sendReportToMail, fetchOptions, setPayload } from "@/leaseStatisticReport/actions"; +import { getAttributes as getLeaseStatisticReportAttributes, getOptions, getIsFetchingOptions } from "@/leaseStatisticReport/selectors"; import type { Attributes, Reports } from "types"; type Props = { leaseStatisticReportAttributes: Attributes; diff --git a/src/leaseStatisticReport/components/LeaseStatisticReportPage.tsx b/src/leaseStatisticReport/components/LeaseStatisticReportPage.tsx index c16b92401..9864b2e4f 100644 --- a/src/leaseStatisticReport/components/LeaseStatisticReportPage.tsx +++ b/src/leaseStatisticReport/components/LeaseStatisticReportPage.tsx @@ -3,27 +3,27 @@ import { connect } from "react-redux"; import { withRouter } from "react-router"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; -import AuthorizationError from "components/authorization/AuthorizationError"; -import ContentContainer from "components/content/ContentContainer"; -import Divider from "components/content/Divider"; -import Loader from "components/loader/Loader"; -import PageContainer from "components/content/PageContainer"; -import { receiveTopNavigationSettings } from "components/topNavigation/actions"; -import { PermissionMissingTexts } from "enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { hasPermissions, setPageTitle } from "util/helpers"; -import { getRouteById, Routes } from "root/routes"; -import { getReportTypeOptions } from "leaseStatisticReport/helpers"; +import AuthorizationError from "@/components/authorization/AuthorizationError"; +import ContentContainer from "@/components/content/ContentContainer"; +import Divider from "@/components/content/Divider"; +import Loader from "@/components/loader/Loader"; +import PageContainer from "@/components/content/PageContainer"; +import { receiveTopNavigationSettings } from "@/components/topNavigation/actions"; +import { PermissionMissingTexts } from "@/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { hasPermissions, setPageTitle } from "@/util/helpers"; +import { getRouteById, Routes } from "@/root/routes"; +import { getReportTypeOptions } from "@/leaseStatisticReport/helpers"; import LeaseStatisticReportForm from "./LeaseStatisticReportForm"; import LeaseInvoicingConfirmationReport from "./LeaseInvoicingConfirmationReport"; -import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "usersPermissions/selectors"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "@/usersPermissions/selectors"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; import type { Reports } from "types"; -import GreenBox from "components/content/GreenBox"; -import SubTitle from "components/content/SubTitle"; -import { getIsFetchingReportData, getPayload, getReports } from "leaseStatisticReport/selectors"; -import { getReportData } from "leaseStatisticReport/selectors"; -import { getLabelOfOption } from "util/helpers"; +import GreenBox from "@/components/content/GreenBox"; +import SubTitle from "@/components/content/SubTitle"; +import { getIsFetchingReportData, getPayload, getReports } from "@/leaseStatisticReport/selectors"; +import { getReportData } from "@/leaseStatisticReport/selectors"; +import { getLabelOfOption } from "@/util/helpers"; type Props = { isFetchingUsersPermissions: boolean; isFetchingReportData: boolean; diff --git a/src/leaseStatisticReport/helpers.ts b/src/leaseStatisticReport/helpers.ts index fcc37d050..a312b9cd0 100644 --- a/src/leaseStatisticReport/helpers.ts +++ b/src/leaseStatisticReport/helpers.ts @@ -1,9 +1,9 @@ import get from "lodash/get"; import format from "date-fns/format"; -import { formatDate, formatNumber } from "util/helpers"; -import { LeaseStatisticReportFormatOptions } from "leaseStatisticReport/enums"; -import type { Reports } from "types"; -import { FieldTypes } from "enums"; +import { formatDate, formatNumber } from "@/util/helpers"; +import { LeaseStatisticReportFormatOptions } from "@/leaseStatisticReport/enums"; +import type { Reports } from "@/types"; +import { FieldTypes } from "@/enums"; import type { ReportOptions, ReportOutputField } from "./types"; /** diff --git a/src/leaseStatisticReport/reducer.ts b/src/leaseStatisticReport/reducer.ts index 4616db9b2..77be4888e 100644 --- a/src/leaseStatisticReport/reducer.ts +++ b/src/leaseStatisticReport/reducer.ts @@ -1,6 +1,6 @@ import { combineReducers } from "redux"; import { handleActions } from "redux-actions"; -import type { Attributes, Reducer, ApiResponse, Reports } from "../types"; +import type { Attributes, Reducer, ApiResponse, Reports } from "@/types"; import type { ReceiveAttributesAction, ReceiveLeaseInvoicingConfirmationReportAttributesAction, ReceiveLeaseInvoicingConfrimationReportsAction, ReceiveReportsAction, ReceiveReportDataAction, SetOptionsAction, SetPayloadAction, ReceiveOptionsAction } from "./types"; const isFetchingAttributesReducer: Reducer = handleActions({ 'mvj/leaseStatisticReport/FETCH_ATTRIBUTES': () => true, diff --git a/src/leaseStatisticReport/requests.ts b/src/leaseStatisticReport/requests.ts index 7acfe8028..9a34a7f94 100644 --- a/src/leaseStatisticReport/requests.ts +++ b/src/leaseStatisticReport/requests.ts @@ -1,5 +1,5 @@ -import callApi from "../api/callApi"; -import createUrl from "../api/createUrl"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; import { parseServiceUnitQuery } from "./helpers"; export const fetchAttributes = (): Generator => { diff --git a/src/leaseStatisticReport/saga.ts b/src/leaseStatisticReport/saga.ts index fa01130ac..6201ed377 100644 --- a/src/leaseStatisticReport/saga.ts +++ b/src/leaseStatisticReport/saga.ts @@ -2,8 +2,8 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects"; import { SubmissionError } from "redux-form"; import { receiveAttributes, attributesNotFound, receiveLeaseInvoicingConfirmationReportAttributes, leaseInvoicingConfirmationReportAttributesNotFound, receiveLeaseInvoicingConfrimationReports, notFoundLeaseInvoicingConfrimationReports, receiveReports, reportsNotFound, receiveReportData, reportDataNotFound, mailSent, noMailSent, receiveOptions, optionsNotFound } from "./actions"; import { fetchAttributes, fetchLeaseInvoicingConfirmationReportAttributes, fetchLeaseInvoicingConfrimationReports, fetchReports, fetchReportData, sendReportToMail, fetchOptions } from "./requests"; -import { receiveError } from "../api/actions"; -import { displayUIMessage } from "util/helpers"; +import { receiveError } from "@/api/actions"; +import { displayUIMessage } from "@/util/helpers"; function* fetchAttributesSaga(): Generator { try { diff --git a/src/leaseStatisticReport/selectors.ts b/src/leaseStatisticReport/selectors.ts index e1bd8627f..819d9dfbe 100644 --- a/src/leaseStatisticReport/selectors.ts +++ b/src/leaseStatisticReport/selectors.ts @@ -1,5 +1,5 @@ import type { Attributes, Selector, Reports } from "types"; -import type { RootState } from "root/types"; +import type { RootState } from "@/root/types"; export const getIsFetchingAttributes: Selector = (state: RootState): boolean => state.leaseStatisticReport.isFetchingAttributes; export const getAttributes: Selector = (state: RootState): Attributes => state.leaseStatisticReport.attributes; export const getIsFetchingLeaseInvoicingConfirmationReportAttributes: Selector = (state: RootState): boolean => state.leaseStatisticReport.isFetchingLeaseInvoicingConfirmationReportAttributes; diff --git a/src/leaseStatisticReport/types.ts b/src/leaseStatisticReport/types.ts index 8e5592e0a..2a887b2ea 100644 --- a/src/leaseStatisticReport/types.ts +++ b/src/leaseStatisticReport/types.ts @@ -1,4 +1,4 @@ -import type { Action, Attributes, ApiResponse, Reports } from "../types"; +import type { Action, Attributes, ApiResponse, Reports } from "@/types"; export type LeaseStatisticReportState = { attributes: Attributes; isFetchingAttributes: boolean; diff --git a/src/leaseType/reducer.ts b/src/leaseType/reducer.ts index bcce2d178..899052f28 100644 --- a/src/leaseType/reducer.ts +++ b/src/leaseType/reducer.ts @@ -1,7 +1,7 @@ import { combineReducers } from "redux"; import { handleActions } from "redux-actions"; import type { Reducer } from "types"; -import type { LeaseTypeList, ReceiveLeaseTypesAction } from "leaseType/types"; +import type { LeaseTypeList, ReceiveLeaseTypesAction } from "@/leaseType/types"; const isFetchingReducer: Reducer = handleActions({ 'mvj/leaseType/FETCH_ALL': () => true, 'mvj/leaseType/NOT_FOUND': () => false, diff --git a/src/leaseType/requests.ts b/src/leaseType/requests.ts index 1eccf4d9d..459b0f1d6 100644 --- a/src/leaseType/requests.ts +++ b/src/leaseType/requests.ts @@ -1,5 +1,5 @@ -import callApi from "../api/callApi"; -import createUrl from "../api/createUrl"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; export const fetchLeaseTypes = (): Generator => { return callApi(new Request(createUrl('lease_type/?limit=10000'))); }; \ No newline at end of file diff --git a/src/leaseType/saga.ts b/src/leaseType/saga.ts index 59afec455..075086aff 100644 --- a/src/leaseType/saga.ts +++ b/src/leaseType/saga.ts @@ -1,6 +1,6 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects"; import { notFound, receiveLeaseTypes } from "./actions"; -import { receiveError } from "api/actions"; +import { receiveError } from "@/api/actions"; import { fetchLeaseTypes } from "./requests"; function* fetchLeaseTypesSaga(): Generator { diff --git a/src/leaseType/selectors.ts b/src/leaseType/selectors.ts index 3b81db1f1..875f617bd 100644 --- a/src/leaseType/selectors.ts +++ b/src/leaseType/selectors.ts @@ -1,5 +1,5 @@ -import type { RootState } from "../root/types"; -import type { Selector } from "../types"; +import type { RootState } from "@/root/types"; +import type { Selector } from "@/types"; import type { LeaseTypeList } from "./types"; export const getIsFetching: Selector = (state: RootState): boolean => state.leaseType.isFetching; export const getLeaseTypeList: Selector = (state: RootState): LeaseTypeList => state.leaseType.list; \ No newline at end of file diff --git a/src/leaseType/types.ts b/src/leaseType/types.ts index 8c5490ce8..e69ee4337 100644 --- a/src/leaseType/types.ts +++ b/src/leaseType/types.ts @@ -1,4 +1,4 @@ -import type { Action } from "../types"; +import type { Action } from "@/types"; export type LeaseTypeList = Array>; export type LeaseTypeState = { isFetching: boolean; diff --git a/src/leaseholdTransfer/actions.ts b/src/leaseholdTransfer/actions.ts index 86d7b8132..02fc12218 100644 --- a/src/leaseholdTransfer/actions.ts +++ b/src/leaseholdTransfer/actions.ts @@ -1,6 +1,6 @@ import { createAction } from "redux-actions"; import type { Attributes, Methods } from "types"; -import type { FetchAttributesAction, ReceiveAttributesAction, ReceiveMethodsAction, AttributesNotFoundAction, LeaseholdTransferList, FetchLeaseholdTransferListAction, ReceiveLeaseholdTransferListAction, DeleteAndUpdateLeaseholdTrasferPayload, DeleteLeaseholdTransferAndUpdateListAction, NotFoundAction } from "leaseholdTransfer/types"; +import type { FetchAttributesAction, ReceiveAttributesAction, ReceiveMethodsAction, AttributesNotFoundAction, LeaseholdTransferList, FetchLeaseholdTransferListAction, ReceiveLeaseholdTransferListAction, DeleteAndUpdateLeaseholdTrasferPayload, DeleteLeaseholdTransferAndUpdateListAction, NotFoundAction } from "@/leaseholdTransfer/types"; export const fetchAttributes = (): FetchAttributesAction => createAction('mvj/leaseholdTransfer/FETCH_ATTRIBUTES')(); export const receiveAttributes = (attributes: Attributes): ReceiveAttributesAction => createAction('mvj/leaseholdTransfer/RECEIVE_ATTRIBUTES')(attributes); export const receiveMethods = (methods: Methods): ReceiveMethodsAction => createAction('mvj/leaseholdTransfer/RECEIVE_METHODS')(methods); diff --git a/src/leaseholdTransfer/components/LeaseholdTransferListPage.tsx b/src/leaseholdTransfer/components/LeaseholdTransferListPage.tsx index a525f588c..a2e4782ce 100644 --- a/src/leaseholdTransfer/components/LeaseholdTransferListPage.tsx +++ b/src/leaseholdTransfer/components/LeaseholdTransferListPage.tsx @@ -5,31 +5,31 @@ import { initialize } from "redux-form"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import AuthorizationError from "components/authorization/AuthorizationError"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import PageContainer from "components/content/PageContainer"; -import Pagination from "components/table/Pagination"; -import RemoveButton from "components/form/RemoveButton"; -import Search from "leaseholdTransfer/components/search/Search"; -import SortableTable from "components/table/SortableTable"; -import TableFilters from "components/table/TableFilters"; -import TableWrapper from "components/table/TableWrapper"; -import { deleteLeaseholdTransferAndUpdateList, fetchLeaseholdTransferList } from "leaseholdTransfer/actions"; -import { receiveTopNavigationSettings } from "components/topNavigation/actions"; -import { LIST_TABLE_PAGE_SIZE } from "util/constants"; -import { DEFAULT_SORT_KEY, DEFAULT_SORT_ORDER } from "leaseholdTransfer/constants"; -import { ConfirmationModalTexts, FormNames, Methods, PermissionMissingTexts } from "enums"; -import { ButtonColors } from "components/enums"; -import { LeaseholdTransferFieldPaths, LeaseholdTransferFieldTitles } from "leaseholdTransfer/enums"; -import { getContentLeaseholdTransfers, mapLeaseholdTransferSearchFilters } from "leaseholdTransfer/helpers"; -import { formatDate, getApiResponseCount, getApiResponseMaxPage, getSearchQuery, getUrlParams, isFieldAllowedToRead, isMethodAllowed, setPageTitle } from "util/helpers"; -import { getRouteById, Routes } from "root/routes"; -import { getIsFetching, getLeaseholdTransferList } from "leaseholdTransfer/selectors"; -import { withLeaseholdTransferAttributes } from "components/attributes/LeaseholdTransferAttributes"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import AuthorizationError from "@/components/authorization/AuthorizationError"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import PageContainer from "@/components/content/PageContainer"; +import Pagination from "@/components/table/Pagination"; +import RemoveButton from "@/components/form/RemoveButton"; +import Search from "@/leaseholdTransfer/components/search/Search"; +import SortableTable from "@/components/table/SortableTable"; +import TableFilters from "@/components/table/TableFilters"; +import TableWrapper from "@/components/table/TableWrapper"; +import { deleteLeaseholdTransferAndUpdateList, fetchLeaseholdTransferList } from "@/leaseholdTransfer/actions"; +import { receiveTopNavigationSettings } from "@/components/topNavigation/actions"; +import { LIST_TABLE_PAGE_SIZE } from "@/util/constants"; +import { DEFAULT_SORT_KEY, DEFAULT_SORT_ORDER } from "@/leaseholdTransfer/constants"; +import { ConfirmationModalTexts, FormNames, Methods, PermissionMissingTexts } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { LeaseholdTransferFieldPaths, LeaseholdTransferFieldTitles } from "@/leaseholdTransfer/enums"; +import { getContentLeaseholdTransfers, mapLeaseholdTransferSearchFilters } from "@/leaseholdTransfer/helpers"; +import { formatDate, getApiResponseCount, getApiResponseMaxPage, getSearchQuery, getUrlParams, isFieldAllowedToRead, isMethodAllowed, setPageTitle } from "@/util/helpers"; +import { getRouteById, Routes } from "@/root/routes"; +import { getIsFetching, getLeaseholdTransferList } from "@/leaseholdTransfer/selectors"; +import { withLeaseholdTransferAttributes } from "@/components/attributes/LeaseholdTransferAttributes"; import type { Attributes, Methods as MethodsType } from "types"; -import type { LeaseholdTransferList } from "leaseholdTransfer/types"; +import type { LeaseholdTransferList } from "@/leaseholdTransfer/types"; type Props = { deleteLeaseholdTransferAndUpdateList: (...args: Array) => any; fetchLeaseholdTransferList: (...args: Array) => any; diff --git a/src/leaseholdTransfer/components/search/Search.tsx b/src/leaseholdTransfer/components/search/Search.tsx index 347605f6c..1428c4e65 100644 --- a/src/leaseholdTransfer/components/search/Search.tsx +++ b/src/leaseholdTransfer/components/search/Search.tsx @@ -5,10 +5,10 @@ import { Row, Column } from "react-foundation"; import debounce from "lodash/debounce"; import flowRight from "lodash/flowRight"; import isEqual from "lodash/isEqual"; -import FormField from "components/form/FormField"; -import SearchClearLink from "components/search/SearchClearLink"; -import SearchContainer from "components/search/SearchContainer"; -import { FieldTypes, FormNames } from "enums"; +import FormField from "@/components/form/FormField"; +import SearchClearLink from "@/components/search/SearchClearLink"; +import SearchContainer from "@/components/search/SearchContainer"; +import { FieldTypes, FormNames } from "@/enums"; type Props = { formValues: Record; handleSubmit: (...args: Array) => any; diff --git a/src/leaseholdTransfer/constants.ts b/src/leaseholdTransfer/constants.ts index 8d041867d..d8e532738 100644 --- a/src/leaseholdTransfer/constants.ts +++ b/src/leaseholdTransfer/constants.ts @@ -1,4 +1,4 @@ -import { TableSortOrder } from "enums"; +import { TableSortOrder } from "@/enums"; /** * Default sort key of leasehold transfer list page diff --git a/src/leaseholdTransfer/helpers.ts b/src/leaseholdTransfer/helpers.ts index 67b9e89e3..550f8bd12 100644 --- a/src/leaseholdTransfer/helpers.ts +++ b/src/leaseholdTransfer/helpers.ts @@ -1,8 +1,8 @@ import get from "lodash/get"; -import { LeaseholdTransferPartyTypes } from "leaseholdTransfer/enums"; -import { TableSortOrder } from "enums"; -import { getApiResponseResults } from "util/helpers"; -import type { LeaseholdTransferList } from "leaseholdTransfer/types"; +import { LeaseholdTransferPartyTypes } from "@/leaseholdTransfer/enums"; +import { TableSortOrder } from "@/enums"; +import { getApiResponseResults } from "@/util/helpers"; +import type { LeaseholdTransferList } from "@/leaseholdTransfer/types"; /** * Map leasehold transfer search filters for API diff --git a/src/leaseholdTransfer/reducer.ts b/src/leaseholdTransfer/reducer.ts index af7b32023..4dcb9a711 100644 --- a/src/leaseholdTransfer/reducer.ts +++ b/src/leaseholdTransfer/reducer.ts @@ -1,7 +1,7 @@ import { combineReducers } from "redux"; import { handleActions } from "redux-actions"; import type { Attributes, Methods, Reducer } from "types"; -import type { LeaseholdTransferList, ReceiveAttributesAction, ReceiveMethodsAction, ReceiveLeaseholdTransferListAction } from "leaseholdTransfer/types"; +import type { LeaseholdTransferList, ReceiveAttributesAction, ReceiveMethodsAction, ReceiveLeaseholdTransferListAction } from "@/leaseholdTransfer/types"; const isFetchingAttributesReducer: Reducer = handleActions({ 'mvj/leaseholdTransfer/FETCH_ATTRIBUTES': () => true, 'mvj/leaseholdTransfer/RECEIVE_METHODS': () => false, diff --git a/src/leaseholdTransfer/requests.ts b/src/leaseholdTransfer/requests.ts index 7dc5dd2f6..1a29d63fa 100644 --- a/src/leaseholdTransfer/requests.ts +++ b/src/leaseholdTransfer/requests.ts @@ -1,5 +1,5 @@ -import callApi from "../api/callApi"; -import createUrl from "../api/createUrl"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; export const fetchAttributes = () => { return callApi(new Request(createUrl('leasehold_transfer/'), { method: 'OPTIONS' diff --git a/src/leaseholdTransfer/saga.ts b/src/leaseholdTransfer/saga.ts index 33d8b2d14..e568522aa 100644 --- a/src/leaseholdTransfer/saga.ts +++ b/src/leaseholdTransfer/saga.ts @@ -1,7 +1,7 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects"; import { receiveAttributes, receiveMethods, attributesNotFound, fetchLeaseholdTransferList as fetchLeaseholdTransferListAction, receiveLeaseholdTransferList, notFound } from "./actions"; -import { receiveError } from "api/actions"; -import { displayUIMessage } from "util/helpers"; +import { receiveError } from "@/api/actions"; +import { displayUIMessage } from "@/util/helpers"; import { deleteLeaseholdTransfer, fetchAttributes, fetchLeaseholdTransferList } from "./requests"; function* fetchAttributesSaga(): Generator { diff --git a/src/leaseholdTransfer/selectors.ts b/src/leaseholdTransfer/selectors.ts index 6542739d8..e84a032d8 100644 --- a/src/leaseholdTransfer/selectors.ts +++ b/src/leaseholdTransfer/selectors.ts @@ -1,6 +1,6 @@ import type { Attributes, Methods, Selector } from "types"; -import type { LeaseholdTransferList } from "leaseholdTransfer/types"; -import type { RootState } from "root/types"; +import type { LeaseholdTransferList } from "@/leaseholdTransfer/types"; +import type { RootState } from "@/root/types"; export const getIsFetchingAttributes: Selector = (state: RootState): boolean => state.leaseholdTransfer.isFetchingAttributes; export const getAttributes: Selector = (state: RootState): Attributes => state.leaseholdTransfer.attributes; export const getMethods: Selector = (state: RootState): Methods => state.leaseholdTransfer.methods; diff --git a/src/leases/components/LeaseListPage.tsx b/src/leases/components/LeaseListPage.tsx index 97d45a44d..8da0c0179 100644 --- a/src/leases/components/LeaseListPage.tsx +++ b/src/leases/components/LeaseListPage.tsx @@ -7,54 +7,54 @@ import { Row, Column } from "react-foundation"; import debounce from "lodash/debounce"; import isArray from "lodash/isArray"; import isEmpty from "lodash/isEmpty"; -import FieldTypeSelect from "components/form/FieldTypeSelect"; -import SearchInputColumn from "components/search/SearchInputColumn"; -import SearchLabel from "components/search/SearchLabel"; -import SearchLabelColumn from "components/search/SearchLabelColumn"; -import SearchRow from "components/search/SearchRow"; -import AddButtonSecondary from "components/form/AddButtonSecondary"; -import Authorization from "components/authorization/Authorization"; -import AuthorizationError from "components/authorization/AuthorizationError"; +import FieldTypeSelect from "@/components/form/FieldTypeSelect"; +import SearchInputColumn from "@/components/search/SearchInputColumn"; +import SearchLabel from "@/components/search/SearchLabel"; +import SearchLabelColumn from "@/components/search/SearchLabelColumn"; +import SearchRow from "@/components/search/SearchRow"; +import AddButtonSecondary from "@/components/form/AddButtonSecondary"; +import Authorization from "@/components/authorization/Authorization"; +import AuthorizationError from "@/components/authorization/AuthorizationError"; import CreateLeaseModal from "./createLease/CreateLeaseModal"; -import IconRadioButtons from "components/button/IconRadioButtons"; -import LeaseListMap from "leases/components/leaseSections/map/LeaseListMap"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import MapIcon from "components/icons/MapIcon"; -import PageContainer from "components/content/PageContainer"; -import Pagination from "components/table/Pagination"; +import IconRadioButtons from "@/components/button/IconRadioButtons"; +import LeaseListMap from "@/leases/components/leaseSections/map/LeaseListMap"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import MapIcon from "@/components/icons/MapIcon"; +import PageContainer from "@/components/content/PageContainer"; +import Pagination from "@/components/table/Pagination"; import Search from "./search/Search"; -import SortableTable from "components/table/SortableTable"; -import TableFilters from "components/table/TableFilters"; -import TableIcon from "components/icons/TableIcon"; -import TableFilterWrapper from "components/table/TableFilterWrapper"; -import TableWrapper from "components/table/TableWrapper"; -import VisualisationTypeWrapper from "components/table/VisualisationTypeWrapper"; -import { fetchAreaNoteList } from "areaNote/actions"; -import { fetchServiceUnits } from "serviceUnits/actions"; -import { receiveTopNavigationSettings } from "components/topNavigation/actions"; -import { createLease, fetchLeases, fetchLeasesByBBox } from "leases/actions"; -import { fetchLessors } from "lessor/actions"; -import { LIST_TABLE_PAGE_SIZE } from "util/constants"; -import { DEFAULT_LEASE_STATES, DEFAULT_ONLY_ACTIVE_LEASES, DEFAULT_SORT_KEY, DEFAULT_SORT_ORDER, MAX_ZOOM_LEVEL_TO_FETCH_LEASES, BOUNDING_BOX_FOR_SEARCH_QUERY, leaseStateFilterOptions } from "leases/constants"; -import { FormNames, Methods, PermissionMissingTexts } from "enums"; -import { LeaseAreasFieldPaths, LeaseAreaAddressesFieldPaths, LeaseFieldPaths, LeaseFieldTitles, LeaseTenantsFieldPaths } from "leases/enums"; -import { getContentLeaseListResults, mapLeaseSearchFilters } from "leases/helpers"; -import { formatDate, getApiResponseCount, getApiResponseMaxPage, getFieldOptions, getLabelOfOption, getSearchQuery, getUrlParams, isFieldAllowedToRead, isMethodAllowed, setPageTitle } from "util/helpers"; -import { getRouteById, Routes } from "root/routes"; -import { getAreaNoteList, getMethods as getAreaNoteMethods } from "areaNote/selectors"; -import { getIsFetching, getIsFetchingByBBox, getLeasesList } from "leases/selectors"; -import { getLessorList } from "lessor/selectors"; -import { getUsersPermissions, getUserActiveServiceUnit } from "usersPermissions/selectors"; -import { withLeaseAttributes } from "components/attributes/LeaseAttributes"; -import { withUiDataList } from "components/uiData/UiDataListHOC"; -import { getServiceUnits, getIsFetching as getIsFetchingServiceUnits } from "serviceUnits/selectors"; +import SortableTable from "@/components/table/SortableTable"; +import TableFilters from "@/components/table/TableFilters"; +import TableIcon from "@/components/icons/TableIcon"; +import TableFilterWrapper from "@/components/table/TableFilterWrapper"; +import TableWrapper from "@/components/table/TableWrapper"; +import VisualisationTypeWrapper from "@/components/table/VisualisationTypeWrapper"; +import { fetchAreaNoteList } from "@/areaNote/actions"; +import { fetchServiceUnits } from "@/serviceUnits/actions"; +import { receiveTopNavigationSettings } from "@/components/topNavigation/actions"; +import { createLease, fetchLeases, fetchLeasesByBBox } from "@/leases/actions"; +import { fetchLessors } from "@/lessor/actions"; +import { LIST_TABLE_PAGE_SIZE } from "@/util/constants"; +import { DEFAULT_LEASE_STATES, DEFAULT_ONLY_ACTIVE_LEASES, DEFAULT_SORT_KEY, DEFAULT_SORT_ORDER, MAX_ZOOM_LEVEL_TO_FETCH_LEASES, BOUNDING_BOX_FOR_SEARCH_QUERY, leaseStateFilterOptions } from "@/leases/constants"; +import { FormNames, Methods, PermissionMissingTexts } from "@/enums"; +import { LeaseAreasFieldPaths, LeaseAreaAddressesFieldPaths, LeaseFieldPaths, LeaseFieldTitles, LeaseTenantsFieldPaths } from "@/leases/enums"; +import { getContentLeaseListResults, mapLeaseSearchFilters } from "@/leases/helpers"; +import { formatDate, getApiResponseCount, getApiResponseMaxPage, getFieldOptions, getLabelOfOption, getSearchQuery, getUrlParams, isFieldAllowedToRead, isMethodAllowed, setPageTitle } from "@/util/helpers"; +import { getRouteById, Routes } from "@/root/routes"; +import { getAreaNoteList, getMethods as getAreaNoteMethods } from "@/areaNote/selectors"; +import { getIsFetching, getIsFetchingByBBox, getLeasesList } from "@/leases/selectors"; +import { getLessorList } from "@/lessor/selectors"; +import { getUsersPermissions, getUserActiveServiceUnit } from "@/usersPermissions/selectors"; +import { withLeaseAttributes } from "@/components/attributes/LeaseAttributes"; +import { withUiDataList } from "@/components/uiData/UiDataListHOC"; +import { getServiceUnits, getIsFetching as getIsFetchingServiceUnits } from "@/serviceUnits/selectors"; import type { Attributes, Methods as MethodsType } from "types"; -import type { AreaNoteList } from "areaNote/types"; -import type { LeaseList } from "leases/types"; -import type { LessorList } from "lessor/types"; -import type { ServiceUnits } from "serviceUnits/types"; -import type { UsersPermissions as UsersPermissionsType, UserServiceUnit } from "usersPermissions/types"; +import type { AreaNoteList } from "@/areaNote/types"; +import type { LeaseList } from "@/leases/types"; +import type { LessorList } from "@/lessor/types"; +import type { ServiceUnits } from "@/serviceUnits/types"; +import type { UsersPermissions as UsersPermissionsType, UserServiceUnit } from "@/usersPermissions/types"; const VisualizationTypes = { MAP: 'map', TABLE: 'table' diff --git a/src/leases/components/LeasePage.tsx b/src/leases/components/LeasePage.tsx index 015b188d5..c78cd559b 100644 --- a/src/leases/components/LeasePage.tsx +++ b/src/leases/components/LeasePage.tsx @@ -5,69 +5,69 @@ import { change, destroy, getFormValues, initialize, isDirty } from "redux-form" import { withRouter } from "react-router"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; -import Authorization from "components/authorization/Authorization"; -import AuthorizationError from "components/authorization/AuthorizationError"; +import Authorization from "@/components/authorization/Authorization"; +import AuthorizationError from "@/components/authorization/AuthorizationError"; import CommentPanel from "./leaseSections/comments/CommentPanel"; -import ConfirmationModal from "components/modal/ConfirmationModal"; +import ConfirmationModal from "@/components/modal/ConfirmationModal"; import Constructability from "./leaseSections/constructability/Constructability"; import ConstructabilityEdit from "./leaseSections/constructability/ConstructabilityEdit"; -import ContentContainer from "components/content/ContentContainer"; -import ControlButtons from "components/controlButtons/ControlButtons"; -import ControlButtonBar from "components/controlButtons/ControlButtonBar"; +import ContentContainer from "@/components/content/ContentContainer"; +import ControlButtons from "@/components/controlButtons/ControlButtons"; +import ControlButtonBar from "@/components/controlButtons/ControlButtonBar"; import DecisionsMain from "./leaseSections/contract/DecisionsMain"; import DecisionsMainEdit from "./leaseSections/contract/DecisionsMainEdit"; -import FullWidthContainer from "components/content/FullWidthContainer"; +import FullWidthContainer from "@/components/content/FullWidthContainer"; import Invoices from "./leaseSections/invoice/Invoices"; import LeaseAreas from "./leaseSections/leaseArea/LeaseAreas"; import LeaseAreasEdit from "./leaseSections/leaseArea/LeaseAreasEdit"; import LeaseAuditLog from "./leaseSections/auditLog/LeaseAuditLog"; import LeaseInfo from "./leaseSections/leaseInfo/LeaseInfo"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import PageContainer from "components/content/PageContainer"; -import PageNavigationWrapper from "components/content/PageNavigationWrapper"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import PageContainer from "@/components/content/PageContainer"; +import PageNavigationWrapper from "@/components/content/PageNavigationWrapper"; import Rents from "./leaseSections/rent/Rents"; import RentsEdit from "./leaseSections/rent/RentsEdit"; import SingleLeaseMap from "./leaseSections/map/SingleLeaseMap"; import Summary from "./leaseSections/summary/Summary"; import SummaryEdit from "./leaseSections/summary/SummaryEdit"; -import Tabs from "components/tabs/Tabs"; -import TabPane from "components/tabs/TabPane"; -import TabContent from "components/tabs/TabContent"; +import Tabs from "@/components/tabs/Tabs"; +import TabPane from "@/components/tabs/TabPane"; +import TabContent from "@/components/tabs/TabContent"; import TenantsEdit from "./leaseSections/tenant/TenantsEdit"; import Tenants from "./leaseSections/tenant/Tenants"; -import { fetchCommentsByLease } from "comments/actions"; -import { fetchInvoicesByLease } from "invoices/actions"; -import { clearFormValidFlags, deleteLease, fetchSingleLease, hideEditMode, patchLease, receiveSingleLease, receiveFormValidFlags, receiveIsSaveClicked, showEditMode } from "leases/actions"; -import { fetchLeaseTypes } from "leaseType/actions"; -import { clearPreviewInvoices } from "previewInvoices/actions"; -import { receiveTopNavigationSettings } from "components/topNavigation/actions"; -import { fetchVats } from "vat/actions"; -import { ConfirmationModalTexts, FormNames, Methods, PermissionMissingTexts } from "enums"; -import { LeaseAreasFieldPaths, LeaseBasisOfRentsFieldPaths, LeaseContractsFieldPaths, LeaseDecisionsFieldPaths, LeaseInspectionsFieldPaths, LeaseRentsFieldPaths, LeaseTenantsFieldPaths } from "leases/enums"; -import { ButtonColors } from "components/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { clearUnsavedChanges, getContentLeaseIdentifier } from "leases/helpers"; -import { addAreasFormValuesToPayload, addConstructabilityFormValuesToPayload, addContractsFormValuesToPayload, addDecisionsFormValuesToPayload, addInspectionsFormValuesToPayload, addRentsFormValuesToPayload, addSummaryFormValuesToPayload, addTenantsFormValuesToPayload, getContentBasisOfRents, getContentContracts, getContentConstructabilityAreas, getContentDecisions, getContentInspections, getContentLeaseAreas, getContentRents, getContentLeaseSummary, getContentTenants, isUserAllowedToDeleteEmptyLease } from "leases/helpers"; -import { getSearchQuery, getUrlParams, hasPermissions, isArchived, isFieldAllowedToRead, isMethodAllowed, scrollToTopPage, setPageTitle } from "util/helpers"; -import { getRouteById, Routes } from "root/routes"; -import { getLoggedInUser } from "auth/selectors"; -import { getCommentsByLease } from "comments/selectors"; -import { getInvoicesByLease } from "invoices/selectors"; -import { getCurrentLease, getIsEditMode, getIsFetching, getIsFormValidById, getIsFormValidFlags, getIsSaveClicked, getIsSaving } from "leases/selectors"; -import { getLeaseTypeList } from "leaseType/selectors"; -import { getVats } from "vat/selectors"; -import { getSessionStorageItem, removeSessionStorageItem, setSessionStorageItem } from "util/storage"; -import { withLeasePageAttributes } from "components/attributes/LeasePageAttributes"; -import { withUiDataList } from "components/uiData/UiDataListHOC"; -import { getUserActiveServiceUnit } from "usersPermissions/selectors"; +import { fetchCommentsByLease } from "@/comments/actions"; +import { fetchInvoicesByLease } from "@/invoices/actions"; +import { clearFormValidFlags, deleteLease, fetchSingleLease, hideEditMode, patchLease, receiveSingleLease, receiveFormValidFlags, receiveIsSaveClicked, showEditMode } from "@/leases/actions"; +import { fetchLeaseTypes } from "@/leaseType/actions"; +import { clearPreviewInvoices } from "@/previewInvoices/actions"; +import { receiveTopNavigationSettings } from "@/components/topNavigation/actions"; +import { fetchVats } from "@/vat/actions"; +import { ConfirmationModalTexts, FormNames, Methods, PermissionMissingTexts } from "@/enums"; +import { LeaseAreasFieldPaths, LeaseBasisOfRentsFieldPaths, LeaseContractsFieldPaths, LeaseDecisionsFieldPaths, LeaseInspectionsFieldPaths, LeaseRentsFieldPaths, LeaseTenantsFieldPaths } from "@/leases/enums"; +import { ButtonColors } from "@/components/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { clearUnsavedChanges, getContentLeaseIdentifier } from "@/leases/helpers"; +import { addAreasFormValuesToPayload, addConstructabilityFormValuesToPayload, addContractsFormValuesToPayload, addDecisionsFormValuesToPayload, addInspectionsFormValuesToPayload, addRentsFormValuesToPayload, addSummaryFormValuesToPayload, addTenantsFormValuesToPayload, getContentBasisOfRents, getContentContracts, getContentConstructabilityAreas, getContentDecisions, getContentInspections, getContentLeaseAreas, getContentRents, getContentLeaseSummary, getContentTenants, isUserAllowedToDeleteEmptyLease } from "@/leases/helpers"; +import { getSearchQuery, getUrlParams, hasPermissions, isArchived, isFieldAllowedToRead, isMethodAllowed, scrollToTopPage, setPageTitle } from "@/util/helpers"; +import { getRouteById, Routes } from "@/root/routes"; +import { getLoggedInUser } from "@/auth/selectors"; +import { getCommentsByLease } from "@/comments/selectors"; +import { getInvoicesByLease } from "@/invoices/selectors"; +import { getCurrentLease, getIsEditMode, getIsFetching, getIsFormValidById, getIsFormValidFlags, getIsSaveClicked, getIsSaving } from "@/leases/selectors"; +import { getLeaseTypeList } from "@/leaseType/selectors"; +import { getVats } from "@/vat/selectors"; +import { getSessionStorageItem, removeSessionStorageItem, setSessionStorageItem } from "@/util/storage"; +import { withLeasePageAttributes } from "@/components/attributes/LeasePageAttributes"; +import { withUiDataList } from "@/components/uiData/UiDataListHOC"; +import { getUserActiveServiceUnit } from "@/usersPermissions/selectors"; import type { Attributes, Methods as MethodsType } from "types"; -import type { CommentList } from "comments/types"; -import type { InvoiceList } from "invoices/types"; -import type { Lease } from "leases/types"; -import type { LeaseTypeList } from "leaseType/types"; -import type { UsersPermissions as UsersPermissionsType, UserServiceUnit } from "usersPermissions/types"; -import type { VatList } from "vat/types"; +import type { CommentList } from "@/comments/types"; +import type { InvoiceList } from "@/invoices/types"; +import type { Lease } from "@/leases/types"; +import type { LeaseTypeList } from "@/leaseType/types"; +import type { UsersPermissions as UsersPermissionsType, UserServiceUnit } from "@/usersPermissions/types"; +import type { VatList } from "@/vat/types"; type Props = { areasFormValues: Record; change: (...args: Array) => any; diff --git a/src/leases/components/createLease/CreateLeaseForm.tsx b/src/leases/components/createLease/CreateLeaseForm.tsx index f9ef2fb8b..c665a25dc 100644 --- a/src/leases/components/createLease/CreateLeaseForm.tsx +++ b/src/leases/components/createLease/CreateLeaseForm.tsx @@ -3,28 +3,28 @@ import { connect } from "react-redux"; import { change, formValueSelector, getFormValues, reduxForm } from "redux-form"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; -import Authorization from "components/authorization/Authorization"; -import Button from "components/button/Button"; -import FormField from "components/form/FormField"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import ModalButtonWrapper from "components/modal/ModalButtonWrapper"; -import { fetchDistrictsByMunicipality } from "district/actions"; -import { FieldTypes, FormNames } from "enums"; -import { ButtonColors } from "components/enums"; -import { LeaseFieldPaths, LeaseFieldTitles } from "leases/enums"; -import { filterOptionsByLabel } from "components/form/filter"; -import { getDistrictOptions } from "district/helpers"; -import { getPayloadCreateLease } from "leases/helpers"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { getFieldAttributes, isFieldAllowedToEdit } from "util/helpers"; -import { getDistrictsByMunicipality, getIsFetching as getIsFetchingDistricts } from "district/selectors"; -import { getAttributes as getLeaseAttributes } from "leases/selectors"; -import { referenceNumber } from "components/form/validations"; -import { getUserActiveServiceUnit } from "usersPermissions/selectors"; +import Authorization from "@/components/authorization/Authorization"; +import Button from "@/components/button/Button"; +import FormField from "@/components/form/FormField"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import ModalButtonWrapper from "@/components/modal/ModalButtonWrapper"; +import { fetchDistrictsByMunicipality } from "@/district/actions"; +import { FieldTypes, FormNames } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { LeaseFieldPaths, LeaseFieldTitles } from "@/leases/enums"; +import { filterOptionsByLabel } from "@/components/form/filter"; +import { getDistrictOptions } from "@/district/helpers"; +import { getPayloadCreateLease } from "@/leases/helpers"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { getFieldAttributes, isFieldAllowedToEdit } from "@/util/helpers"; +import { getDistrictsByMunicipality, getIsFetching as getIsFetchingDistricts } from "@/district/selectors"; +import { getAttributes as getLeaseAttributes } from "@/leases/selectors"; +import { referenceNumber } from "@/components/form/validations"; +import { getUserActiveServiceUnit } from "@/usersPermissions/selectors"; import type { Attributes } from "types"; -import type { DistrictList } from "district/types"; -import type { UserServiceUnit } from "usersPermissions/types"; +import type { DistrictList } from "@/district/types"; +import type { UserServiceUnit } from "@/usersPermissions/types"; type OwnProps = { onClose: (...args: Array) => any; onSubmit: (...args: Array) => any; diff --git a/src/leases/components/createLease/CreateLeaseModal.tsx b/src/leases/components/createLease/CreateLeaseModal.tsx index a69de0d9d..a760c4d72 100644 --- a/src/leases/components/createLease/CreateLeaseModal.tsx +++ b/src/leases/components/createLease/CreateLeaseModal.tsx @@ -1,7 +1,7 @@ import { $Shape } from "utility-types"; import React, { Component } from "react"; import CreateLeaseForm from "./CreateLeaseForm"; -import Modal from "components/modal/Modal"; +import Modal from "@/components/modal/Modal"; type Props = { allowToChangeRelateTo?: boolean; isOpen: boolean; diff --git a/src/leases/components/leaseSections/auditLog/LeaseAuditLog.tsx b/src/leases/components/leaseSections/auditLog/LeaseAuditLog.tsx index 4d8930d80..3fdf7ff11 100644 --- a/src/leases/components/leaseSections/auditLog/LeaseAuditLog.tsx +++ b/src/leases/components/leaseSections/auditLog/LeaseAuditLog.tsx @@ -1,21 +1,21 @@ import React, { Fragment, PureComponent } from "react"; import { connect } from "react-redux"; import isEmpty from "lodash/isEmpty"; -import AuditLogTable from "components/auditLog/AuditLogTable"; -import Divider from "components/content/Divider"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import Pagination from "components/table/Pagination"; -import TableWrapper from "components/table/TableWrapper"; -import Title from "components/content/Title"; -import { fetchAuditLogByLease } from "auditLog/actions"; -import { LIST_TABLE_PAGE_SIZE } from "util/constants"; -import { LeaseFieldPaths, LeaseFieldTitles } from "leases/enums"; -import { getApiResponseCount, getApiResponseMaxPage, getApiResponseResults } from "util/helpers"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { getAuditLogByLease, getIsFetchingByLease } from "auditLog/selectors"; -import { getIsEditMode } from "leases/selectors"; -import type { AuditLogList } from "auditLog/types"; +import AuditLogTable from "@/components/auditLog/AuditLogTable"; +import Divider from "@/components/content/Divider"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import Pagination from "@/components/table/Pagination"; +import TableWrapper from "@/components/table/TableWrapper"; +import Title from "@/components/content/Title"; +import { fetchAuditLogByLease } from "@/auditLog/actions"; +import { LIST_TABLE_PAGE_SIZE } from "@/util/constants"; +import { LeaseFieldPaths, LeaseFieldTitles } from "@/leases/enums"; +import { getApiResponseCount, getApiResponseMaxPage, getApiResponseResults } from "@/util/helpers"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { getAuditLogByLease, getIsFetchingByLease } from "@/auditLog/selectors"; +import { getIsEditMode } from "@/leases/selectors"; +import type { AuditLogList } from "@/auditLog/types"; type Props = { auditLogList: AuditLogList; fetchAuditLogByLease: (...args: Array) => any; diff --git a/src/leases/components/leaseSections/comments/Comment.tsx b/src/leases/components/leaseSections/comments/Comment.tsx index a4c21c55e..aa738b41b 100644 --- a/src/leases/components/leaseSections/comments/Comment.tsx +++ b/src/leases/components/leaseSections/comments/Comment.tsx @@ -1,15 +1,15 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; -import Button from "components/button/Button"; -import EditButton from "components/button/EditButton"; -import ShowMore from "components/showMore/ShowMore"; -import TextAreaInput from "components/inputs/TextAreaInput"; -import { editComment, hideEditModeById, showEditModeById } from "comments/actions"; -import { ButtonColors } from "components/enums"; -import { getPayloadComment } from "comments/helpers"; -import { formatDate } from "util/helpers"; -import { getIsEditModeById } from "comments/selectors"; +import Button from "@/components/button/Button"; +import EditButton from "@/components/button/EditButton"; +import ShowMore from "@/components/showMore/ShowMore"; +import TextAreaInput from "@/components/inputs/TextAreaInput"; +import { editComment, hideEditModeById, showEditModeById } from "@/comments/actions"; +import { ButtonColors } from "@/components/enums"; +import { getPayloadComment } from "@/comments/helpers"; +import { formatDate } from "@/util/helpers"; +import { getIsEditModeById } from "@/comments/selectors"; type Props = { allowEdit: boolean; comment: Record; diff --git a/src/leases/components/leaseSections/comments/CommentPanel.tsx b/src/leases/components/leaseSections/comments/CommentPanel.tsx index 0d8581a8f..13bdbd1bf 100644 --- a/src/leases/components/leaseSections/comments/CommentPanel.tsx +++ b/src/leases/components/leaseSections/comments/CommentPanel.tsx @@ -5,26 +5,26 @@ import { withRouter } from "react-router"; import classNames from "classnames"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import Authorization from "components/authorization/Authorization"; -import CheckboxInput from "components/inputs/CheckboxInput"; -import CloseButton from "components/button/CloseButton"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import Authorization from "@/components/authorization/Authorization"; +import CheckboxInput from "@/components/inputs/CheckboxInput"; +import CloseButton from "@/components/button/CloseButton"; import Comment from "./Comment"; -import FormText from "components/form/FormText"; +import FormText from "@/components/form/FormText"; import NewCommentForm from "./NewCommentForm"; -import { clearEditFlags, createComment, receiveIsSaveClicked } from "comments/actions"; -import { ConfirmationModalTexts, FormNames, Methods } from "enums"; -import { ButtonColors } from "components/enums"; -import { CommentFieldPaths } from "comments/enums"; -import { getFieldOptions, isFieldAllowedToEdit, isMethodAllowed, sortStringByKeyDesc } from "util/helpers"; -import { getContentComments } from "comments/helpers"; -import { getAttributes as getCommentAttributes, getCommentsByLease, getEditModeFlags, getMethods as getCommentMethods } from "comments/selectors"; -import { getCurrentLease } from "leases/selectors"; -import { getUserActiveServiceUnit } from "usersPermissions/selectors"; +import { clearEditFlags, createComment, receiveIsSaveClicked } from "@/comments/actions"; +import { ConfirmationModalTexts, FormNames, Methods } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { CommentFieldPaths } from "@/comments/enums"; +import { getFieldOptions, isFieldAllowedToEdit, isMethodAllowed, sortStringByKeyDesc } from "@/util/helpers"; +import { getContentComments } from "@/comments/helpers"; +import { getAttributes as getCommentAttributes, getCommentsByLease, getEditModeFlags, getMethods as getCommentMethods } from "@/comments/selectors"; +import { getCurrentLease } from "@/leases/selectors"; +import { getUserActiveServiceUnit } from "@/usersPermissions/selectors"; import type { Attributes, Methods as MethodsType } from "types"; -import type { CommentList } from "comments/types"; -import type { Lease } from "leases/types"; -import type { UserServiceUnit } from "usersPermissions/types"; +import type { CommentList } from "@/comments/types"; +import type { Lease } from "@/leases/types"; +import type { UserServiceUnit } from "@/usersPermissions/types"; type Props = { clearEditFlags: (...args: Array) => any; commentAttributes: Attributes; diff --git a/src/leases/components/leaseSections/comments/NewCommentForm.tsx b/src/leases/components/leaseSections/comments/NewCommentForm.tsx index 676826915..25bd71994 100644 --- a/src/leases/components/leaseSections/comments/NewCommentForm.tsx +++ b/src/leases/components/leaseSections/comments/NewCommentForm.tsx @@ -2,18 +2,18 @@ import React from "react"; import { connect } from "react-redux"; import { formValueSelector, reduxForm } from "redux-form"; import flowRight from "lodash/flowRight"; -import Authorization from "components/authorization/Authorization"; -import Button from "components/button/Button"; -import FormField from "components/form/FormField"; -import { receiveIsSaveClicked } from "comments/actions"; -import { FieldTypes, FormNames } from "enums"; -import { ButtonColors } from "components/enums"; -import { CommentFieldPaths, CommentFieldTitles } from "comments/enums"; -import { getUiDataCommentKey } from "uiData/helpers"; -import { getFieldAttributes, isFieldAllowedToEdit } from "util/helpers"; -import { getAttributes as getCommentAttributes, getIsSaveClicked } from "comments/selectors"; +import Authorization from "@/components/authorization/Authorization"; +import Button from "@/components/button/Button"; +import FormField from "@/components/form/FormField"; +import { receiveIsSaveClicked } from "@/comments/actions"; +import { FieldTypes, FormNames } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { CommentFieldPaths, CommentFieldTitles } from "@/comments/enums"; +import { getUiDataCommentKey } from "@/uiData/helpers"; +import { getFieldAttributes, isFieldAllowedToEdit } from "@/util/helpers"; +import { getAttributes as getCommentAttributes, getIsSaveClicked } from "@/comments/selectors"; import type { Attributes } from "types"; -import type { RootState } from "root/types"; +import type { RootState } from "@/root/types"; type Props = { commentAttributes: Attributes; isSaveClicked: boolean; diff --git a/src/leases/components/leaseSections/constructability/Comment.tsx b/src/leases/components/leaseSections/constructability/Comment.tsx index 9026be801..5340240f5 100644 --- a/src/leases/components/leaseSections/constructability/Comment.tsx +++ b/src/leases/components/leaseSections/constructability/Comment.tsx @@ -2,15 +2,15 @@ import React from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; import classNames from "classnames"; -import Authorization from "components/authorization/Authorization"; -import BoxItem from "components/content/BoxItem"; -import ExternalLink from "components/links/ExternalLink"; -import FormText from "components/form/FormText"; -import ListItem from "components/content/ListItem"; -import { LeaseConstructabilityDescriptionsFieldPaths } from "leases/enums"; -import { formatDate, getReferenceNumberLink, isFieldAllowedToRead } from "util/helpers"; -import { getUserFullName } from "users/helpers"; -import { getAttributes as getLeaseAttributes } from "leases/selectors"; +import Authorization from "@/components/authorization/Authorization"; +import BoxItem from "@/components/content/BoxItem"; +import ExternalLink from "@/components/links/ExternalLink"; +import FormText from "@/components/form/FormText"; +import ListItem from "@/components/content/ListItem"; +import { LeaseConstructabilityDescriptionsFieldPaths } from "@/leases/enums"; +import { formatDate, getReferenceNumberLink, isFieldAllowedToRead } from "@/util/helpers"; +import { getUserFullName } from "@/users/helpers"; +import { getAttributes as getLeaseAttributes } from "@/leases/selectors"; import type { Attributes } from "types"; type Props = { className?: string; diff --git a/src/leases/components/leaseSections/constructability/Comments.tsx b/src/leases/components/leaseSections/constructability/Comments.tsx index e3db700ff..1712d2cd0 100644 --- a/src/leases/components/leaseSections/constructability/Comments.tsx +++ b/src/leases/components/leaseSections/constructability/Comments.tsx @@ -1,10 +1,10 @@ import React, { Fragment } from "react"; -import BoxItemContainer from "components/content/BoxItemContainer"; +import BoxItemContainer from "@/components/content/BoxItemContainer"; import Comment from "./Comment"; -import FormText from "components/form/FormText"; -import SubTitle from "components/content/SubTitle"; -import { LeaseConstructabilityDescriptionsFieldPaths, LeaseConstructabilityDescriptionsFieldTitles } from "leases/enums"; -import { getUiDataLeaseKey } from "uiData/helpers"; +import FormText from "@/components/form/FormText"; +import SubTitle from "@/components/content/SubTitle"; +import { LeaseConstructabilityDescriptionsFieldPaths, LeaseConstructabilityDescriptionsFieldTitles } from "@/leases/enums"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; type Props = { commentClassName?: string; comments: Array>; diff --git a/src/leases/components/leaseSections/constructability/Constructability.tsx b/src/leases/components/leaseSections/constructability/Constructability.tsx index d3664bc0b..61fd5e07c 100644 --- a/src/leases/components/leaseSections/constructability/Constructability.tsx +++ b/src/leases/components/leaseSections/constructability/Constructability.tsx @@ -1,17 +1,17 @@ import React, { Fragment, PureComponent } from "react"; import { connect } from "react-redux"; import ConstructabilityItem from "./ConstructabilityItem"; -import Divider from "components/content/Divider"; -import FormText from "components/form/FormText"; +import Divider from "@/components/content/Divider"; +import FormText from "@/components/form/FormText"; import SendEmail from "./SendEmail"; -import Title from "components/content/Title"; -import { LeaseAreasFieldPaths, LeaseAreasFieldTitles } from "leases/enums"; -import { getContentConstructabilityAreas } from "leases/helpers"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { getFieldOptions } from "util/helpers"; -import { getAttributes, getCurrentLease } from "leases/selectors"; +import Title from "@/components/content/Title"; +import { LeaseAreasFieldPaths, LeaseAreasFieldTitles } from "@/leases/enums"; +import { getContentConstructabilityAreas } from "@/leases/helpers"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { getFieldOptions } from "@/util/helpers"; +import { getAttributes, getCurrentLease } from "@/leases/selectors"; import type { Attributes } from "types"; -import type { Lease } from "leases/types"; +import type { Lease } from "@/leases/types"; type Props = { attributes: Attributes; currentLease: Lease; diff --git a/src/leases/components/leaseSections/constructability/ConstructabilityEdit.tsx b/src/leases/components/leaseSections/constructability/ConstructabilityEdit.tsx index 7abb8f8e6..0427eb742 100644 --- a/src/leases/components/leaseSections/constructability/ConstructabilityEdit.tsx +++ b/src/leases/components/leaseSections/constructability/ConstructabilityEdit.tsx @@ -3,19 +3,19 @@ import { connect } from "react-redux"; import { FieldArray, reduxForm } from "redux-form"; import flowRight from "lodash/flowRight"; import ConstructabilityItemEdit from "./ConstructabilityItemEdit"; -import Divider from "components/content/Divider"; -import FormText from "components/form/FormText"; +import Divider from "@/components/content/Divider"; +import FormText from "@/components/form/FormText"; import SendEmail from "./SendEmail"; -import Title from "components/content/Title"; -import { receiveFormValidFlags } from "leases/actions"; -import { FormNames } from "enums"; -import { LeaseAreasFieldPaths, LeaseAreasFieldTitles } from "leases/enums"; -import { getContentConstructabilityAreas } from "leases/helpers"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { getFieldOptions } from "util/helpers"; -import { getAttributes, getCurrentLease, getErrorsByFormName, getIsSaveClicked } from "leases/selectors"; +import Title from "@/components/content/Title"; +import { receiveFormValidFlags } from "@/leases/actions"; +import { FormNames } from "@/enums"; +import { LeaseAreasFieldPaths, LeaseAreasFieldTitles } from "@/leases/enums"; +import { getContentConstructabilityAreas } from "@/leases/helpers"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { getFieldOptions } from "@/util/helpers"; +import { getAttributes, getCurrentLease, getErrorsByFormName, getIsSaveClicked } from "@/leases/selectors"; import type { Attributes } from "types"; -import type { Lease } from "leases/types"; +import type { Lease } from "@/leases/types"; type AreaProps = { attributes: Attributes; constructabilityStateOptions: Array>; diff --git a/src/leases/components/leaseSections/constructability/ConstructabilityItem.tsx b/src/leases/components/leaseSections/constructability/ConstructabilityItem.tsx index 4783d7dbd..b5927664e 100644 --- a/src/leases/components/leaseSections/constructability/ConstructabilityItem.tsx +++ b/src/leases/components/leaseSections/constructability/ConstructabilityItem.tsx @@ -2,23 +2,23 @@ import React, { Fragment } from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; import get from "lodash/get"; -import Authorization from "components/authorization/Authorization"; -import Collapse from "components/collapse/Collapse"; -import CollapseHeaderSubtitle from "components/collapse/CollapseHeaderSubtitle"; +import Authorization from "@/components/authorization/Authorization"; +import Collapse from "@/components/collapse/Collapse"; +import CollapseHeaderSubtitle from "@/components/collapse/CollapseHeaderSubtitle"; import Comments from "./Comments"; -import FileDownloadLink from "components/file/FileDownloadLink"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; +import FileDownloadLink from "@/components/file/FileDownloadLink"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; import StatusIndicator from "./StatusIndicator"; -import SubTitle from "components/content/SubTitle"; -import { receiveCollapseStates } from "leases/actions"; -import { FormNames, ViewModes } from "enums"; -import { LeaseAreaAddressesFieldPaths, LeaseAreaAttachmentsFieldPaths, LeaseAreaAttachmentsFieldTitles, LeaseAreasFieldPaths, LeaseAreasFieldTitles, LeaseConstructabilityDescriptionsFieldPaths } from "leases/enums"; -import { getFullAddress } from "leases/helpers"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { formatDate, formatNumber, getLabelOfOption, isEmptyValue, isFieldAllowedToRead } from "util/helpers"; -import { getUserFullName } from "users/helpers"; -import { getAttributes, getCollapseStateByKey } from "leases/selectors"; +import SubTitle from "@/components/content/SubTitle"; +import { receiveCollapseStates } from "@/leases/actions"; +import { FormNames, ViewModes } from "@/enums"; +import { LeaseAreaAddressesFieldPaths, LeaseAreaAttachmentsFieldPaths, LeaseAreaAttachmentsFieldTitles, LeaseAreasFieldPaths, LeaseAreasFieldTitles, LeaseConstructabilityDescriptionsFieldPaths } from "@/leases/enums"; +import { getFullAddress } from "@/leases/helpers"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { formatDate, formatNumber, getLabelOfOption, isEmptyValue, isFieldAllowedToRead } from "@/util/helpers"; +import { getUserFullName } from "@/users/helpers"; +import { getAttributes, getCollapseStateByKey } from "@/leases/selectors"; import type { Attributes } from "types"; const formName = FormNames.LEASE_CONSTRUCTABILITY; type Props = { diff --git a/src/leases/components/leaseSections/constructability/ConstructabilityItemEdit.tsx b/src/leases/components/leaseSections/constructability/ConstructabilityItemEdit.tsx index fc6dbfb8e..984ef12b5 100644 --- a/src/leases/components/leaseSections/constructability/ConstructabilityItemEdit.tsx +++ b/src/leases/components/leaseSections/constructability/ConstructabilityItemEdit.tsx @@ -4,38 +4,38 @@ import { Row, Column } from "react-foundation"; import { FieldArray, formValueSelector } from "redux-form"; import get from "lodash/get"; import isEmpty from "lodash/isEmpty"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import AddButtonThird from "components/form/AddButtonThird"; -import AddFileButton from "components/form/AddFileButton"; -import Authorization from "components/authorization/Authorization"; -import Collapse from "components/collapse/Collapse"; -import CollapseHeaderSubtitle from "components/collapse/CollapseHeaderSubtitle"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import AddButtonThird from "@/components/form/AddButtonThird"; +import AddFileButton from "@/components/form/AddFileButton"; +import Authorization from "@/components/authorization/Authorization"; +import Collapse from "@/components/collapse/Collapse"; +import CollapseHeaderSubtitle from "@/components/collapse/CollapseHeaderSubtitle"; import Comments from "./Comments"; -import FieldAndRemoveButtonWrapper from "components/form/FieldAndRemoveButtonWrapper"; -import FileDownloadLink from "components/file/FileDownloadLink"; -import FormField from "components/form/FormField"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import RemoveButton from "components/form/RemoveButton"; +import FieldAndRemoveButtonWrapper from "@/components/form/FieldAndRemoveButtonWrapper"; +import FileDownloadLink from "@/components/file/FileDownloadLink"; +import FormField from "@/components/form/FormField"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import RemoveButton from "@/components/form/RemoveButton"; import StatusIndicator from "./StatusIndicator"; -import SubTitle from "components/content/SubTitle"; -import { receiveCollapseStates } from "leases/actions"; -import { createLeaseAreaAttachment, deleteLeaseAreaAttachment } from "leaseAreaAttachment/actions"; -import { ConfirmationModalTexts, FieldTypes, FormNames, ViewModes } from "enums"; -import { ButtonColors } from "components/enums"; -import { LeaseAreaAddressesFieldPaths, LeaseAreaAttachmentsFieldPaths, LeaseAreaAttachmentsFieldTitles, LeaseAreasFieldPaths, LeaseAreasFieldTitles, LeaseConstructabilityDescriptionsFieldPaths, LeaseConstructabilityDescriptionsFieldTitles } from "leases/enums"; -import { LeaseAreaAttachmentTypes } from "leaseAreaAttachment/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getFullAddress } from "leases/helpers"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { getUserFullName } from "users/helpers"; -import { formatDate, formatNumber, getFieldAttributes, getLabelOfOption, hasPermissions, isEmptyValue, isFieldAllowedToEdit, isFieldAllowedToRead, isFieldRequired } from "util/helpers"; -import { getAttributes, getCollapseStateByKey, getCurrentLease } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import { referenceNumber } from "components/form/validations"; +import SubTitle from "@/components/content/SubTitle"; +import { receiveCollapseStates } from "@/leases/actions"; +import { createLeaseAreaAttachment, deleteLeaseAreaAttachment } from "@/leaseAreaAttachment/actions"; +import { ConfirmationModalTexts, FieldTypes, FormNames, ViewModes } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { LeaseAreaAddressesFieldPaths, LeaseAreaAttachmentsFieldPaths, LeaseAreaAttachmentsFieldTitles, LeaseAreasFieldPaths, LeaseAreasFieldTitles, LeaseConstructabilityDescriptionsFieldPaths, LeaseConstructabilityDescriptionsFieldTitles } from "@/leases/enums"; +import { LeaseAreaAttachmentTypes } from "@/leaseAreaAttachment/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getFullAddress } from "@/leases/helpers"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { getUserFullName } from "@/users/helpers"; +import { formatDate, formatNumber, getFieldAttributes, getLabelOfOption, hasPermissions, isEmptyValue, isFieldAllowedToEdit, isFieldAllowedToRead, isFieldRequired } from "@/util/helpers"; +import { getAttributes, getCollapseStateByKey, getCurrentLease } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import { referenceNumber } from "@/components/form/validations"; import type { Attributes } from "types"; -import type { Lease } from "leases/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { Lease } from "@/leases/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; const getPreconstructionErrors = (errors: Record | null | undefined, area: string) => { return { ...get(errors, `${area}.preconstruction_state`, {}), diff --git a/src/leases/components/leaseSections/constructability/SendEmail.tsx b/src/leases/components/leaseSections/constructability/SendEmail.tsx index 929f3fac5..c0a722378 100644 --- a/src/leases/components/leaseSections/constructability/SendEmail.tsx +++ b/src/leases/components/leaseSections/constructability/SendEmail.tsx @@ -1,24 +1,24 @@ import React, { Fragment, PureComponent } from "react"; import { Row, Column } from "react-foundation"; import { connect } from "react-redux"; -import Authorization from "components/authorization/Authorization"; -import Button from "components/button/Button"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import ListItem from "components/content/ListItem"; +import Authorization from "@/components/authorization/Authorization"; +import Button from "@/components/button/Button"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import ListItem from "@/components/content/ListItem"; import SendEmailModal from "./SendEmailModal"; -import { sendEmail } from "leases/actions"; -import { ButtonColors } from "components/enums"; -import { SendEmailTypes } from "leases/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getContentConstructabilityEmail, getContentEmailLogs } from "leases/helpers"; -import { getUserFullName } from "users/helpers"; -import { formatDate, hasPermissions } from "util/helpers"; -import { getLoggedInUser } from "auth/selectors"; -import { getCurrentLease } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import type { Lease } from "leases/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import { sendEmail } from "@/leases/actions"; +import { ButtonColors } from "@/components/enums"; +import { SendEmailTypes } from "@/leases/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getContentConstructabilityEmail, getContentEmailLogs } from "@/leases/helpers"; +import { getUserFullName } from "@/users/helpers"; +import { formatDate, hasPermissions } from "@/util/helpers"; +import { getLoggedInUser } from "@/auth/selectors"; +import { getCurrentLease } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import type { Lease } from "@/leases/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { currentLease: Lease; loggedUser: Record; diff --git a/src/leases/components/leaseSections/constructability/SendEmailModal.tsx b/src/leases/components/leaseSections/constructability/SendEmailModal.tsx index fd540b2f6..8569b15f2 100644 --- a/src/leases/components/leaseSections/constructability/SendEmailModal.tsx +++ b/src/leases/components/leaseSections/constructability/SendEmailModal.tsx @@ -1,15 +1,15 @@ import React, { PureComponent } from "react"; import debounce from "lodash/debounce"; -import Button from "components/button/Button"; +import Button from "@/components/button/Button"; import DualListBox from "react-dual-listbox"; -import FormText from "components/form/FormText"; -import Modal from "components/modal/Modal"; -import ModalButtonWrapper from "components/modal/ModalButtonWrapper"; -import TextAreaInput from "components/inputs/TextAreaInput"; -import { fetchUsers } from "users/requestsAsync"; -import { ButtonColors } from "components/enums"; -import { getUserOptions } from "users/helpers"; -import { sortStringByKeyAsc } from "util/helpers"; +import FormText from "@/components/form/FormText"; +import Modal from "@/components/modal/Modal"; +import ModalButtonWrapper from "@/components/modal/ModalButtonWrapper"; +import TextAreaInput from "@/components/inputs/TextAreaInput"; +import { fetchUsers } from "@/users/requestsAsync"; +import { ButtonColors } from "@/components/enums"; +import { getUserOptions } from "@/users/helpers"; +import { sortStringByKeyAsc } from "@/util/helpers"; type FilterProps = { available: string; selected: string; diff --git a/src/leases/components/leaseSections/constructability/StatusIndicator.tsx b/src/leases/components/leaseSections/constructability/StatusIndicator.tsx index dcb024120..ca7958a29 100644 --- a/src/leases/components/leaseSections/constructability/StatusIndicator.tsx +++ b/src/leases/components/leaseSections/constructability/StatusIndicator.tsx @@ -1,7 +1,7 @@ import React, { Fragment } from "react"; import classnames from "classnames"; -import { ConstructabilityStatus } from "leases/enums"; -import { getLabelOfOption } from "util/helpers"; +import { ConstructabilityStatus } from "@/leases/enums"; +import { getLabelOfOption } from "@/util/helpers"; type StatusIndicatorProps = { researchState: string; stateOptions: Array>; diff --git a/src/leases/components/leaseSections/contract/AttachDecisionModal.tsx b/src/leases/components/leaseSections/contract/AttachDecisionModal.tsx index 1a9bcaba7..c77c46a54 100644 --- a/src/leases/components/leaseSections/contract/AttachDecisionModal.tsx +++ b/src/leases/components/leaseSections/contract/AttachDecisionModal.tsx @@ -1,15 +1,15 @@ import React, { PureComponent } from "react"; import debounce from "lodash/debounce"; -import Button from "components/button/Button"; -import CheckboxInput from "components/inputs/CheckboxInput"; +import Button from "@/components/button/Button"; +import CheckboxInput from "@/components/inputs/CheckboxInput"; import DualListBox from "react-dual-listbox"; -import FormText from "components/form/FormText"; -import Modal from "components/modal/Modal"; -import ModalButtonWrapper from "components/modal/ModalButtonWrapper"; -import { fetchLeases } from "leases/requestsAsync"; -import { ButtonColors } from "components/enums"; -import { getContentLeaseOption } from "leases/helpers"; -import { sortStringByKeyAsc } from "util/helpers"; +import FormText from "@/components/form/FormText"; +import Modal from "@/components/modal/Modal"; +import ModalButtonWrapper from "@/components/modal/ModalButtonWrapper"; +import { fetchLeases } from "@/leases/requestsAsync"; +import { ButtonColors } from "@/components/enums"; +import { getContentLeaseOption } from "@/leases/helpers"; +import { sortStringByKeyAsc } from "@/util/helpers"; type FilterProps = { available: string; selected: string; diff --git a/src/leases/components/leaseSections/contract/Collateral.tsx b/src/leases/components/leaseSections/contract/Collateral.tsx index 11c320d91..5e9c65b71 100644 --- a/src/leases/components/leaseSections/contract/Collateral.tsx +++ b/src/leases/components/leaseSections/contract/Collateral.tsx @@ -2,14 +2,14 @@ import React, { Fragment } from "react"; import { Row, Column } from "react-foundation"; import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; -import Authorization from "components/authorization/Authorization"; -import BoxItem from "components/content/BoxItem"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import { CollateralTypes, LeaseContractCollateralsFieldPaths, LeaseContractCollateralsFieldTitles } from "leases/enums"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { formatDate, formatNumber, getLabelOfOption, isEmptyValue, isFieldAllowedToRead } from "util/helpers"; -import { getAttributes } from "leases/selectors"; +import Authorization from "@/components/authorization/Authorization"; +import BoxItem from "@/components/content/BoxItem"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import { CollateralTypes, LeaseContractCollateralsFieldPaths, LeaseContractCollateralsFieldTitles } from "@/leases/enums"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { formatDate, formatNumber, getLabelOfOption, isEmptyValue, isFieldAllowedToRead } from "@/util/helpers"; +import { getAttributes } from "@/leases/selectors"; import type { Attributes } from "types"; type EmptyProps = { attributes: Attributes; diff --git a/src/leases/components/leaseSections/contract/CollateralEdit.tsx b/src/leases/components/leaseSections/contract/CollateralEdit.tsx index 73783a30a..c9cec4a90 100644 --- a/src/leases/components/leaseSections/contract/CollateralEdit.tsx +++ b/src/leases/components/leaseSections/contract/CollateralEdit.tsx @@ -3,21 +3,21 @@ import { Row, Column } from "react-foundation"; import { formValueSelector } from "redux-form"; import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; -import ActionButtonWrapper from "components/form/ActionButtonWrapper"; -import Authorization from "components/authorization/Authorization"; -import BoxContentWrapper from "components/content/BoxContentWrapper"; -import BoxItem from "components/content/BoxItem"; -import FormField from "components/form/FormField"; -import RemoveButton from "components/form/RemoveButton"; -import { FormNames } from "enums"; -import { CollateralTypes, LeaseContractCollateralsFieldPaths, LeaseContractCollateralsFieldTitles } from "leases/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { getFieldAttributes, hasPermissions, isFieldAllowedToRead } from "util/helpers"; -import { getAttributes, getIsSaveClicked } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; +import ActionButtonWrapper from "@/components/form/ActionButtonWrapper"; +import Authorization from "@/components/authorization/Authorization"; +import BoxContentWrapper from "@/components/content/BoxContentWrapper"; +import BoxItem from "@/components/content/BoxItem"; +import FormField from "@/components/form/FormField"; +import RemoveButton from "@/components/form/RemoveButton"; +import { FormNames } from "@/enums"; +import { CollateralTypes, LeaseContractCollateralsFieldPaths, LeaseContractCollateralsFieldTitles } from "@/leases/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { getFieldAttributes, hasPermissions, isFieldAllowedToRead } from "@/util/helpers"; +import { getAttributes, getIsSaveClicked } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; import type { Attributes } from "types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type EmptyProps = { attributes: Attributes; field: string; diff --git a/src/leases/components/leaseSections/contract/ContractFileModal.tsx b/src/leases/components/leaseSections/contract/ContractFileModal.tsx index acaf4da99..01dd541ff 100644 --- a/src/leases/components/leaseSections/contract/ContractFileModal.tsx +++ b/src/leases/components/leaseSections/contract/ContractFileModal.tsx @@ -1,19 +1,19 @@ import React, { Fragment, PureComponent } from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; -import Button from "components/button/Button"; -import FileDownloadLink from "components/file/FileDownloadLink"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import Modal from "components/modal/Modal"; -import ModalButtonWrapper from "components/modal/ModalButtonWrapper"; -import { ButtonColors } from "components/enums"; -import { fetchContractFilesById } from "contractFile/actions"; -import createUrlWithoutVersionSuffix from "api/createUrlWithoutVersionSuffix"; -import { humanReadableByteCount } from "util/helpers"; -import { getContractFilesById, getIsFetchingById } from "contractFile/selectors"; +import Button from "@/components/button/Button"; +import FileDownloadLink from "@/components/file/FileDownloadLink"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import Modal from "@/components/modal/Modal"; +import ModalButtonWrapper from "@/components/modal/ModalButtonWrapper"; +import { ButtonColors } from "@/components/enums"; +import { fetchContractFilesById } from "@/contractFile/actions"; +import createUrlWithoutVersionSuffix from "@/api/createUrlWithoutVersionSuffix"; +import { humanReadableByteCount } from "@/util/helpers"; +import { getContractFilesById, getIsFetchingById } from "@/contractFile/selectors"; type Props = { contractId: number; fetchContractFilesById: (...args: Array) => any; diff --git a/src/leases/components/leaseSections/contract/ContractItem.tsx b/src/leases/components/leaseSections/contract/ContractItem.tsx index 3fab6450c..5c1693390 100644 --- a/src/leases/components/leaseSections/contract/ContractItem.tsx +++ b/src/leases/components/leaseSections/contract/ContractItem.tsx @@ -2,25 +2,25 @@ import React, { Fragment } from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; import get from "lodash/get"; -import Authorization from "components/authorization/Authorization"; -import BoxItem from "components/content/BoxItem"; -import BoxItemContainer from "components/content/BoxItemContainer"; -import Collapse from "components/collapse/Collapse"; -import CollapseHeaderSubtitle from "components/collapse/CollapseHeaderSubtitle"; +import Authorization from "@/components/authorization/Authorization"; +import BoxItem from "@/components/content/BoxItem"; +import BoxItemContainer from "@/components/content/BoxItemContainer"; +import Collapse from "@/components/collapse/Collapse"; +import CollapseHeaderSubtitle from "@/components/collapse/CollapseHeaderSubtitle"; import Collateral from "./Collateral"; -import DecisionLink from "components/links/DecisionLink"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import KtjLink from "components/ktj/KtjLink"; -import { receiveCollapseStates } from "leases/actions"; -import { FormNames, ViewModes } from "enums"; -import { LeaseContractChangesFieldPaths, LeaseContractChangesFieldTitles, LeaseContractsFieldPaths, LeaseContractsFieldTitles, LeaseContractCollateralsFieldPaths, LeaseContractCollateralsFieldTitles } from "leases/enums"; -import { getDecisionById, getDecisionOptions } from "leases/helpers"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { formatDate, getFieldOptions, getLabelOfOption, isFieldAllowedToRead } from "util/helpers"; -import { getAttributes, getCollapseStateByKey, getCurrentLease } from "leases/selectors"; +import DecisionLink from "@/components/links/DecisionLink"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import KtjLink from "@/components/ktj/KtjLink"; +import { receiveCollapseStates } from "@/leases/actions"; +import { FormNames, ViewModes } from "@/enums"; +import { LeaseContractChangesFieldPaths, LeaseContractChangesFieldTitles, LeaseContractsFieldPaths, LeaseContractsFieldTitles, LeaseContractCollateralsFieldPaths, LeaseContractCollateralsFieldTitles } from "@/leases/enums"; +import { getDecisionById, getDecisionOptions } from "@/leases/helpers"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { formatDate, getFieldOptions, getLabelOfOption, isFieldAllowedToRead } from "@/util/helpers"; +import { getAttributes, getCollapseStateByKey, getCurrentLease } from "@/leases/selectors"; import type { Attributes } from "types"; -import type { Lease } from "leases/types"; +import type { Lease } from "@/leases/types"; const formName = FormNames.LEASE_CONTRACTS; type Props = { attributes: Attributes; diff --git a/src/leases/components/leaseSections/contract/ContractItemEdit.tsx b/src/leases/components/leaseSections/contract/ContractItemEdit.tsx index 839839d12..7e988f42e 100644 --- a/src/leases/components/leaseSections/contract/ContractItemEdit.tsx +++ b/src/leases/components/leaseSections/contract/ContractItemEdit.tsx @@ -4,37 +4,37 @@ import { FieldArray, formValueSelector } from "redux-form"; import { Row, Column } from "react-foundation"; import get from "lodash/get"; import isEmpty from "lodash/isEmpty"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import ActionButtonWrapper from "components/form/ActionButtonWrapper"; -import AddButtonSecondary from "components/form/AddButtonSecondary"; -import Authorization from "components/authorization/Authorization"; -import BoxContentWrapper from "components/content/BoxContentWrapper"; -import BoxItem from "components/content/BoxItem"; -import BoxItemContainer from "components/content/BoxItemContainer"; -import Collapse from "components/collapse/Collapse"; -import CollapseHeaderSubtitle from "components/collapse/CollapseHeaderSubtitle"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import ActionButtonWrapper from "@/components/form/ActionButtonWrapper"; +import AddButtonSecondary from "@/components/form/AddButtonSecondary"; +import Authorization from "@/components/authorization/Authorization"; +import BoxContentWrapper from "@/components/content/BoxContentWrapper"; +import BoxItem from "@/components/content/BoxItem"; +import BoxItemContainer from "@/components/content/BoxItemContainer"; +import Collapse from "@/components/collapse/Collapse"; +import CollapseHeaderSubtitle from "@/components/collapse/CollapseHeaderSubtitle"; import CollateralEdit from "./CollateralEdit"; -import DecisionLink from "components/links/DecisionLink"; -import FormField from "components/form/FormField"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import KtjLink from "components/ktj/KtjLink"; -import RemoveButton from "components/form/RemoveButton"; -import { receiveCollapseStates, fetchLeasesForContractNumber } from "leases/actions"; -import { ConfirmationModalTexts, FormNames, ViewModes } from "enums"; -import { ButtonColors } from "components/enums"; -import { LeaseContractChangesFieldPaths, LeaseContractChangesFieldTitles, LeaseContractCollateralsFieldPaths, LeaseContractCollateralsFieldTitles, LeaseContractsFieldPaths, LeaseContractsFieldTitles } from "leases/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getDecisionById, getLeasesWithContractNumber } from "leases/helpers"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { formatDate, getFieldAttributes, getFieldOptions, getLabelOfOption, hasPermissions, isFieldAllowedToRead } from "util/helpers"; -import { getAttributes, getCollapseStateByKey, getCurrentLease, getErrorsByFormName, getIsSaveClicked, getIsFetchingLeasesForContractNumbers, getLeasesForContractNumbers } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import WarningContainer from "components/content/WarningContainer"; -import WarningField from "components/form/WarningField"; +import DecisionLink from "@/components/links/DecisionLink"; +import FormField from "@/components/form/FormField"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import KtjLink from "@/components/ktj/KtjLink"; +import RemoveButton from "@/components/form/RemoveButton"; +import { receiveCollapseStates, fetchLeasesForContractNumber } from "@/leases/actions"; +import { ConfirmationModalTexts, FormNames, ViewModes } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { LeaseContractChangesFieldPaths, LeaseContractChangesFieldTitles, LeaseContractCollateralsFieldPaths, LeaseContractCollateralsFieldTitles, LeaseContractsFieldPaths, LeaseContractsFieldTitles } from "@/leases/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getDecisionById, getLeasesWithContractNumber } from "@/leases/helpers"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { formatDate, getFieldAttributes, getFieldOptions, getLabelOfOption, hasPermissions, isFieldAllowedToRead } from "@/util/helpers"; +import { getAttributes, getCollapseStateByKey, getCurrentLease, getErrorsByFormName, getIsSaveClicked, getIsFetchingLeasesForContractNumbers, getLeasesForContractNumbers } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import WarningContainer from "@/components/content/WarningContainer"; +import WarningField from "@/components/form/WarningField"; import type { Attributes } from "types"; -import type { Lease, LeaseList } from "leases/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { Lease, LeaseList } from "@/leases/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type ContractChangesProps = { attributes: Attributes; collapseState: boolean; diff --git a/src/leases/components/leaseSections/contract/Contracts.tsx b/src/leases/components/leaseSections/contract/Contracts.tsx index 77f7a4564..bb8484e84 100644 --- a/src/leases/components/leaseSections/contract/Contracts.tsx +++ b/src/leases/components/leaseSections/contract/Contracts.tsx @@ -2,13 +2,13 @@ import React, { Fragment, PureComponent } from "react"; import { connect } from "react-redux"; import ContractFileModal from "./ContractFileModal"; import ContractItem from "./ContractItem"; -import FormText from "components/form/FormText"; -import { LeaseContractsFieldPaths } from "leases/enums"; -import { getContentContracts } from "leases/helpers"; -import { getFieldOptions } from "util/helpers"; -import { getAttributes, getCurrentLease } from "leases/selectors"; +import FormText from "@/components/form/FormText"; +import { LeaseContractsFieldPaths } from "@/leases/enums"; +import { getContentContracts } from "@/leases/helpers"; +import { getFieldOptions } from "@/util/helpers"; +import { getAttributes, getCurrentLease } from "@/leases/selectors"; import type { Attributes } from "types"; -import type { Lease } from "leases/types"; +import type { Lease } from "@/leases/types"; type Props = { attributes: Attributes; currentLease: Lease; diff --git a/src/leases/components/leaseSections/contract/ContractsEdit.tsx b/src/leases/components/leaseSections/contract/ContractsEdit.tsx index 26c1dff43..2f28ccf4d 100644 --- a/src/leases/components/leaseSections/contract/ContractsEdit.tsx +++ b/src/leases/components/leaseSections/contract/ContractsEdit.tsx @@ -3,24 +3,24 @@ import { connect } from "react-redux"; import { FieldArray, reduxForm } from "redux-form"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import AddButton from "components/form/AddButton"; -import Authorization from "components/authorization/Authorization"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import AddButton from "@/components/form/AddButton"; +import Authorization from "@/components/authorization/Authorization"; import ContractFileModal from "./ContractFileModal"; import ContractItemEdit from "./ContractItemEdit"; -import FormText from "components/form/FormText"; -import { receiveFormValidFlags } from "leases/actions"; -import { ConfirmationModalTexts, FormNames } from "enums"; -import { ButtonColors } from "components/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { validateContractForm } from "leases/formValidators"; -import { getContentContracts, getDecisionOptions } from "leases/helpers"; -import { hasPermissions } from "util/helpers"; -import { getCurrentLease } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; +import FormText from "@/components/form/FormText"; +import { receiveFormValidFlags } from "@/leases/actions"; +import { ConfirmationModalTexts, FormNames } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { validateContractForm } from "@/leases/formValidators"; +import { getContentContracts, getDecisionOptions } from "@/leases/helpers"; +import { hasPermissions } from "@/util/helpers"; +import { getCurrentLease } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; import type { Attributes } from "types"; -import type { Lease } from "leases/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { Lease } from "@/leases/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type ContractsProps = { decisionOptions: Array>; fields: any; diff --git a/src/leases/components/leaseSections/contract/DecisionConditionsEdit.tsx b/src/leases/components/leaseSections/contract/DecisionConditionsEdit.tsx index 9d3878bc0..e665bb047 100644 --- a/src/leases/components/leaseSections/contract/DecisionConditionsEdit.tsx +++ b/src/leases/components/leaseSections/contract/DecisionConditionsEdit.tsx @@ -4,30 +4,30 @@ import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; import get from "lodash/get"; import isEmpty from "lodash/isEmpty"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import ActionButtonWrapper from "components/form/ActionButtonWrapper"; -import Authorization from "components/authorization/Authorization"; -import AddButtonSecondary from "components/form/AddButtonSecondary"; -import BoxContentWrapper from "components/content/BoxContentWrapper"; -import BoxItem from "components/content/BoxItem"; -import BoxItemContainer from "components/content/BoxItemContainer"; -import Collapse from "components/collapse/Collapse"; -import FieldAndRemoveButtonWrapper from "components/form/FieldAndRemoveButtonWrapper"; -import FormField from "components/form/FormField"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import RemoveButton from "components/form/RemoveButton"; -import { ConfirmationModalTexts, FieldTypes } from "enums"; -import { ButtonColors } from "components/enums"; -import { LeaseDecisionConditionsFieldPaths, LeaseDecisionConditionsFieldTitles } from "leases/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { getFieldAttributes, hasPermissions, isFieldAllowedToRead, isFieldRequired } from "util/helpers"; -import { getAttributes } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import { withWindowResize } from "components/resize/WindowResizeHandler"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import ActionButtonWrapper from "@/components/form/ActionButtonWrapper"; +import Authorization from "@/components/authorization/Authorization"; +import AddButtonSecondary from "@/components/form/AddButtonSecondary"; +import BoxContentWrapper from "@/components/content/BoxContentWrapper"; +import BoxItem from "@/components/content/BoxItem"; +import BoxItemContainer from "@/components/content/BoxItemContainer"; +import Collapse from "@/components/collapse/Collapse"; +import FieldAndRemoveButtonWrapper from "@/components/form/FieldAndRemoveButtonWrapper"; +import FormField from "@/components/form/FormField"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import RemoveButton from "@/components/form/RemoveButton"; +import { ConfirmationModalTexts, FieldTypes } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { LeaseDecisionConditionsFieldPaths, LeaseDecisionConditionsFieldTitles } from "@/leases/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { getFieldAttributes, hasPermissions, isFieldAllowedToRead, isFieldRequired } from "@/util/helpers"; +import { getAttributes } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import { withWindowResize } from "@/components/resize/WindowResizeHandler"; import type { Attributes } from "types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { attributes: Attributes; collapseState: boolean; diff --git a/src/leases/components/leaseSections/contract/DecisionItem.tsx b/src/leases/components/leaseSections/contract/DecisionItem.tsx index b13e78564..a7547abe3 100644 --- a/src/leases/components/leaseSections/contract/DecisionItem.tsx +++ b/src/leases/components/leaseSections/contract/DecisionItem.tsx @@ -2,21 +2,21 @@ import React, { Fragment } from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; -import Authorization from "components/authorization/Authorization"; -import BoxItem from "components/content/BoxItem"; -import BoxItemContainer from "components/content/BoxItemContainer"; -import Collapse from "components/collapse/Collapse"; -import ExternalLink from "components/links/ExternalLink"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import ShowMore from "components/showMore/ShowMore"; -import { receiveCollapseStates } from "leases/actions"; -import { FormNames, ViewModes } from "enums"; -import { LeaseDecisionConditionsFieldPaths, LeaseDecisionConditionsFieldTitles, LeaseDecisionsFieldPaths, LeaseDecisionsFieldTitles } from "leases/enums"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { formatDate, getLabelOfOption, getReferenceNumberLink, isFieldAllowedToRead } from "util/helpers"; -import { getAttributes, getCollapseStateByKey } from "leases/selectors"; -import { withWindowResize } from "components/resize/WindowResizeHandler"; +import Authorization from "@/components/authorization/Authorization"; +import BoxItem from "@/components/content/BoxItem"; +import BoxItemContainer from "@/components/content/BoxItemContainer"; +import Collapse from "@/components/collapse/Collapse"; +import ExternalLink from "@/components/links/ExternalLink"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import ShowMore from "@/components/showMore/ShowMore"; +import { receiveCollapseStates } from "@/leases/actions"; +import { FormNames, ViewModes } from "@/enums"; +import { LeaseDecisionConditionsFieldPaths, LeaseDecisionConditionsFieldTitles, LeaseDecisionsFieldPaths, LeaseDecisionsFieldTitles } from "@/leases/enums"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { formatDate, getLabelOfOption, getReferenceNumberLink, isFieldAllowedToRead } from "@/util/helpers"; +import { getAttributes, getCollapseStateByKey } from "@/leases/selectors"; +import { withWindowResize } from "@/components/resize/WindowResizeHandler"; import type { Attributes } from "types"; const formName = FormNames.LEASE_DECISIONS; type Props = { diff --git a/src/leases/components/leaseSections/contract/DecisionItemEdit.tsx b/src/leases/components/leaseSections/contract/DecisionItemEdit.tsx index 4c4569a1e..3b0a70704 100644 --- a/src/leases/components/leaseSections/contract/DecisionItemEdit.tsx +++ b/src/leases/components/leaseSections/contract/DecisionItemEdit.tsx @@ -4,24 +4,24 @@ import { FieldArray, formValueSelector } from "redux-form"; import { Row, Column } from "react-foundation"; import get from "lodash/get"; import isEmpty from "lodash/isEmpty"; -import Authorization from "components/authorization/Authorization"; -import BoxContentWrapper from "components/content/BoxContentWrapper"; -import Collapse from "components/collapse/Collapse"; +import Authorization from "@/components/authorization/Authorization"; +import BoxContentWrapper from "@/components/content/BoxContentWrapper"; +import Collapse from "@/components/collapse/Collapse"; import DecisionConditionsEdit from "./DecisionConditionsEdit"; -import FormField from "components/form/FormField"; -import { receiveCollapseStates } from "leases/actions"; -import { FieldTypes, FormNames, ViewModes } from "enums"; -import { LeaseDecisionConditionsFieldPaths, LeaseDecisionsFieldPaths, LeaseDecisionsFieldTitles } from "leases/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getDecisionById } from "leases/helpers"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { formatDate, getFieldAttributes, getFieldOptions, getLabelOfOption, hasPermissions, isFieldAllowedToRead } from "util/helpers"; -import { getAttributes, getCollapseStateByKey, getCurrentLease, getErrorsByFormName, getIsSaveClicked } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import { referenceNumber } from "components/form/validations"; +import FormField from "@/components/form/FormField"; +import { receiveCollapseStates } from "@/leases/actions"; +import { FieldTypes, FormNames, ViewModes } from "@/enums"; +import { LeaseDecisionConditionsFieldPaths, LeaseDecisionsFieldPaths, LeaseDecisionsFieldTitles } from "@/leases/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getDecisionById } from "@/leases/helpers"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { formatDate, getFieldAttributes, getFieldOptions, getLabelOfOption, hasPermissions, isFieldAllowedToRead } from "@/util/helpers"; +import { getAttributes, getCollapseStateByKey, getCurrentLease, getErrorsByFormName, getIsSaveClicked } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import { referenceNumber } from "@/components/form/validations"; import type { Attributes } from "types"; -import type { Lease } from "leases/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { Lease } from "@/leases/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { attributes: Attributes; conditionsCollapseState: boolean; diff --git a/src/leases/components/leaseSections/contract/Decisions.tsx b/src/leases/components/leaseSections/contract/Decisions.tsx index a8c0556f7..7b2ef9934 100644 --- a/src/leases/components/leaseSections/contract/Decisions.tsx +++ b/src/leases/components/leaseSections/contract/Decisions.tsx @@ -1,13 +1,13 @@ import React, { Fragment, PureComponent } from "react"; import { connect } from "react-redux"; import DecisionItem from "./DecisionItem"; -import FormText from "components/form/FormText"; -import { LeaseDecisionConditionsFieldPaths, LeaseDecisionsFieldPaths } from "leases/enums"; -import { getContentDecisions } from "leases/helpers"; -import { getFieldOptions } from "util/helpers"; -import { getAttributes, getCurrentLease } from "leases/selectors"; +import FormText from "@/components/form/FormText"; +import { LeaseDecisionConditionsFieldPaths, LeaseDecisionsFieldPaths } from "@/leases/enums"; +import { getContentDecisions } from "@/leases/helpers"; +import { getFieldOptions } from "@/util/helpers"; +import { getAttributes, getCurrentLease } from "@/leases/selectors"; import type { Attributes } from "types"; -import type { Lease } from "leases/types"; +import type { Lease } from "@/leases/types"; type Props = { attributes: Attributes; currentLease: Lease; diff --git a/src/leases/components/leaseSections/contract/DecisionsEdit.tsx b/src/leases/components/leaseSections/contract/DecisionsEdit.tsx index dd37e212b..15452f634 100644 --- a/src/leases/components/leaseSections/contract/DecisionsEdit.tsx +++ b/src/leases/components/leaseSections/contract/DecisionsEdit.tsx @@ -3,21 +3,21 @@ import { connect } from "react-redux"; import { FieldArray, reduxForm } from "redux-form"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import AddButton from "components/form/AddButton"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import AddButton from "@/components/form/AddButton"; import AttachDecisionModal from "./AttachDecisionModal"; -import Authorization from "components/authorization/Authorization"; +import Authorization from "@/components/authorization/Authorization"; import DecisionItemEdit from "./DecisionItemEdit"; -import FormText from "components/form/FormText"; -import { copyDecisionToLeases, hideAttachDecisionModal, receiveFormValidFlags, showAttachDecisionModal } from "leases/actions"; -import { ConfirmationModalTexts, FormNames } from "enums"; -import { ButtonColors } from "components/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { hasPermissions } from "util/helpers"; -import { getCurrentLease, getIsAttachDecisionModalOpen } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import type { Lease } from "leases/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import FormText from "@/components/form/FormText"; +import { copyDecisionToLeases, hideAttachDecisionModal, receiveFormValidFlags, showAttachDecisionModal } from "@/leases/actions"; +import { ConfirmationModalTexts, FormNames } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { hasPermissions } from "@/util/helpers"; +import { getCurrentLease, getIsAttachDecisionModalOpen } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import type { Lease } from "@/leases/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type DecisionsProps = { fields: any; onAttach: (...args: Array) => any; diff --git a/src/leases/components/leaseSections/contract/DecisionsMain.tsx b/src/leases/components/leaseSections/contract/DecisionsMain.tsx index db70aefb1..19242db36 100644 --- a/src/leases/components/leaseSections/contract/DecisionsMain.tsx +++ b/src/leases/components/leaseSections/contract/DecisionsMain.tsx @@ -1,15 +1,15 @@ import React, { Fragment } from "react"; import { connect } from "react-redux"; -import Authorization from "components/authorization/Authorization"; +import Authorization from "@/components/authorization/Authorization"; import Contracts from "./Contracts"; import Decisions from "./Decisions"; -import Divider from "components/content/Divider"; +import Divider from "@/components/content/Divider"; import Inspections from "./Inspections"; -import Title from "components/content/Title"; -import { LeaseContractsFieldPaths, LeaseContractsFieldTitles, LeaseDecisionsFieldPaths, LeaseDecisionsFieldTitles, LeaseInspectionsFieldPaths, LeaseInspectionsFieldTitles } from "leases/enums"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { isFieldAllowedToRead } from "util/helpers"; -import { getAttributes } from "leases/selectors"; +import Title from "@/components/content/Title"; +import { LeaseContractsFieldPaths, LeaseContractsFieldTitles, LeaseDecisionsFieldPaths, LeaseDecisionsFieldTitles, LeaseInspectionsFieldPaths, LeaseInspectionsFieldTitles } from "@/leases/enums"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { isFieldAllowedToRead } from "@/util/helpers"; +import { getAttributes } from "@/leases/selectors"; import type { Attributes } from "types"; type Props = { attributes: Attributes; diff --git a/src/leases/components/leaseSections/contract/DecisionsMainEdit.tsx b/src/leases/components/leaseSections/contract/DecisionsMainEdit.tsx index cfd0a7fdd..8ed761150 100644 --- a/src/leases/components/leaseSections/contract/DecisionsMainEdit.tsx +++ b/src/leases/components/leaseSections/contract/DecisionsMainEdit.tsx @@ -1,15 +1,15 @@ import React, { Fragment } from "react"; import { connect } from "react-redux"; -import Authorization from "components/authorization/Authorization"; +import Authorization from "@/components/authorization/Authorization"; import ContractsEdit from "./ContractsEdit"; import DecisionsEdit from "./DecisionsEdit"; -import Divider from "components/content/Divider"; +import Divider from "@/components/content/Divider"; import InspectionsEdit from "./InspectionsEdit"; -import Title from "components/content/Title"; -import { LeaseContractsFieldPaths, LeaseContractsFieldTitles, LeaseDecisionsFieldPaths, LeaseDecisionsFieldTitles, LeaseInspectionsFieldPaths, LeaseInspectionsFieldTitles } from "leases/enums"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { isFieldAllowedToRead } from "util/helpers"; -import { getAttributes } from "leases/selectors"; +import Title from "@/components/content/Title"; +import { LeaseContractsFieldPaths, LeaseContractsFieldTitles, LeaseDecisionsFieldPaths, LeaseDecisionsFieldTitles, LeaseInspectionsFieldPaths, LeaseInspectionsFieldTitles } from "@/leases/enums"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { isFieldAllowedToRead } from "@/util/helpers"; +import { getAttributes } from "@/leases/selectors"; import type { Attributes } from "types"; type Props = { attributes: Attributes; diff --git a/src/leases/components/leaseSections/contract/InspectionItem.tsx b/src/leases/components/leaseSections/contract/InspectionItem.tsx index 1a937d7f4..e33c42172 100644 --- a/src/leases/components/leaseSections/contract/InspectionItem.tsx +++ b/src/leases/components/leaseSections/contract/InspectionItem.tsx @@ -1,15 +1,15 @@ import React, { Fragment } from "react"; import { Row, Column } from "react-foundation"; -import Authorization from "components/authorization/Authorization"; -import FileDownloadLink from "components/file/FileDownloadLink"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import ShowMore from "components/showMore/ShowMore"; -import SubTitle from "components/content/SubTitle"; -import { LeaseInspectionAttachmentsFieldPaths, LeaseInspectionAttachmentsFieldTitles, LeaseInspectionsFieldPaths, LeaseInspectionsFieldTitles } from "leases/enums"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { formatDate, isFieldAllowedToRead } from "util/helpers"; -import { getUserFullName } from "users/helpers"; +import Authorization from "@/components/authorization/Authorization"; +import FileDownloadLink from "@/components/file/FileDownloadLink"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import ShowMore from "@/components/showMore/ShowMore"; +import SubTitle from "@/components/content/SubTitle"; +import { LeaseInspectionAttachmentsFieldPaths, LeaseInspectionAttachmentsFieldTitles, LeaseInspectionsFieldPaths, LeaseInspectionsFieldTitles } from "@/leases/enums"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { formatDate, isFieldAllowedToRead } from "@/util/helpers"; +import { getUserFullName } from "@/users/helpers"; import type { Attributes } from "types"; type Props = { inspection: Record; diff --git a/src/leases/components/leaseSections/contract/InspectionItemEdit.tsx b/src/leases/components/leaseSections/contract/InspectionItemEdit.tsx index db3d6ab08..dc2f8c465 100644 --- a/src/leases/components/leaseSections/contract/InspectionItemEdit.tsx +++ b/src/leases/components/leaseSections/contract/InspectionItemEdit.tsx @@ -2,31 +2,31 @@ import React, { Fragment } from "react"; import { connect } from "react-redux"; import { formValueSelector } from "redux-form"; import { Row, Column } from "react-foundation"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import ActionButtonWrapper from "components/form/ActionButtonWrapper"; -import AddFileButton from "components/form/AddFileButton"; -import Authorization from "components/authorization/Authorization"; -import BoxItem from "components/content/BoxItem"; -import FileDownloadLink from "components/file/FileDownloadLink"; -import FormField from "components/form/FormField"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import RemoveButton from "components/form/RemoveButton"; -import SubTitle from "components/content/SubTitle"; -import { createLeaseInspectionAttachment, deleteLeaseInspectionAttachment } from "leaseInspectionAttachment/actions"; -import { ConfirmationModalTexts, FieldTypes, FormNames } from "enums"; -import { ButtonColors } from "components/enums"; -import { LeaseInspectionAttachmentsFieldPaths, LeaseInspectionAttachmentsFieldTitles, LeaseInspectionsFieldPaths, LeaseInspectionsFieldTitles } from "leases/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getContentInspections } from "leases/helpers"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { getUserFullName } from "users/helpers"; -import { findItemById, formatDate, getFieldAttributes, hasPermissions, isFieldAllowedToRead } from "util/helpers"; -import { getAttributes as getLeaseAttributes, getCurrentLease, getIsSaveClicked } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import ActionButtonWrapper from "@/components/form/ActionButtonWrapper"; +import AddFileButton from "@/components/form/AddFileButton"; +import Authorization from "@/components/authorization/Authorization"; +import BoxItem from "@/components/content/BoxItem"; +import FileDownloadLink from "@/components/file/FileDownloadLink"; +import FormField from "@/components/form/FormField"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import RemoveButton from "@/components/form/RemoveButton"; +import SubTitle from "@/components/content/SubTitle"; +import { createLeaseInspectionAttachment, deleteLeaseInspectionAttachment } from "@/leaseInspectionAttachment/actions"; +import { ConfirmationModalTexts, FieldTypes, FormNames } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { LeaseInspectionAttachmentsFieldPaths, LeaseInspectionAttachmentsFieldTitles, LeaseInspectionsFieldPaths, LeaseInspectionsFieldTitles } from "@/leases/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getContentInspections } from "@/leases/helpers"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { getUserFullName } from "@/users/helpers"; +import { findItemById, formatDate, getFieldAttributes, hasPermissions, isFieldAllowedToRead } from "@/util/helpers"; +import { getAttributes as getLeaseAttributes, getCurrentLease, getIsSaveClicked } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; import type { Attributes } from "types"; -import type { Lease } from "leases/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { Lease } from "@/leases/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { createLeaseInspectionAttachment: (...args: Array) => any; currentLease: Lease; diff --git a/src/leases/components/leaseSections/contract/Inspections.tsx b/src/leases/components/leaseSections/contract/Inspections.tsx index 03ae0a255..d745e3263 100644 --- a/src/leases/components/leaseSections/contract/Inspections.tsx +++ b/src/leases/components/leaseSections/contract/Inspections.tsx @@ -1,15 +1,15 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; -import BoxItem from "components/content/BoxItem"; -import BoxItemContainer from "components/content/BoxItemContainer"; -import FormText from "components/form/FormText"; -import GreenBox from "components/content/GreenBox"; +import BoxItem from "@/components/content/BoxItem"; +import BoxItemContainer from "@/components/content/BoxItemContainer"; +import FormText from "@/components/form/FormText"; +import GreenBox from "@/components/content/GreenBox"; import InspectionItem from "./InspectionItem"; -import { getContentInspections } from "leases/helpers"; -import { getAttributes as getLeaseAttributes, getCurrentLease } from "leases/selectors"; +import { getContentInspections } from "@/leases/helpers"; +import { getAttributes as getLeaseAttributes, getCurrentLease } from "@/leases/selectors"; import type { Attributes } from "types"; -import type { Lease } from "leases/types"; +import type { Lease } from "@/leases/types"; type Props = { currentLease: Lease; leaseAttributes: Attributes; diff --git a/src/leases/components/leaseSections/contract/InspectionsEdit.tsx b/src/leases/components/leaseSections/contract/InspectionsEdit.tsx index 8fc91ce06..13812f8de 100644 --- a/src/leases/components/leaseSections/contract/InspectionsEdit.tsx +++ b/src/leases/components/leaseSections/contract/InspectionsEdit.tsx @@ -3,25 +3,25 @@ import flowRight from "lodash/flowRight"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; import { FieldArray, reduxForm } from "redux-form"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import AddButtonSecondary from "components/form/AddButtonSecondary"; -import Authorization from "components/authorization/Authorization"; -import { getLoggedInUser } from "auth/selectors"; -import BoxItemContainer from "components/content/BoxItemContainer"; -import FormText from "components/form/FormText"; -import GreenBox from "components/content/GreenBox"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import AddButtonSecondary from "@/components/form/AddButtonSecondary"; +import Authorization from "@/components/authorization/Authorization"; +import { getLoggedInUser } from "@/auth/selectors"; +import BoxItemContainer from "@/components/content/BoxItemContainer"; +import FormText from "@/components/form/FormText"; +import GreenBox from "@/components/content/GreenBox"; import InspectionItemEdit from "./InspectionItemEdit"; -import { receiveFormValidFlags } from "leases/actions"; -import { ConfirmationModalTexts, FormNames } from "enums"; -import { ButtonColors } from "components/enums"; -import { LeaseInspectionsFieldPaths } from "leases/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { hasPermissions, isFieldAllowedToEdit } from "util/helpers"; -import { getAttributes as getLeaseAttributes } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; +import { receiveFormValidFlags } from "@/leases/actions"; +import { ConfirmationModalTexts, FormNames } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { LeaseInspectionsFieldPaths } from "@/leases/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { hasPermissions, isFieldAllowedToEdit } from "@/util/helpers"; +import { getAttributes as getLeaseAttributes } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; import get from "lodash/get"; import type { Attributes } from "types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type InspectionsProps = { fields: any; isSaveClicked: boolean; diff --git a/src/leases/components/leaseSections/invoice/CollectionCourtDecisionPanel.tsx b/src/leases/components/leaseSections/invoice/CollectionCourtDecisionPanel.tsx index c683b8aed..024337024 100644 --- a/src/leases/components/leaseSections/invoice/CollectionCourtDecisionPanel.tsx +++ b/src/leases/components/leaseSections/invoice/CollectionCourtDecisionPanel.tsx @@ -3,18 +3,18 @@ import { connect } from "react-redux"; import { formValueSelector, reduxForm } from "redux-form"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; -import Authorization from "components/authorization/Authorization"; -import Button from "components/button/Button"; -import FileInput from "components/file/FileInput"; -import FormField from "components/form/FormField"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import ButtonWrapper from "components/content/ButtonWrapper"; -import { FormNames } from "enums"; -import { CollectionCourtDecisionFieldPaths, CollectionCourtDecisionFieldTitles } from "collectionCourtDecision/enums"; -import { ButtonColors } from "components/enums"; -import { getFieldAttributes, isFieldAllowedToEdit } from "util/helpers"; -import { getAttributes as getCollectionCourtDecisionAttributes } from "collectionCourtDecision/selectors"; +import Authorization from "@/components/authorization/Authorization"; +import Button from "@/components/button/Button"; +import FileInput from "@/components/file/FileInput"; +import FormField from "@/components/form/FormField"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import ButtonWrapper from "@/components/content/ButtonWrapper"; +import { FormNames } from "@/enums"; +import { CollectionCourtDecisionFieldPaths, CollectionCourtDecisionFieldTitles } from "@/collectionCourtDecision/enums"; +import { ButtonColors } from "@/components/enums"; +import { getFieldAttributes, isFieldAllowedToEdit } from "@/util/helpers"; +import { getAttributes as getCollectionCourtDecisionAttributes } from "@/collectionCourtDecision/selectors"; import type { Attributes } from "types"; type Props = { collectionCourtDecisionAttributes: Attributes; diff --git a/src/leases/components/leaseSections/invoice/CreateAndCreditInvoice.tsx b/src/leases/components/leaseSections/invoice/CreateAndCreditInvoice.tsx index c1ccdf3f5..bd884ed47 100644 --- a/src/leases/components/leaseSections/invoice/CreateAndCreditInvoice.tsx +++ b/src/leases/components/leaseSections/invoice/CreateAndCreditInvoice.tsx @@ -3,28 +3,28 @@ import { connect } from "react-redux"; import scrollToComponent from "react-scroll-to-component"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; -import AddButton from "components/form/AddButton"; -import Authorization from "components/authorization/Authorization"; -import Button from "components/button/Button"; +import AddButton from "@/components/form/AddButton"; +import Authorization from "@/components/authorization/Authorization"; +import Button from "@/components/button/Button"; import CreditInvoiceForm from "./forms/CreditInvoiceForm"; import NewInvoiceForm from "./forms/NewInvoiceForm"; -import { createCharge } from "leases/actions"; -import { createInvoice, creditInvoice, deleteInvoice, receiveIsCreateClicked, receiveIsCreateInvoicePanelOpen, receiveIsCreditClicked, receiveIsCreditInvoicePanelOpen } from "invoices/actions"; -import { creditInvoiceSet } from "invoiceSets/actions"; -import { ButtonColors } from "components/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { RecipientOptions } from "leases/enums"; -import { getPayloadCreateInvoice, getPayloadCreditInvoice } from "invoices/helpers"; -import { getCreditInvoiceSetPayload } from "invoiceSets/helpers"; -import { getPayloadLeaseCreateCharge } from "leaseCreateCharge/helpers"; -import { hasPermissions } from "util/helpers"; -import { getCurrentLease } from "leases/selectors"; -import { getIsCreateInvoicePanelOpen, getIsCreditInvoicePanelOpen } from "invoices/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import { AppConsumer, ActionTypes } from "app/AppContext"; -import { ConfirmationModalTexts } from "enums"; -import type { Lease } from "leases/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import { createCharge } from "@/leases/actions"; +import { createInvoice, creditInvoice, deleteInvoice, receiveIsCreateClicked, receiveIsCreateInvoicePanelOpen, receiveIsCreditClicked, receiveIsCreditInvoicePanelOpen } from "@/invoices/actions"; +import { creditInvoiceSet } from "@/invoiceSets/actions"; +import { ButtonColors } from "@/components/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { RecipientOptions } from "@/leases/enums"; +import { getPayloadCreateInvoice, getPayloadCreditInvoice } from "@/invoices/helpers"; +import { getCreditInvoiceSetPayload } from "@/invoiceSets/helpers"; +import { getPayloadLeaseCreateCharge } from "@/leaseCreateCharge/helpers"; +import { hasPermissions } from "@/util/helpers"; +import { getCurrentLease } from "@/leases/selectors"; +import { getIsCreateInvoicePanelOpen, getIsCreditInvoicePanelOpen } from "@/invoices/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import { AppConsumer, ActionTypes } from "@/app/AppContext"; +import { ConfirmationModalTexts } from "@/enums"; +import type { Lease } from "@/leases/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { createCharge: (...args: Array) => any; createInvoice: (...args: Array) => any; diff --git a/src/leases/components/leaseSections/invoice/CreateCollectionLetter.tsx b/src/leases/components/leaseSections/invoice/CreateCollectionLetter.tsx index cd8cf69cc..7d01e9afc 100644 --- a/src/leases/components/leaseSections/invoice/CreateCollectionLetter.tsx +++ b/src/leases/components/leaseSections/invoice/CreateCollectionLetter.tsx @@ -1,9 +1,9 @@ import React from "react"; import CreateCollectionLetterForm from "./forms/CreateCollectionLetterForm"; -import GreenBox from "components/content/GreenBox"; -import SubTitle from "components/content/SubTitle"; -import { CreateCollectionLetterFieldPaths, CreateCollectionLetterFieldTitles } from "createCollectionLetter/enums"; -import { getUiDataCreateCollectionLetterKey } from "uiData/helpers"; +import GreenBox from "@/components/content/GreenBox"; +import SubTitle from "@/components/content/SubTitle"; +import { CreateCollectionLetterFieldPaths, CreateCollectionLetterFieldTitles } from "@/createCollectionLetter/enums"; +import { getUiDataCreateCollectionLetterKey } from "@/uiData/helpers"; const CreateCollectionLetter = () => { return diff --git a/src/leases/components/leaseSections/invoice/DebtCollection.tsx b/src/leases/components/leaseSections/invoice/DebtCollection.tsx index 68b0bb56e..01dada8b7 100644 --- a/src/leases/components/leaseSections/invoice/DebtCollection.tsx +++ b/src/leases/components/leaseSections/invoice/DebtCollection.tsx @@ -1,6 +1,6 @@ import React from "react"; import DebtCollectionForm from "./forms/DebtCollectionForm"; -import GreenBox from "components/content/GreenBox"; +import GreenBox from "@/components/content/GreenBox"; const DebtCollection = () => diff --git a/src/leases/components/leaseSections/invoice/InvoiceNotes.tsx b/src/leases/components/leaseSections/invoice/InvoiceNotes.tsx index ee8583da8..9963518a2 100644 --- a/src/leases/components/leaseSections/invoice/InvoiceNotes.tsx +++ b/src/leases/components/leaseSections/invoice/InvoiceNotes.tsx @@ -3,27 +3,27 @@ import { Row, Column } from "react-foundation"; import { connect } from "react-redux"; import { FieldArray, formValueSelector, reduxForm } from "redux-form"; import flowRight from "lodash/flowRight"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import AddButton from "components/form/AddButton"; -import Authorization from "components/authorization/Authorization"; -import Button from "components/button/Button"; -import ButtonWrapper from "components/content/ButtonWrapper"; -import FieldAndRemoveButtonWrapper from "components/form/FieldAndRemoveButtonWrapper"; -import FormField from "components/form/FormField"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import ListItem from "components/content/ListItem"; -import ListItems from "components/content/ListItems"; -import RemoveButton from "components/form/RemoveButton"; -import { patchLeaseInvoiceNotes } from "leases/actions"; -import { ConfirmationModalTexts, FieldTypes, FormNames, Methods } from "enums"; -import { ButtonColors } from "components/enums"; -import { InvoiceNoteFieldPaths, InvoiceNoteFieldTitles } from "invoiceNote/enums"; -import { formatDate, getFieldAttributes, isFieldAllowedToRead, isMethodAllowed } from "util/helpers"; -import { getAttributes as getInvoiceNoteAttributes, getMethods as getInvoiceNoteMethods } from "invoiceNote/selectors"; -import { getCurrentLease } from "leases/selectors"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import AddButton from "@/components/form/AddButton"; +import Authorization from "@/components/authorization/Authorization"; +import Button from "@/components/button/Button"; +import ButtonWrapper from "@/components/content/ButtonWrapper"; +import FieldAndRemoveButtonWrapper from "@/components/form/FieldAndRemoveButtonWrapper"; +import FormField from "@/components/form/FormField"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import ListItem from "@/components/content/ListItem"; +import ListItems from "@/components/content/ListItems"; +import RemoveButton from "@/components/form/RemoveButton"; +import { patchLeaseInvoiceNotes } from "@/leases/actions"; +import { ConfirmationModalTexts, FieldTypes, FormNames, Methods } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { InvoiceNoteFieldPaths, InvoiceNoteFieldTitles } from "@/invoiceNote/enums"; +import { formatDate, getFieldAttributes, isFieldAllowedToRead, isMethodAllowed } from "@/util/helpers"; +import { getAttributes as getInvoiceNoteAttributes, getMethods as getInvoiceNoteMethods } from "@/invoiceNote/selectors"; +import { getCurrentLease } from "@/leases/selectors"; import type { Attributes, Methods as MethodsType } from "types"; -import type { Lease } from "leases/types"; +import type { Lease } from "@/leases/types"; type ReadOnlyProps = { invoiceNoteAttributes: Attributes; invoiceNotes: Array>; diff --git a/src/leases/components/leaseSections/invoice/InvoicePanel.tsx b/src/leases/components/leaseSections/invoice/InvoicePanel.tsx index f10e9d445..decd68848 100644 --- a/src/leases/components/leaseSections/invoice/InvoicePanel.tsx +++ b/src/leases/components/leaseSections/invoice/InvoicePanel.tsx @@ -2,19 +2,19 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import { getFormValues, isValid } from "redux-form"; import isEmpty from "lodash/isEmpty"; -import Authorization from "components/authorization/Authorization"; -import Button from "components/button/Button"; +import Authorization from "@/components/authorization/Authorization"; +import Button from "@/components/button/Button"; import EditInvoiceForm from "./forms/EditInvoiceForm"; import InvoiceTemplate from "./InvoiceTemplate"; -import TablePanelContainer from "components/table/TablePanelContainer"; -import { receiveIsEditClicked } from "invoices/actions"; -import { FormNames, Methods } from "enums"; -import { ButtonColors } from "components/enums"; -import { isMethodAllowed } from "util/helpers"; -import { getInvoicesByLease, getIsEditClicked, getMethods as getInvoiceMethods } from "invoices/selectors"; -import { getCurrentLease } from "leases/selectors"; +import TablePanelContainer from "@/components/table/TablePanelContainer"; +import { receiveIsEditClicked } from "@/invoices/actions"; +import { FormNames, Methods } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { isMethodAllowed } from "@/util/helpers"; +import { getInvoicesByLease, getIsEditClicked, getMethods as getInvoiceMethods } from "@/invoices/selectors"; +import { getCurrentLease } from "@/leases/selectors"; import type { Methods as MethodsType } from "types"; -import type { Invoice, InvoiceList } from "invoices/types"; +import type { Invoice, InvoiceList } from "@/invoices/types"; type Props = { formValues: Record; diff --git a/src/leases/components/leaseSections/invoice/InvoiceTableAndPanel.tsx b/src/leases/components/leaseSections/invoice/InvoiceTableAndPanel.tsx index 8e99a8115..f2b13571d 100644 --- a/src/leases/components/leaseSections/invoice/InvoiceTableAndPanel.tsx +++ b/src/leases/components/leaseSections/invoice/InvoiceTableAndPanel.tsx @@ -4,27 +4,27 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import { withRouter } from "react-router"; import { initialize } from "redux-form"; -import AmountWithVat from "components/vat/AmountWithVat"; -import FormText from "components/form/FormText"; +import AmountWithVat from "@/components/vat/AmountWithVat"; +import FormText from "@/components/form/FormText"; import InvoicePanel from "./InvoicePanel"; -import SingleRadioInput from "components/inputs/SingleRadioInput"; -import SortableTable from "components/table/SortableTable"; -import TableAndPanelWrapper from "components/table/TableAndPanelWrapper"; -import { clearPatchedInvoice, patchInvoice } from "invoices/actions"; -import { FormNames, KeyCodes, TableSortOrder } from "enums"; -import { InvoiceFieldPaths, InvoiceFieldTitles, InvoiceRowsFieldPaths, InvoiceRowsFieldTitles, InvoiceType } from "invoices/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getContactFullName } from "contacts/helpers"; -import { formatReceivableTypesString, getContentIncoive, getContentInvoices, getPayloadEditInvoice, isInvoiceOverdue } from "invoices/helpers"; -import { findReactById, formatDate, formatDateRange, formatNumber, getFieldOptions, getLabelOfOption, hasPermissions, isFieldAllowedToRead, sortByOptionsAsc, sortByOptionsDesc, sortNumberByKeyAsc, sortNumberByKeyDesc, sortStringAsc, sortStringDesc } from "util/helpers"; -import { getAttributes as getInvoiceAttributes, getInvoicesByLease, getPatchedInvoice } from "invoices/selectors"; -import { getInvoiceSetsByLease } from "invoiceSets/selectors"; -import { getCurrentLease } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import type { Invoice, InvoiceList } from "invoices/types"; -import type { InvoiceSetList } from "invoiceSets/types"; +import SingleRadioInput from "@/components/inputs/SingleRadioInput"; +import SortableTable from "@/components/table/SortableTable"; +import TableAndPanelWrapper from "@/components/table/TableAndPanelWrapper"; +import { clearPatchedInvoice, patchInvoice } from "@/invoices/actions"; +import { FormNames, KeyCodes, TableSortOrder } from "@/enums"; +import { InvoiceFieldPaths, InvoiceFieldTitles, InvoiceRowsFieldPaths, InvoiceRowsFieldTitles, InvoiceType } from "@/invoices/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getContactFullName } from "@/contacts/helpers"; +import { formatReceivableTypesString, getContentIncoive, getContentInvoices, getPayloadEditInvoice, isInvoiceOverdue } from "@/invoices/helpers"; +import { findReactById, formatDate, formatDateRange, formatNumber, getFieldOptions, getLabelOfOption, hasPermissions, isFieldAllowedToRead, sortByOptionsAsc, sortByOptionsDesc, sortNumberByKeyAsc, sortNumberByKeyDesc, sortStringAsc, sortStringDesc } from "@/util/helpers"; +import { getAttributes as getInvoiceAttributes, getInvoicesByLease, getPatchedInvoice } from "@/invoices/selectors"; +import { getInvoiceSetsByLease } from "@/invoiceSets/selectors"; +import { getCurrentLease } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import type { Invoice, InvoiceList } from "@/invoices/types"; +import type { InvoiceSetList } from "@/invoiceSets/types"; import type { Attributes } from "types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { clearPatchedInvoice: (...args: Array) => any; initialize: (...args: Array) => any; diff --git a/src/leases/components/leaseSections/invoice/InvoiceTemplate.tsx b/src/leases/components/leaseSections/invoice/InvoiceTemplate.tsx index 9e176f107..30db8804a 100644 --- a/src/leases/components/leaseSections/invoice/InvoiceTemplate.tsx +++ b/src/leases/components/leaseSections/invoice/InvoiceTemplate.tsx @@ -2,19 +2,19 @@ import React, { Fragment } from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; -import AmountWithVat from "components/vat/AmountWithVat"; -import Authorization from "components/authorization/Authorization"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; +import AmountWithVat from "@/components/vat/AmountWithVat"; +import Authorization from "@/components/authorization/Authorization"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; import InvoiceRows from "./forms/InvoiceRows"; -import ListItem from "components/content/ListItem"; -import ListItems from "components/content/ListItems"; -import SubTitle from "components/content/SubTitle"; -import { InvoiceCreditInvoicesFieldPaths, InvoiceCreditInvoicesFieldTitles, InvoiceFieldPaths, InvoiceFieldTitles, InvoiceInterestInvoicesFieldPaths, InvoiceInterestInvoicesFieldTitles, InvoicePaymentsFieldPaths, InvoicePaymentsFieldTitles, InvoiceRowsFieldPaths, InvoiceType } from "invoices/enums"; -import { getUiDataInvoiceKey } from "uiData/helpers"; -import { formatDate, formatDateRange, formatNumber, getFieldOptions, getLabelOfOption, isEmptyValue, isFieldAllowedToRead } from "util/helpers"; -import { getContactFullName } from "contacts/helpers"; -import { getAttributes as getInvoiceAttributes } from "invoices/selectors"; +import ListItem from "@/components/content/ListItem"; +import ListItems from "@/components/content/ListItems"; +import SubTitle from "@/components/content/SubTitle"; +import { InvoiceCreditInvoicesFieldPaths, InvoiceCreditInvoicesFieldTitles, InvoiceFieldPaths, InvoiceFieldTitles, InvoiceInterestInvoicesFieldPaths, InvoiceInterestInvoicesFieldTitles, InvoicePaymentsFieldPaths, InvoicePaymentsFieldTitles, InvoiceRowsFieldPaths, InvoiceType } from "@/invoices/enums"; +import { getUiDataInvoiceKey } from "@/uiData/helpers"; +import { formatDate, formatDateRange, formatNumber, getFieldOptions, getLabelOfOption, isEmptyValue, isFieldAllowedToRead } from "@/util/helpers"; +import { getContactFullName } from "@/contacts/helpers"; +import { getAttributes as getInvoiceAttributes } from "@/invoices/selectors"; import type { Attributes } from "types"; type Props = { creditedInvoice: Record | null | undefined; diff --git a/src/leases/components/leaseSections/invoice/Invoices.tsx b/src/leases/components/leaseSections/invoice/Invoices.tsx index 5c443eee8..03cc668cd 100644 --- a/src/leases/components/leaseSections/invoice/Invoices.tsx +++ b/src/leases/components/leaseSections/invoice/Invoices.tsx @@ -3,48 +3,48 @@ import { connect } from "react-redux"; import { withRouter } from "react-router"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import Authorization from "components/authorization/Authorization"; -import AuthorizationError from "components/authorization/AuthorizationError"; -import Button from "components/button/Button"; -import Collapse from "components/collapse/Collapse"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import Authorization from "@/components/authorization/Authorization"; +import AuthorizationError from "@/components/authorization/AuthorizationError"; +import Button from "@/components/button/Button"; +import Collapse from "@/components/collapse/Collapse"; import CreateAndCreditInvoice from "./CreateAndCreditInvoice"; import CreateCollectionLetter from "./CreateCollectionLetter"; import DebtCollection from "./DebtCollection"; -import Divider from "components/content/Divider"; +import Divider from "@/components/content/Divider"; import InvoiceNotes from "./InvoiceNotes"; -import InvoiceSimulator from "components/invoice-simulator/InvoiceSimulator"; +import InvoiceSimulator from "@/components/invoice-simulator/InvoiceSimulator"; import InvoiceTableAndPanel from "./InvoiceTableAndPanel"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import SuccessField from "components/form/SuccessField"; -import Title from "components/content/Title"; -import WarningContainer from "components/content/WarningContainer"; -import WarningField from "components/form/WarningField"; -import { fetchCollectionCourtDecisionsByLease } from "collectionCourtDecision/actions"; -import { fetchCollectionLettersByLease } from "collectionLetter/actions"; -import { fetchCollectionNotesByLease } from "collectionNote/actions"; -import { fetchInvoiceSetsByLease } from "invoiceSets/actions"; -import { receiveInvoiceToCredit, receiveIsCreateInvoicePanelOpen, receiveIsCreditInvoicePanelOpen } from "invoices/actions"; -import { receiveCollapseStates, startInvoicing, stopInvoicing } from "leases/actions"; -import { ConfirmationModalTexts, PermissionMissingTexts, ViewModes } from "enums"; -import { ButtonColors } from "components/enums"; -import { LeaseInvoiceNotesFieldPaths, LeaseInvoiceNotesFieldTitles, LeaseInvoicingFieldPaths, LeaseInvoicingFieldTitles, LeaseRentsFieldPaths } from "leases/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getContentInvoiceNotes } from "leases/helpers"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { hasPermissions, isFieldAllowedToRead } from "util/helpers"; -import { getCollectionCourtDecisionsByLease } from "collectionCourtDecision/selectors"; -import { getCollectionLettersByLease } from "collectionLetter/selectors"; -import { getCollectionNotesByLease } from "collectionNote/selectors"; -import { getInvoiceToCredit } from "invoices/selectors"; -import { getInvoiceSetsByLease } from "invoiceSets/selectors"; -import { getAttributes as getLeaseAttributes, getCollapseStateByKey, getCurrentLease } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import { withLeaseInvoiceTabAttributes } from "components/attributes/LeaseInvoiceTabAttributes"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import SuccessField from "@/components/form/SuccessField"; +import Title from "@/components/content/Title"; +import WarningContainer from "@/components/content/WarningContainer"; +import WarningField from "@/components/form/WarningField"; +import { fetchCollectionCourtDecisionsByLease } from "@/collectionCourtDecision/actions"; +import { fetchCollectionLettersByLease } from "@/collectionLetter/actions"; +import { fetchCollectionNotesByLease } from "@/collectionNote/actions"; +import { fetchInvoiceSetsByLease } from "@/invoiceSets/actions"; +import { receiveInvoiceToCredit, receiveIsCreateInvoicePanelOpen, receiveIsCreditInvoicePanelOpen } from "@/invoices/actions"; +import { receiveCollapseStates, startInvoicing, stopInvoicing } from "@/leases/actions"; +import { ConfirmationModalTexts, PermissionMissingTexts, ViewModes } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { LeaseInvoiceNotesFieldPaths, LeaseInvoiceNotesFieldTitles, LeaseInvoicingFieldPaths, LeaseInvoicingFieldTitles, LeaseRentsFieldPaths } from "@/leases/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getContentInvoiceNotes } from "@/leases/helpers"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { hasPermissions, isFieldAllowedToRead } from "@/util/helpers"; +import { getCollectionCourtDecisionsByLease } from "@/collectionCourtDecision/selectors"; +import { getCollectionLettersByLease } from "@/collectionLetter/selectors"; +import { getCollectionNotesByLease } from "@/collectionNote/selectors"; +import { getInvoiceToCredit } from "@/invoices/selectors"; +import { getInvoiceSetsByLease } from "@/invoiceSets/selectors"; +import { getAttributes as getLeaseAttributes, getCollapseStateByKey, getCurrentLease } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import { withLeaseInvoiceTabAttributes } from "@/components/attributes/LeaseInvoiceTabAttributes"; import type { Attributes } from "types"; -import type { Lease } from "leases/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { Lease } from "@/leases/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { collectionCourtDecisions: Array> | null | undefined; collectionLetters: Array> | null | undefined; diff --git a/src/leases/components/leaseSections/invoice/forms/CollectionLetterInvoiceRow.tsx b/src/leases/components/leaseSections/invoice/forms/CollectionLetterInvoiceRow.tsx index 3ecd401ea..d06aca579 100644 --- a/src/leases/components/leaseSections/invoice/forms/CollectionLetterInvoiceRow.tsx +++ b/src/leases/components/leaseSections/invoice/forms/CollectionLetterInvoiceRow.tsx @@ -4,19 +4,19 @@ import { formValueSelector } from "redux-form"; import { Row, Column } from "react-foundation"; import get from "lodash/get"; import isEmpty from "lodash/isEmpty"; -import FieldAndRemoveButtonWrapper from "components/form/FieldAndRemoveButtonWrapper"; -import FormField from "components/form/FormField"; -import FormText from "components/form/FormText"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import RemoveButton from "components/form/RemoveButton"; -import { fetchPenaltyInterestByInvoice } from "penaltyInterest/actions"; -import { FormNames } from "enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { convertStrToDecimalNumber, formatNumber, hasPermissions } from "util/helpers"; -import { getIsFetchingByInvoice, getPenaltyInterestByInvoice } from "penaltyInterest/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import FieldAndRemoveButtonWrapper from "@/components/form/FieldAndRemoveButtonWrapper"; +import FormField from "@/components/form/FormField"; +import FormText from "@/components/form/FormText"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import RemoveButton from "@/components/form/RemoveButton"; +import { fetchPenaltyInterestByInvoice } from "@/penaltyInterest/actions"; +import { FormNames } from "@/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { convertStrToDecimalNumber, formatNumber, hasPermissions } from "@/util/helpers"; +import { getIsFetchingByInvoice, getPenaltyInterestByInvoice } from "@/penaltyInterest/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { field: any; collectionCharge: string; diff --git a/src/leases/components/leaseSections/invoice/forms/CollectionLetterTotalRow.tsx b/src/leases/components/leaseSections/invoice/forms/CollectionLetterTotalRow.tsx index eb79f059e..2f700e072 100644 --- a/src/leases/components/leaseSections/invoice/forms/CollectionLetterTotalRow.tsx +++ b/src/leases/components/leaseSections/invoice/forms/CollectionLetterTotalRow.tsx @@ -3,10 +3,10 @@ import { connect } from "react-redux"; import { formValueSelector } from "redux-form"; import { Row, Column } from "react-foundation"; import isEmpty from "lodash/isEmpty"; -import FormText from "components/form/FormText"; -import { FormNames } from "enums"; -import { convertStrToDecimalNumber, formatNumber } from "util/helpers"; -import { getPenaltyInterestByInvoice } from "penaltyInterest/selectors"; +import FormText from "@/components/form/FormText"; +import { FormNames } from "@/enums"; +import { convertStrToDecimalNumber, formatNumber } from "@/util/helpers"; +import { getPenaltyInterestByInvoice } from "@/penaltyInterest/selectors"; type OwnProps = { selectedInvoices: Array>; fields: any; diff --git a/src/leases/components/leaseSections/invoice/forms/CreateCollectionLetterForm.tsx b/src/leases/components/leaseSections/invoice/forms/CreateCollectionLetterForm.tsx index 9e2a6393b..e6f25f532 100644 --- a/src/leases/components/leaseSections/invoice/forms/CreateCollectionLetterForm.tsx +++ b/src/leases/components/leaseSections/invoice/forms/CreateCollectionLetterForm.tsx @@ -4,28 +4,28 @@ import { FieldArray, formValueSelector, reduxForm } from "redux-form"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; -import createUrl from "api/createUrl"; -import AddButtonThird from "components/form/AddButtonThird"; -import Authorization from "components/authorization/Authorization"; +import createUrl from "@/api/createUrl"; +import AddButtonThird from "@/components/form/AddButtonThird"; +import Authorization from "@/components/authorization/Authorization"; import CollectionLetterInvoiceRow from "./CollectionLetterInvoiceRow"; import CollectionLetterTotalRow from "./CollectionLetterTotalRow"; -import Divider from "components/content/Divider"; -import FileDownloadButton from "components/file/FileDownloadButton"; -import FormField from "components/form/FormField"; -import FormTextTitle from "components/form/FormTextTitle"; -import SubTitle from "components/content/SubTitle"; -import { FieldTypes, FormNames } from "enums"; -import { CreateCollectionLetterFieldPaths, CreateCollectionLetterFieldTitles } from "createCollectionLetter/enums"; -import { InvoiceType } from "invoices/enums"; -import { PenaltyInterestFieldPaths, PenaltyInterestFieldTitles } from "penaltyInterest/enums"; -import { getInvoiceTenantOptions } from "leases/helpers"; -import { getUiDataCreateCollectionLetterKey, getUiDataPenaltyInterestKey } from "uiData/helpers"; -import { convertStrToDecimalNumber, formatDate, formatDateRange, getFieldAttributes, isFieldAllowedToEdit, sortStringByKeyDesc } from "util/helpers"; -import { getAttributes as getCreateCollectionLetterAttributes } from "createCollectionLetter/selectors"; -import { getInvoicesByLease } from "invoices/selectors"; -import { getCurrentLease } from "leases/selectors"; +import Divider from "@/components/content/Divider"; +import FileDownloadButton from "@/components/file/FileDownloadButton"; +import FormField from "@/components/form/FormField"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import SubTitle from "@/components/content/SubTitle"; +import { FieldTypes, FormNames } from "@/enums"; +import { CreateCollectionLetterFieldPaths, CreateCollectionLetterFieldTitles } from "@/createCollectionLetter/enums"; +import { InvoiceType } from "@/invoices/enums"; +import { PenaltyInterestFieldPaths, PenaltyInterestFieldTitles } from "@/penaltyInterest/enums"; +import { getInvoiceTenantOptions } from "@/leases/helpers"; +import { getUiDataCreateCollectionLetterKey, getUiDataPenaltyInterestKey } from "@/uiData/helpers"; +import { convertStrToDecimalNumber, formatDate, formatDateRange, getFieldAttributes, isFieldAllowedToEdit, sortStringByKeyDesc } from "@/util/helpers"; +import { getAttributes as getCreateCollectionLetterAttributes } from "@/createCollectionLetter/selectors"; +import { getInvoicesByLease } from "@/invoices/selectors"; +import { getCurrentLease } from "@/leases/selectors"; import type { Attributes } from "types"; -import type { Lease } from "leases/types"; +import type { Lease } from "@/leases/types"; type InvoicesProps = { disableDirty?: boolean; fields: any; diff --git a/src/leases/components/leaseSections/invoice/forms/CreditInvoiceForm.tsx b/src/leases/components/leaseSections/invoice/forms/CreditInvoiceForm.tsx index 2a00d5b29..e4e6b1fb5 100644 --- a/src/leases/components/leaseSections/invoice/forms/CreditInvoiceForm.tsx +++ b/src/leases/components/leaseSections/invoice/forms/CreditInvoiceForm.tsx @@ -3,21 +3,21 @@ import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; import { formValueSelector, getFormValues, reduxForm } from "redux-form"; import flowRight from "lodash/flowRight"; -import Authorization from "components/authorization/Authorization"; -import BoxContentWrapper from "components/content/BoxContentWrapper"; -import Button from "components/button/Button"; -import CloseButton from "components/button/CloseButton"; -import FormField from "components/form/FormField"; -import WhiteBox from "components/content/WhiteBox"; -import { receiveIsCreditClicked } from "invoices/actions"; -import { CreditInvoiceOptions, CreditInvoiceSetOptions } from "leases/constants"; -import { FormNames } from "enums"; -import { ButtonColors } from "components/enums"; -import { InvoiceFieldPaths, InvoiceFieldTitles, InvoiceRowsFieldPaths, InvoiceRowsFieldTitles } from "invoices/enums"; -import { CreditInvoiceOptions as CreditInvoiceOptionsEnum } from "leases/enums"; -import { getUiDataCreditInvoiceKey } from "uiData/helpers"; -import { addEmptyOption, getFieldAttributes, getFieldOptions, getLabelOfOption, isFieldAllowedToEdit, sortStringByKeyAsc } from "util/helpers"; -import { getAttributes as getInvoiceAttributes, getIsCreditClicked } from "invoices/selectors"; +import Authorization from "@/components/authorization/Authorization"; +import BoxContentWrapper from "@/components/content/BoxContentWrapper"; +import Button from "@/components/button/Button"; +import CloseButton from "@/components/button/CloseButton"; +import FormField from "@/components/form/FormField"; +import WhiteBox from "@/components/content/WhiteBox"; +import { receiveIsCreditClicked } from "@/invoices/actions"; +import { CreditInvoiceOptions, CreditInvoiceSetOptions } from "@/leases/constants"; +import { FormNames } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { InvoiceFieldPaths, InvoiceFieldTitles, InvoiceRowsFieldPaths, InvoiceRowsFieldTitles } from "@/invoices/enums"; +import { CreditInvoiceOptions as CreditInvoiceOptionsEnum } from "@/leases/enums"; +import { getUiDataCreditInvoiceKey } from "@/uiData/helpers"; +import { addEmptyOption, getFieldAttributes, getFieldOptions, getLabelOfOption, isFieldAllowedToEdit, sortStringByKeyAsc } from "@/util/helpers"; +import { getAttributes as getInvoiceAttributes, getIsCreditClicked } from "@/invoices/selectors"; import type { Attributes } from "types"; type Props = { formValues: Record; diff --git a/src/leases/components/leaseSections/invoice/forms/DebtCollectionForm.tsx b/src/leases/components/leaseSections/invoice/forms/DebtCollectionForm.tsx index cf8edcd0e..8cb7aa8f2 100644 --- a/src/leases/components/leaseSections/invoice/forms/DebtCollectionForm.tsx +++ b/src/leases/components/leaseSections/invoice/forms/DebtCollectionForm.tsx @@ -4,49 +4,49 @@ import { FieldArray, reduxForm } from "redux-form"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import ActionButtonWrapper from "components/form/ActionButtonWrapper"; -import AddButtonThird from "components/form/AddButtonThird"; -import AddFileButton from "components/form/AddFileButton"; -import Authorization from "components/authorization/Authorization"; -import BoxItem from "components/content/BoxItem"; -import BoxItemContainer from "components/content/BoxItemContainer"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import ActionButtonWrapper from "@/components/form/ActionButtonWrapper"; +import AddButtonThird from "@/components/form/AddButtonThird"; +import AddFileButton from "@/components/form/AddFileButton"; +import Authorization from "@/components/authorization/Authorization"; +import BoxItem from "@/components/content/BoxItem"; +import BoxItemContainer from "@/components/content/BoxItemContainer"; import CollectionCourtDecisionPanel from "../CollectionCourtDecisionPanel"; -import DecisionLink from "components/links/DecisionLink"; +import DecisionLink from "@/components/links/DecisionLink"; import NewCollectionNote from "./NewCollectionNote"; -import FieldAndRemoveButtonWrapper from "components/form/FieldAndRemoveButtonWrapper"; -import FileDownloadLink from "components/file/FileDownloadLink"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import RemoveButton from "components/form/RemoveButton"; -import ShowMore from "components/showMore/ShowMore"; -import SubTitle from "components/content/SubTitle"; -import { deleteCollectionCourtDecision, hideCollectionCourtDecisionPanel, showCollectionCourtDecisionPanel, uploadCollectionCourtDecision } from "collectionCourtDecision/actions"; -import { deleteCollectionLetter, uploadCollectionLetter } from "collectionLetter/actions"; -import { createCollectionNote, deleteCollectionNote } from "collectionNote/actions"; -import { ConfirmationModalTexts, FormNames } from "enums"; -import { CollectionCourtDecisionFieldPaths, CollectionCourtDecisionFieldTitles } from "collectionCourtDecision/enums"; -import { CollectionLetterFieldPaths, CollectionLetterFieldTitles } from "collectionLetter/enums"; -import { CollectionNoteFieldPaths, CollectionNoteFieldTitles } from "collectionNote/enums"; -import { ButtonColors } from "components/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { LeaseDecisionsFieldPaths, LeaseDecisionsFieldTitles } from "leases/enums"; -import { getUserFullName } from "users/helpers"; -import { getContentDebtCollectionDecisions, getDecisionOptions } from "leases/helpers"; -import { getUiDataCollectionCourtDecisionKey, getUiDataCollectionLetterKey, getUiDataCollectionNoteKey, getUiDataLeaseKey } from "uiData/helpers"; -import { formatDate, hasPermissions, isFieldAllowedToRead, isFieldRequired, sortStringByKeyAsc } from "util/helpers"; -import { getAttributes as getCollectionCourtDecisionAttributes, getCollectionCourtDecisionsByLease, getIsCollectionCourtDecisionPanelOpen } from "collectionCourtDecision/selectors"; -import { getAttributes as getCollectionLetterAttributes, getCollectionLettersByLease } from "collectionLetter/selectors"; -import { getAttributes as getCollectionNoteAttributes } from "collectionNote/selectors"; -import { getCollectionNotesByLease } from "collectionNote/selectors"; -import { getAttributes as getLeaseAttributes, getCurrentLease } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import { withWindowResize } from "components/resize/WindowResizeHandler"; +import FieldAndRemoveButtonWrapper from "@/components/form/FieldAndRemoveButtonWrapper"; +import FileDownloadLink from "@/components/file/FileDownloadLink"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import RemoveButton from "@/components/form/RemoveButton"; +import ShowMore from "@/components/showMore/ShowMore"; +import SubTitle from "@/components/content/SubTitle"; +import { deleteCollectionCourtDecision, hideCollectionCourtDecisionPanel, showCollectionCourtDecisionPanel, uploadCollectionCourtDecision } from "@/collectionCourtDecision/actions"; +import { deleteCollectionLetter, uploadCollectionLetter } from "@/collectionLetter/actions"; +import { createCollectionNote, deleteCollectionNote } from "@/collectionNote/actions"; +import { ConfirmationModalTexts, FormNames } from "@/enums"; +import { CollectionCourtDecisionFieldPaths, CollectionCourtDecisionFieldTitles } from "@/collectionCourtDecision/enums"; +import { CollectionLetterFieldPaths, CollectionLetterFieldTitles } from "@/collectionLetter/enums"; +import { CollectionNoteFieldPaths, CollectionNoteFieldTitles } from "@/collectionNote/enums"; +import { ButtonColors } from "@/components/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { LeaseDecisionsFieldPaths, LeaseDecisionsFieldTitles } from "@/leases/enums"; +import { getUserFullName } from "@/users/helpers"; +import { getContentDebtCollectionDecisions, getDecisionOptions } from "@/leases/helpers"; +import { getUiDataCollectionCourtDecisionKey, getUiDataCollectionLetterKey, getUiDataCollectionNoteKey, getUiDataLeaseKey } from "@/uiData/helpers"; +import { formatDate, hasPermissions, isFieldAllowedToRead, isFieldRequired, sortStringByKeyAsc } from "@/util/helpers"; +import { getAttributes as getCollectionCourtDecisionAttributes, getCollectionCourtDecisionsByLease, getIsCollectionCourtDecisionPanelOpen } from "@/collectionCourtDecision/selectors"; +import { getAttributes as getCollectionLetterAttributes, getCollectionLettersByLease } from "@/collectionLetter/selectors"; +import { getAttributes as getCollectionNoteAttributes } from "@/collectionNote/selectors"; +import { getCollectionNotesByLease } from "@/collectionNote/selectors"; +import { getAttributes as getLeaseAttributes, getCurrentLease } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import { withWindowResize } from "@/components/resize/WindowResizeHandler"; import type { Attributes } from "types"; -import type { CollectionCourtDecisionId } from "collectionCourtDecision/types"; -import type { CollectionLetterId } from "collectionLetter/types"; -import type { Lease } from "leases/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { CollectionCourtDecisionId } from "@/collectionCourtDecision/types"; +import type { CollectionLetterId } from "@/collectionLetter/types"; +import type { Lease } from "@/leases/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type NotesProps = { fields: any; onCreate: (...args: Array) => any; diff --git a/src/leases/components/leaseSections/invoice/forms/EditInvoiceForm.tsx b/src/leases/components/leaseSections/invoice/forms/EditInvoiceForm.tsx index 46c87c9d3..a3057cd18 100644 --- a/src/leases/components/leaseSections/invoice/forms/EditInvoiceForm.tsx +++ b/src/leases/components/leaseSections/invoice/forms/EditInvoiceForm.tsx @@ -3,35 +3,35 @@ import { Row, Column } from "react-foundation"; import { connect } from "react-redux"; import { FieldArray, formValueSelector, reduxForm } from "redux-form"; import flowRight from "lodash/flowRight"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import AddButtonThird from "components/form/AddButtonThird"; -import AmountWithVat from "components/vat/AmountWithVat"; -import Authorization from "components/authorization/Authorization"; -import FieldAndRemoveButtonWrapper from "components/form/FieldAndRemoveButtonWrapper"; -import FormField from "components/form/FormField"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import AddButtonThird from "@/components/form/AddButtonThird"; +import AmountWithVat from "@/components/vat/AmountWithVat"; +import Authorization from "@/components/authorization/Authorization"; +import FieldAndRemoveButtonWrapper from "@/components/form/FieldAndRemoveButtonWrapper"; +import FormField from "@/components/form/FormField"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; import InvoiceRowsEdit from "./InvoiceRowsEdit"; -import RemoveButton from "components/form/RemoveButton"; -import SendupButton from "components/button/SendupButton"; -import SubTitle from "components/content/SubTitle"; -import { exportInvoiceToLaskeAndUpdateList } from "invoices/actions"; -import { ConfirmationModalTexts, FieldTypes, FormNames } from "enums"; -import { ButtonColors } from "components/enums"; -import { InvoiceCreditInvoicesFieldPaths, InvoiceCreditInvoicesFieldTitles, InvoiceFieldPaths, InvoiceFieldTitles, InvoiceInterestInvoicesFieldPaths, InvoiceInterestInvoicesFieldTitles, InvoicePaymentsFieldPaths, InvoicePaymentsFieldTitles, InvoiceRowsFieldPaths, InvoiceType } from "invoices/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { validateInvoiceForm } from "leases/formValidators"; -import { getContactFullName } from "contacts/helpers"; -import { isInvoiceBillingPeriodRequired } from "invoices/helpers"; -import { getInvoiceTenantOptions } from "leases/helpers"; -import { getUiDataInvoiceKey } from "uiData/helpers"; -import { formatDate, formatNumber, getFieldAttributes, getFieldOptions, getLabelOfOption, hasPermissions, isEmptyValue, isFieldAllowedToEdit, isFieldAllowedToRead, isFieldRequired } from "util/helpers"; -import { getAttributes as getInvoiceAttributes, getIsEditClicked } from "invoices/selectors"; -import { getCurrentLease } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; +import RemoveButton from "@/components/form/RemoveButton"; +import SendupButton from "@/components/button/SendupButton"; +import SubTitle from "@/components/content/SubTitle"; +import { exportInvoiceToLaskeAndUpdateList } from "@/invoices/actions"; +import { ConfirmationModalTexts, FieldTypes, FormNames } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { InvoiceCreditInvoicesFieldPaths, InvoiceCreditInvoicesFieldTitles, InvoiceFieldPaths, InvoiceFieldTitles, InvoiceInterestInvoicesFieldPaths, InvoiceInterestInvoicesFieldTitles, InvoicePaymentsFieldPaths, InvoicePaymentsFieldTitles, InvoiceRowsFieldPaths, InvoiceType } from "@/invoices/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { validateInvoiceForm } from "@/leases/formValidators"; +import { getContactFullName } from "@/contacts/helpers"; +import { isInvoiceBillingPeriodRequired } from "@/invoices/helpers"; +import { getInvoiceTenantOptions } from "@/leases/helpers"; +import { getUiDataInvoiceKey } from "@/uiData/helpers"; +import { formatDate, formatNumber, getFieldAttributes, getFieldOptions, getLabelOfOption, hasPermissions, isEmptyValue, isFieldAllowedToEdit, isFieldAllowedToRead, isFieldRequired } from "@/util/helpers"; +import { getAttributes as getInvoiceAttributes, getIsEditClicked } from "@/invoices/selectors"; +import { getCurrentLease } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; import type { Attributes } from "types"; -import type { Lease } from "leases/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { Lease } from "@/leases/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type PaymentsProps = { attributes: Attributes; fields: any; diff --git a/src/leases/components/leaseSections/invoice/forms/InvoiceRows.tsx b/src/leases/components/leaseSections/invoice/forms/InvoiceRows.tsx index e1848d230..1dc58e7b5 100644 --- a/src/leases/components/leaseSections/invoice/forms/InvoiceRows.tsx +++ b/src/leases/components/leaseSections/invoice/forms/InvoiceRows.tsx @@ -1,18 +1,18 @@ import React from "react"; import { Row, Column } from "react-foundation"; import get from "lodash/get"; -import AmountWithVat from "components/vat/AmountWithVat"; -import Authorization from "components/authorization/Authorization"; -import BoxItem from "components/content/BoxItem"; -import BoxItemContainer from "components/content/BoxItemContainer"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import SubTitle from "components/content/SubTitle"; -import { InvoiceRowsFieldPaths, InvoiceRowsFieldTitles } from "invoices/enums"; -import { getContactFullName } from "contacts/helpers"; -import { getContentTenant } from "leases/helpers"; -import { getUiDataInvoiceKey } from "uiData/helpers"; -import { formatDate, getLabelOfOption, isFieldAllowedToRead } from "util/helpers"; +import AmountWithVat from "@/components/vat/AmountWithVat"; +import Authorization from "@/components/authorization/Authorization"; +import BoxItem from "@/components/content/BoxItem"; +import BoxItemContainer from "@/components/content/BoxItemContainer"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import SubTitle from "@/components/content/SubTitle"; +import { InvoiceRowsFieldPaths, InvoiceRowsFieldTitles } from "@/invoices/enums"; +import { getContactFullName } from "@/contacts/helpers"; +import { getContentTenant } from "@/leases/helpers"; +import { getUiDataInvoiceKey } from "@/uiData/helpers"; +import { formatDate, getLabelOfOption, isFieldAllowedToRead } from "@/util/helpers"; import type { Attributes } from "types"; type Props = { invoiceAttributes: Attributes; diff --git a/src/leases/components/leaseSections/invoice/forms/InvoiceRowsEdit.tsx b/src/leases/components/leaseSections/invoice/forms/InvoiceRowsEdit.tsx index ab46b4662..689a7f800 100644 --- a/src/leases/components/leaseSections/invoice/forms/InvoiceRowsEdit.tsx +++ b/src/leases/components/leaseSections/invoice/forms/InvoiceRowsEdit.tsx @@ -2,25 +2,25 @@ import React, { Fragment, ReactElement } from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; import { formValueSelector } from "redux-form"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import ActionButtonWrapper from "components/form/ActionButtonWrapper"; -import AddButtonThird from "components/form/AddButtonThird"; -import Authorization from "components/authorization/Authorization"; -import BoxItem from "components/content/BoxItem"; -import BoxItemContainer from "components/content/BoxItemContainer"; -import FormField from "components/form/FormField"; -import RemoveButton from "components/form/RemoveButton"; -import SubTitle from "components/content/SubTitle"; -import { ConfirmationModalTexts, FormNames } from "enums"; -import { ButtonColors } from "components/enums"; -import { InvoiceRowsFieldPaths, InvoiceRowsFieldTitles } from "invoices/enums"; -import { getUiDataInvoiceKey } from "uiData/helpers"; -import { getFieldAttributes, isFieldAllowedToEdit, isFieldAllowedToRead } from "util/helpers"; -import { getAttributes as getInvoiceAttributes } from "invoices/selectors"; -import { getReceivableTypes } from "leaseCreateCharge/selectors"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import ActionButtonWrapper from "@/components/form/ActionButtonWrapper"; +import AddButtonThird from "@/components/form/AddButtonThird"; +import Authorization from "@/components/authorization/Authorization"; +import BoxItem from "@/components/content/BoxItem"; +import BoxItemContainer from "@/components/content/BoxItemContainer"; +import FormField from "@/components/form/FormField"; +import RemoveButton from "@/components/form/RemoveButton"; +import SubTitle from "@/components/content/SubTitle"; +import { ConfirmationModalTexts, FormNames } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { InvoiceRowsFieldPaths, InvoiceRowsFieldTitles } from "@/invoices/enums"; +import { getUiDataInvoiceKey } from "@/uiData/helpers"; +import { getFieldAttributes, isFieldAllowedToEdit, isFieldAllowedToRead } from "@/util/helpers"; +import { getAttributes as getInvoiceAttributes } from "@/invoices/selectors"; +import { getReceivableTypes } from "@/leaseCreateCharge/selectors"; import type { Attributes } from "types"; -import { receivableTypesFromAttributes, receivableTypeFromRows } from "leaseCreateCharge/helpers"; -import Loader from "components/loader/Loader"; +import { receivableTypesFromAttributes, receivableTypeFromRows } from "@/leaseCreateCharge/helpers"; +import Loader from "@/components/loader/Loader"; type Props = { fields: any; invoiceAttributes: Attributes; diff --git a/src/leases/components/leaseSections/invoice/forms/NewCollectionNote.tsx b/src/leases/components/leaseSections/invoice/forms/NewCollectionNote.tsx index 20465dee8..4e920f86f 100644 --- a/src/leases/components/leaseSections/invoice/forms/NewCollectionNote.tsx +++ b/src/leases/components/leaseSections/invoice/forms/NewCollectionNote.tsx @@ -2,14 +2,14 @@ import React, { Fragment } from "react"; import { connect } from "react-redux"; import { formValueSelector } from "redux-form"; import { Row, Column } from "react-foundation"; -import Authorization from "components/authorization/Authorization"; -import Button from "components/button/Button"; -import FormField from "components/form/FormField"; -import { FormNames } from "enums"; -import { ButtonColors } from "components/enums"; -import { CollectionNoteFieldPaths, CollectionNoteFieldTitles } from "collectionNote/enums"; -import { getFieldAttributes, isFieldAllowedToRead } from "util/helpers"; -import { getAttributes as getCollectionNoteAttributes } from "collectionNote/selectors"; +import Authorization from "@/components/authorization/Authorization"; +import Button from "@/components/button/Button"; +import FormField from "@/components/form/FormField"; +import { FormNames } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { CollectionNoteFieldPaths, CollectionNoteFieldTitles } from "@/collectionNote/enums"; +import { getFieldAttributes, isFieldAllowedToRead } from "@/util/helpers"; +import { getAttributes as getCollectionNoteAttributes } from "@/collectionNote/selectors"; import type { Attributes } from "types"; type Props = { collectionNoteAttributes: Attributes; diff --git a/src/leases/components/leaseSections/invoice/forms/NewInvoiceForm.tsx b/src/leases/components/leaseSections/invoice/forms/NewInvoiceForm.tsx index 8c9bdc4fb..28a17d059 100644 --- a/src/leases/components/leaseSections/invoice/forms/NewInvoiceForm.tsx +++ b/src/leases/components/leaseSections/invoice/forms/NewInvoiceForm.tsx @@ -3,38 +3,38 @@ import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; import { FieldArray, formValueSelector, getFormValues, reduxForm } from "redux-form"; import flowRight from "lodash/flowRight"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import AddButtonThird from "components/form/AddButtonThird"; -import Authorization from "components/authorization/Authorization"; -import BoxContentWrapper from "components/content/BoxContentWrapper"; -import Button from "components/button/Button"; -import CloseButton from "components/button/CloseButton"; -import FormField from "components/form/FormField"; -import FormTextTitle from "components/form/FormTextTitle"; -import RemoveButton from "components/form/RemoveButton"; -import SubTitle from "components/content/SubTitle"; -import WhiteBox from "components/content/WhiteBox"; -import { receiveIsCreateClicked } from "invoices/actions"; -import { ConfirmationModalTexts, FormNames } from "enums"; -import { ButtonColors } from "components/enums"; -import { InvoiceFieldPaths, InvoiceFieldTitles, InvoiceRowsFieldPaths, InvoiceRowsFieldTitles } from "invoices/enums"; -import { LeaseCreateChargeFieldPaths, LeaseCreateChargeRowsFieldPaths } from "leaseCreateCharge/enums"; -import { RecipientOptions } from "leases/enums"; -import { receivableTypesFromAttributes } from "leaseCreateCharge/helpers"; -import { UsersPermissions } from "usersPermissions/enums"; -import { validateInvoiceForm } from "leases/formValidators"; -import { isInvoiceBillingPeriodRequired } from "invoices/helpers"; -import { getInvoiceRecipientOptions } from "leases/helpers"; -import { getUiDataCreateChargeKey } from "uiData/helpers"; -import { getFieldAttributes, hasPermissions, isFieldAllowedToEdit, isFieldRequired } from "util/helpers"; -import { getAttributes as getInvoiceAttributes, getIsCreateClicked } from "invoices/selectors"; -import { getCurrentLease } from "leases/selectors"; -import { getAttributes as getLeaseCreateCrargeAttributes, getReceivableTypes } from "leaseCreateCharge/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import AddButtonThird from "@/components/form/AddButtonThird"; +import Authorization from "@/components/authorization/Authorization"; +import BoxContentWrapper from "@/components/content/BoxContentWrapper"; +import Button from "@/components/button/Button"; +import CloseButton from "@/components/button/CloseButton"; +import FormField from "@/components/form/FormField"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import RemoveButton from "@/components/form/RemoveButton"; +import SubTitle from "@/components/content/SubTitle"; +import WhiteBox from "@/components/content/WhiteBox"; +import { receiveIsCreateClicked } from "@/invoices/actions"; +import { ConfirmationModalTexts, FormNames } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { InvoiceFieldPaths, InvoiceFieldTitles, InvoiceRowsFieldPaths, InvoiceRowsFieldTitles } from "@/invoices/enums"; +import { LeaseCreateChargeFieldPaths, LeaseCreateChargeRowsFieldPaths } from "@/leaseCreateCharge/enums"; +import { RecipientOptions } from "@/leases/enums"; +import { receivableTypesFromAttributes } from "@/leaseCreateCharge/helpers"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { validateInvoiceForm } from "@/leases/formValidators"; +import { isInvoiceBillingPeriodRequired } from "@/invoices/helpers"; +import { getInvoiceRecipientOptions } from "@/leases/helpers"; +import { getUiDataCreateChargeKey } from "@/uiData/helpers"; +import { getFieldAttributes, hasPermissions, isFieldAllowedToEdit, isFieldRequired } from "@/util/helpers"; +import { getAttributes as getInvoiceAttributes, getIsCreateClicked } from "@/invoices/selectors"; +import { getCurrentLease } from "@/leases/selectors"; +import { getAttributes as getLeaseCreateCrargeAttributes, getReceivableTypes } from "@/leaseCreateCharge/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; import type { Attributes } from "types"; -import type { Lease } from "leases/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; -import Loader from "components/loader/Loader"; +import type { Lease } from "@/leases/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; +import Loader from "@/components/loader/Loader"; type InvoiceRowsProps = { fields: any; invoiceAttributes: Attributes; diff --git a/src/leases/components/leaseSections/leaseArea/ArchiveAreaModal.tsx b/src/leases/components/leaseSections/leaseArea/ArchiveAreaModal.tsx index c1dc97952..989765b37 100644 --- a/src/leases/components/leaseSections/leaseArea/ArchiveAreaModal.tsx +++ b/src/leases/components/leaseSections/leaseArea/ArchiveAreaModal.tsx @@ -3,17 +3,17 @@ import { connect } from "react-redux"; import { formValueSelector, reduxForm } from "redux-form"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; -import Authorization from "components/authorization/Authorization"; -import Button from "components/button/Button"; -import FormField from "components/form/FormField"; -import FormText from "components/form/FormText"; -import Modal from "components/modal/Modal"; -import { ConfirmationModalTexts, FormNames } from "enums"; -import { LeaseAreasFieldPaths, LeaseAreasFieldTitles } from "leases/enums"; -import { ButtonColors } from "components/enums"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { getFieldAttributes, isFieldAllowedToRead } from "util/helpers"; -import { getAttributes } from "leases/selectors"; +import Authorization from "@/components/authorization/Authorization"; +import Button from "@/components/button/Button"; +import FormField from "@/components/form/FormField"; +import FormText from "@/components/form/FormText"; +import Modal from "@/components/modal/Modal"; +import { ConfirmationModalTexts, FormNames } from "@/enums"; +import { LeaseAreasFieldPaths, LeaseAreasFieldTitles } from "@/leases/enums"; +import { ButtonColors } from "@/components/enums"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { getFieldAttributes, isFieldAllowedToRead } from "@/util/helpers"; +import { getAttributes } from "@/leases/selectors"; import type { Attributes } from "types"; type Props = { archivedNote: string; diff --git a/src/leases/components/leaseSections/leaseArea/CustomDetailedPlan.tsx b/src/leases/components/leaseSections/leaseArea/CustomDetailedPlan.tsx index cbd77e758..261a4abfa 100644 --- a/src/leases/components/leaseSections/leaseArea/CustomDetailedPlan.tsx +++ b/src/leases/components/leaseSections/leaseArea/CustomDetailedPlan.tsx @@ -3,17 +3,17 @@ import { connect } from "react-redux"; import { withRouter } from "react-router"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; -import Authorization from "components/authorization/Authorization"; -import BoxItem from "components/content/BoxItem"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import ExternalLink from "components/links/ExternalLink"; -import { LeaseAreaCustomDetailedPlanFieldPaths, LeaseAreaCustomDetailedPlanFieldTitles, LeaseAreaUsageDistributionFieldTitles, LeaseAreaUsageDistributionFieldPaths, LeaseAreaCustomDetailedPlanInfoLinksFieldPaths, LeaseAreaCustomDetailedPlanInfoLinksFieldTitles } from "leases/enums"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, isEmptyValue, isFieldAllowedToRead } from "util/helpers"; -import { getAttributes } from "leases/selectors"; +import Authorization from "@/components/authorization/Authorization"; +import BoxItem from "@/components/content/BoxItem"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import ExternalLink from "@/components/links/ExternalLink"; +import { LeaseAreaCustomDetailedPlanFieldPaths, LeaseAreaCustomDetailedPlanFieldTitles, LeaseAreaUsageDistributionFieldTitles, LeaseAreaUsageDistributionFieldPaths, LeaseAreaCustomDetailedPlanInfoLinksFieldPaths, LeaseAreaCustomDetailedPlanInfoLinksFieldTitles } from "@/leases/enums"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, isEmptyValue, isFieldAllowedToRead } from "@/util/helpers"; +import { getAttributes } from "@/leases/selectors"; import type { Attributes } from "types"; -import SubTitle from "components/content/SubTitle"; +import SubTitle from "@/components/content/SubTitle"; type OwnProps = { customDetailedPlan: Record; }; diff --git a/src/leases/components/leaseSections/leaseArea/CustomDetailedPlanEdit.tsx b/src/leases/components/leaseSections/leaseArea/CustomDetailedPlanEdit.tsx index 94affa2e6..b96548a85 100644 --- a/src/leases/components/leaseSections/leaseArea/CustomDetailedPlanEdit.tsx +++ b/src/leases/components/leaseSections/leaseArea/CustomDetailedPlanEdit.tsx @@ -4,27 +4,27 @@ import { withRouter } from "react-router"; import { FieldArray, reduxForm, change } from "redux-form"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; -import AddButtonSecondary from "components/form/AddButtonSecondary"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import BoxItemContainer from "components/content/BoxItemContainer"; -import BoxItem from "components/content/BoxItem"; -import BoxContentWrapper from "components/content/BoxContentWrapper"; -import ActionButtonWrapper from "components/form/ActionButtonWrapper"; -import Authorization from "components/authorization/Authorization"; -import FormText from "components/form/FormText"; -import FormField from "components/form/FormField"; -import RemoveButton from "components/form/RemoveButton"; -import { ButtonColors } from "components/enums"; -import { ConfirmationModalTexts } from "enums"; -import { FormNames } from "enums"; -import { LeaseAreaCustomDetailedPlanFieldPaths, LeaseAreaCustomDetailedPlanFieldTitles, LeaseAreaUsageDistributionFieldPaths, LeaseAreaUsageDistributionFieldTitles, LeaseAreaCustomDetailedPlanInfoLinksFieldPaths, LeaseAreaCustomDetailedPlanInfoLinksFieldTitles } from "leases/enums"; +import AddButtonSecondary from "@/components/form/AddButtonSecondary"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import BoxItemContainer from "@/components/content/BoxItemContainer"; +import BoxItem from "@/components/content/BoxItem"; +import BoxContentWrapper from "@/components/content/BoxContentWrapper"; +import ActionButtonWrapper from "@/components/form/ActionButtonWrapper"; +import Authorization from "@/components/authorization/Authorization"; +import FormText from "@/components/form/FormText"; +import FormField from "@/components/form/FormField"; +import RemoveButton from "@/components/form/RemoveButton"; +import { ButtonColors } from "@/components/enums"; +import { ConfirmationModalTexts } from "@/enums"; +import { FormNames } from "@/enums"; +import { LeaseAreaCustomDetailedPlanFieldPaths, LeaseAreaCustomDetailedPlanFieldTitles, LeaseAreaUsageDistributionFieldPaths, LeaseAreaUsageDistributionFieldTitles, LeaseAreaCustomDetailedPlanInfoLinksFieldPaths, LeaseAreaCustomDetailedPlanInfoLinksFieldTitles } from "@/leases/enums"; import type { Attributes } from "types"; -import { UsersPermissions } from "usersPermissions/enums"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { getAttributes } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import { getFieldAttributes, hasPermissions, isFieldAllowedToEdit, isFieldAllowedToRead } from "util/helpers"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { getAttributes } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import { getFieldAttributes, hasPermissions, isFieldAllowedToEdit, isFieldAllowedToRead } from "@/util/helpers"; type UsageDistributionsProps = { attributes: Attributes; buttonTitle: string; diff --git a/src/leases/components/leaseSections/leaseArea/LeaseArea.tsx b/src/leases/components/leaseSections/leaseArea/LeaseArea.tsx index 8dea8d9a7..1cd1757b5 100644 --- a/src/leases/components/leaseSections/leaseArea/LeaseArea.tsx +++ b/src/leases/components/leaseSections/leaseArea/LeaseArea.tsx @@ -6,22 +6,22 @@ import { Link } from "react-router-dom"; import flowRight from "lodash/flowRight"; import get from "lodash/get"; import isEmpty from "lodash/isEmpty"; -import Authorization from "components/authorization/Authorization"; -import BoxItemContainer from "components/content/BoxItemContainer"; -import Collapse from "components/collapse/Collapse"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import ListItem from "components/content/ListItem"; -import ListItems from "components/content/ListItems"; +import Authorization from "@/components/authorization/Authorization"; +import BoxItemContainer from "@/components/content/BoxItemContainer"; +import Collapse from "@/components/collapse/Collapse"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import ListItem from "@/components/content/ListItem"; +import ListItems from "@/components/content/ListItems"; import PlanUnitItem from "./PlanUnitItem"; import PlotItem from "./PlotItem"; -import SubTitle from "components/content/SubTitle"; -import { receiveCollapseStates } from "leases/actions"; -import { FormNames, ViewModes } from "enums"; -import { LeaseAreaAddressesFieldPaths, LeaseAreaAddressesFieldTitles, LeaseAreasFieldPaths, LeaseAreasFieldTitles, LeaseAreaCustomDetailedPlanFieldPaths, LeasePlanUnitsFieldPaths, LeasePlotsFieldPaths } from "leases/enums"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { formatNumber, getFieldOptions, getLabelOfOption, getSearchQuery, getUrlParams, isEmptyValue, isFieldAllowedToRead } from "util/helpers"; -import { getAttributes, getCollapseStateByKey, getIsEditMode } from "leases/selectors"; +import SubTitle from "@/components/content/SubTitle"; +import { receiveCollapseStates } from "@/leases/actions"; +import { FormNames, ViewModes } from "@/enums"; +import { LeaseAreaAddressesFieldPaths, LeaseAreaAddressesFieldTitles, LeaseAreasFieldPaths, LeaseAreasFieldTitles, LeaseAreaCustomDetailedPlanFieldPaths, LeasePlanUnitsFieldPaths, LeasePlotsFieldPaths } from "@/leases/enums"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { formatNumber, getFieldOptions, getLabelOfOption, getSearchQuery, getUrlParams, isEmptyValue, isFieldAllowedToRead } from "@/util/helpers"; +import { getAttributes, getCollapseStateByKey, getIsEditMode } from "@/leases/selectors"; import type { Attributes } from "types"; import CustomDetailedPlan from "./CustomDetailedPlan"; type Props = { diff --git a/src/leases/components/leaseSections/leaseArea/LeaseAreaEdit.tsx b/src/leases/components/leaseSections/leaseArea/LeaseAreaEdit.tsx index f06523659..ad6d93a2d 100644 --- a/src/leases/components/leaseSections/leaseArea/LeaseAreaEdit.tsx +++ b/src/leases/components/leaseSections/leaseArea/LeaseAreaEdit.tsx @@ -7,32 +7,32 @@ import { Link } from "react-router-dom"; import flowRight from "lodash/flowRight"; import get from "lodash/get"; import isEmpty from "lodash/isEmpty"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import AddButtonSecondary from "components/form/AddButtonSecondary"; -import AddButtonThird from "components/form/AddButtonThird"; -import Authorization from "components/authorization/Authorization"; -import BoxContentWrapper from "components/content/BoxContentWrapper"; -import BoxItemContainer from "components/content/BoxItemContainer"; -import Collapse from "components/collapse/Collapse"; -import FieldAndRemoveButtonWrapper from "components/form/FieldAndRemoveButtonWrapper"; -import FormField from "components/form/FormField"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import AddButtonSecondary from "@/components/form/AddButtonSecondary"; +import AddButtonThird from "@/components/form/AddButtonThird"; +import Authorization from "@/components/authorization/Authorization"; +import BoxContentWrapper from "@/components/content/BoxContentWrapper"; +import BoxItemContainer from "@/components/content/BoxItemContainer"; +import Collapse from "@/components/collapse/Collapse"; +import FieldAndRemoveButtonWrapper from "@/components/form/FieldAndRemoveButtonWrapper"; +import FormField from "@/components/form/FormField"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; import PlanUnitItemEdit from "./PlanUnitItemEdit"; import PlotItemEdit from "./PlotItemEdit"; -import RemoveButton from "components/form/RemoveButton"; -import SubTitle from "components/content/SubTitle"; -import { receiveCollapseStates } from "leases/actions"; -import { ConfirmationModalTexts, FieldTypes, FormNames, ViewModes } from "enums"; -import { ButtonColors } from "components/enums"; -import { LeaseAreaAddressesFieldPaths, LeaseAreaAddressesFieldTitles, LeaseAreasFieldPaths, LeaseAreasFieldTitles, LeasePlanUnitsFieldPaths, LeasePlotsFieldPaths, LeaseAreaCustomDetailedPlanFieldPaths } from "leases/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { getFieldAttributes, getSearchQuery, getUrlParams, hasPermissions, isFieldAllowedToEdit, isFieldAllowedToRead, isFieldRequired } from "util/helpers"; -import { getAttributes, getCollapseStateByKey, getErrorsByFormName, getIsSaveClicked } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; +import RemoveButton from "@/components/form/RemoveButton"; +import SubTitle from "@/components/content/SubTitle"; +import { receiveCollapseStates } from "@/leases/actions"; +import { ConfirmationModalTexts, FieldTypes, FormNames, ViewModes } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { LeaseAreaAddressesFieldPaths, LeaseAreaAddressesFieldTitles, LeaseAreasFieldPaths, LeaseAreasFieldTitles, LeasePlanUnitsFieldPaths, LeasePlotsFieldPaths, LeaseAreaCustomDetailedPlanFieldPaths } from "@/leases/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { getFieldAttributes, getSearchQuery, getUrlParams, hasPermissions, isFieldAllowedToEdit, isFieldAllowedToRead, isFieldRequired } from "@/util/helpers"; +import { getAttributes, getCollapseStateByKey, getErrorsByFormName, getIsSaveClicked } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; import type { Attributes } from "types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; import CustomDetailedPlanEdit from "./CustomDetailedPlanEdit"; type PlanUnitsProps = { attributes: Attributes; diff --git a/src/leases/components/leaseSections/leaseArea/LeaseAreaWithArchiceInfo.tsx b/src/leases/components/leaseSections/leaseArea/LeaseAreaWithArchiceInfo.tsx index a7ddc658b..4ad3bc9f2 100644 --- a/src/leases/components/leaseSections/leaseArea/LeaseAreaWithArchiceInfo.tsx +++ b/src/leases/components/leaseSections/leaseArea/LeaseAreaWithArchiceInfo.tsx @@ -2,20 +2,20 @@ import React, { Fragment } from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; import get from "lodash/get"; -import Authorization from "components/authorization/Authorization"; -import Collapse from "components/collapse/Collapse"; -import CollapseHeaderSubtitle from "components/collapse/CollapseHeaderSubtitle"; -import Divider from "components/content/Divider"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; +import Authorization from "@/components/authorization/Authorization"; +import Collapse from "@/components/collapse/Collapse"; +import CollapseHeaderSubtitle from "@/components/collapse/CollapseHeaderSubtitle"; +import Divider from "@/components/content/Divider"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; import LeaseArea from "./LeaseArea"; -import { receiveCollapseStates } from "leases/actions"; -import { FormNames, ViewModes } from "enums"; -import { LeaseAreaAddressesFieldPaths, LeaseAreasFieldPaths, LeaseAreasFieldTitles } from "leases/enums"; -import { getFullAddress } from "leases/helpers"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, isFieldAllowedToRead } from "util/helpers"; -import { getAttributes, getCollapseStateByKey } from "leases/selectors"; +import { receiveCollapseStates } from "@/leases/actions"; +import { FormNames, ViewModes } from "@/enums"; +import { LeaseAreaAddressesFieldPaths, LeaseAreasFieldPaths, LeaseAreasFieldTitles } from "@/leases/enums"; +import { getFullAddress } from "@/leases/helpers"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, isFieldAllowedToRead } from "@/util/helpers"; +import { getAttributes, getCollapseStateByKey } from "@/leases/selectors"; import type { Attributes } from "types"; type Props = { area: Record; diff --git a/src/leases/components/leaseSections/leaseArea/LeaseAreaWithArchiveInfoEdit.tsx b/src/leases/components/leaseSections/leaseArea/LeaseAreaWithArchiveInfoEdit.tsx index 0f6455b7d..aa71e189f 100644 --- a/src/leases/components/leaseSections/leaseArea/LeaseAreaWithArchiveInfoEdit.tsx +++ b/src/leases/components/leaseSections/leaseArea/LeaseAreaWithArchiveInfoEdit.tsx @@ -4,27 +4,27 @@ import { formValueSelector } from "redux-form"; import { Row, Column } from "react-foundation"; import get from "lodash/get"; import isEmpty from "lodash/isEmpty"; -import Authorization from "components/authorization/Authorization"; -import Collapse from "components/collapse/Collapse"; -import CollapseHeaderSubtitle from "components/collapse/CollapseHeaderSubtitle"; -import Divider from "components/content/Divider"; -import FormField from "components/form/FormField"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; +import Authorization from "@/components/authorization/Authorization"; +import Collapse from "@/components/collapse/Collapse"; +import CollapseHeaderSubtitle from "@/components/collapse/CollapseHeaderSubtitle"; +import Divider from "@/components/content/Divider"; +import FormField from "@/components/form/FormField"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; import LeaseArea from "./LeaseArea"; import LeaseAreaEdit from "./LeaseAreaEdit"; -import { receiveCollapseStates } from "leases/actions"; -import { FormNames, ViewModes } from "enums"; -import { LeaseAreasFieldPaths, LeaseAreasFieldTitles, LeaseAreaAddressesFieldPaths } from "leases/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getFullAddress, getLeaseAreaById } from "leases/helpers"; -import { formatDate, formatNumber, getFieldAttributes, getFieldOptions, getLabelOfOption, hasPermissions, isFieldAllowedToEdit, isFieldAllowedToRead } from "util/helpers"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { getAttributes, getCollapseStateByKey, getCurrentLease, getErrorsByFormName, getIsSaveClicked } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; +import { receiveCollapseStates } from "@/leases/actions"; +import { FormNames, ViewModes } from "@/enums"; +import { LeaseAreasFieldPaths, LeaseAreasFieldTitles, LeaseAreaAddressesFieldPaths } from "@/leases/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getFullAddress, getLeaseAreaById } from "@/leases/helpers"; +import { formatDate, formatNumber, getFieldAttributes, getFieldOptions, getLabelOfOption, hasPermissions, isFieldAllowedToEdit, isFieldAllowedToRead } from "@/util/helpers"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { getAttributes, getCollapseStateByKey, getCurrentLease, getErrorsByFormName, getIsSaveClicked } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; import type { Attributes } from "types"; -import type { Lease } from "leases/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { Lease } from "@/leases/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { archivedAt: string | null | undefined; areaCollapseState: boolean; diff --git a/src/leases/components/leaseSections/leaseArea/LeaseAreas.tsx b/src/leases/components/leaseSections/leaseArea/LeaseAreas.tsx index 283728854..aa6f793be 100644 --- a/src/leases/components/leaseSections/leaseArea/LeaseAreas.tsx +++ b/src/leases/components/leaseSections/leaseArea/LeaseAreas.tsx @@ -1,18 +1,18 @@ import React from "react"; import { connect } from "react-redux"; -import Authorization from "components/authorization/Authorization"; -import Divider from "components/content/Divider"; -import FormText from "components/form/FormText"; +import Authorization from "@/components/authorization/Authorization"; +import Divider from "@/components/content/Divider"; +import FormText from "@/components/form/FormText"; import LeaseAreaWithArchiceInfo from "./LeaseAreaWithArchiceInfo"; -import Title from "components/content/Title"; -import WarningContainer from "components/content/WarningContainer"; -import { LeaseAreasFieldPaths } from "leases/enums"; -import { calculateAreasSum, getContentLeaseAreas, getDecisionOptions } from "leases/helpers"; -import { formatNumber, isFieldAllowedToRead } from "util/helpers"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { getAttributes, getCurrentLease } from "leases/selectors"; +import Title from "@/components/content/Title"; +import WarningContainer from "@/components/content/WarningContainer"; +import { LeaseAreasFieldPaths } from "@/leases/enums"; +import { calculateAreasSum, getContentLeaseAreas, getDecisionOptions } from "@/leases/helpers"; +import { formatNumber, isFieldAllowedToRead } from "@/util/helpers"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { getAttributes, getCurrentLease } from "@/leases/selectors"; import type { Attributes } from "types"; -import type { Lease } from "leases/types"; +import type { Lease } from "@/leases/types"; type Props = { attributes: Attributes; currentLease: Lease; diff --git a/src/leases/components/leaseSections/leaseArea/LeaseAreasEdit.tsx b/src/leases/components/leaseSections/leaseArea/LeaseAreasEdit.tsx index 23c5f8031..70622ef17 100644 --- a/src/leases/components/leaseSections/leaseArea/LeaseAreasEdit.tsx +++ b/src/leases/components/leaseSections/leaseArea/LeaseAreasEdit.tsx @@ -3,29 +3,29 @@ import { connect } from "react-redux"; import { FieldArray, formValueSelector, getFormValues, initialize, reduxForm } from "redux-form"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import AddButton from "components/form/AddButton"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import AddButton from "@/components/form/AddButton"; import ArchiveAreaModal from "./ArchiveAreaModal"; -import Authorization from "components/authorization/Authorization"; -import Button from "components/button/Button"; -import Divider from "components/content/Divider"; +import Authorization from "@/components/authorization/Authorization"; +import Button from "@/components/button/Button"; +import Divider from "@/components/content/Divider"; import LeaseAreaWithArchiveInfoEdit from "./LeaseAreaWithArchiveInfoEdit"; -import Title from "components/content/Title"; -import WarningContainer from "components/content/WarningContainer"; -import { copyAreasToContract, receiveFormValidFlags } from "leases/actions"; -import { ConfirmationModalTexts, FormNames } from "enums"; -import { ButtonColors } from "components/enums"; -import { AreaLocation, LeaseAreasFieldPaths } from "leases/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { calculateAreasSum, getContentLeaseAreas, getDecisionOptions, getLeaseAreaById } from "leases/helpers"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { formatNumber, hasPermissions, isFieldAllowedToEdit, isFieldAllowedToRead } from "util/helpers"; -import { getAttributes as getLeaseAttributes, getCurrentLease } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import { store } from "root/startApp"; +import Title from "@/components/content/Title"; +import WarningContainer from "@/components/content/WarningContainer"; +import { copyAreasToContract, receiveFormValidFlags } from "@/leases/actions"; +import { ConfirmationModalTexts, FormNames } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { AreaLocation, LeaseAreasFieldPaths } from "@/leases/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { calculateAreasSum, getContentLeaseAreas, getDecisionOptions, getLeaseAreaById } from "@/leases/helpers"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { formatNumber, hasPermissions, isFieldAllowedToEdit, isFieldAllowedToRead } from "@/util/helpers"; +import { getAttributes as getLeaseAttributes, getCurrentLease } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import { store } from "@/index"; import type { Attributes } from "types"; -import type { Lease } from "leases/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { Lease } from "@/leases/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type AreaItemProps = { decisionOptions: Array>; fields: any; diff --git a/src/leases/components/leaseSections/leaseArea/PlanUnitItem.tsx b/src/leases/components/leaseSections/leaseArea/PlanUnitItem.tsx index 6d4a17a61..6e0eaee74 100644 --- a/src/leases/components/leaseSections/leaseArea/PlanUnitItem.tsx +++ b/src/leases/components/leaseSections/leaseArea/PlanUnitItem.tsx @@ -6,18 +6,18 @@ import { Link } from "react-router-dom"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; -import Authorization from "components/authorization/Authorization"; -import BoxItem from "components/content/BoxItem"; -import ExternalLink from "components/links/ExternalLink"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import { LeasePlanUnitsFieldPaths, LeasePlanUnitsFieldTitles, LeaseAreaUsageDistributionFieldPaths, LeaseAreaUsageDistributionFieldTitles } from "leases/enums"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, getSearchQuery, getUrlParams, isEmptyValue, isFieldAllowedToRead } from "util/helpers"; -import { getAttributes } from "leases/selectors"; -import { createPTPPlanReportUrl, createPTPPlotDivisionUrl } from "util/helpers"; +import Authorization from "@/components/authorization/Authorization"; +import BoxItem from "@/components/content/BoxItem"; +import ExternalLink from "@/components/links/ExternalLink"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import { LeasePlanUnitsFieldPaths, LeasePlanUnitsFieldTitles, LeaseAreaUsageDistributionFieldPaths, LeaseAreaUsageDistributionFieldTitles } from "@/leases/enums"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, getSearchQuery, getUrlParams, isEmptyValue, isFieldAllowedToRead } from "@/util/helpers"; +import { getAttributes } from "@/leases/selectors"; +import { createPTPPlanReportUrl, createPTPPlotDivisionUrl } from "@/util/helpers"; import type { Attributes } from "types"; -import SubTitle from "components/content/SubTitle"; +import SubTitle from "@/components/content/SubTitle"; type OwnProps = { areaArchived: boolean; planUnit: Record; diff --git a/src/leases/components/leaseSections/leaseArea/PlanUnitItemEdit.tsx b/src/leases/components/leaseSections/leaseArea/PlanUnitItemEdit.tsx index 70cd38739..a346be18c 100644 --- a/src/leases/components/leaseSections/leaseArea/PlanUnitItemEdit.tsx +++ b/src/leases/components/leaseSections/leaseArea/PlanUnitItemEdit.tsx @@ -6,21 +6,21 @@ import { Link } from "react-router-dom"; import { formValueSelector, change, reduxForm } from "redux-form"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; -import ActionButtonWrapper from "components/form/ActionButtonWrapper"; -import Authorization from "components/authorization/Authorization"; -import BoxContentWrapper from "components/content/BoxContentWrapper"; -import BoxItem from "components/content/BoxItem"; -import FormField from "components/form/FormField"; -import RemoveButton from "components/form/RemoveButton"; -import { FormNames } from "enums"; -import { LeasePlanUnitsFieldPaths, LeasePlanUnitsFieldTitles } from "leases/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { getFieldAttributes, getSearchQuery, getUrlParams, hasPermissions, isFieldAllowedToRead } from "util/helpers"; -import { getAttributes } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; +import ActionButtonWrapper from "@/components/form/ActionButtonWrapper"; +import Authorization from "@/components/authorization/Authorization"; +import BoxContentWrapper from "@/components/content/BoxContentWrapper"; +import BoxItem from "@/components/content/BoxItem"; +import FormField from "@/components/form/FormField"; +import RemoveButton from "@/components/form/RemoveButton"; +import { FormNames } from "@/enums"; +import { LeasePlanUnitsFieldPaths, LeasePlanUnitsFieldTitles } from "@/leases/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { getFieldAttributes, getSearchQuery, getUrlParams, hasPermissions, isFieldAllowedToRead } from "@/util/helpers"; +import { getAttributes } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; import type { Attributes } from "types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { attributes: Attributes; field: string; diff --git a/src/leases/components/leaseSections/leaseArea/PlotItem.tsx b/src/leases/components/leaseSections/leaseArea/PlotItem.tsx index 99e094db1..b543bb6cf 100644 --- a/src/leases/components/leaseSections/leaseArea/PlotItem.tsx +++ b/src/leases/components/leaseSections/leaseArea/PlotItem.tsx @@ -5,16 +5,16 @@ import { Link } from "react-router-dom"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; -import Authorization from "components/authorization/Authorization"; -import BoxItem from "components/content/BoxItem"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import KtjLink from "components/ktj/KtjLink"; -import SubTitle from "components/content/SubTitle"; -import { LeasePlotsFieldPaths, LeasePlotsFieldTitles, PlotType } from "leases/enums"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, getSearchQuery, getUrlParams, isEmptyValue, isFieldAllowedToRead } from "util/helpers"; -import { getAttributes } from "leases/selectors"; +import Authorization from "@/components/authorization/Authorization"; +import BoxItem from "@/components/content/BoxItem"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import KtjLink from "@/components/ktj/KtjLink"; +import SubTitle from "@/components/content/SubTitle"; +import { LeasePlotsFieldPaths, LeasePlotsFieldTitles, PlotType } from "@/leases/enums"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, getSearchQuery, getUrlParams, isEmptyValue, isFieldAllowedToRead } from "@/util/helpers"; +import { getAttributes } from "@/leases/selectors"; import type { Attributes } from "types"; type Props = { areaArchived: boolean; diff --git a/src/leases/components/leaseSections/leaseArea/PlotItemEdit.tsx b/src/leases/components/leaseSections/leaseArea/PlotItemEdit.tsx index bb29130b7..df378426a 100644 --- a/src/leases/components/leaseSections/leaseArea/PlotItemEdit.tsx +++ b/src/leases/components/leaseSections/leaseArea/PlotItemEdit.tsx @@ -6,23 +6,23 @@ import { withRouter } from "react-router"; import { Link } from "react-router-dom"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; -import ActionButtonWrapper from "components/form/ActionButtonWrapper"; -import Authorization from "components/authorization/Authorization"; -import BoxContentWrapper from "components/content/BoxContentWrapper"; -import BoxItem from "components/content/BoxItem"; -import FormField from "components/form/FormField"; -import KtjLink from "components/ktj/KtjLink"; -import RemoveButton from "components/form/RemoveButton"; -import SubTitle from "components/content/SubTitle"; -import { FormNames } from "enums"; -import { LeasePlotsFieldPaths, LeasePlotsFieldTitles, PlotType } from "leases/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { getFieldAttributes, getSearchQuery, getUrlParams, hasPermissions, isFieldAllowedToRead } from "util/helpers"; -import { getAttributes, getIsSaveClicked } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; +import ActionButtonWrapper from "@/components/form/ActionButtonWrapper"; +import Authorization from "@/components/authorization/Authorization"; +import BoxContentWrapper from "@/components/content/BoxContentWrapper"; +import BoxItem from "@/components/content/BoxItem"; +import FormField from "@/components/form/FormField"; +import KtjLink from "@/components/ktj/KtjLink"; +import RemoveButton from "@/components/form/RemoveButton"; +import SubTitle from "@/components/content/SubTitle"; +import { FormNames } from "@/enums"; +import { LeasePlotsFieldPaths, LeasePlotsFieldTitles, PlotType } from "@/leases/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { getFieldAttributes, getSearchQuery, getUrlParams, hasPermissions, isFieldAllowedToRead } from "@/util/helpers"; +import { getAttributes, getIsSaveClicked } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; import type { Attributes } from "types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { attributes: Attributes; field: string; diff --git a/src/leases/components/leaseSections/leaseInfo/LeaseInfo.tsx b/src/leases/components/leaseSections/leaseInfo/LeaseInfo.tsx index 18ef96787..92905e8de 100644 --- a/src/leases/components/leaseSections/leaseInfo/LeaseInfo.tsx +++ b/src/leases/components/leaseSections/leaseInfo/LeaseInfo.tsx @@ -1,15 +1,15 @@ import React from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; -import Authorization from "components/authorization/Authorization"; -import FormTextTitle from "components/form/FormTextTitle"; -import { LeaseFieldPaths, LeaseFieldTitles } from "leases/enums"; -import { getContentLeaseInfo } from "leases/helpers"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { formatDate, getFieldOptions, getLabelOfOption, isFieldAllowedToRead } from "util/helpers"; -import { getAttributes, getCurrentLease } from "leases/selectors"; +import Authorization from "@/components/authorization/Authorization"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import { LeaseFieldPaths, LeaseFieldTitles } from "@/leases/enums"; +import { getContentLeaseInfo } from "@/leases/helpers"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { formatDate, getFieldOptions, getLabelOfOption, isFieldAllowedToRead } from "@/util/helpers"; +import { getAttributes, getCurrentLease } from "@/leases/selectors"; import type { Attributes } from "types"; -import type { Lease } from "leases/types"; +import type { Lease } from "@/leases/types"; type Props = { attributes: Attributes; currentLease: Lease; diff --git a/src/leases/components/leaseSections/map/AreasLayer.tsx b/src/leases/components/leaseSections/map/AreasLayer.tsx index 04db711c8..9f66b8091 100644 --- a/src/leases/components/leaseSections/map/AreasLayer.tsx +++ b/src/leases/components/leaseSections/map/AreasLayer.tsx @@ -1,6 +1,6 @@ import React from "react"; import { GeoJSON } from "react-leaflet"; -import { formatNumber, getLabelOfOption } from "util/helpers"; +import { formatNumber, getLabelOfOption } from "@/util/helpers"; import type { LeafletGeoJson } from "types"; type Props = { areasGeoJson: LeafletGeoJson; diff --git a/src/leases/components/leaseSections/map/LeaseListLayer.tsx b/src/leases/components/leaseSections/map/LeaseListLayer.tsx index 055583b6d..a07f20d18 100644 --- a/src/leases/components/leaseSections/map/LeaseListLayer.tsx +++ b/src/leases/components/leaseSections/map/LeaseListLayer.tsx @@ -2,9 +2,9 @@ import React from "react"; import { withRouter } from "react-router"; import { GeoJSON } from "react-leaflet"; import flowRight from "lodash/flowRight"; -import { LeaseFieldTitles } from "leases/enums"; -import { formatDate, getLabelOfOption } from "util/helpers"; -import { getRouteById, Routes } from "root/routes"; +import { LeaseFieldTitles } from "@/leases/enums"; +import { formatDate, getLabelOfOption } from "@/util/helpers"; +import { getRouteById, Routes } from "@/root/routes"; import type { LeafletGeoJson } from "types"; type Props = { color: string; diff --git a/src/leases/components/leaseSections/map/LeaseListMap.tsx b/src/leases/components/leaseSections/map/LeaseListMap.tsx index 2fb8f49e4..dc3d59209 100644 --- a/src/leases/components/leaseSections/map/LeaseListMap.tsx +++ b/src/leases/components/leaseSections/map/LeaseListMap.tsx @@ -3,23 +3,23 @@ import { connect } from "react-redux"; import { withRouter } from "react-router"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; -import AreaNotesLayer from "areaNote/components/AreaNotesLayer"; -import AreaNotesEditMap from "areaNote/components/AreaNotesEditMap"; +import AreaNotesLayer from "@/areaNote/components/AreaNotesLayer"; +import AreaNotesEditMap from "@/areaNote/components/AreaNotesEditMap"; import LeaseListLayer from "./LeaseListLayer"; -import { DEFAULT_ZOOM, MAP_COLORS } from "util/constants"; -import { MAX_ZOOM_LEVEL_TO_FETCH_LEASES } from "leases/constants"; -import { LeaseFieldPaths } from "leases/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getContentLeasesGeoJson } from "leases/helpers"; -import { getApiResponseResults, getFieldOptions, getUrlParams, hasPermissions } from "util/helpers"; -import { getBoundsFromBBox, getBoundsFromFeatures } from "util/map"; -import { getAreaNoteList } from "areaNote/selectors"; -import { getAttributes as getLeaseAttributes, getLeasesByBBox } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; +import { DEFAULT_ZOOM, MAP_COLORS } from "@/util/constants"; +import { MAX_ZOOM_LEVEL_TO_FETCH_LEASES } from "@/leases/constants"; +import { LeaseFieldPaths } from "@/leases/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getContentLeasesGeoJson } from "@/leases/helpers"; +import { getApiResponseResults, getFieldOptions, getUrlParams, hasPermissions } from "@/util/helpers"; +import { getBoundsFromBBox, getBoundsFromFeatures } from "@/util/map"; +import { getAreaNoteList } from "@/areaNote/selectors"; +import { getAttributes as getLeaseAttributes, getLeasesByBBox } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; import type { Attributes, LeafletGeoJson } from "types"; -import type { AreaNoteList } from "areaNote/types"; -import type { LeaseList } from "leases/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { AreaNoteList } from "@/areaNote/types"; +import type { LeaseList } from "@/leases/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; const getMapBounds = () => { const { diff --git a/src/leases/components/leaseSections/map/PlanUnitsLayer.tsx b/src/leases/components/leaseSections/map/PlanUnitsLayer.tsx index 80c8b5b73..95974a413 100644 --- a/src/leases/components/leaseSections/map/PlanUnitsLayer.tsx +++ b/src/leases/components/leaseSections/map/PlanUnitsLayer.tsx @@ -1,7 +1,7 @@ import React from "react"; import { GeoJSON } from "react-leaflet"; -import { LeasePlanUnitsFieldTitles } from "leases/enums"; -import { formatDate, formatNumber, getLabelOfOption } from "util/helpers"; +import { LeasePlanUnitsFieldTitles } from "@/leases/enums"; +import { formatDate, formatNumber, getLabelOfOption } from "@/util/helpers"; import type { LeafletGeoJson } from "types"; type Props = { color: string; diff --git a/src/leases/components/leaseSections/map/PlotsLayer.tsx b/src/leases/components/leaseSections/map/PlotsLayer.tsx index 88a427fff..0b5a44cbc 100644 --- a/src/leases/components/leaseSections/map/PlotsLayer.tsx +++ b/src/leases/components/leaseSections/map/PlotsLayer.tsx @@ -1,6 +1,6 @@ import React from "react"; import { GeoJSON } from "react-leaflet"; -import { formatDate, formatNumber, getLabelOfOption } from "util/helpers"; +import { formatDate, formatNumber, getLabelOfOption } from "@/util/helpers"; import type { LeafletGeoJson } from "types"; type Props = { color: string; diff --git a/src/leases/components/leaseSections/map/SingleLeaseMap.tsx b/src/leases/components/leaseSections/map/SingleLeaseMap.tsx index 8f6c3eee5..034b435f3 100644 --- a/src/leases/components/leaseSections/map/SingleLeaseMap.tsx +++ b/src/leases/components/leaseSections/map/SingleLeaseMap.tsx @@ -3,28 +3,28 @@ import { connect } from "react-redux"; import { withRouter } from "react-router"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; -import AreaNotesLayer from "areaNote/components/AreaNotesLayer"; -import AreaNotesEditMap from "areaNote/components/AreaNotesEditMap"; +import AreaNotesLayer from "@/areaNote/components/AreaNotesLayer"; +import AreaNotesEditMap from "@/areaNote/components/AreaNotesEditMap"; import AreasLayer from "./AreasLayer"; -import Divider from "components/content/Divider"; +import Divider from "@/components/content/Divider"; import PlanUnitsLayer from "./PlanUnitsLayer"; import PlotsLayer from "./PlotsLayer"; -import Title from "components/content/Title"; -import { fetchAreaNoteList } from "areaNote/actions"; -import { MAP_COLORS } from "util/constants"; -import { LeaseAreasFieldPaths, LeaseFieldPaths, LeaseFieldTitles, LeasePlanUnitsFieldPaths, LeasePlotsFieldPaths } from "leases/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getContentAreasGeoJson, getContentPlanUnitsGeoJson, getContentPlotsGeoJson, getLeaseCoordinates } from "leases/helpers"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { getFieldOptions, getUrlParams, hasPermissions, isFieldAllowedToRead } from "util/helpers"; -import { getBoundsFromCoordinates, getCenterFromCoordinates } from "util/map"; -import { getAreaNoteList } from "areaNote/selectors"; -import { getAttributes as getLeaseAttributes, getCurrentLease, getIsEditMode } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; +import Title from "@/components/content/Title"; +import { fetchAreaNoteList } from "@/areaNote/actions"; +import { MAP_COLORS } from "@/util/constants"; +import { LeaseAreasFieldPaths, LeaseFieldPaths, LeaseFieldTitles, LeasePlanUnitsFieldPaths, LeasePlotsFieldPaths } from "@/leases/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getContentAreasGeoJson, getContentPlanUnitsGeoJson, getContentPlotsGeoJson, getLeaseCoordinates } from "@/leases/helpers"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { getFieldOptions, getUrlParams, hasPermissions, isFieldAllowedToRead } from "@/util/helpers"; +import { getBoundsFromCoordinates, getCenterFromCoordinates } from "@/util/map"; +import { getAreaNoteList } from "@/areaNote/selectors"; +import { getAttributes as getLeaseAttributes, getCurrentLease, getIsEditMode } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; import type { Attributes, LeafletGeoJson } from "types"; -import type { Lease } from "leases/types"; -import type { AreaNoteList } from "areaNote/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { Lease } from "@/leases/types"; +import type { AreaNoteList } from "@/areaNote/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { areaNotes: AreaNoteList; currentLease: Lease; diff --git a/src/leases/components/leaseSections/rent/BasicInfo.tsx b/src/leases/components/leaseSections/rent/BasicInfo.tsx index 1cf29a106..ad8874760 100644 --- a/src/leases/components/leaseSections/rent/BasicInfo.tsx +++ b/src/leases/components/leaseSections/rent/BasicInfo.tsx @@ -1,14 +1,14 @@ import React, { Fragment } from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; -import Authorization from "components/authorization/Authorization"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import { LeaseRentDueDatesFieldPaths, LeaseRentDueDatesFieldTitles, LeaseRentsFieldPaths, LeaseRentsFieldTitles, RentCycles, RentTypes, RentDueDateTypes } from "leases/enums"; -import { formatDueDates, formatSeasonalDate } from "leases/helpers"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, isEmptyValue, isFieldAllowedToRead } from "util/helpers"; -import { getAttributes as getLeaseAttributes } from "leases/selectors"; +import Authorization from "@/components/authorization/Authorization"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import { LeaseRentDueDatesFieldPaths, LeaseRentDueDatesFieldTitles, LeaseRentsFieldPaths, LeaseRentsFieldTitles, RentCycles, RentTypes, RentDueDateTypes } from "@/leases/enums"; +import { formatDueDates, formatSeasonalDate } from "@/leases/helpers"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, isEmptyValue, isFieldAllowedToRead } from "@/util/helpers"; +import { getAttributes as getLeaseAttributes } from "@/leases/selectors"; import type { Attributes } from "types"; type SeasonalDatesProps = { leaseAttributes: Attributes; diff --git a/src/leases/components/leaseSections/rent/BasicInfoEdit.tsx b/src/leases/components/leaseSections/rent/BasicInfoEdit.tsx index be5f0989b..2dfa83a25 100644 --- a/src/leases/components/leaseSections/rent/BasicInfoEdit.tsx +++ b/src/leases/components/leaseSections/rent/BasicInfoEdit.tsx @@ -3,29 +3,29 @@ import { connect } from "react-redux"; import { change, Field, FieldArray, formValueSelector } from "redux-form"; import { Row, Column } from "react-foundation"; import get from "lodash/get"; -import AddButtonThird from "components/form/AddButtonThird"; -import Authorization from "components/authorization/Authorization"; -import ErrorField from "components/form/ErrorField"; -import FieldAndRemoveButtonWrapper from "components/form/FieldAndRemoveButtonWrapper"; -import FormField from "components/form/FormField"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import RemoveButton from "components/form/RemoveButton"; -import { rentCustomDateOptions } from "leases/constants"; -import { FieldTypes, FormNames } from "enums"; -import { DueDatesPositions, FixedDueDates, LeaseRentDueDatesFieldPaths, LeaseRentDueDatesFieldTitles, LeaseRentsFieldPaths, LeaseRentsFieldTitles, RentCycles, RentTypes, RentDueDateTypes } from "leases/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { formatDueDates, formatSeasonalDate } from "leases/helpers"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { getFieldAttributes, hasPermissions, isFieldAllowedToEdit, isFieldAllowedToRead, isFieldRequired } from "util/helpers"; -import { getAttributes as getLeaseAttributes, getCurrentLease } from "leases/selectors"; -import { getLeaseTypeList } from "leaseType/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import { PlotSearchFieldPaths } from "plotSearch/enums"; +import AddButtonThird from "@/components/form/AddButtonThird"; +import Authorization from "@/components/authorization/Authorization"; +import ErrorField from "@/components/form/ErrorField"; +import FieldAndRemoveButtonWrapper from "@/components/form/FieldAndRemoveButtonWrapper"; +import FormField from "@/components/form/FormField"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import RemoveButton from "@/components/form/RemoveButton"; +import { rentCustomDateOptions } from "@/leases/constants"; +import { FieldTypes, FormNames } from "@/enums"; +import { DueDatesPositions, FixedDueDates, LeaseRentDueDatesFieldPaths, LeaseRentDueDatesFieldTitles, LeaseRentsFieldPaths, LeaseRentsFieldTitles, RentCycles, RentTypes, RentDueDateTypes } from "@/leases/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { formatDueDates, formatSeasonalDate } from "@/leases/helpers"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { getFieldAttributes, hasPermissions, isFieldAllowedToEdit, isFieldAllowedToRead, isFieldRequired } from "@/util/helpers"; +import { getAttributes as getLeaseAttributes, getCurrentLease } from "@/leases/selectors"; +import { getLeaseTypeList } from "@/leaseType/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import { PlotSearchFieldPaths } from "@/plotSearch/enums"; import type { Attributes } from "types"; -import type { Lease } from "leases/types"; -import type { LeaseTypeList } from "leaseType/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { Lease } from "@/leases/types"; +import type { LeaseTypeList } from "@/leaseType/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; const formName = FormNames.LEASE_RENTS; const selector = formValueSelector(formName); type SeasonalDatesProps = { diff --git a/src/leases/components/leaseSections/rent/BasisOfRent.tsx b/src/leases/components/leaseSections/rent/BasisOfRent.tsx index 8f1f3b4e0..f5f5a63fd 100644 --- a/src/leases/components/leaseSections/rent/BasisOfRent.tsx +++ b/src/leases/components/leaseSections/rent/BasisOfRent.tsx @@ -1,23 +1,23 @@ import React, { Fragment } from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; -import ActionButtonWrapper from "components/form/ActionButtonWrapper"; -import Authorization from "components/authorization/Authorization"; -import BoxContentWrapper from "components/content/BoxContentWrapper"; -import BoxItem from "components/content/BoxItem"; -import Divider from "components/content/Divider"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import RemoveButton from "components/form/RemoveButton"; -import SubTitle from "components/content/SubTitle"; -import UnarchiveButton from "components/form/UnarchiveButton"; -import WhiteBox from "components/content/WhiteBox"; -import { BasisOfRentManagementSubventionsFieldPaths, BasisOfRentManagementSubventionsFieldTitles, BasisOfRentTemporarySubventionsFieldPaths, BasisOfRentTemporarySubventionsFieldTitles, LeaseBasisOfRentsFieldPaths, LeaseBasisOfRentsFieldTitles, SubventionTypes, CalculatorTypes, calculatorTypeOptions } from "leases/enums"; -import { getBasisOfRentAmountPerArea, calculateBasisOfRentBasicAnnualRent, calculateBasisOfRentDiscountedInitialYearRent, calculateBasisOfRentInitialYearRent, calculateBasisOfRentSubventionAmount, calculateBasisOfRentSubventionAmountCumulative, calculateBasisOfRentSubventionPercentage, calculateReLeaseDiscountPercent, calculateBasisOfRentSubventionPercent, calculateSubventionDiscountTotal, calculateSubventionDiscountTotalFromReLease, calculateTemporarySubventionDiscountPercentage, getBasisOfRentIndexValue, calculateExtraRent, calculateFieldsRent, calculateTemporaryRent, calculateBasicAnnualRentIndexed, mastCalculatorRent, calculateRackAndHeightPrice, getZonePriceFromValue } from "leases/helpers"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { getUserFullName } from "users/helpers"; -import { formatDate, formatNumber, getLabelOfOption, isEmptyValue, isFieldAllowedToEdit, isFieldAllowedToRead, getFieldOptions } from "util/helpers"; -import { getAttributes as getLeaseAttributes } from "leases/selectors"; +import ActionButtonWrapper from "@/components/form/ActionButtonWrapper"; +import Authorization from "@/components/authorization/Authorization"; +import BoxContentWrapper from "@/components/content/BoxContentWrapper"; +import BoxItem from "@/components/content/BoxItem"; +import Divider from "@/components/content/Divider"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import RemoveButton from "@/components/form/RemoveButton"; +import SubTitle from "@/components/content/SubTitle"; +import UnarchiveButton from "@/components/form/UnarchiveButton"; +import WhiteBox from "@/components/content/WhiteBox"; +import { BasisOfRentManagementSubventionsFieldPaths, BasisOfRentManagementSubventionsFieldTitles, BasisOfRentTemporarySubventionsFieldPaths, BasisOfRentTemporarySubventionsFieldTitles, LeaseBasisOfRentsFieldPaths, LeaseBasisOfRentsFieldTitles, SubventionTypes, CalculatorTypes, calculatorTypeOptions } from "@/leases/enums"; +import { getBasisOfRentAmountPerArea, calculateBasisOfRentBasicAnnualRent, calculateBasisOfRentDiscountedInitialYearRent, calculateBasisOfRentInitialYearRent, calculateBasisOfRentSubventionAmount, calculateBasisOfRentSubventionAmountCumulative, calculateBasisOfRentSubventionPercentage, calculateReLeaseDiscountPercent, calculateBasisOfRentSubventionPercent, calculateSubventionDiscountTotal, calculateSubventionDiscountTotalFromReLease, calculateTemporarySubventionDiscountPercentage, getBasisOfRentIndexValue, calculateExtraRent, calculateFieldsRent, calculateTemporaryRent, calculateBasicAnnualRentIndexed, mastCalculatorRent, calculateRackAndHeightPrice, getZonePriceFromValue } from "@/leases/helpers"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { getUserFullName } from "@/users/helpers"; +import { formatDate, formatNumber, getLabelOfOption, isEmptyValue, isFieldAllowedToEdit, isFieldAllowedToRead, getFieldOptions } from "@/util/helpers"; +import { getAttributes as getLeaseAttributes } from "@/leases/selectors"; import type { Attributes } from "types"; type Props = { areaUnitOptions: Array>; diff --git a/src/leases/components/leaseSections/rent/BasisOfRentEdit.tsx b/src/leases/components/leaseSections/rent/BasisOfRentEdit.tsx index c5e469322..e0fc4b6c9 100644 --- a/src/leases/components/leaseSections/rent/BasisOfRentEdit.tsx +++ b/src/leases/components/leaseSections/rent/BasisOfRentEdit.tsx @@ -2,38 +2,38 @@ import React, { Fragment, PureComponent, ReactElement } from "react"; import { connect } from "react-redux"; import { change, FieldArray, formValueSelector, clearFields } from "redux-form"; import { Row, Column } from "react-foundation"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import ActionButtonWrapper from "components/form/ActionButtonWrapper"; -import AddButtonSecondary from "components/form/AddButtonSecondary"; -import AddButtonThird from "components/form/AddButtonThird"; -import ArchiveButton from "components/form/ArchiveButton"; -import Authorization from "components/authorization/Authorization"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import ActionButtonWrapper from "@/components/form/ActionButtonWrapper"; +import AddButtonSecondary from "@/components/form/AddButtonSecondary"; +import AddButtonThird from "@/components/form/AddButtonThird"; +import ArchiveButton from "@/components/form/ArchiveButton"; +import Authorization from "@/components/authorization/Authorization"; import BasisOfRent from "./BasisOfRent"; import BasisOfRentManagementSubventionEdit from "./BasisOfRentManagementSubventionEdit"; import BasisOfRentTemporarySubventionEdit from "./BasisOfRentTemporarySubventionEdit"; -import BoxContentWrapper from "components/content/BoxContentWrapper"; -import BoxItem from "components/content/BoxItem"; -import CopyToClipboardButton from "components/form/CopyToClipboardButton"; -import Divider from "components/content/Divider"; -import FormField from "components/form/FormField"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import RemoveButton from "components/form/RemoveButton"; -import SubTitle from "components/content/SubTitle"; -import WhiteBox from "components/content/WhiteBox"; -import { ConfirmationModalTexts } from "enums"; -import { ButtonColors } from "components/enums"; -import { BasisOfRentManagementSubventionsFieldPaths, BasisOfRentManagementSubventionsFieldTitles, BasisOfRentTemporarySubventionsFieldPaths, BasisOfRentTemporarySubventionsFieldTitles, CalculatorTypes, LeaseBasisOfRentsFieldPaths, LeaseBasisOfRentsFieldTitles, SubventionTypes } from "leases/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getBasisOfRentAmountPerArea, calculateAmountFromValue, calculateBasisOfRentBasicAnnualRent, calculateBasisOfRentDiscountedInitialYearRent, calculateBasisOfRentInitialYearRent, calculateBasisOfRentSubventionAmount, calculateReLeaseDiscountPercent, calculateBasicAnnualRentIndexed, calculateBasisOfRentSubventionPercent, calculateSubventionDiscountTotal, calculateSubventionDiscountTotalFromReLease, calculateTemporarySubventionDiscountPercentage, calculateExtraRent, calculateFieldsRent, calculateRackAndHeightPrice, calculateTemporaryRent, getBasisOfRentIndexValue, getBasisOfRentById, getZonePriceFromValue } from "leases/helpers"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { getUserFullName } from "users/helpers"; -import { copyElementContentsToClipboard, displayUIMessage, formatDate, formatNumber, getFieldAttributes, getLabelOfOption, hasPermissions, isEmptyValue, isFieldAllowedToEdit, isFieldAllowedToRead, isFieldRequired } from "util/helpers"; -import { getAttributes as getLeaseAttributes, getCurrentLease } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; +import BoxContentWrapper from "@/components/content/BoxContentWrapper"; +import BoxItem from "@/components/content/BoxItem"; +import CopyToClipboardButton from "@/components/form/CopyToClipboardButton"; +import Divider from "@/components/content/Divider"; +import FormField from "@/components/form/FormField"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import RemoveButton from "@/components/form/RemoveButton"; +import SubTitle from "@/components/content/SubTitle"; +import WhiteBox from "@/components/content/WhiteBox"; +import { ConfirmationModalTexts } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { BasisOfRentManagementSubventionsFieldPaths, BasisOfRentManagementSubventionsFieldTitles, BasisOfRentTemporarySubventionsFieldPaths, BasisOfRentTemporarySubventionsFieldTitles, CalculatorTypes, LeaseBasisOfRentsFieldPaths, LeaseBasisOfRentsFieldTitles, SubventionTypes } from "@/leases/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getBasisOfRentAmountPerArea, calculateAmountFromValue, calculateBasisOfRentBasicAnnualRent, calculateBasisOfRentDiscountedInitialYearRent, calculateBasisOfRentInitialYearRent, calculateBasisOfRentSubventionAmount, calculateReLeaseDiscountPercent, calculateBasicAnnualRentIndexed, calculateBasisOfRentSubventionPercent, calculateSubventionDiscountTotal, calculateSubventionDiscountTotalFromReLease, calculateTemporarySubventionDiscountPercentage, calculateExtraRent, calculateFieldsRent, calculateRackAndHeightPrice, calculateTemporaryRent, getBasisOfRentIndexValue, getBasisOfRentById, getZonePriceFromValue } from "@/leases/helpers"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { getUserFullName } from "@/users/helpers"; +import { copyElementContentsToClipboard, displayUIMessage, formatDate, formatNumber, getFieldAttributes, getLabelOfOption, hasPermissions, isEmptyValue, isFieldAllowedToEdit, isFieldAllowedToRead, isFieldRequired } from "@/util/helpers"; +import { getAttributes as getLeaseAttributes, getCurrentLease } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; import type { Attributes } from "types"; -import type { Lease } from "leases/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { Lease } from "@/leases/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; import MastChildrenEdit from "./MastChildrenEdit"; type ManagementSubventionsProps = { currentAmountPerArea: number; diff --git a/src/leases/components/leaseSections/rent/BasisOfRentManagementSubventionEdit.tsx b/src/leases/components/leaseSections/rent/BasisOfRentManagementSubventionEdit.tsx index 7bc6558a2..21a8cdfe9 100644 --- a/src/leases/components/leaseSections/rent/BasisOfRentManagementSubventionEdit.tsx +++ b/src/leases/components/leaseSections/rent/BasisOfRentManagementSubventionEdit.tsx @@ -2,19 +2,19 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import { change, formValueSelector } from "redux-form"; import { Row, Column } from "react-foundation"; -import Authorization from "components/authorization/Authorization"; -import FieldAndRemoveButtonWrapper from "components/form/FieldAndRemoveButtonWrapper"; -import FormField from "components/form/FormField"; -import FormText from "components/form/FormText"; -import RemoveButton from "components/form/RemoveButton"; -import { BasisOfRentManagementSubventionsFieldPaths, BasisOfRentManagementSubventionsFieldTitles } from "leases/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { calculateBasisOfRentSubventionAmount, calculateBasisOfRentSubventionPercentage, calculateSubventionAmountFromPercantage } from "leases/helpers"; -import { formatNumber, hasPermissions, isFieldAllowedToRead, getFieldAttributes } from "util/helpers"; -import { getAttributes as getLeaseAttributes, getIsSaveClicked } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; +import Authorization from "@/components/authorization/Authorization"; +import FieldAndRemoveButtonWrapper from "@/components/form/FieldAndRemoveButtonWrapper"; +import FormField from "@/components/form/FormField"; +import FormText from "@/components/form/FormText"; +import RemoveButton from "@/components/form/RemoveButton"; +import { BasisOfRentManagementSubventionsFieldPaths, BasisOfRentManagementSubventionsFieldTitles } from "@/leases/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { calculateBasisOfRentSubventionAmount, calculateBasisOfRentSubventionPercentage, calculateSubventionAmountFromPercantage } from "@/leases/helpers"; +import { formatNumber, hasPermissions, isFieldAllowedToRead, getFieldAttributes } from "@/util/helpers"; +import { getAttributes as getLeaseAttributes, getIsSaveClicked } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; import type { Attributes } from "types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { currentAmountPerArea: number; change: (...args: Array) => any; diff --git a/src/leases/components/leaseSections/rent/BasisOfRentTemporarySubventionEdit.tsx b/src/leases/components/leaseSections/rent/BasisOfRentTemporarySubventionEdit.tsx index ed74a5504..165bdf1e7 100644 --- a/src/leases/components/leaseSections/rent/BasisOfRentTemporarySubventionEdit.tsx +++ b/src/leases/components/leaseSections/rent/BasisOfRentTemporarySubventionEdit.tsx @@ -2,19 +2,19 @@ import React from "react"; import { connect } from "react-redux"; import { formValueSelector } from "redux-form"; import { Row, Column } from "react-foundation"; -import Authorization from "components/authorization/Authorization"; -import FieldAndRemoveButtonWrapper from "components/form/FieldAndRemoveButtonWrapper"; -import FormField from "components/form/FormField"; -import FormText from "components/form/FormText"; -import RemoveButton from "components/form/RemoveButton"; -import { BasisOfRentTemporarySubventionsFieldPaths, BasisOfRentTemporarySubventionsFieldTitles } from "leases/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { calculateBasisOfRentSubventionAmountCumulative } from "leases/helpers"; -import { formatNumber, hasPermissions, isFieldAllowedToRead, getFieldAttributes } from "util/helpers"; -import { getAttributes as getLeaseAttributes, getIsSaveClicked } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; +import Authorization from "@/components/authorization/Authorization"; +import FieldAndRemoveButtonWrapper from "@/components/form/FieldAndRemoveButtonWrapper"; +import FormField from "@/components/form/FormField"; +import FormText from "@/components/form/FormText"; +import RemoveButton from "@/components/form/RemoveButton"; +import { BasisOfRentTemporarySubventionsFieldPaths, BasisOfRentTemporarySubventionsFieldTitles } from "@/leases/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { calculateBasisOfRentSubventionAmountCumulative } from "@/leases/helpers"; +import { formatNumber, hasPermissions, isFieldAllowedToRead, getFieldAttributes } from "@/util/helpers"; +import { getAttributes as getLeaseAttributes, getIsSaveClicked } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; import type { Attributes } from "types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { disabled: boolean; field: any; diff --git a/src/leases/components/leaseSections/rent/BasisOfRents.tsx b/src/leases/components/leaseSections/rent/BasisOfRents.tsx index 7bcba8bcd..b9fc6d66a 100644 --- a/src/leases/components/leaseSections/rent/BasisOfRents.tsx +++ b/src/leases/components/leaseSections/rent/BasisOfRents.tsx @@ -2,16 +2,16 @@ import React, { Fragment, PureComponent } from "react"; import { connect } from "react-redux"; import BasisOfRent from "./BasisOfRent"; import CalculateRentTotal from "./CalculateRentTotal"; -import BoxItemContainer from "components/content/BoxItemContainer"; -import FormText from "components/form/FormText"; -import GrayBox from "components/content/GrayBox"; -import GreenBox from "components/content/GreenBox"; -import { BasisOfRentManagementSubventionsFieldPaths, LeaseBasisOfRentsFieldPaths } from "leases/enums"; -import { calculateBasisOfRentTotalDiscountedInitialYearRent, getContentBasisOfRents } from "leases/helpers"; -import { getFieldOptions, isEmptyValue } from "util/helpers"; -import { getAttributes as getLeaseAttributes, getCurrentLease } from "leases/selectors"; +import BoxItemContainer from "@/components/content/BoxItemContainer"; +import FormText from "@/components/form/FormText"; +import GrayBox from "@/components/content/GrayBox"; +import GreenBox from "@/components/content/GreenBox"; +import { BasisOfRentManagementSubventionsFieldPaths, LeaseBasisOfRentsFieldPaths } from "@/leases/enums"; +import { calculateBasisOfRentTotalDiscountedInitialYearRent, getContentBasisOfRents } from "@/leases/helpers"; +import { getFieldOptions, isEmptyValue } from "@/util/helpers"; +import { getAttributes as getLeaseAttributes, getCurrentLease } from "@/leases/selectors"; import type { Attributes } from "types"; -import type { Lease } from "leases/types"; +import type { Lease } from "@/leases/types"; type Props = { currentLease: Lease; leaseAttributes: Attributes; diff --git a/src/leases/components/leaseSections/rent/BasisOfRentsEdit.tsx b/src/leases/components/leaseSections/rent/BasisOfRentsEdit.tsx index ecf5f19e0..2e0babf88 100644 --- a/src/leases/components/leaseSections/rent/BasisOfRentsEdit.tsx +++ b/src/leases/components/leaseSections/rent/BasisOfRentsEdit.tsx @@ -3,25 +3,25 @@ import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; import { change } from "redux-form"; import classNames from "classnames"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import AddButtonSecondary from "components/form/AddButtonSecondary"; -import Authorization from "components/authorization/Authorization"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import AddButtonSecondary from "@/components/form/AddButtonSecondary"; +import Authorization from "@/components/authorization/Authorization"; import BasisOfRentEdit from "./BasisOfRentEdit"; import CalculateRentTotal from "./CalculateRentTotal"; -import BoxItemContainer from "components/content/BoxItemContainer"; -import FormText from "components/form/FormText"; -import GrayBox from "components/content/GrayBox"; -import GreenBox from "components/content/GreenBox"; -import { ConfirmationModalTexts } from "enums"; -import { ButtonColors } from "components/enums"; -import { BasisOfRentManagementSubventionsFieldPaths, LeaseBasisOfRentsFieldPaths, calculatorTypeOptions } from "leases/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { calculateBasisOfRentTotalDiscountedInitialYearRent } from "leases/helpers"; -import { getFieldOptions, hasPermissions, isEmptyValue } from "util/helpers"; -import { getAttributes as getLeaseAttributes } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; +import BoxItemContainer from "@/components/content/BoxItemContainer"; +import FormText from "@/components/form/FormText"; +import GrayBox from "@/components/content/GrayBox"; +import GreenBox from "@/components/content/GreenBox"; +import { ConfirmationModalTexts } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { BasisOfRentManagementSubventionsFieldPaths, LeaseBasisOfRentsFieldPaths, calculatorTypeOptions } from "@/leases/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { calculateBasisOfRentTotalDiscountedInitialYearRent } from "@/leases/helpers"; +import { getFieldOptions, hasPermissions, isEmptyValue } from "@/util/helpers"; +import { getAttributes as getLeaseAttributes } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; import type { Attributes } from "types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { addButtonClass?: string; archived: boolean; diff --git a/src/leases/components/leaseSections/rent/CalculateRentTotal.tsx b/src/leases/components/leaseSections/rent/CalculateRentTotal.tsx index 33a4c96cc..f51899260 100644 --- a/src/leases/components/leaseSections/rent/CalculateRentTotal.tsx +++ b/src/leases/components/leaseSections/rent/CalculateRentTotal.tsx @@ -1,10 +1,10 @@ import React, { Fragment } from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; -import { LeaseBasisOfRentsFieldTitles } from "leases/enums"; -import FormText from "components/form/FormText"; -import { calculateBasisOfRentDiscountedInitialYearRentsTotal, calculateInitialYearRentsTotal } from "leases/helpers"; -import { formatNumber } from "util/helpers"; +import { LeaseBasisOfRentsFieldTitles } from "@/leases/enums"; +import FormText from "@/components/form/FormText"; +import { calculateBasisOfRentDiscountedInitialYearRentsTotal, calculateInitialYearRentsTotal } from "@/leases/helpers"; +import { formatNumber } from "@/util/helpers"; type Props = { basisOfRents: any; indexOptions: Array>; diff --git a/src/leases/components/leaseSections/rent/ContractRentEdit.tsx b/src/leases/components/leaseSections/rent/ContractRentEdit.tsx index 1bd33299c..d567d2a19 100644 --- a/src/leases/components/leaseSections/rent/ContractRentEdit.tsx +++ b/src/leases/components/leaseSections/rent/ContractRentEdit.tsx @@ -3,24 +3,24 @@ import { connect } from "react-redux"; import { formValueSelector, change, reduxForm } from "redux-form"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; -import ActionButtonWrapper from "components/form/ActionButtonWrapper"; -import Authorization from "components/authorization/Authorization"; -import BoxContentWrapper from "components/content/BoxContentWrapper"; -import BoxItem from "components/content/BoxItem"; -import FormField from "components/form/FormField"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import RemoveButton from "components/form/RemoveButton"; -import { FormNames } from "enums"; -import { ContractRentPeriods, LeaseRentContractRentsFieldPaths, LeaseRentContractRentsFieldTitles, RentTypes } from "leases/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { formatNumber, getFieldAttributes, getFieldOptions, getLabelOfOption, hasPermissions, isEmptyValue, isFieldAllowedToEdit, isFieldAllowedToRead, isFieldRequired } from "util/helpers"; -import { getAttributes as getLeaseAttributes, getIsSaveClicked } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import { withWindowResize } from "components/resize/WindowResizeHandler"; +import ActionButtonWrapper from "@/components/form/ActionButtonWrapper"; +import Authorization from "@/components/authorization/Authorization"; +import BoxContentWrapper from "@/components/content/BoxContentWrapper"; +import BoxItem from "@/components/content/BoxItem"; +import FormField from "@/components/form/FormField"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import RemoveButton from "@/components/form/RemoveButton"; +import { FormNames } from "@/enums"; +import { ContractRentPeriods, LeaseRentContractRentsFieldPaths, LeaseRentContractRentsFieldTitles, RentTypes } from "@/leases/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { formatNumber, getFieldAttributes, getFieldOptions, getLabelOfOption, hasPermissions, isEmptyValue, isFieldAllowedToEdit, isFieldAllowedToRead, isFieldRequired } from "@/util/helpers"; +import { getAttributes as getLeaseAttributes, getIsSaveClicked } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import { withWindowResize } from "@/components/resize/WindowResizeHandler"; import type { Attributes } from "types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { amount: string; period: string; diff --git a/src/leases/components/leaseSections/rent/ContractRents.tsx b/src/leases/components/leaseSections/rent/ContractRents.tsx index b462b444f..ffd820184 100644 --- a/src/leases/components/leaseSections/rent/ContractRents.tsx +++ b/src/leases/components/leaseSections/rent/ContractRents.tsx @@ -2,17 +2,17 @@ import React, { Fragment, PureComponent } from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; -import Authorization from "components/authorization/Authorization"; -import BoxContentWrapper from "components/content/BoxContentWrapper"; -import BoxItem from "components/content/BoxItem"; -import BoxItemContainer from "components/content/BoxItemContainer"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import { LeaseRentContractRentsFieldPaths, LeaseRentContractRentsFieldTitles, RentTypes } from "leases/enums"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, isEmptyValue, isFieldAllowedToRead } from "util/helpers"; -import { getAttributes as getLeaseAttributes } from "leases/selectors"; -import { withWindowResize } from "components/resize/WindowResizeHandler"; +import Authorization from "@/components/authorization/Authorization"; +import BoxContentWrapper from "@/components/content/BoxContentWrapper"; +import BoxItem from "@/components/content/BoxItem"; +import BoxItemContainer from "@/components/content/BoxItemContainer"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import { LeaseRentContractRentsFieldPaths, LeaseRentContractRentsFieldTitles, RentTypes } from "@/leases/enums"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, isEmptyValue, isFieldAllowedToRead } from "@/util/helpers"; +import { getAttributes as getLeaseAttributes } from "@/leases/selectors"; +import { withWindowResize } from "@/components/resize/WindowResizeHandler"; import type { Attributes } from "types"; type Props = { contractRents: Array>; diff --git a/src/leases/components/leaseSections/rent/ContractRentsEdit.tsx b/src/leases/components/leaseSections/rent/ContractRentsEdit.tsx index 534aac877..0312d72fb 100644 --- a/src/leases/components/leaseSections/rent/ContractRentsEdit.tsx +++ b/src/leases/components/leaseSections/rent/ContractRentsEdit.tsx @@ -1,24 +1,24 @@ import React, { Fragment } from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import AddButtonSecondary from "components/form/AddButtonSecondary"; -import Authorization from "components/authorization/Authorization"; -import BoxItemContainer from "components/content/BoxItemContainer"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import AddButtonSecondary from "@/components/form/AddButtonSecondary"; +import Authorization from "@/components/authorization/Authorization"; +import BoxItemContainer from "@/components/content/BoxItemContainer"; import ContractRentEdit from "./ContractRentEdit"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import { ConfirmationModalTexts } from "enums"; -import { ButtonColors } from "components/enums"; -import { LeaseRentContractRentsFieldPaths, LeaseRentContractRentsFieldTitles, RentTypes } from "leases/enums"; -import { Breakpoints } from "foundation/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { hasPermissions, isFieldAllowedToRead, isFieldRequired } from "util/helpers"; -import { getAttributes as getLeaseAttributes } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import { ConfirmationModalTexts } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { LeaseRentContractRentsFieldPaths, LeaseRentContractRentsFieldTitles, RentTypes } from "@/leases/enums"; +import { Breakpoints } from "@/foundation/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { hasPermissions, isFieldAllowedToRead, isFieldRequired } from "@/util/helpers"; +import { getAttributes as getLeaseAttributes } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; import type { Attributes } from "types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { fields: any; leaseAttributes: Attributes; diff --git a/src/leases/components/leaseSections/rent/EqualizedRents.tsx b/src/leases/components/leaseSections/rent/EqualizedRents.tsx index 284c83ba9..8271d0258 100644 --- a/src/leases/components/leaseSections/rent/EqualizedRents.tsx +++ b/src/leases/components/leaseSections/rent/EqualizedRents.tsx @@ -1,11 +1,11 @@ import React from "react"; import { connect } from "react-redux"; -import AmountWithVat from "components/vat/AmountWithVat"; -import SortableTable from "components/table/SortableTable"; -import { LeaseEqualizedRentsFieldPaths, LeaseEqualizedRentsFieldTitles } from "leases/enums"; -import { TableSortOrder } from "enums"; -import { formatDate, formatNumber, isFieldAllowedToRead, sortNumberByKeyAsc, sortNumberByKeyDesc } from "util/helpers"; -import { getAttributes } from "leases/selectors"; +import AmountWithVat from "@/components/vat/AmountWithVat"; +import SortableTable from "@/components/table/SortableTable"; +import { LeaseEqualizedRentsFieldPaths, LeaseEqualizedRentsFieldTitles } from "@/leases/enums"; +import { TableSortOrder } from "@/enums"; +import { formatDate, formatNumber, isFieldAllowedToRead, sortNumberByKeyAsc, sortNumberByKeyDesc } from "@/util/helpers"; +import { getAttributes } from "@/leases/selectors"; import type { Attributes } from "types"; type Props = { equalizedRents: Array>; diff --git a/src/leases/components/leaseSections/rent/FixedInitialYearRents.tsx b/src/leases/components/leaseSections/rent/FixedInitialYearRents.tsx index 33de609d7..195cf3ee5 100644 --- a/src/leases/components/leaseSections/rent/FixedInitialYearRents.tsx +++ b/src/leases/components/leaseSections/rent/FixedInitialYearRents.tsx @@ -2,17 +2,17 @@ import React, { Fragment, PureComponent } from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; -import Authorization from "components/authorization/Authorization"; -import BoxContentWrapper from "components/content/BoxContentWrapper"; -import BoxItem from "components/content/BoxItem"; -import BoxItemContainer from "components/content/BoxItemContainer"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import { LeaseRentFixedInitialYearRentsFieldPaths, LeaseRentFixedInitialYearRentsFieldTitles } from "leases/enums"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, isEmptyValue, isFieldAllowedToRead } from "util/helpers"; -import { getAttributes as getLeaseAttributes } from "leases/selectors"; -import { withWindowResize } from "components/resize/WindowResizeHandler"; +import Authorization from "@/components/authorization/Authorization"; +import BoxContentWrapper from "@/components/content/BoxContentWrapper"; +import BoxItem from "@/components/content/BoxItem"; +import BoxItemContainer from "@/components/content/BoxItemContainer"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import { LeaseRentFixedInitialYearRentsFieldPaths, LeaseRentFixedInitialYearRentsFieldTitles } from "@/leases/enums"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, isEmptyValue, isFieldAllowedToRead } from "@/util/helpers"; +import { getAttributes as getLeaseAttributes } from "@/leases/selectors"; +import { withWindowResize } from "@/components/resize/WindowResizeHandler"; import type { Attributes } from "types"; type Props = { fixedInitialYearRents: Array>; diff --git a/src/leases/components/leaseSections/rent/FixedInitialYearRentsEdit.tsx b/src/leases/components/leaseSections/rent/FixedInitialYearRentsEdit.tsx index e903880c8..da78202df 100644 --- a/src/leases/components/leaseSections/rent/FixedInitialYearRentsEdit.tsx +++ b/src/leases/components/leaseSections/rent/FixedInitialYearRentsEdit.tsx @@ -2,29 +2,29 @@ import React, { Fragment } from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import ActionButtonWrapper from "components/form/ActionButtonWrapper"; -import AddButtonSecondary from "components/form/AddButtonSecondary"; -import Authorization from "components/authorization/Authorization"; -import BoxContentWrapper from "components/content/BoxContentWrapper"; -import BoxItem from "components/content/BoxItem"; -import BoxItemContainer from "components/content/BoxItemContainer"; -import FormField from "components/form/FormField"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import RemoveButton from "components/form/RemoveButton"; -import { ConfirmationModalTexts } from "enums"; -import { ButtonColors } from "components/enums"; -import { Breakpoints } from "foundation/enums"; -import { LeaseRentFixedInitialYearRentsFieldPaths, LeaseRentFixedInitialYearRentsFieldTitles } from "leases/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { getFieldAttributes, hasPermissions, isFieldAllowedToRead, isFieldRequired } from "util/helpers"; -import { getAttributes as getLeaseAttributes } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import { withWindowResize } from "components/resize/WindowResizeHandler"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import ActionButtonWrapper from "@/components/form/ActionButtonWrapper"; +import AddButtonSecondary from "@/components/form/AddButtonSecondary"; +import Authorization from "@/components/authorization/Authorization"; +import BoxContentWrapper from "@/components/content/BoxContentWrapper"; +import BoxItem from "@/components/content/BoxItem"; +import BoxItemContainer from "@/components/content/BoxItemContainer"; +import FormField from "@/components/form/FormField"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import RemoveButton from "@/components/form/RemoveButton"; +import { ConfirmationModalTexts } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { Breakpoints } from "@/foundation/enums"; +import { LeaseRentFixedInitialYearRentsFieldPaths, LeaseRentFixedInitialYearRentsFieldTitles } from "@/leases/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { getFieldAttributes, hasPermissions, isFieldAllowedToRead, isFieldRequired } from "@/util/helpers"; +import { getAttributes as getLeaseAttributes } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import { withWindowResize } from "@/components/resize/WindowResizeHandler"; import type { Attributes } from "types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { fields: any; isSaveClicked: boolean; diff --git a/src/leases/components/leaseSections/rent/IndexAdjustedRents.tsx b/src/leases/components/leaseSections/rent/IndexAdjustedRents.tsx index 61e3ae131..2689e1e17 100644 --- a/src/leases/components/leaseSections/rent/IndexAdjustedRents.tsx +++ b/src/leases/components/leaseSections/rent/IndexAdjustedRents.tsx @@ -1,11 +1,11 @@ import React from "react"; import { connect } from "react-redux"; -import AmountWithVat from "components/vat/AmountWithVat"; -import SortableTable from "components/table/SortableTable"; -import { LeaseIndexAdjustedRentsFieldPaths, LeaseIndexAdjustedRentsFieldTitles } from "leases/enums"; -import { TableSortOrder } from "enums"; -import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, isFieldAllowedToRead, sortByOptionsAsc, sortByOptionsDesc, sortNumberByKeyAsc, sortNumberByKeyDesc } from "util/helpers"; -import { getAttributes } from "leases/selectors"; +import AmountWithVat from "@/components/vat/AmountWithVat"; +import SortableTable from "@/components/table/SortableTable"; +import { LeaseIndexAdjustedRentsFieldPaths, LeaseIndexAdjustedRentsFieldTitles } from "@/leases/enums"; +import { TableSortOrder } from "@/enums"; +import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, isFieldAllowedToRead, sortByOptionsAsc, sortByOptionsDesc, sortNumberByKeyAsc, sortNumberByKeyDesc } from "@/util/helpers"; +import { getAttributes } from "@/leases/selectors"; import type { Attributes } from "types"; type Props = { attributes: Attributes; diff --git a/src/leases/components/leaseSections/rent/MastChildrenEdit.tsx b/src/leases/components/leaseSections/rent/MastChildrenEdit.tsx index e704ce802..6b86a2692 100644 --- a/src/leases/components/leaseSections/rent/MastChildrenEdit.tsx +++ b/src/leases/components/leaseSections/rent/MastChildrenEdit.tsx @@ -2,14 +2,14 @@ import React, { Fragment } from "react"; import { connect } from "react-redux"; import { formValueSelector } from "redux-form"; import { Row, Column } from "react-foundation"; -import Authorization from "components/authorization/Authorization"; -import FormField from "components/form/FormField"; -import FormText from "components/form/FormText"; -import { isFieldAllowedToRead, getFieldAttributes, formatNumber, isEmptyValue } from "util/helpers"; -import { getAttributes as getLeaseAttributes, getIsSaveClicked } from "leases/selectors"; -import { LeaseBasisOfRentsFieldPaths } from "leases/enums"; +import Authorization from "@/components/authorization/Authorization"; +import FormField from "@/components/form/FormField"; +import FormText from "@/components/form/FormText"; +import { isFieldAllowedToRead, getFieldAttributes, formatNumber, isEmptyValue } from "@/util/helpers"; +import { getAttributes as getLeaseAttributes, getIsSaveClicked } from "@/leases/selectors"; +import { LeaseBasisOfRentsFieldPaths } from "@/leases/enums"; import type { Attributes } from "types"; -import { mastCalculatorRent } from "leases/helpers"; +import { mastCalculatorRent } from "@/leases/helpers"; type Props = { formName: string; parentField: string; diff --git a/src/leases/components/leaseSections/rent/PayableRents.tsx b/src/leases/components/leaseSections/rent/PayableRents.tsx index 60bb28e1f..074543f51 100644 --- a/src/leases/components/leaseSections/rent/PayableRents.tsx +++ b/src/leases/components/leaseSections/rent/PayableRents.tsx @@ -1,11 +1,11 @@ import React from "react"; import { connect } from "react-redux"; -import AmountWithVat from "components/vat/AmountWithVat"; -import SortableTable from "components/table/SortableTable"; -import { LeasePayableRentsFieldPaths, LeasePayableRentsFieldTitles } from "leases/enums"; -import { TableSortOrder } from "enums"; -import { formatDate, formatNumber, isFieldAllowedToRead, sortNumberByKeyAsc, sortNumberByKeyDesc } from "util/helpers"; -import { getAttributes } from "leases/selectors"; +import AmountWithVat from "@/components/vat/AmountWithVat"; +import SortableTable from "@/components/table/SortableTable"; +import { LeasePayableRentsFieldPaths, LeasePayableRentsFieldTitles } from "@/leases/enums"; +import { TableSortOrder } from "@/enums"; +import { formatDate, formatNumber, isFieldAllowedToRead, sortNumberByKeyAsc, sortNumberByKeyDesc } from "@/util/helpers"; +import { getAttributes } from "@/leases/selectors"; import type { Attributes } from "types"; type Props = { leaseAttributes: Attributes; diff --git a/src/leases/components/leaseSections/rent/RentAdjustmentEdit.tsx b/src/leases/components/leaseSections/rent/RentAdjustmentEdit.tsx index ac1b4e783..556e5d28f 100644 --- a/src/leases/components/leaseSections/rent/RentAdjustmentEdit.tsx +++ b/src/leases/components/leaseSections/rent/RentAdjustmentEdit.tsx @@ -3,35 +3,35 @@ import { change, FieldArray } from "redux-form"; import { connect } from "react-redux"; import { formValueSelector } from "redux-form"; import { Row, Column } from "react-foundation"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import ActionButtonWrapper from "components/form/ActionButtonWrapper"; -import AddButtonSecondary from "components/form/AddButtonSecondary"; -import AddButtonThird from "components/form/AddButtonThird"; -import Authorization from "components/authorization/Authorization"; -import BoxContentWrapper from "components/content/BoxContentWrapper"; -import BoxItem from "components/content/BoxItem"; -import DecisionLink from "components/links/DecisionLink"; -import Divider from "components/content/Divider"; -import FormField from "components/form/FormField"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import GreenBox from "components/content/GreenBox"; -import RemoveButton from "components/form/RemoveButton"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import ActionButtonWrapper from "@/components/form/ActionButtonWrapper"; +import AddButtonSecondary from "@/components/form/AddButtonSecondary"; +import AddButtonThird from "@/components/form/AddButtonThird"; +import Authorization from "@/components/authorization/Authorization"; +import BoxContentWrapper from "@/components/content/BoxContentWrapper"; +import BoxItem from "@/components/content/BoxItem"; +import DecisionLink from "@/components/links/DecisionLink"; +import Divider from "@/components/content/Divider"; +import FormField from "@/components/form/FormField"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import GreenBox from "@/components/content/GreenBox"; +import RemoveButton from "@/components/form/RemoveButton"; import RentAdjustmentManagementSubventionEdit from "./RentAdjustmentManagementSubventionEdit"; import RentAdjustmentTemporarySubventionEdit from "./RentAdjustmentTemporarySubventionEdit"; -import SubTitle from "components/content/SubTitle"; -import { ConfirmationModalTexts, FormNames } from "enums"; -import { ButtonColors } from "components/enums"; -import { LeaseRentAdjustmentsFieldPaths, LeaseRentAdjustmentsFieldTitles, RentAdjustmentManagementSubventionsFieldPaths, RentAdjustmentManagementSubventionsFieldTitles, RentAdjustmentTemporarySubventionsFieldPaths, RentAdjustmentTemporarySubventionsFieldTitles, RentAdjustmentAmountTypes, RentAdjustmentTypes, SubventionTypes } from "leases/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { calculateReLeaseDiscountPercent, calculateRentAdjustmentSubventionPercentCumulative, getDecisionById, hasSubventionDataChanged, hasSubventionValues, isSubventionTypeSpecified } from "leases/helpers"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { formatNumber, getFieldAttributes, getLabelOfOption, hasPermissions, isFieldAllowedToEdit, isFieldAllowedToRead, isFieldRequired } from "util/helpers"; -import { getAttributes as getLeaseAttributes, getCurrentLease } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; +import SubTitle from "@/components/content/SubTitle"; +import { ConfirmationModalTexts, FormNames } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { LeaseRentAdjustmentsFieldPaths, LeaseRentAdjustmentsFieldTitles, RentAdjustmentManagementSubventionsFieldPaths, RentAdjustmentManagementSubventionsFieldTitles, RentAdjustmentTemporarySubventionsFieldPaths, RentAdjustmentTemporarySubventionsFieldTitles, RentAdjustmentAmountTypes, RentAdjustmentTypes, SubventionTypes } from "@/leases/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { calculateReLeaseDiscountPercent, calculateRentAdjustmentSubventionPercentCumulative, getDecisionById, hasSubventionDataChanged, hasSubventionValues, isSubventionTypeSpecified } from "@/leases/helpers"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { formatNumber, getFieldAttributes, getLabelOfOption, hasPermissions, isFieldAllowedToEdit, isFieldAllowedToRead, isFieldRequired } from "@/util/helpers"; +import { getAttributes as getLeaseAttributes, getCurrentLease } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; import type { Attributes } from "types"; -import type { Lease } from "leases/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { Lease } from "@/leases/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type ManagementSubventionsProps = { fields: any; leaseAttributes: Attributes; diff --git a/src/leases/components/leaseSections/rent/RentAdjustmentManagementSubventionEdit.tsx b/src/leases/components/leaseSections/rent/RentAdjustmentManagementSubventionEdit.tsx index 47224e5a7..65aa7bd2e 100644 --- a/src/leases/components/leaseSections/rent/RentAdjustmentManagementSubventionEdit.tsx +++ b/src/leases/components/leaseSections/rent/RentAdjustmentManagementSubventionEdit.tsx @@ -1,17 +1,17 @@ import React from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; -import Authorization from "components/authorization/Authorization"; -import FormField from "components/form/FormField"; -import RemoveButton from "components/form/RemoveButton"; -import { RentAdjustmentManagementSubventionsFieldPaths, RentAdjustmentManagementSubventionsFieldTitles } from "leases/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { hasPermissions, isFieldAllowedToRead, getFieldAttributes } from "util/helpers"; -import { getAttributes as getLeaseAttributes, getIsSaveClicked } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; +import Authorization from "@/components/authorization/Authorization"; +import FormField from "@/components/form/FormField"; +import RemoveButton from "@/components/form/RemoveButton"; +import { RentAdjustmentManagementSubventionsFieldPaths, RentAdjustmentManagementSubventionsFieldTitles } from "@/leases/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { hasPermissions, isFieldAllowedToRead, getFieldAttributes } from "@/util/helpers"; +import { getAttributes as getLeaseAttributes, getIsSaveClicked } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; import type { Attributes } from "types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { field: any; isSaveClicked: boolean; diff --git a/src/leases/components/leaseSections/rent/RentAdjustmentTemporarySubventionEdit.tsx b/src/leases/components/leaseSections/rent/RentAdjustmentTemporarySubventionEdit.tsx index 67070e9ea..4f11166ec 100644 --- a/src/leases/components/leaseSections/rent/RentAdjustmentTemporarySubventionEdit.tsx +++ b/src/leases/components/leaseSections/rent/RentAdjustmentTemporarySubventionEdit.tsx @@ -1,17 +1,17 @@ import React from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; -import Authorization from "components/authorization/Authorization"; -import FormField from "components/form/FormField"; -import RemoveButton from "components/form/RemoveButton"; -import { RentAdjustmentTemporarySubventionsFieldPaths, RentAdjustmentTemporarySubventionsFieldTitles } from "leases/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { hasPermissions, isFieldAllowedToRead, getFieldAttributes } from "util/helpers"; -import { getAttributes as getLeaseAttributes, getIsSaveClicked } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; +import Authorization from "@/components/authorization/Authorization"; +import FormField from "@/components/form/FormField"; +import RemoveButton from "@/components/form/RemoveButton"; +import { RentAdjustmentTemporarySubventionsFieldPaths, RentAdjustmentTemporarySubventionsFieldTitles } from "@/leases/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { hasPermissions, isFieldAllowedToRead, getFieldAttributes } from "@/util/helpers"; +import { getAttributes as getLeaseAttributes, getIsSaveClicked } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; import type { Attributes } from "types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { field: any; isSaveClicked: boolean; diff --git a/src/leases/components/leaseSections/rent/RentAdjustments.tsx b/src/leases/components/leaseSections/rent/RentAdjustments.tsx index 554f162b8..5ec9b7b44 100644 --- a/src/leases/components/leaseSections/rent/RentAdjustments.tsx +++ b/src/leases/components/leaseSections/rent/RentAdjustments.tsx @@ -1,22 +1,22 @@ import React, { Fragment } from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; -import Authorization from "components/authorization/Authorization"; -import BoxItem from "components/content/BoxItem"; -import BoxItemContainer from "components/content/BoxItemContainer"; -import DecisionLink from "components/links/DecisionLink"; -import Divider from "components/content/Divider"; -import GreenBox from "components/content/GreenBox"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import SubTitle from "components/content/SubTitle"; -import { LeaseRentAdjustmentsFieldPaths, LeaseRentAdjustmentsFieldTitles, RentAdjustmentManagementSubventionsFieldPaths, RentAdjustmentManagementSubventionsFieldTitles, RentAdjustmentAmountTypes, RentAdjustmentTypes, SubventionTypes, RentAdjustmentTemporarySubventionsFieldPaths, RentAdjustmentTemporarySubventionsFieldTitles } from "leases/enums"; -import { calculateReLeaseDiscountPercent, getDecisionById, getDecisionOptions } from "leases/helpers"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, isEmptyValue, isFieldAllowedToRead } from "util/helpers"; -import { getAttributes as getLeaseAttributes, getCurrentLease } from "leases/selectors"; +import Authorization from "@/components/authorization/Authorization"; +import BoxItem from "@/components/content/BoxItem"; +import BoxItemContainer from "@/components/content/BoxItemContainer"; +import DecisionLink from "@/components/links/DecisionLink"; +import Divider from "@/components/content/Divider"; +import GreenBox from "@/components/content/GreenBox"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import SubTitle from "@/components/content/SubTitle"; +import { LeaseRentAdjustmentsFieldPaths, LeaseRentAdjustmentsFieldTitles, RentAdjustmentManagementSubventionsFieldPaths, RentAdjustmentManagementSubventionsFieldTitles, RentAdjustmentAmountTypes, RentAdjustmentTypes, SubventionTypes, RentAdjustmentTemporarySubventionsFieldPaths, RentAdjustmentTemporarySubventionsFieldTitles } from "@/leases/enums"; +import { calculateReLeaseDiscountPercent, getDecisionById, getDecisionOptions } from "@/leases/helpers"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, isEmptyValue, isFieldAllowedToRead } from "@/util/helpers"; +import { getAttributes as getLeaseAttributes, getCurrentLease } from "@/leases/selectors"; import type { Attributes } from "types"; -import type { Lease } from "leases/types"; +import type { Lease } from "@/leases/types"; type Props = { currentLease: Lease; leaseAttributes: Attributes; diff --git a/src/leases/components/leaseSections/rent/RentAdjustmentsEdit.tsx b/src/leases/components/leaseSections/rent/RentAdjustmentsEdit.tsx index 5aec13e16..45e8d8200 100644 --- a/src/leases/components/leaseSections/rent/RentAdjustmentsEdit.tsx +++ b/src/leases/components/leaseSections/rent/RentAdjustmentsEdit.tsx @@ -6,25 +6,25 @@ import addMonths from "date-fns/addMonths"; import format from "date-fns/format"; import isAfter from "date-fns/isAfter"; import subDays from "date-fns/subDays"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import AddButtonSecondary from "components/form/AddButtonSecondary"; -import Authorization from "components/authorization/Authorization"; -import BoxItemContainer from "components/content/BoxItemContainer"; -import DecisionLink from "components/links/DecisionLink"; -import FormText from "components/form/FormText"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import AddButtonSecondary from "@/components/form/AddButtonSecondary"; +import Authorization from "@/components/authorization/Authorization"; +import BoxItemContainer from "@/components/content/BoxItemContainer"; +import DecisionLink from "@/components/links/DecisionLink"; +import FormText from "@/components/form/FormText"; import RentAdjustmentEdit from "./RentAdjustmentEdit"; import SteppedDiscountModal from "./SteppedDiscountModal"; -import { ConfirmationModalTexts, FormNames } from "enums"; -import { ButtonColors } from "components/enums"; -import { LeaseRentAdjustmentsFieldPaths, RentAdjustmentAmountTypes, RentAdjustmentTypes } from "leases/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getDecisionById, getDecisionOptions } from "leases/helpers"; -import { convertStrToDecimalNumber, formatNumber, getFieldOptions, hasPermissions } from "util/helpers"; -import { getAttributes as getLeaseAttributes, getCurrentLease } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; +import { ConfirmationModalTexts, FormNames } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { LeaseRentAdjustmentsFieldPaths, RentAdjustmentAmountTypes, RentAdjustmentTypes } from "@/leases/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getDecisionById, getDecisionOptions } from "@/leases/helpers"; +import { convertStrToDecimalNumber, formatNumber, getFieldOptions, hasPermissions } from "@/util/helpers"; +import { getAttributes as getLeaseAttributes, getCurrentLease } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; import type { Attributes } from "types"; -import type { Lease } from "leases/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { Lease } from "@/leases/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { adjustments: Array>; currentLease: Lease; diff --git a/src/leases/components/leaseSections/rent/RentItem.tsx b/src/leases/components/leaseSections/rent/RentItem.tsx index f7fa9d08c..00b09fe7f 100644 --- a/src/leases/components/leaseSections/rent/RentItem.tsx +++ b/src/leases/components/leaseSections/rent/RentItem.tsx @@ -2,22 +2,22 @@ import React from "react"; import { connect } from "react-redux"; import { Column } from "react-foundation"; import get from "lodash/get"; -import Authorization from "components/authorization/Authorization"; +import Authorization from "@/components/authorization/Authorization"; import BasicInfo from "./BasicInfo"; -import Collapse from "components/collapse/Collapse"; -import CollapseHeaderSubtitle from "components/collapse/CollapseHeaderSubtitle"; +import Collapse from "@/components/collapse/Collapse"; +import CollapseHeaderSubtitle from "@/components/collapse/CollapseHeaderSubtitle"; import ContractRents from "./ContractRents"; import EqualizedRents from "./EqualizedRents"; import FixedInitialYearRents from "./FixedInitialYearRents"; import IndexAdjustedRents from "./IndexAdjustedRents"; import PayableRents from "./PayableRents"; import RentAdjustments from "./RentAdjustments"; -import { receiveCollapseStates } from "leases/actions"; -import { FormNames, ViewModes } from "enums"; -import { LeaseRentsFieldPaths, LeaseRentFixedInitialYearRentsFieldPaths, LeaseRentFixedInitialYearRentsFieldTitles, LeaseRentContractRentsFieldPaths, LeaseRentContractRentsFieldTitles, LeaseIndexAdjustedRentsFieldPaths, LeaseIndexAdjustedRentsFieldTitles, LeaseRentAdjustmentsFieldPaths, LeaseRentAdjustmentsFieldTitles, LeasePayableRentsFieldPaths, LeasePayableRentsFieldTitles, LeaseEqualizedRentsFieldPaths, LeaseEqualizedRentsFieldTitles, RentTypes } from "leases/enums"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { formatDateRange, getFieldOptions, getLabelOfOption, isActive, isArchived, isFieldAllowedToRead } from "util/helpers"; -import { getAttributes as getLeaseAttributes, getCollapseStateByKey } from "leases/selectors"; +import { receiveCollapseStates } from "@/leases/actions"; +import { FormNames, ViewModes } from "@/enums"; +import { LeaseRentsFieldPaths, LeaseRentFixedInitialYearRentsFieldPaths, LeaseRentFixedInitialYearRentsFieldTitles, LeaseRentContractRentsFieldPaths, LeaseRentContractRentsFieldTitles, LeaseIndexAdjustedRentsFieldPaths, LeaseIndexAdjustedRentsFieldTitles, LeaseRentAdjustmentsFieldPaths, LeaseRentAdjustmentsFieldTitles, LeasePayableRentsFieldPaths, LeasePayableRentsFieldTitles, LeaseEqualizedRentsFieldPaths, LeaseEqualizedRentsFieldTitles, RentTypes } from "@/leases/enums"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { formatDateRange, getFieldOptions, getLabelOfOption, isActive, isArchived, isFieldAllowedToRead } from "@/util/helpers"; +import { getAttributes as getLeaseAttributes, getCollapseStateByKey } from "@/leases/selectors"; import type { Attributes } from "types"; const formName = FormNames.LEASE_RENTS; type Props = { diff --git a/src/leases/components/leaseSections/rent/RentItemEdit.tsx b/src/leases/components/leaseSections/rent/RentItemEdit.tsx index 7c40b6530..e9f7edd71 100644 --- a/src/leases/components/leaseSections/rent/RentItemEdit.tsx +++ b/src/leases/components/leaseSections/rent/RentItemEdit.tsx @@ -4,27 +4,27 @@ import { change, FieldArray, formValueSelector, FormSection } from "redux-form"; import { Column } from "react-foundation"; import get from "lodash/get"; import isEmpty from "lodash/isEmpty"; -import Authorization from "components/authorization/Authorization"; +import Authorization from "@/components/authorization/Authorization"; import BasicInfoEdit from "./BasicInfoEdit"; -import BoxContentWrapper from "components/content/BoxContentWrapper"; -import Collapse from "components/collapse/Collapse"; -import CollapseHeaderSubtitle from "components/collapse/CollapseHeaderSubtitle"; +import BoxContentWrapper from "@/components/content/BoxContentWrapper"; +import Collapse from "@/components/collapse/Collapse"; +import CollapseHeaderSubtitle from "@/components/collapse/CollapseHeaderSubtitle"; import ContractRentsEdit from "./ContractRentsEdit"; import EqualizedRents from "./EqualizedRents"; import FixedInitialYearRentsEdit from "./FixedInitialYearRentsEdit"; import IndexAdjustedRents from "./IndexAdjustedRents"; import PayableRents from "./PayableRents"; import RentAdjustmentsEdit from "./RentAdjustmentsEdit"; -import { receiveCollapseStates } from "leases/actions"; -import { FormNames, ViewModes } from "enums"; -import { ContractRentPeriods, LeaseRentsFieldPaths, LeaseRentFixedInitialYearRentsFieldPaths, LeaseRentFixedInitialYearRentsFieldTitles, LeaseRentContractRentsFieldPaths, LeaseRentContractRentsFieldTitles, LeaseIndexAdjustedRentsFieldPaths, LeaseIndexAdjustedRentsFieldTitles, LeaseRentAdjustmentsFieldPaths, LeaseRentAdjustmentsFieldTitles, LeasePayableRentsFieldPaths, LeasePayableRentsFieldTitles, LeaseEqualizedRentsFieldPaths, LeaseEqualizedRentsFieldTitles, RentDueDateTypes, RentTypes } from "leases/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { formatDateRange, getFieldOptions, getLabelOfOption, hasPermissions, isActive, isArchived, isEmptyValue, isFieldAllowedToRead } from "util/helpers"; -import { getAttributes as getLeaseAttributes, getCollapseStateByKey, getErrorsByFormName, getIsSaveClicked } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; +import { receiveCollapseStates } from "@/leases/actions"; +import { FormNames, ViewModes } from "@/enums"; +import { ContractRentPeriods, LeaseRentsFieldPaths, LeaseRentFixedInitialYearRentsFieldPaths, LeaseRentFixedInitialYearRentsFieldTitles, LeaseRentContractRentsFieldPaths, LeaseRentContractRentsFieldTitles, LeaseIndexAdjustedRentsFieldPaths, LeaseIndexAdjustedRentsFieldTitles, LeaseRentAdjustmentsFieldPaths, LeaseRentAdjustmentsFieldTitles, LeasePayableRentsFieldPaths, LeasePayableRentsFieldTitles, LeaseEqualizedRentsFieldPaths, LeaseEqualizedRentsFieldTitles, RentDueDateTypes, RentTypes } from "@/leases/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { formatDateRange, getFieldOptions, getLabelOfOption, hasPermissions, isActive, isArchived, isEmptyValue, isFieldAllowedToRead } from "@/util/helpers"; +import { getAttributes as getLeaseAttributes, getCollapseStateByKey, getErrorsByFormName, getIsSaveClicked } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; import type { Attributes } from "types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { change: (...args: Array) => any; contractRentsCollapseState: boolean; diff --git a/src/leases/components/leaseSections/rent/Rents.tsx b/src/leases/components/leaseSections/rent/Rents.tsx index cf42e6650..3fbeabc32 100644 --- a/src/leases/components/leaseSections/rent/Rents.tsx +++ b/src/leases/components/leaseSections/rent/Rents.tsx @@ -2,29 +2,29 @@ import React, { Fragment } from "react"; import { connect } from "react-redux"; import { withRouter } from "react-router"; import flowRight from "lodash/flowRight"; -import Authorization from "components/authorization/Authorization"; +import Authorization from "@/components/authorization/Authorization"; import BasisOfRents from "./BasisOfRents"; -import Divider from "components/content/Divider"; -import FormText from "components/form/FormText"; -import GreenBox from "components/content/GreenBox"; -import RentCalculator from "components/rent-calculator/RentCalculator"; +import Divider from "@/components/content/Divider"; +import FormText from "@/components/form/FormText"; +import GreenBox from "@/components/content/GreenBox"; +import RentCalculator from "@/components/rent-calculator/RentCalculator"; import RentItem from "./RentItem"; -import SuccessField from "components/form/SuccessField"; -import Title from "components/content/Title"; -import WarningContainer from "components/content/WarningContainer"; -import WarningField from "components/form/WarningField"; -import { RentCalculatorFieldPaths, RentCalculatorFieldTitles } from "components/enums"; -import { LeaseBasisOfRentsFieldPaths, LeaseBasisOfRentsFieldTitles, LeaseRentsFieldPaths, LeaseRentsFieldTitles } from "leases/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getContentRents, getRentWarnings } from "leases/helpers"; -import { hasPermissions, isArchived, isFieldAllowedToRead } from "util/helpers"; -import { getUiDataLeaseKey, getUiDataRentCalculatorKey } from "uiData/helpers"; -import { getAttributes as getLeaseAttributes, getCurrentLease } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; +import SuccessField from "@/components/form/SuccessField"; +import Title from "@/components/content/Title"; +import WarningContainer from "@/components/content/WarningContainer"; +import WarningField from "@/components/form/WarningField"; +import { RentCalculatorFieldPaths, RentCalculatorFieldTitles } from "@/components/enums"; +import { LeaseBasisOfRentsFieldPaths, LeaseBasisOfRentsFieldTitles, LeaseRentsFieldPaths, LeaseRentsFieldTitles } from "@/leases/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getContentRents, getRentWarnings } from "@/leases/helpers"; +import { hasPermissions, isArchived, isFieldAllowedToRead } from "@/util/helpers"; +import { getUiDataLeaseKey, getUiDataRentCalculatorKey } from "@/uiData/helpers"; +import { getAttributes as getLeaseAttributes, getCurrentLease } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; import type { Attributes } from "types"; -import type { RootState } from "root/types"; -import type { Lease } from "leases/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { RootState } from "@/root/types"; +import type { Lease } from "@/leases/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { currentLease: Lease; leaseAttributes: Attributes; diff --git a/src/leases/components/leaseSections/rent/RentsEdit.tsx b/src/leases/components/leaseSections/rent/RentsEdit.tsx index 4ae5d167b..583917ac2 100644 --- a/src/leases/components/leaseSections/rent/RentsEdit.tsx +++ b/src/leases/components/leaseSections/rent/RentsEdit.tsx @@ -4,34 +4,34 @@ import { withRouter } from "react-router"; import { Field, FieldArray, formValueSelector, reduxForm } from "redux-form"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import AddButton from "components/form/AddButton"; -import Authorization from "components/authorization/Authorization"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import AddButton from "@/components/form/AddButton"; +import Authorization from "@/components/authorization/Authorization"; import BasisOfRentsEdit from "./BasisOfRentsEdit"; -import Button from "components/button/Button"; -import Divider from "components/content/Divider"; -import FormText from "components/form/FormText"; -import GreenBox from "components/content/GreenBox"; -import RentCalculator from "components/rent-calculator/RentCalculator"; +import Button from "@/components/button/Button"; +import Divider from "@/components/content/Divider"; +import FormText from "@/components/form/FormText"; +import GreenBox from "@/components/content/GreenBox"; +import RentCalculator from "@/components/rent-calculator/RentCalculator"; import RentItemEdit from "./RentItemEdit"; -import SuccessField from "components/form/SuccessField"; -import Title from "components/content/Title"; -import WarningContainer from "components/content/WarningContainer"; -import WarningField from "components/form/WarningField"; -import { receiveFormValidFlags, setRentInfoComplete, setRentInfoUncomplete } from "leases/actions"; -import { ConfirmationModalTexts, FormNames } from "enums"; -import { ButtonColors, RentCalculatorFieldPaths, RentCalculatorFieldTitles } from "components/enums"; -import { LeaseBasisOfRentsFieldPaths, LeaseBasisOfRentsFieldTitles, LeaseRentsFieldPaths, LeaseRentsFieldTitles } from "leases/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { validateRentForm, warnRentForm } from "leases/formValidators"; -import { getContentRents } from "leases/helpers"; -import { getUiDataLeaseKey, getUiDataRentCalculatorKey } from "uiData/helpers"; -import { hasPermissions, isArchived, isFieldAllowedToRead } from "util/helpers"; -import { getAttributes as getLeaseAttributes, getCurrentLease, getErrorsByFormName, getIsSaveClicked } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; +import SuccessField from "@/components/form/SuccessField"; +import Title from "@/components/content/Title"; +import WarningContainer from "@/components/content/WarningContainer"; +import WarningField from "@/components/form/WarningField"; +import { receiveFormValidFlags, setRentInfoComplete, setRentInfoUncomplete } from "@/leases/actions"; +import { ConfirmationModalTexts, FormNames } from "@/enums"; +import { ButtonColors, RentCalculatorFieldPaths, RentCalculatorFieldTitles } from "@/components/enums"; +import { LeaseBasisOfRentsFieldPaths, LeaseBasisOfRentsFieldTitles, LeaseRentsFieldPaths, LeaseRentsFieldTitles } from "@/leases/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { validateRentForm, warnRentForm } from "@/leases/formValidators"; +import { getContentRents } from "@/leases/helpers"; +import { getUiDataLeaseKey, getUiDataRentCalculatorKey } from "@/uiData/helpers"; +import { hasPermissions, isArchived, isFieldAllowedToRead } from "@/util/helpers"; +import { getAttributes as getLeaseAttributes, getCurrentLease, getErrorsByFormName, getIsSaveClicked } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; import type { Attributes } from "types"; -import type { Lease } from "leases/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { Lease } from "@/leases/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type WarningsProps = { leaseAttributes: Attributes; meta: Record; diff --git a/src/leases/components/leaseSections/rent/SteppedDiscountForm.tsx b/src/leases/components/leaseSections/rent/SteppedDiscountForm.tsx index c2e2a5d7a..73ab8e713 100644 --- a/src/leases/components/leaseSections/rent/SteppedDiscountForm.tsx +++ b/src/leases/components/leaseSections/rent/SteppedDiscountForm.tsx @@ -3,14 +3,14 @@ import { connect } from "react-redux"; import { reduxForm } from "redux-form"; import flowRight from "lodash/flowRight"; import { Row, Column } from "react-foundation"; -import Authorization from "components/authorization/Authorization"; -import FormField from "components/form/FormField"; -import { FormNames } from "enums"; -import { LeaseRentAdjustmentsFieldPaths, LeaseRentAdjustmentsFieldTitles } from "leases/enums"; -import { validateSteppedDiscountForm } from "leases/formValidators"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { getFieldAttributes, isFieldAllowedToEdit } from "util/helpers"; -import { getAttributes as getLeaseAttributes } from "leases/selectors"; +import Authorization from "@/components/authorization/Authorization"; +import FormField from "@/components/form/FormField"; +import { FormNames } from "@/enums"; +import { LeaseRentAdjustmentsFieldPaths, LeaseRentAdjustmentsFieldTitles } from "@/leases/enums"; +import { validateSteppedDiscountForm } from "@/leases/formValidators"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { getFieldAttributes, isFieldAllowedToEdit } from "@/util/helpers"; +import { getAttributes as getLeaseAttributes } from "@/leases/selectors"; import type { Attributes } from "types"; type Props = { decisionOptions: Array>; diff --git a/src/leases/components/leaseSections/rent/SteppedDiscountModal.tsx b/src/leases/components/leaseSections/rent/SteppedDiscountModal.tsx index d0eb7d5d2..ff65344ac 100644 --- a/src/leases/components/leaseSections/rent/SteppedDiscountModal.tsx +++ b/src/leases/components/leaseSections/rent/SteppedDiscountModal.tsx @@ -2,12 +2,12 @@ import React from "react"; import { getFormValues, isValid } from "redux-form"; import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; -import Button from "components/button/Button"; -import Modal from "components/modal/Modal"; -import ModalButtonWrapper from "components/modal/ModalButtonWrapper"; +import Button from "@/components/button/Button"; +import Modal from "@/components/modal/Modal"; +import ModalButtonWrapper from "@/components/modal/ModalButtonWrapper"; import SteppedDiscountForm from "./SteppedDiscountForm"; -import { FormNames } from "enums"; -import { ButtonColors } from "components/enums"; +import { FormNames } from "@/enums"; +import { ButtonColors } from "@/components/enums"; type Props = { decisionOptions: Array>; formValues: Record; diff --git a/src/leases/components/leaseSections/summary/LeaseHistory.tsx b/src/leases/components/leaseSections/summary/LeaseHistory.tsx index 81c772d80..f4f143ed3 100644 --- a/src/leases/components/leaseSections/summary/LeaseHistory.tsx +++ b/src/leases/components/leaseSections/summary/LeaseHistory.tsx @@ -1,15 +1,15 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import LeaseHistoryItem from "./LeaseHistoryItem"; -import TitleH3 from "components/content/TitleH3"; -import { LeaseFieldPaths, LeaseFieldTitles, LeaseHistoryContentTypes, LeaseHistoryItemTypes } from "leases/enums"; -import { getContentRelatedLeasesFrom, getContentRelatedLeasesTo, sortRelatedLeasesFrom } from "leases/helpers"; -import { getFieldOptions } from "util/helpers"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { getAttributes as getLeaseAttributes, getCurrentLease } from "leases/selectors"; +import TitleH3 from "@/components/content/TitleH3"; +import { LeaseFieldPaths, LeaseFieldTitles, LeaseHistoryContentTypes, LeaseHistoryItemTypes } from "@/leases/enums"; +import { getContentRelatedLeasesFrom, getContentRelatedLeasesTo, sortRelatedLeasesFrom } from "@/leases/helpers"; +import { getFieldOptions } from "@/util/helpers"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { getAttributes as getLeaseAttributes, getCurrentLease } from "@/leases/selectors"; import type { Attributes } from "types"; -import type { Lease } from "leases/types"; -import { restructureLease, sortRelatedHistoryItems } from "leases/helpers"; +import type { Lease } from "@/leases/types"; +import { restructureLease, sortRelatedHistoryItems } from "@/leases/helpers"; type Props = { currentLease: Lease; leaseAttributes: Attributes; diff --git a/src/leases/components/leaseSections/summary/LeaseHistoryEdit.tsx b/src/leases/components/leaseSections/summary/LeaseHistoryEdit.tsx index 2848f2b80..10f32baee 100644 --- a/src/leases/components/leaseSections/summary/LeaseHistoryEdit.tsx +++ b/src/leases/components/leaseSections/summary/LeaseHistoryEdit.tsx @@ -2,31 +2,31 @@ import React, { Component } from "react"; import { Row, Column } from "react-foundation"; import { connect } from "react-redux"; import { initialize } from "redux-form"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import AddButtonSecondary from "components/form/AddButtonSecondary"; -import Authorization from "components/authorization/Authorization"; -import CreateLeaseModal from "leases/components/createLease/CreateLeaseModal"; -import FormFieldLabel from "components/form/FormFieldLabel"; -import LeaseSelectInput from "components/inputs/LeaseSelectInput"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import AddButtonSecondary from "@/components/form/AddButtonSecondary"; +import Authorization from "@/components/authorization/Authorization"; +import CreateLeaseModal from "@/leases/components/createLease/CreateLeaseModal"; +import FormFieldLabel from "@/components/form/FormFieldLabel"; +import LeaseSelectInput from "@/components/inputs/LeaseSelectInput"; import LeaseHistoryItem from "./LeaseHistoryItem"; -import TitleH3 from "components/content/TitleH3"; -import { createLease, hideCreateModal, showCreateModal } from "leases/actions"; -import { createReleatedLease, deleteReleatedLease, createRelatedPlotApplication, deleteRelatedPlotApplication } from "relatedLease/actions"; -import { ConfirmationModalTexts, FormNames, Methods } from "enums"; -import { ButtonColors } from "components/enums"; -import { LeaseFieldPaths, LeaseFieldTitles, LeaseHistoryContentTypes, LeaseHistoryItemTypes, RelationTypes } from "leases/enums"; -import { RelatedLeasePaths } from "relatedLease/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getContentRelatedLeasesFrom, getContentRelatedLeasesTo, isAnyLeaseFormDirty, sortRelatedLeasesFrom } from "leases/helpers"; -import { getUiDataLeaseKey, getUiDataRelatedLeaseKey } from "uiData/helpers"; -import { getFieldOptions, hasPermissions, isMethodAllowed } from "util/helpers"; -import { getAttributes as getLeaseAttributes, getMethods as getLeaseMethods, getCurrentLease, getIsCreateModalOpen } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; +import TitleH3 from "@/components/content/TitleH3"; +import { createLease, hideCreateModal, showCreateModal } from "@/leases/actions"; +import { createReleatedLease, deleteReleatedLease, createRelatedPlotApplication, deleteRelatedPlotApplication } from "@/relatedLease/actions"; +import { ConfirmationModalTexts, FormNames, Methods } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { LeaseFieldPaths, LeaseFieldTitles, LeaseHistoryContentTypes, LeaseHistoryItemTypes, RelationTypes } from "@/leases/enums"; +import { RelatedLeasePaths } from "@/relatedLease/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getContentRelatedLeasesFrom, getContentRelatedLeasesTo, isAnyLeaseFormDirty, sortRelatedLeasesFrom } from "@/leases/helpers"; +import { getUiDataLeaseKey, getUiDataRelatedLeaseKey } from "@/uiData/helpers"; +import { getFieldOptions, hasPermissions, isMethodAllowed } from "@/util/helpers"; +import { getAttributes as getLeaseAttributes, getMethods as getLeaseMethods, getCurrentLease, getIsCreateModalOpen } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; import type { Attributes, Methods as MethodsType } from "types"; -import type { Lease } from "leases/types"; -import { restructureLease, sortRelatedHistoryItems } from "leases/helpers"; -import PlotApplication from "plotApplications/components/PlotApplication"; -import type { UsersPermissions as UsersPermissionsType, UserServiceUnit } from "usersPermissions/types"; +import type { Lease } from "@/leases/types"; +import { restructureLease, sortRelatedHistoryItems } from "@/leases/helpers"; +import PlotApplication from "@/plotApplications/components/PlotApplication"; +import type { UsersPermissions as UsersPermissionsType, UserServiceUnit } from "@/usersPermissions/types"; type Props = { createLease: (...args: Array) => any; createReleatedLease: (...args: Array) => any; diff --git a/src/leases/components/leaseSections/summary/LeaseHistoryItem.tsx b/src/leases/components/leaseSections/summary/LeaseHistoryItem.tsx index bb7185010..8c72e0e82 100644 --- a/src/leases/components/leaseSections/summary/LeaseHistoryItem.tsx +++ b/src/leases/components/leaseSections/summary/LeaseHistoryItem.tsx @@ -1,22 +1,22 @@ import React from "react"; import { connect } from "react-redux"; import classNames from "classnames"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import AccordionIcon from "components/icons/AccordionIcon"; -import Authorization from "components/authorization/Authorization"; -import ExternalLink from "components/links/ExternalLink"; -import FormText from "components/form/FormText"; -import RemoveButton from "components/form/RemoveButton"; -import { ConfirmationModalTexts } from "enums"; -import { LeaseHistoryItemTypes } from "leases/enums"; -import { ButtonColors } from "components/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getContentLeaseIdentifier, getTitleText } from "leases/helpers"; -import { formatDate, getLabelOfOption, hasPermissions } from "util/helpers"; -import { getRouteById, Routes } from "root/routes"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import type { Lease } from "leases/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import AccordionIcon from "@/components/icons/AccordionIcon"; +import Authorization from "@/components/authorization/Authorization"; +import ExternalLink from "@/components/links/ExternalLink"; +import FormText from "@/components/form/FormText"; +import RemoveButton from "@/components/form/RemoveButton"; +import { ConfirmationModalTexts } from "@/enums"; +import { LeaseHistoryItemTypes } from "@/leases/enums"; +import { ButtonColors } from "@/components/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getContentLeaseIdentifier, getTitleText } from "@/leases/helpers"; +import { formatDate, getLabelOfOption, hasPermissions } from "@/util/helpers"; +import { getRouteById, Routes } from "@/root/routes"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import type { Lease } from "@/leases/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { active?: boolean; indented?: boolean; diff --git a/src/leases/components/leaseSections/summary/Summary.tsx b/src/leases/components/leaseSections/summary/Summary.tsx index 9a28eaee9..a5845ad2d 100644 --- a/src/leases/components/leaseSections/summary/Summary.tsx +++ b/src/leases/components/leaseSections/summary/Summary.tsx @@ -2,34 +2,34 @@ import React, { Fragment, PureComponent } from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; import get from "lodash/get"; -import Authorization from "components/authorization/Authorization"; -import Collapse from "components/collapse/Collapse"; -import Divider from "components/content/Divider"; -import ExternalLink from "components/links/ExternalLink"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import ListItem from "components/content/ListItem"; -import ListItems from "components/content/ListItems"; +import Authorization from "@/components/authorization/Authorization"; +import Collapse from "@/components/collapse/Collapse"; +import Divider from "@/components/content/Divider"; +import ExternalLink from "@/components/links/ExternalLink"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import ListItem from "@/components/content/ListItem"; +import ListItems from "@/components/content/ListItems"; import LeaseHistory from "./LeaseHistory"; -import ShowMore from "components/showMore/ShowMore"; +import ShowMore from "@/components/showMore/ShowMore"; import SummaryLeaseInfo from "./SummaryLeaseInfo"; -import Title from "components/content/Title"; -import WarningContainer from "components/content/WarningContainer"; -import { receiveCollapseStates } from "leases/actions"; -import { FormNames, ViewModes } from "enums"; -import { LeaseContractsFieldPaths, LeaseFieldTitles, LeaseFieldPaths } from "leases/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getContactFullName } from "contacts/helpers"; -import { getContentLeaseSummary } from "leases/helpers"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, getReferenceNumberLink, hasPermissions, isEmptyValue, isFieldAllowedToRead } from "util/helpers"; -import { getUserFullName } from "users/helpers"; -import { getRouteById, Routes } from "root/routes"; -import { getAttributes, getCollapseStateByKey, getCurrentLease } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; +import Title from "@/components/content/Title"; +import WarningContainer from "@/components/content/WarningContainer"; +import { receiveCollapseStates } from "@/leases/actions"; +import { FormNames, ViewModes } from "@/enums"; +import { LeaseContractsFieldPaths, LeaseFieldTitles, LeaseFieldPaths } from "@/leases/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getContactFullName } from "@/contacts/helpers"; +import { getContentLeaseSummary } from "@/leases/helpers"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, getReferenceNumberLink, hasPermissions, isEmptyValue, isFieldAllowedToRead } from "@/util/helpers"; +import { getUserFullName } from "@/users/helpers"; +import { getRouteById, Routes } from "@/root/routes"; +import { getAttributes, getCollapseStateByKey, getCurrentLease } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; import type { Attributes } from "types"; -import type { Lease } from "leases/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { Lease } from "@/leases/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { attributes: Attributes; collapseStateBasic: boolean; diff --git a/src/leases/components/leaseSections/summary/SummaryEdit.tsx b/src/leases/components/leaseSections/summary/SummaryEdit.tsx index d77a27660..fdbc42a6e 100644 --- a/src/leases/components/leaseSections/summary/SummaryEdit.tsx +++ b/src/leases/components/leaseSections/summary/SummaryEdit.tsx @@ -5,34 +5,34 @@ import { formValueSelector, reduxForm } from "redux-form"; import flowRight from "lodash/flowRight"; import get from "lodash/get"; import isEmpty from "lodash/isEmpty"; -import Authorization from "components/authorization/Authorization"; -import Collapse from "components/collapse/Collapse"; -import Divider from "components/content/Divider"; -import ExternalLink from "components/links/ExternalLink"; -import FormField from "components/form/FormField"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import ListItem from "components/content/ListItem"; -import ListItems from "components/content/ListItems"; +import Authorization from "@/components/authorization/Authorization"; +import Collapse from "@/components/collapse/Collapse"; +import Divider from "@/components/content/Divider"; +import ExternalLink from "@/components/links/ExternalLink"; +import FormField from "@/components/form/FormField"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import ListItem from "@/components/content/ListItem"; +import ListItems from "@/components/content/ListItems"; import LeaseHistoryEdit from "./LeaseHistoryEdit"; import SummaryLeaseInfo from "./SummaryLeaseInfo"; -import Title from "components/content/Title"; -import WarningContainer from "components/content/WarningContainer"; -import { receiveCollapseStates, receiveFormValidFlags } from "leases/actions"; -import { FieldTypes, FormNames, ViewModes } from "enums"; -import { LeaseContractsFieldPaths, LeaseFieldTitles, LeaseFieldPaths } from "leases/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { validateSummaryForm } from "leases/formValidators"; -import { getContentLeaseSummary } from "leases/helpers"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { getFieldAttributes, getFieldOptions, getLabelOfOption, getReferenceNumberLink, hasPermissions, isFieldAllowedToRead, isFieldAllowedToEdit } from "util/helpers"; -import { getRouteById, Routes } from "root/routes"; -import { getAttributes, getCollapseStateByKey, getCurrentLease, getErrorsByFormName, getIsSaveClicked } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import { internalOrder, referenceNumber } from "components/form/validations"; +import Title from "@/components/content/Title"; +import WarningContainer from "@/components/content/WarningContainer"; +import { receiveCollapseStates, receiveFormValidFlags } from "@/leases/actions"; +import { FieldTypes, FormNames, ViewModes } from "@/enums"; +import { LeaseContractsFieldPaths, LeaseFieldTitles, LeaseFieldPaths } from "@/leases/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { validateSummaryForm } from "@/leases/formValidators"; +import { getContentLeaseSummary } from "@/leases/helpers"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { getFieldAttributes, getFieldOptions, getLabelOfOption, getReferenceNumberLink, hasPermissions, isFieldAllowedToRead, isFieldAllowedToEdit } from "@/util/helpers"; +import { getRouteById, Routes } from "@/root/routes"; +import { getAttributes, getCollapseStateByKey, getCurrentLease, getErrorsByFormName, getIsSaveClicked } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import { internalOrder, referenceNumber } from "@/components/form/validations"; import type { Attributes, Methods as MethodsType } from "types"; -import type { Lease } from "leases/types"; -import type { UsersPermissions as UsersPermissionsType, UserServiceUnit } from "usersPermissions/types"; +import type { Lease } from "@/leases/types"; +import type { UsersPermissions as UsersPermissionsType, UserServiceUnit } from "@/usersPermissions/types"; type Props = { attributes: Attributes; collapseStateBasic: boolean; diff --git a/src/leases/components/leaseSections/summary/SummaryLeaseInfo.tsx b/src/leases/components/leaseSections/summary/SummaryLeaseInfo.tsx index df048a048..412b1be3f 100644 --- a/src/leases/components/leaseSections/summary/SummaryLeaseInfo.tsx +++ b/src/leases/components/leaseSections/summary/SummaryLeaseInfo.tsx @@ -4,36 +4,36 @@ import { Row, Column } from "react-foundation"; import classNames from "classnames"; import flowRight from "lodash/flowRight"; import get from "lodash/get"; -import AmountWithVat from "components/vat/AmountWithVat"; -import Authorization from "components/authorization/Authorization"; -import BoxItem from "components/content/BoxItem"; -import BoxItemContainer from "components/content/BoxItemContainer"; +import AmountWithVat from "@/components/vat/AmountWithVat"; +import Authorization from "@/components/authorization/Authorization"; +import BoxItem from "@/components/content/BoxItem"; +import BoxItemContainer from "@/components/content/BoxItemContainer"; import Comments from "../constructability/Comments"; -import ErrorBlock from "components/form/ErrorBlock"; -import ExternalLink from "components/links/ExternalLink"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import ListItem from "components/content/ListItem"; -import ListItems from "components/content/ListItems"; -import SubTitle from "components/content/SubTitle"; -import { Methods } from "enums"; -import { AreaNoteFieldTitles } from "areaNote/enums"; -import { InvoiceFieldPaths, InvoiceFieldTitles } from "invoices/enums"; -import { ConstructabilityStatus, LeaseAreaAddressesFieldPaths, LeaseAreasFieldPaths } from "leases/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getContactFullName } from "contacts/helpers"; -import { getContentOverdueInvoices } from "invoices/helpers"; -import { getContentLeaseSummary, getFullAddress, getTenantShareWarnings } from "leases/helpers"; -import { getUserFullName } from "users/helpers"; -import { formatDate, formatDateRange, getFieldOptions, getLabelOfOption, hasPermissions, isFieldAllowedToRead, isMethodAllowed } from "util/helpers"; -import { getRouteById, Routes } from "root/routes"; -import { getAttributes as getInvoiceAttributes, getInvoicesByLease, getMethods as getInvoiceMethods } from "invoices/selectors"; -import { getAttributes, getCurrentLease } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import { withWindowResize } from "components/resize/WindowResizeHandler"; +import ErrorBlock from "@/components/form/ErrorBlock"; +import ExternalLink from "@/components/links/ExternalLink"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import ListItem from "@/components/content/ListItem"; +import ListItems from "@/components/content/ListItems"; +import SubTitle from "@/components/content/SubTitle"; +import { Methods } from "@/enums"; +import { AreaNoteFieldTitles } from "@/areaNote/enums"; +import { InvoiceFieldPaths, InvoiceFieldTitles } from "@/invoices/enums"; +import { ConstructabilityStatus, LeaseAreaAddressesFieldPaths, LeaseAreasFieldPaths } from "@/leases/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getContactFullName } from "@/contacts/helpers"; +import { getContentOverdueInvoices } from "@/invoices/helpers"; +import { getContentLeaseSummary, getFullAddress, getTenantShareWarnings } from "@/leases/helpers"; +import { getUserFullName } from "@/users/helpers"; +import { formatDate, formatDateRange, getFieldOptions, getLabelOfOption, hasPermissions, isFieldAllowedToRead, isMethodAllowed } from "@/util/helpers"; +import { getRouteById, Routes } from "@/root/routes"; +import { getAttributes as getInvoiceAttributes, getInvoicesByLease, getMethods as getInvoiceMethods } from "@/invoices/selectors"; +import { getAttributes, getCurrentLease } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import { withWindowResize } from "@/components/resize/WindowResizeHandler"; import type { Attributes, Methods as MethodsType } from "types"; -import type { Lease } from "leases/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { Lease } from "@/leases/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type StatusIndicatorProps = { researchState: string; stateOptions: Array>; diff --git a/src/leases/components/leaseSections/tenant/OtherTenantItem.tsx b/src/leases/components/leaseSections/tenant/OtherTenantItem.tsx index 4325b4127..680217aaf 100644 --- a/src/leases/components/leaseSections/tenant/OtherTenantItem.tsx +++ b/src/leases/components/leaseSections/tenant/OtherTenantItem.tsx @@ -2,25 +2,25 @@ import React, { Fragment } from "react"; import { connect } from "react-redux"; import get from "lodash/get"; import { Row, Column } from "react-foundation"; -import Authorization from "components/authorization/Authorization"; -import Collapse from "components/collapse/Collapse"; -import CollapseHeaderSubtitle from "components/collapse/CollapseHeaderSubtitle"; -import ContactTemplate from "contacts/components/templates/ContactTemplate"; -import ExternalLink from "components/links/ExternalLink"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import FormWrapper from "components/form/FormWrapper"; -import FormWrapperLeft from "components/form/FormWrapperLeft"; -import FormWrapperRight from "components/form/FormWrapperRight"; -import SubTitle from "components/content/SubTitle"; -import { receiveCollapseStates } from "leases/actions"; -import { FormNames, ViewModes } from "enums"; -import { LeaseTenantContactSetFieldPaths, LeaseTenantContactSetFieldTitles } from "leases/enums"; -import { getContactFullName } from "contacts/helpers"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { formatDate, formatDateRange, getFieldOptions, getLabelOfOption, isActive, isArchived, isFieldAllowedToRead } from "util/helpers"; -import { getRouteById, Routes } from "root/routes"; -import { getAttributes, getCollapseStateByKey } from "leases/selectors"; +import Authorization from "@/components/authorization/Authorization"; +import Collapse from "@/components/collapse/Collapse"; +import CollapseHeaderSubtitle from "@/components/collapse/CollapseHeaderSubtitle"; +import ContactTemplate from "@/contacts/components/templates/ContactTemplate"; +import ExternalLink from "@/components/links/ExternalLink"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import FormWrapper from "@/components/form/FormWrapper"; +import FormWrapperLeft from "@/components/form/FormWrapperLeft"; +import FormWrapperRight from "@/components/form/FormWrapperRight"; +import SubTitle from "@/components/content/SubTitle"; +import { receiveCollapseStates } from "@/leases/actions"; +import { FormNames, ViewModes } from "@/enums"; +import { LeaseTenantContactSetFieldPaths, LeaseTenantContactSetFieldTitles } from "@/leases/enums"; +import { getContactFullName } from "@/contacts/helpers"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { formatDate, formatDateRange, getFieldOptions, getLabelOfOption, isActive, isArchived, isFieldAllowedToRead } from "@/util/helpers"; +import { getRouteById, Routes } from "@/root/routes"; +import { getAttributes, getCollapseStateByKey } from "@/leases/selectors"; import type { Attributes } from "types"; type Props = { attributes: Attributes; diff --git a/src/leases/components/leaseSections/tenant/OtherTenantItemEdit.tsx b/src/leases/components/leaseSections/tenant/OtherTenantItemEdit.tsx index 64d6c95fd..e8249c913 100644 --- a/src/leases/components/leaseSections/tenant/OtherTenantItemEdit.tsx +++ b/src/leases/components/leaseSections/tenant/OtherTenantItemEdit.tsx @@ -5,30 +5,30 @@ import { connect } from "react-redux"; import classNames from "classnames"; import get from "lodash/get"; import isEmpty from "lodash/isEmpty"; -import AddButtonThird from "components/form/AddButtonThird"; -import Authorization from "components/authorization/Authorization"; -import BoxContentWrapper from "components/content/BoxContentWrapper"; -import Collapse from "components/collapse/Collapse"; -import CollapseHeaderSubtitle from "components/collapse/CollapseHeaderSubtitle"; -import ContactTemplate from "contacts/components/templates/ContactTemplate"; -import EditButton from "components/form/EditButton"; -import FormField from "components/form/FormField"; -import FormWrapper from "components/form/FormWrapper"; -import FormWrapperLeft from "components/form/FormWrapperLeft"; -import FormWrapperRight from "components/form/FormWrapperRight"; -import SubTitle from "components/content/SubTitle"; -import { initializeContactForm, receiveContactModalSettings, receiveIsSaveClicked, showContactModal } from "contacts/actions"; -import { receiveCollapseStates } from "leases/actions"; -import { FieldTypes, FormNames, Methods, ViewModes } from "enums"; -import { LeaseTenantContactSetFieldPaths, LeaseTenantContactSetFieldTitles, TenantContactType } from "leases/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { formatDateRange, hasPermissions, isActive, isArchived, isFieldAllowedToRead, isMethodAllowed } from "util/helpers"; -import { getMethods as getContactMethods } from "contacts/selectors"; -import { getAttributes, getCollapseStateByKey, getErrorsByFormName, getIsSaveClicked } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; +import AddButtonThird from "@/components/form/AddButtonThird"; +import Authorization from "@/components/authorization/Authorization"; +import BoxContentWrapper from "@/components/content/BoxContentWrapper"; +import Collapse from "@/components/collapse/Collapse"; +import CollapseHeaderSubtitle from "@/components/collapse/CollapseHeaderSubtitle"; +import ContactTemplate from "@/contacts/components/templates/ContactTemplate"; +import EditButton from "@/components/form/EditButton"; +import FormField from "@/components/form/FormField"; +import FormWrapper from "@/components/form/FormWrapper"; +import FormWrapperLeft from "@/components/form/FormWrapperLeft"; +import FormWrapperRight from "@/components/form/FormWrapperRight"; +import SubTitle from "@/components/content/SubTitle"; +import { initializeContactForm, receiveContactModalSettings, receiveIsSaveClicked, showContactModal } from "@/contacts/actions"; +import { receiveCollapseStates } from "@/leases/actions"; +import { FieldTypes, FormNames, Methods, ViewModes } from "@/enums"; +import { LeaseTenantContactSetFieldPaths, LeaseTenantContactSetFieldTitles, TenantContactType } from "@/leases/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { formatDateRange, hasPermissions, isActive, isArchived, isFieldAllowedToRead, isMethodAllowed } from "@/util/helpers"; +import { getMethods as getContactMethods } from "@/contacts/selectors"; +import { getAttributes, getCollapseStateByKey, getErrorsByFormName, getIsSaveClicked } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; import type { Attributes, Methods as MethodsType } from "types"; -import type { UsersPermissions as UsersPermissionsType, UserServiceUnit } from "usersPermissions/types"; +import type { UsersPermissions as UsersPermissionsType, UserServiceUnit } from "@/usersPermissions/types"; type Props = { attributes: Attributes; collapseState: boolean; diff --git a/src/leases/components/leaseSections/tenant/Tenant.tsx b/src/leases/components/leaseSections/tenant/Tenant.tsx index ee6027e7a..da6cd336d 100644 --- a/src/leases/components/leaseSections/tenant/Tenant.tsx +++ b/src/leases/components/leaseSections/tenant/Tenant.tsx @@ -2,17 +2,17 @@ import React, { Fragment } from "react"; import { connect } from "react-redux"; import get from "lodash/get"; import { Column } from "react-foundation"; -import Authorization from "components/authorization/Authorization"; -import Collapse from "components/collapse/Collapse"; -import CollapseHeaderSubtitle from "components/collapse/CollapseHeaderSubtitle"; +import Authorization from "@/components/authorization/Authorization"; +import Collapse from "@/components/collapse/Collapse"; +import CollapseHeaderSubtitle from "@/components/collapse/CollapseHeaderSubtitle"; import OtherTenantItem from "./OtherTenantItem"; import TenantItem from "./TenantItem"; -import { receiveCollapseStates } from "leases/actions"; -import { LeaseTenantsFieldPaths, LeaseTenantsFieldTitles, LeaseTenantContactSetFieldPaths } from "leases/enums"; -import { FormNames, ViewModes } from "enums"; -import { getContactFullName } from "contacts/helpers"; -import { formatDateRange, isActive, isArchived, isFieldAllowedToRead } from "util/helpers"; -import { getAttributes, getCollapseStateByKey } from "leases/selectors"; +import { receiveCollapseStates } from "@/leases/actions"; +import { LeaseTenantsFieldPaths, LeaseTenantsFieldTitles, LeaseTenantContactSetFieldPaths } from "@/leases/enums"; +import { FormNames, ViewModes } from "@/enums"; +import { getContactFullName } from "@/contacts/helpers"; +import { formatDateRange, isActive, isArchived, isFieldAllowedToRead } from "@/util/helpers"; +import { getAttributes, getCollapseStateByKey } from "@/leases/selectors"; import type { Attributes } from "types"; type Props = { attributes: Attributes; diff --git a/src/leases/components/leaseSections/tenant/TenantItem.tsx b/src/leases/components/leaseSections/tenant/TenantItem.tsx index 7f33417cc..51ccac7d0 100644 --- a/src/leases/components/leaseSections/tenant/TenantItem.tsx +++ b/src/leases/components/leaseSections/tenant/TenantItem.tsx @@ -2,21 +2,21 @@ import React, { Fragment } from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; import get from "lodash/get"; -import Authorization from "components/authorization/Authorization"; -import ContactTemplate from "contacts/components/templates/ContactTemplate"; -import ExternalLink from "components/links/ExternalLink"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import FormWrapper from "components/form/FormWrapper"; -import FormWrapperLeft from "components/form/FormWrapperLeft"; -import FormWrapperRight from "components/form/FormWrapperRight"; -import SubTitle from "components/content/SubTitle"; -import { LeaseTenantsFieldPaths, LeaseTenantsFieldTitles, LeaseTenantContactSetFieldPaths, LeaseTenantContactSetFieldTitles, LeaseTenantRentSharesFieldPaths, LeaseTenantRentSharesFieldTitles } from "leases/enums"; -import { getContactFullName } from "contacts/helpers"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { formatDate, getFieldOptions, getLabelOfOption, isFieldAllowedToRead } from "util/helpers"; -import { getRouteById, Routes } from "root/routes"; -import { getAttributes } from "leases/selectors"; +import Authorization from "@/components/authorization/Authorization"; +import ContactTemplate from "@/contacts/components/templates/ContactTemplate"; +import ExternalLink from "@/components/links/ExternalLink"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import FormWrapper from "@/components/form/FormWrapper"; +import FormWrapperLeft from "@/components/form/FormWrapperLeft"; +import FormWrapperRight from "@/components/form/FormWrapperRight"; +import SubTitle from "@/components/content/SubTitle"; +import { LeaseTenantsFieldPaths, LeaseTenantsFieldTitles, LeaseTenantContactSetFieldPaths, LeaseTenantContactSetFieldTitles, LeaseTenantRentSharesFieldPaths, LeaseTenantRentSharesFieldTitles } from "@/leases/enums"; +import { getContactFullName } from "@/contacts/helpers"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { formatDate, getFieldOptions, getLabelOfOption, isFieldAllowedToRead } from "@/util/helpers"; +import { getRouteById, Routes } from "@/root/routes"; +import { getAttributes } from "@/leases/selectors"; import type { Attributes } from "types"; type RentSharesProps = { attributes: Attributes; diff --git a/src/leases/components/leaseSections/tenant/TenantItemEdit.tsx b/src/leases/components/leaseSections/tenant/TenantItemEdit.tsx index d1137e7ef..d37da5931 100644 --- a/src/leases/components/leaseSections/tenant/TenantItemEdit.tsx +++ b/src/leases/components/leaseSections/tenant/TenantItemEdit.tsx @@ -4,39 +4,39 @@ import { FieldArray, formValueSelector } from "redux-form"; import { Row, Column } from "react-foundation"; import get from "lodash/get"; import isEmpty from "lodash/isEmpty"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import AddButtonSecondary from "components/form/AddButtonSecondary"; -import AddButtonThird from "components/form/AddButtonThird"; -import Authorization from "components/authorization/Authorization"; -import BoxContentWrapper from "components/content/BoxContentWrapper"; -import Collapse from "components/collapse/Collapse"; -import CollapseHeaderSubtitle from "components/collapse/CollapseHeaderSubtitle"; -import ContactTemplate from "contacts/components/templates/ContactTemplate"; -import EditButton from "components/form/EditButton"; -import FieldAndRemoveButtonWrapper from "components/form/FieldAndRemoveButtonWrapper"; -import FormField from "components/form/FormField"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import FormWrapper from "components/form/FormWrapper"; -import FormWrapperLeft from "components/form/FormWrapperLeft"; -import FormWrapperRight from "components/form/FormWrapperRight"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import AddButtonSecondary from "@/components/form/AddButtonSecondary"; +import AddButtonThird from "@/components/form/AddButtonThird"; +import Authorization from "@/components/authorization/Authorization"; +import BoxContentWrapper from "@/components/content/BoxContentWrapper"; +import Collapse from "@/components/collapse/Collapse"; +import CollapseHeaderSubtitle from "@/components/collapse/CollapseHeaderSubtitle"; +import ContactTemplate from "@/contacts/components/templates/ContactTemplate"; +import EditButton from "@/components/form/EditButton"; +import FieldAndRemoveButtonWrapper from "@/components/form/FieldAndRemoveButtonWrapper"; +import FormField from "@/components/form/FormField"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import FormWrapper from "@/components/form/FormWrapper"; +import FormWrapperLeft from "@/components/form/FormWrapperLeft"; +import FormWrapperRight from "@/components/form/FormWrapperRight"; import OtherTenantItemEdit from "./OtherTenantItemEdit"; -import RemoveButton from "components/form/RemoveButton"; -import SubTitle from "components/content/SubTitle"; -import { initializeContactForm, receiveContactModalSettings, receiveIsSaveClicked, showContactModal } from "contacts/actions"; -import { receiveCollapseStates } from "leases/actions"; -import { ButtonColors } from "components/enums"; -import { ConfirmationModalTexts, FieldTypes, FormNames, Methods, ViewModes } from "enums"; -import { LeaseTenantContactSetFieldPaths, LeaseTenantContactSetFieldTitles, LeaseTenantRentSharesFieldPaths, LeaseTenantRentSharesFieldTitles, LeaseTenantsFieldPaths, LeaseTenantsFieldTitles, TenantContactType } from "leases/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getContactFullName } from "contacts/helpers"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { formatDateRange, getFieldAttributes, hasPermissions, isActive, isArchived, isFieldAllowedToEdit, isFieldAllowedToRead, isFieldRequired, isMethodAllowed } from "util/helpers"; -import { getMethods as getContactMethods } from "contacts/selectors"; -import { getAttributes, getCollapseStateByKey, getErrorsByFormName, getIsSaveClicked } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; +import RemoveButton from "@/components/form/RemoveButton"; +import SubTitle from "@/components/content/SubTitle"; +import { initializeContactForm, receiveContactModalSettings, receiveIsSaveClicked, showContactModal } from "@/contacts/actions"; +import { receiveCollapseStates } from "@/leases/actions"; +import { ButtonColors } from "@/components/enums"; +import { ConfirmationModalTexts, FieldTypes, FormNames, Methods, ViewModes } from "@/enums"; +import { LeaseTenantContactSetFieldPaths, LeaseTenantContactSetFieldTitles, LeaseTenantRentSharesFieldPaths, LeaseTenantRentSharesFieldTitles, LeaseTenantsFieldPaths, LeaseTenantsFieldTitles, TenantContactType } from "@/leases/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getContactFullName } from "@/contacts/helpers"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { formatDateRange, getFieldAttributes, hasPermissions, isActive, isArchived, isFieldAllowedToEdit, isFieldAllowedToRead, isFieldRequired, isMethodAllowed } from "@/util/helpers"; +import { getMethods as getContactMethods } from "@/contacts/selectors"; +import { getAttributes, getCollapseStateByKey, getErrorsByFormName, getIsSaveClicked } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; import type { Attributes, Methods as MethodsType } from "types"; -import type { UsersPermissions as UsersPermissionsType, UserServiceUnit } from "usersPermissions/types"; +import type { UsersPermissions as UsersPermissionsType, UserServiceUnit } from "@/usersPermissions/types"; type RentSharesProps = { archived: boolean; attributes: Attributes; diff --git a/src/leases/components/leaseSections/tenant/Tenants.tsx b/src/leases/components/leaseSections/tenant/Tenants.tsx index 0a887b1b5..f015b5228 100644 --- a/src/leases/components/leaseSections/tenant/Tenants.tsx +++ b/src/leases/components/leaseSections/tenant/Tenants.tsx @@ -1,21 +1,21 @@ import React, { Fragment } from "react"; import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; -import Divider from "components/content/Divider"; -import FormText from "components/form/FormText"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; +import Divider from "@/components/content/Divider"; +import FormText from "@/components/form/FormText"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; import Tenant from "./Tenant"; -import Title from "components/content/Title"; -import WarningContainer from "components/content/WarningContainer"; -import WarningField from "components/form/WarningField"; -import { LeaseTenantsFieldPaths, LeaseTenantsFieldTitles } from "leases/enums"; -import { getContentTenants, getTenantShareWarnings } from "leases/helpers"; -import { isArchived } from "util/helpers"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { getCurrentLease } from "leases/selectors"; -import { withContactAttributes } from "components/attributes/ContactAttributes"; -import type { Lease } from "leases/types"; +import Title from "@/components/content/Title"; +import WarningContainer from "@/components/content/WarningContainer"; +import WarningField from "@/components/form/WarningField"; +import { LeaseTenantsFieldPaths, LeaseTenantsFieldTitles } from "@/leases/enums"; +import { getContentTenants, getTenantShareWarnings } from "@/leases/helpers"; +import { isArchived } from "@/util/helpers"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { getCurrentLease } from "@/leases/selectors"; +import { withContactAttributes } from "@/components/attributes/ContactAttributes"; +import type { Lease } from "@/leases/types"; type Props = { currentLease: Lease; isFetchingContactAttributes: boolean; diff --git a/src/leases/components/leaseSections/tenant/TenantsEdit.tsx b/src/leases/components/leaseSections/tenant/TenantsEdit.tsx index 765ae4c52..38f56ff83 100644 --- a/src/leases/components/leaseSections/tenant/TenantsEdit.tsx +++ b/src/leases/components/leaseSections/tenant/TenantsEdit.tsx @@ -3,40 +3,40 @@ import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; import { Field, FieldArray, getFormValues, reduxForm } from "redux-form"; import { Row, Column } from "react-foundation"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import Authorization from "components/authorization/Authorization"; -import AddButton from "components/form/AddButton"; -import ContactModal from "contacts/components/ContactModal"; -import Divider from "components/content/Divider"; -import FormText from "components/form/FormText"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import Authorization from "@/components/authorization/Authorization"; +import AddButton from "@/components/form/AddButton"; +import ContactModal from "@/contacts/components/ContactModal"; +import Divider from "@/components/content/Divider"; +import FormText from "@/components/form/FormText"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; import TenantItemEdit from "./TenantItemEdit"; -import Title from "components/content/Title"; -import WarningContainer from "components/content/WarningContainer"; -import WarningField from "components/form/WarningField"; -import { createContactOnModal as createContact, editContactOnModal as editContact, hideContactModal, receiveContactModalSettings, receiveIsSaveClicked } from "contacts/actions"; -import { receiveFormValidFlags } from "leases/actions"; -import { ContactTypes } from "contacts/enums"; -import { ButtonColors } from "components/enums"; -import { ConfirmationModalTexts, FormNames } from "enums"; -import { LeaseTenantsFieldPaths, LeaseTenantsFieldTitles } from "leases/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { Methods } from "enums"; -import { validateTenantForm, warnTenantForm } from "leases/formValidators"; -import { hasPermissions, isArchived, isEmptyValue, isFieldAllowedToEdit, isMethodAllowed } from "util/helpers"; -import { getContentContact } from "contacts/helpers"; -import { getContentTenants } from "leases/helpers"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { contactExists } from "contacts/requestsAsync"; -import { getMethods as getContactMethods, getContactModalSettings, getIsContactFormValid, getIsContactModalOpen, getIsFetching as getIsFetchingContact } from "contacts/selectors"; -import { getAttributes as getLeaseAttributes, getCurrentLease } from "leases/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import { withContactAttributes } from "components/attributes/ContactAttributes"; +import Title from "@/components/content/Title"; +import WarningContainer from "@/components/content/WarningContainer"; +import WarningField from "@/components/form/WarningField"; +import { createContactOnModal as createContact, editContactOnModal as editContact, hideContactModal, receiveContactModalSettings, receiveIsSaveClicked } from "@/contacts/actions"; +import { receiveFormValidFlags } from "@/leases/actions"; +import { ContactTypes } from "@/contacts/enums"; +import { ButtonColors } from "@/components/enums"; +import { ConfirmationModalTexts, FormNames } from "@/enums"; +import { LeaseTenantsFieldPaths, LeaseTenantsFieldTitles } from "@/leases/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { Methods } from "@/enums"; +import { validateTenantForm, warnTenantForm } from "@/leases/formValidators"; +import { hasPermissions, isArchived, isEmptyValue, isFieldAllowedToEdit, isMethodAllowed } from "@/util/helpers"; +import { getContentContact } from "@/contacts/helpers"; +import { getContentTenants } from "@/leases/helpers"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { contactExists } from "@/contacts/requestsAsync"; +import { getMethods as getContactMethods, getContactModalSettings, getIsContactFormValid, getIsContactModalOpen, getIsFetching as getIsFetchingContact } from "@/contacts/selectors"; +import { getAttributes as getLeaseAttributes, getCurrentLease } from "@/leases/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import { withContactAttributes } from "@/components/attributes/ContactAttributes"; import type { Attributes, Methods as MethodsType } from "types"; -import type { ContactModalSettings } from "contacts/types"; -import type { Lease } from "leases/types"; -import type { UsersPermissions as UsersPermissionsType, UserServiceUnit } from "usersPermissions/types"; +import type { ContactModalSettings } from "@/contacts/types"; +import type { Lease } from "@/leases/types"; +import type { UsersPermissions as UsersPermissionsType, UserServiceUnit } from "@/usersPermissions/types"; type WarningsProps = { meta: Record; }; diff --git a/src/leases/components/search/Search.tsx b/src/leases/components/search/Search.tsx index 0f0a35caa..0ff15755d 100644 --- a/src/leases/components/search/Search.tsx +++ b/src/leases/components/search/Search.tsx @@ -7,25 +7,25 @@ import debounce from "lodash/debounce"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; import isEqual from "lodash/isEqual"; -import FormField from "components/form/FormField"; -import SearchChangeTypeLink from "components/search/SearchChangeTypeLink"; -import SearchClearLink from "components/search/SearchClearLink"; -import SearchContainer from "components/search/SearchContainer"; -import SearchInputColumn from "components/search/SearchInputColumn"; -import SearchLabel from "components/search/SearchLabel"; -import SearchLabelColumn from "components/search/SearchLabelColumn"; -import SearchRow from "components/search/SearchRow"; -import { fetchDistrictsByMunicipality } from "district/actions"; -import { FieldTypes, FormNames } from "enums"; -import { LeaseDecisionsFieldPaths, LeaseFieldPaths, LeaseTenantContactSetFieldPaths } from "leases/enums"; -import { getContactOptions } from "contacts/helpers"; -import { getDistrictOptions } from "district/helpers"; -import { addEmptyOption, getFieldOptions, getUrlParams } from "util/helpers"; -import { getDistrictsByMunicipality } from "district/selectors"; -import { getAttributes as getLeaseAttributes, getIsFetchingAttributes } from "leases/selectors"; -import { getLessorList } from "lessor/selectors"; +import FormField from "@/components/form/FormField"; +import SearchChangeTypeLink from "@/components/search/SearchChangeTypeLink"; +import SearchClearLink from "@/components/search/SearchClearLink"; +import SearchContainer from "@/components/search/SearchContainer"; +import SearchInputColumn from "@/components/search/SearchInputColumn"; +import SearchLabel from "@/components/search/SearchLabel"; +import SearchLabelColumn from "@/components/search/SearchLabelColumn"; +import SearchRow from "@/components/search/SearchRow"; +import { fetchDistrictsByMunicipality } from "@/district/actions"; +import { FieldTypes, FormNames } from "@/enums"; +import { LeaseDecisionsFieldPaths, LeaseFieldPaths, LeaseTenantContactSetFieldPaths } from "@/leases/enums"; +import { getContactOptions } from "@/contacts/helpers"; +import { getDistrictOptions } from "@/district/helpers"; +import { addEmptyOption, getFieldOptions, getUrlParams } from "@/util/helpers"; +import { getDistrictsByMunicipality } from "@/district/selectors"; +import { getAttributes as getLeaseAttributes, getIsFetchingAttributes } from "@/leases/selectors"; +import { getLessorList } from "@/lessor/selectors"; import type { Attributes } from "types"; -import type { LessorList } from "lessor/types"; +import type { LessorList } from "@/lessor/types"; type Props = { anyTouched: boolean; change: (...args: Array) => any; diff --git a/src/leases/constants.ts b/src/leases/constants.ts index b88862f01..f612e0114 100644 --- a/src/leases/constants.ts +++ b/src/leases/constants.ts @@ -1,4 +1,4 @@ -import { TableSortOrder } from "enums"; +import { TableSortOrder } from "@/enums"; import { CreditInvoiceOptions as CreditInvoiceOptionsEnum, RentDueDateTypes, SteppedDiscountAmountTypes } from "./enums"; /** diff --git a/src/leases/enums.ts b/src/leases/enums.ts index 4b4bb3d3b..6943ff54a 100644 --- a/src/leases/enums.ts +++ b/src/leases/enums.ts @@ -1,4 +1,4 @@ -import { getDayMonth } from "util/date"; +import { getDayMonth } from "@/util/date"; /** * Area location enumerable. diff --git a/src/leases/formValidators.ts b/src/leases/formValidators.ts index cbb64ec67..73b168bdb 100644 --- a/src/leases/formValidators.ts +++ b/src/leases/formValidators.ts @@ -1,13 +1,13 @@ import format from "date-fns/format"; import get from "lodash/get"; import isEmpty from "lodash/isEmpty"; -import { store } from "root/startApp"; +import { store } from "@/index"; import { RentAdjustmentAmountTypes, RentCycles, RentDueDateTypes, RentTypes } from "./enums"; -import { getRentWarnings, getTenantRentShareWarnings, getTenantShareWarnings } from "leases/helpers"; -import { getAttributes as getLeaseAttributes } from "leases/selectors"; -import { dateGreaterOrEqual } from "components/form/validations"; -import { isInvoiceBillingPeriodRequired } from "invoices/helpers"; -import { required } from "components/form/validations"; +import { getRentWarnings, getTenantRentShareWarnings, getTenantShareWarnings } from "@/leases/helpers"; +import { getAttributes as getLeaseAttributes } from "@/leases/selectors"; +import { dateGreaterOrEqual } from "@/components/form/validations"; +import { isInvoiceBillingPeriodRequired } from "@/invoices/helpers"; +import { required } from "@/components/form/validations"; /** * Validate summary form diff --git a/src/leases/helpers.ts b/src/leases/helpers.ts index b298371dd..cadce04ef 100644 --- a/src/leases/helpers.ts +++ b/src/leases/helpers.ts @@ -5,24 +5,24 @@ import isArray from "lodash/isArray"; import isEmpty from "lodash/isEmpty"; import isEqual from "lodash/isEqual"; import { isDirty } from "redux-form"; -import { getSplittedDateRangesWithItems, sortByStartAndEndDateDesc } from "util/date"; -import { FormNames, TableSortOrder } from "enums"; +import { getSplittedDateRangesWithItems, sortByStartAndEndDateDesc } from "@/util/date"; +import { FormNames, TableSortOrder } from "@/enums"; import { CollateralTypes, ConstructabilityType, DecisionTypeKinds, LeaseState, LeaseTenantRentSharesFieldPaths, LeaseStatus, RecipientOptions, RelationTypes, RentAdjustmentAmountTypes, RentCycles, RentDueDateTypes, RentTypes, SubventionTypes, TenantContactType } from "./enums"; -import { CalculatorTypes } from "leases/enums"; -import { LeaseAreaAttachmentTypes } from "leaseAreaAttachment/enums"; -import { getContactFullName, getContentContact } from "contacts/helpers"; -import { getContentLessor } from "lessor/helpers"; -import { getContentPropertyIdentifiers } from "rentbasis/helpers"; -import { getContentUser } from "users/helpers"; -import { addEmptyOption, convertStrToDecimalNumber, fixedLengthNumber, formatDate, formatDateRange, getApiResponseResults, getFieldOptions, getLabelOfOption, isDecimalNumberStr, isEmptyValue, isActive, isActiveOrFuture, isArchived, sortStringAsc, sortStringByKeyAsc, sortStringByKeyDesc } from "util/helpers"; -import { getCoordinatesOfGeometry } from "util/map"; +import { CalculatorTypes } from "@/leases/enums"; +import { LeaseAreaAttachmentTypes } from "@/leaseAreaAttachment/enums"; +import { getContactFullName, getContentContact } from "@/contacts/helpers"; +import { getContentLessor } from "@/lessor/helpers"; +import { getContentPropertyIdentifiers } from "@/rentbasis/helpers"; +import { getContentUser } from "@/users/helpers"; +import { addEmptyOption, convertStrToDecimalNumber, fixedLengthNumber, formatDate, formatDateRange, getApiResponseResults, getFieldOptions, getLabelOfOption, isDecimalNumberStr, isEmptyValue, isActive, isActiveOrFuture, isArchived, sortStringAsc, sortStringByKeyAsc, sortStringByKeyDesc } from "@/util/helpers"; +import { getCoordinatesOfGeometry } from "@/util/map"; import { getIsEditMode } from "./selectors"; -import { removeSessionStorageItem } from "util/storage"; +import { removeSessionStorageItem } from "@/util/storage"; import type { Lease, IntendedUse } from "./types"; -import type { CommentList } from "comments/types"; +import type { CommentList } from "@/comments/types"; import type { Attributes, LeafletFeature, LeafletGeoJson } from "types"; -import type { RootState } from "root/types"; -import type { LeaseList } from "leases/types"; +import type { RootState } from "@/root/types"; +import type { LeaseList } from "@/leases/types"; /** * Test is lease empty diff --git a/src/leases/reducer.ts b/src/leases/reducer.ts index 829c5a558..6cac369dd 100644 --- a/src/leases/reducer.ts +++ b/src/leases/reducer.ts @@ -1,9 +1,9 @@ import { combineReducers } from "redux"; import { handleActions } from "redux-actions"; import merge from "lodash/merge"; -import { FormNames } from "enums"; +import { FormNames } from "@/enums"; import type { Attributes, Methods, Reducer } from "types"; -import type { Lease, LeaseList, ReceiveAttributesAction, ReceiveMethodsAction, ReceiveLeasesAction, ReceiveLeasesByBBoxAction, ReceiveSingleLeaseAction, FetchLeaseByIdAction, ReceiveLeaseByIdAction, LeaseNotFoundByIdAction, ReceiveFormValidFlagsAction, ReceiveIsSaveClickedAction, ReceiveCollapseStatesAction, ReceiveLeasesForContractNumbersAction } from "leases/types"; +import type { Lease, LeaseList, ReceiveAttributesAction, ReceiveMethodsAction, ReceiveLeasesAction, ReceiveLeasesByBBoxAction, ReceiveSingleLeaseAction, FetchLeaseByIdAction, ReceiveLeaseByIdAction, LeaseNotFoundByIdAction, ReceiveFormValidFlagsAction, ReceiveIsSaveClickedAction, ReceiveCollapseStatesAction, ReceiveLeasesForContractNumbersAction } from "@/leases/types"; const isAttachDecisionModalOpenReducer: Reducer = handleActions({ 'mvj/leases/HIDE_ATTACH_DECISION_MODAL': () => false, 'mvj/leases/SHOW_ATTACH_DECISION_MODAL': () => true diff --git a/src/leases/requests.ts b/src/leases/requests.ts index 927aa5352..8c830380f 100644 --- a/src/leases/requests.ts +++ b/src/leases/requests.ts @@ -1,5 +1,5 @@ -import callApi from "../api/callApi"; -import createUrl, { standardStringifyQuery } from "../api/createUrl"; +import callApi from "@/api/callApi"; +import createUrl, { standardStringifyQuery } from "@/api/createUrl"; import type { CreateChargePayload, Lease, LeaseId, SendEmailPayload } from "./types"; export const fetchAttributes = (): Generator => { return callApi(new Request(createUrl('lease/'), { diff --git a/src/leases/requestsAsync.ts b/src/leases/requestsAsync.ts index ee1ce66c3..7ba39f8f3 100644 --- a/src/leases/requestsAsync.ts +++ b/src/leases/requestsAsync.ts @@ -1,5 +1,5 @@ -import createUrl from "api/createUrl"; -import callApiAsync from "api/callApiAsync"; +import createUrl from "@/api/createUrl"; +import callApiAsync from "@/api/callApiAsync"; import type { IntendedUse } from "./types"; export const fetchLeases = async (query?: Record) => { const { diff --git a/src/leases/saga.ts b/src/leases/saga.ts index ee7b772c0..a742c21cd 100644 --- a/src/leases/saga.ts +++ b/src/leases/saga.ts @@ -1,12 +1,12 @@ import { all, call, fork, put, select, takeEvery, takeLatest } from "redux-saga/effects"; import { push } from "react-router-redux"; import { SubmissionError } from "redux-form"; -import { getRouteById, Routes } from "root/routes"; +import { getRouteById, Routes } from "@/root/routes"; import { fetchSingleLeaseAfterEdit, hideAttachDecisionModal, hideCreateModal, hideEditMode, attributesNotFound, notFound, notFoundByBBox, notFoundById, receiveAttributes, receiveMethods, receiveIsSaveClicked, receiveLeases, receiveLeasesByBBox, receiveSingleLease, receiveLeaseById, receiveLeasesForContractNumbers } from "./actions"; -import { receiveError } from "api/actions"; -import { fetchInvoicesByLease, receiveIsCreateInvoicePanelOpen } from "invoices/actions"; -import { fetchInvoiceSetsByLease } from "invoiceSets/actions"; -import { displayUIMessage, getSearchQuery, getUrlParams } from "util/helpers"; +import { receiveError } from "@/api/actions"; +import { fetchInvoicesByLease, receiveIsCreateInvoicePanelOpen } from "@/invoices/actions"; +import { fetchInvoiceSetsByLease } from "@/invoiceSets/actions"; +import { displayUIMessage, getSearchQuery, getUrlParams } from "@/util/helpers"; import { copyAreasToContract, copyDecisionToLeases, createCharge, createLease, deleteLease, fetchAttributes, fetchLeases, fetchSingleLease, patchLease, sendEmail, startInvoicing, stopInvoicing, setRentInfoComplete, setRentInfoUncomplete } from "./requests"; import { getCurrentLease } from "./selectors"; diff --git a/src/leases/selectors.ts b/src/leases/selectors.ts index 01beac5cf..a2272786a 100644 --- a/src/leases/selectors.ts +++ b/src/leases/selectors.ts @@ -1,6 +1,6 @@ import get from "lodash/get"; import isEmpty from "lodash/isEmpty"; -import type { RootState } from "root/types"; +import type { RootState } from "@/root/types"; import type { Attributes, Methods, Selector } from "types"; import type { LeaseId, Lease, LeaseList } from "./types"; export const getIsAttachDecisionModalOpen: Selector = (state: RootState): boolean => state.lease.isAttachDecisionModalOpen; diff --git a/src/leases/types.ts b/src/leases/types.ts index de8d893e0..33b968b41 100644 --- a/src/leases/types.ts +++ b/src/leases/types.ts @@ -1,5 +1,5 @@ -import type { Action, ApiResponse, Attributes, Methods } from "../types"; -import type { ServiceUnit } from "serviceUnits/types"; +import type { Action, ApiResponse, Attributes, Methods } from "@/types"; +import type { ServiceUnit } from "@/serviceUnits/types"; export type LeaseState = { attributes: Attributes; byId: Record; diff --git a/src/lessor/helpers.ts b/src/lessor/helpers.ts index a3e1e5f46..de5122c96 100644 --- a/src/lessor/helpers.ts +++ b/src/lessor/helpers.ts @@ -1,4 +1,4 @@ -import { getContactFullName } from "contacts/helpers"; +import { getContactFullName } from "@/contacts/helpers"; /** * Get content lessor diff --git a/src/lessor/reducer.ts b/src/lessor/reducer.ts index 43ecab28c..5f7cec8e1 100644 --- a/src/lessor/reducer.ts +++ b/src/lessor/reducer.ts @@ -1,7 +1,7 @@ import { combineReducers } from "redux"; import { handleActions } from "redux-actions"; import type { Reducer } from "types"; -import type { LessorList, ReceiveLessorsAction } from "lessor/types"; +import type { LessorList, ReceiveLessorsAction } from "@/lessor/types"; const listReducer: Reducer> = handleActions({ ['mvj/lessors/RECEIVE_ALL']: (state: LessorList, { payload diff --git a/src/lessor/saga.ts b/src/lessor/saga.ts index efe0cc22e..cde8bbd12 100644 --- a/src/lessor/saga.ts +++ b/src/lessor/saga.ts @@ -1,6 +1,6 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects"; import { receiveLessors } from "./actions"; -import { fetchContacts } from "contacts/requests"; +import { fetchContacts } from "@/contacts/requests"; function* fetchLessorsSaga({ payload: params, diff --git a/src/lessor/selectors.ts b/src/lessor/selectors.ts index d48b61bf5..db67d05ff 100644 --- a/src/lessor/selectors.ts +++ b/src/lessor/selectors.ts @@ -1,4 +1,4 @@ import type { Selector } from "types"; -import type { RootState } from "root/types"; +import type { RootState } from "@/root/types"; import type { LessorList } from "./types"; export const getLessorList: Selector = (state: RootState): LessorList => state.lessor.list; \ No newline at end of file diff --git a/src/lessor/types.ts b/src/lessor/types.ts index 5da3beee3..ccd931953 100644 --- a/src/lessor/types.ts +++ b/src/lessor/types.ts @@ -1,4 +1,4 @@ -import type { Action } from "../types"; +import type { Action } from "@/types"; export type LessorState = { list: LessorList; }; diff --git a/src/penaltyInterest/actions.ts b/src/penaltyInterest/actions.ts index 755ed0077..d65cfddb1 100644 --- a/src/penaltyInterest/actions.ts +++ b/src/penaltyInterest/actions.ts @@ -1,5 +1,5 @@ import { createAction } from "redux-actions"; -import type { InvoiceId } from "invoices/types"; +import type { InvoiceId } from "@/invoices/types"; import type { FetchPenaltyInterestByInvoiceAction, ReceivePenaltyInterestByInvoiceAction, PenaltyInterestNotFoundByInvoiceAction } from "./types"; export const fetchPenaltyInterestByInvoice = (invoiceId: InvoiceId): FetchPenaltyInterestByInvoiceAction => createAction('mvj/penaltyInterest/FETCH_BY_INVOICE')(invoiceId); export const receivePenaltyInterestByInvoice = (penaltyInterest: Record): ReceivePenaltyInterestByInvoiceAction => createAction('mvj/penaltyInterest/RECEIVE_BY_INVOICE')(penaltyInterest); diff --git a/src/penaltyInterest/reducer.ts b/src/penaltyInterest/reducer.ts index cfbb9e534..e9aba4562 100644 --- a/src/penaltyInterest/reducer.ts +++ b/src/penaltyInterest/reducer.ts @@ -1,7 +1,7 @@ import { combineReducers } from "redux"; import { handleActions } from "redux-actions"; import type { Reducer } from "types"; -import type { FetchPenaltyInterestByInvoiceAction, ReceivePenaltyInterestByInvoiceAction, PenaltyInterestNotFoundByInvoiceAction } from "penaltyInterest/types"; +import type { FetchPenaltyInterestByInvoiceAction, ReceivePenaltyInterestByInvoiceAction, PenaltyInterestNotFoundByInvoiceAction } from "@/penaltyInterest/types"; const isFetchingByInvoiceReducer: Reducer> = handleActions({ ['mvj/penaltyInterest/FETCH_BY_INVOICE']: (state: Record, { payload: invoice diff --git a/src/penaltyInterest/requests.ts b/src/penaltyInterest/requests.ts index 0331e44cd..3adc8dc4c 100644 --- a/src/penaltyInterest/requests.ts +++ b/src/penaltyInterest/requests.ts @@ -1,6 +1,6 @@ -import callApi from "../api/callApi"; -import createUrl from "../api/createUrl"; -import type { InvoiceId } from "invoices/types"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; +import type { InvoiceId } from "@/invoices/types"; export const fetchPenaltyInterestByInvoice = (invoice: InvoiceId): Generator => { return callApi(new Request(createUrl(`invoice_calculate_penalty_interest/?invoice=${invoice}`))); }; \ No newline at end of file diff --git a/src/penaltyInterest/saga.ts b/src/penaltyInterest/saga.ts index 36eac247f..6c2395ceb 100644 --- a/src/penaltyInterest/saga.ts +++ b/src/penaltyInterest/saga.ts @@ -1,6 +1,6 @@ import { all, call, fork, put, takeEvery } from "redux-saga/effects"; import { receivePenaltyInterestByInvoice, penaltyInterestNotFoundByInvoice } from "./actions"; -import { receiveError } from "api/actions"; +import { receiveError } from "@/api/actions"; import { fetchPenaltyInterestByInvoice } from "./requests"; function* fetchPenaltyInterestByInvoiceSaga({ diff --git a/src/penaltyInterest/selectors.ts b/src/penaltyInterest/selectors.ts index 85e52ea81..b9b124644 100644 --- a/src/penaltyInterest/selectors.ts +++ b/src/penaltyInterest/selectors.ts @@ -1,5 +1,5 @@ import type { Selector } from "types"; -import type { RootState } from "root/types"; -import type { InvoiceId } from "invoices/types"; +import type { RootState } from "@/root/types"; +import type { InvoiceId } from "@/invoices/types"; export const getPenaltyInterestByInvoice: Selector = (state: RootState, id: InvoiceId): boolean => state.penaltyInterest.byInvoice[id]; export const getIsFetchingByInvoice: Selector = (state: RootState, id: InvoiceId): boolean => state.penaltyInterest.isFetchingByInvoice[id]; \ No newline at end of file diff --git a/src/penaltyInterest/types.ts b/src/penaltyInterest/types.ts index 389d062e5..a48cc960c 100644 --- a/src/penaltyInterest/types.ts +++ b/src/penaltyInterest/types.ts @@ -1,5 +1,5 @@ import type { Action } from "types"; -import type { InvoiceId } from "invoices/types"; +import type { InvoiceId } from "@/invoices/types"; export type PenaltyInterestState = { byInvoice: Record; isFetchingByInvoice: Record; diff --git a/src/plotApplications/actions.ts b/src/plotApplications/actions.ts index d28b01e11..8a14a49e5 100644 --- a/src/plotApplications/actions.ts +++ b/src/plotApplications/actions.ts @@ -1,5 +1,5 @@ import { createAction } from "redux-actions"; -import type { ApplicationRelatedFormNotFoundAction, ApplicationRelatedPlotSearchNotFoundAction, ApplicationsNotFoundAction, BatchEditPlotApplicationModelsAction, ClearFormValidFlagsAction, CreatePlotApplicationOpeningRecordAction, CreatePlotApplicationAction, DeleteTargetInfoCheckMeetingMemoAction, EditPlotApplicationAction, FetchApplicationRelatedFormAction, FetchApplicationRelatedPlotSearchAction, FetchPlotApplicationsByBBoxAction, FetchPlotApplicationsListAction, FetchPlotSearchSubtypesAction, FetchSinglePlotApplicationAction, FetchTargetInfoChecksForPlotSearchAction, HideEditModeAction, InfoCheckBatchEditData, InfoCheckBatchEditErrors, InitializeFormEntriesForApplicationAction, NotFoundByBBoxAction, PlotApplication, PlotApplicationsList, PlotSearchSubtypesNotFoundAction, ReceiveApplicationRelatedFormAction, ReceiveApplicationRelatedPlotSearchAction, ReceiveCollapseStatesAction, ReceiveFileOperationFinishedAction, ReceiveFormValidFlagsAction, ReceiveIsSaveClickedAction, ReceivePlotApplicationInfoCheckBatchEditFailureAction, ReceivePlotApplicationInfoCheckBatchEditSuccessAction, ReceivePlotApplicationSavedAction, ReceivePlotApplicationSaveFailedAction, ReceivePlotApplicationsByBBoxAction, ReceivePlotApplicationsListAction, ReceivePlotSearchSubtypesAction, ReceiveSinglePlotApplicationAction, ReceiveTargetInfoCheckMeetingMemoUploadedAction, ReceiveTargetInfoChecksForPlotSearchAction, SinglePlotApplicationNotAllowedAction, SinglePlotApplicationNotFoundAction, SetCurrentEditorTargetsAction, ShowEditModeAction, TargetInfoCheckMeetingMemoDeleteFailedAction, TargetInfoCheckMeetingMemoUploadFailedAction, TargetInfoChecksForPlotSearchNotFoundAction, UploadTargetInfoCheckMeetingMemoAction } from "plotApplications/types"; +import type { ApplicationRelatedFormNotFoundAction, ApplicationRelatedPlotSearchNotFoundAction, ApplicationsNotFoundAction, BatchEditPlotApplicationModelsAction, ClearFormValidFlagsAction, CreatePlotApplicationOpeningRecordAction, CreatePlotApplicationAction, DeleteTargetInfoCheckMeetingMemoAction, EditPlotApplicationAction, FetchApplicationRelatedFormAction, FetchApplicationRelatedPlotSearchAction, FetchPlotApplicationsByBBoxAction, FetchPlotApplicationsListAction, FetchPlotSearchSubtypesAction, FetchSinglePlotApplicationAction, FetchTargetInfoChecksForPlotSearchAction, HideEditModeAction, InfoCheckBatchEditData, InfoCheckBatchEditErrors, InitializeFormEntriesForApplicationAction, NotFoundByBBoxAction, PlotApplication, PlotApplicationsList, PlotSearchSubtypesNotFoundAction, ReceiveApplicationRelatedFormAction, ReceiveApplicationRelatedPlotSearchAction, ReceiveCollapseStatesAction, ReceiveFileOperationFinishedAction, ReceiveFormValidFlagsAction, ReceiveIsSaveClickedAction, ReceivePlotApplicationInfoCheckBatchEditFailureAction, ReceivePlotApplicationInfoCheckBatchEditSuccessAction, ReceivePlotApplicationSavedAction, ReceivePlotApplicationSaveFailedAction, ReceivePlotApplicationsByBBoxAction, ReceivePlotApplicationsListAction, ReceivePlotSearchSubtypesAction, ReceiveSinglePlotApplicationAction, ReceiveTargetInfoCheckMeetingMemoUploadedAction, ReceiveTargetInfoChecksForPlotSearchAction, SinglePlotApplicationNotAllowedAction, SinglePlotApplicationNotFoundAction, SetCurrentEditorTargetsAction, ShowEditModeAction, TargetInfoCheckMeetingMemoDeleteFailedAction, TargetInfoCheckMeetingMemoUploadFailedAction, TargetInfoChecksForPlotSearchNotFoundAction, UploadTargetInfoCheckMeetingMemoAction } from "@/plotApplications/types"; export const fetchPlotApplicationsList = (search: string): FetchPlotApplicationsListAction => createAction('mvj/plotApplications/FETCH_ALL')(search); export const receivePlotApplicationsList = (list: PlotApplicationsList): ReceivePlotApplicationsListAction => createAction('mvj/plotApplications/RECEIVE_ALL')(list); export const fetchSinglePlotApplication = (id: number): FetchSinglePlotApplicationAction => createAction('mvj/plotApplications/FETCH_SINGLE')(id); diff --git a/src/plotApplications/components/PlotApplication.tsx b/src/plotApplications/components/PlotApplication.tsx index a124a5999..c0b601429 100644 --- a/src/plotApplications/components/PlotApplication.tsx +++ b/src/plotApplications/components/PlotApplication.tsx @@ -2,34 +2,34 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; import { orderBy } from "lodash"; -import Authorization from "components/authorization/Authorization"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import { FormNames, ViewModes } from "enums"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import Collapse from "components/collapse/Collapse"; -import Divider from "components/content/Divider"; -import Title from "components/content/Title"; -import { getCollapseStateByKey, getCurrentPlotApplication, getIsFetchingApplicationRelatedForm, getApplicationRelatedForm } from "plotApplications/selectors"; -import { receiveCollapseStates } from "plotApplications/actions"; -import { formatDate, isFieldAllowedToRead } from "util/helpers"; -import Loader from "components/loader/Loader"; -import { reshapeSavedApplicationObject } from "plotApplications/helpers"; -import { getFieldAttributes } from "util/helpers"; -import { getApplicationRelatedPlotSearch, getIsFetchingApplicationRelatedPlotSearch } from "plotApplications/selectors"; -import ApplicationAnswersSection from "application/components/ApplicationAnswersSection"; -import PlotApplicationTargetInfoCheck from "plotApplications/components/infoCheck/PlotApplicationTargetInfoCheck"; -import PlotApplicationApplicantInfoCheck from "plotApplications/components/infoCheck/PlotApplicationApplicantInfoCheck"; -import { transformApplicantSectionTitle, transformTargetSectionTitle } from "application/helpers"; -import { getApplicationRelatedAttachments, getAttributes, getFormAttributes, getIsFetchingApplicationRelatedAttachments, getIsFetchingFormAttributes } from "application/selectors"; -import { APPLICANT_SECTION_IDENTIFIER, TARGET_SECTION_IDENTIFIER } from "application/constants"; +import Authorization from "@/components/authorization/Authorization"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import { FormNames, ViewModes } from "@/enums"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import Collapse from "@/components/collapse/Collapse"; +import Divider from "@/components/content/Divider"; +import Title from "@/components/content/Title"; +import { getCollapseStateByKey, getCurrentPlotApplication, getIsFetchingApplicationRelatedForm, getApplicationRelatedForm } from "@/plotApplications/selectors"; +import { receiveCollapseStates } from "@/plotApplications/actions"; +import { formatDate, isFieldAllowedToRead } from "@/util/helpers"; +import Loader from "@/components/loader/Loader"; +import { reshapeSavedApplicationObject } from "@/plotApplications/helpers"; +import { getFieldAttributes } from "@/util/helpers"; +import { getApplicationRelatedPlotSearch, getIsFetchingApplicationRelatedPlotSearch } from "@/plotApplications/selectors"; +import ApplicationAnswersSection from "@/application/components/ApplicationAnswersSection"; +import PlotApplicationTargetInfoCheck from "@/plotApplications/components/infoCheck/PlotApplicationTargetInfoCheck"; +import PlotApplicationApplicantInfoCheck from "@/plotApplications/components/infoCheck/PlotApplicationApplicantInfoCheck"; +import { transformApplicantSectionTitle, transformTargetSectionTitle } from "@/application/helpers"; +import { getApplicationRelatedAttachments, getAttributes, getFormAttributes, getIsFetchingApplicationRelatedAttachments, getIsFetchingFormAttributes } from "@/application/selectors"; +import { APPLICANT_SECTION_IDENTIFIER, TARGET_SECTION_IDENTIFIER } from "@/application/constants"; import type { Attributes } from "types"; -import type { PlotApplication as PlotApplicationType } from "plotApplications/types"; -import type { SectionExtraComponentProps } from "application/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; -import { PlotApplicationOpeningRecordLabels, PlotApplicationOpeningRecordPaths } from "plotApplications/enums"; -import { getHoursAndMinutes } from "util/date"; -import { getContentUser } from "users/helpers"; +import type { PlotApplication as PlotApplicationType } from "@/plotApplications/types"; +import type { SectionExtraComponentProps } from "@/application/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; +import { PlotApplicationOpeningRecordLabels, PlotApplicationOpeningRecordPaths } from "@/plotApplications/enums"; +import { getHoursAndMinutes } from "@/util/date"; +import { getContentUser } from "@/users/helpers"; type OwnProps = {}; type Props = { usersPermissions: UsersPermissionsType; diff --git a/src/plotApplications/components/PlotApplicationCreate.tsx b/src/plotApplications/components/PlotApplicationCreate.tsx index d0fa6b48f..ddadc1b3b 100644 --- a/src/plotApplications/components/PlotApplicationCreate.tsx +++ b/src/plotApplications/components/PlotApplicationCreate.tsx @@ -5,30 +5,30 @@ import { reduxForm, initialize, change, getFormValues } from "redux-form"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; import get from "lodash/get"; -import Authorization from "components/authorization/Authorization"; -import { FormNames, ViewModes } from "enums"; -import Collapse from "components/collapse/Collapse"; -import Divider from "components/content/Divider"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import Title from "components/content/Title"; -import FormField from "components/form/FormField"; -import { receiveCollapseStates, receiveIsSaveClicked } from "plotApplications/actions"; -import { getCollapseStateByKey, getIsSaveClicked, getErrorsByFormName } from "plotApplications/selectors"; -import { getInitialApplication, getSectionTargetFromMeta } from "plotApplications/helpers"; -import { getIsFetching as getIsFetchingPlotSearchList, getIsFetchingForm, getPlotSearchList } from "plotSearch/selectors"; -import { getCurrentEditorTargets, getCurrentPlotApplication } from "plotApplications/selectors"; -import ApplicationSubsection from "application/components/ApplicationSubsection"; -import { receiveFormValidFlags, receiveSinglePlotApplication, setCurrentEditorTargets } from "plotApplications/actions"; -import Loader from "components/loader/Loader"; -import { getAttributes, getFieldTypeMapping, getFormAttributes, getIsFetchingApplicantInfoCheckAttributes, getIsFetchingAttachmentAttributes, getIsFetchingFormAttributes } from "application/selectors"; -import { getInitialApplicationForm, getSectionTemplate, getTargetTitle } from "application/helpers"; -import { fetchAttachmentAttributes, fetchFormAttributes, fetchPendingUploads } from "application/actions"; -import { TARGET_SECTION_IDENTIFIER } from "application/constants"; +import Authorization from "@/components/authorization/Authorization"; +import { FormNames, ViewModes } from "@/enums"; +import Collapse from "@/components/collapse/Collapse"; +import Divider from "@/components/content/Divider"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import Title from "@/components/content/Title"; +import FormField from "@/components/form/FormField"; +import { receiveCollapseStates, receiveIsSaveClicked } from "@/plotApplications/actions"; +import { getCollapseStateByKey, getIsSaveClicked, getErrorsByFormName } from "@/plotApplications/selectors"; +import { getInitialApplication, getSectionTargetFromMeta } from "@/plotApplications/helpers"; +import { getIsFetching as getIsFetchingPlotSearchList, getIsFetchingForm, getPlotSearchList } from "@/plotSearch/selectors"; +import { getCurrentEditorTargets, getCurrentPlotApplication } from "@/plotApplications/selectors"; +import ApplicationSubsection from "@/application/components/ApplicationSubsection"; +import { receiveFormValidFlags, receiveSinglePlotApplication, setCurrentEditorTargets } from "@/plotApplications/actions"; +import Loader from "@/components/loader/Loader"; +import { getAttributes, getFieldTypeMapping, getFormAttributes, getIsFetchingApplicantInfoCheckAttributes, getIsFetchingAttachmentAttributes, getIsFetchingFormAttributes } from "@/application/selectors"; +import { getInitialApplicationForm, getSectionTemplate, getTargetTitle } from "@/application/helpers"; +import { fetchAttachmentAttributes, fetchFormAttributes, fetchPendingUploads } from "@/application/actions"; +import { TARGET_SECTION_IDENTIFIER } from "@/application/constants"; import type { Attributes } from "types"; -import type { PlotSearchList } from "plotSearch/types"; -import type { PlotApplication } from "plotApplications/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; -import { validateApplicationForm } from "application/formValidation"; +import type { PlotSearchList } from "@/plotSearch/types"; +import type { PlotApplication } from "@/plotApplications/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; +import { validateApplicationForm } from "@/application/formValidation"; type OwnProps = {}; type Props = OwnProps & { attributes: Attributes; diff --git a/src/plotApplications/components/PlotApplicationCreatePage.tsx b/src/plotApplications/components/PlotApplicationCreatePage.tsx index 612d62076..8c276e92b 100644 --- a/src/plotApplications/components/PlotApplicationCreatePage.tsx +++ b/src/plotApplications/components/PlotApplicationCreatePage.tsx @@ -6,35 +6,35 @@ import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; import { initialize, isDirty, destroy, getFormValues } from "redux-form"; import type { ContextRouter } from "react-router"; -import { FormNames } from "enums"; -import AuthorizationError from "components/authorization/AuthorizationError"; -import FullWidthContainer from "components/content/FullWidthContainer"; -import PageContainer from "components/content/PageContainer"; -import Loader from "components/loader/Loader"; -import TabContent from "components/tabs/TabContent"; -import TabPane from "components/tabs/TabPane"; -import Tabs from "components/tabs/Tabs"; -import ContentContainer from "components/content/ContentContainer"; -import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "usersPermissions/selectors"; -import PageNavigationWrapper from "components/content/PageNavigationWrapper"; -import ControlButtonBar from "components/controlButtons/ControlButtonBar"; -import ControlButtons from "components/controlButtons/ControlButtons"; -import { withPlotApplicationsAttributes } from "components/attributes/PlotApplicationsAttributes"; -import { receiveTopNavigationSettings } from "components/topNavigation/actions"; -import { getRouteById, Routes } from "root/routes"; -import { Methods, PermissionMissingTexts } from "enums"; -import { getSessionStorageItem, removeSessionStorageItem, setSessionStorageItem } from "util/storage"; -import { getIsFetching, getCurrentPlotApplication, getIsSaveClicked, getIsFormValidById, getIsFormValidFlags, getIsPerformingFileOperation, getIsSaving } from "plotApplications/selectors"; -import { fetchSinglePlotApplication, showEditMode, receiveIsSaveClicked, hideEditMode, clearFormValidFlags, receiveFormValidFlags, editPlotApplication, createPlotApplication } from "plotApplications/actions"; -import { getUrlParams, setPageTitle, isMethodAllowed, getSearchQuery, scrollToTopPage } from "util/helpers"; -import PlotApplicationInfo from "plotApplications/components/PlotApplicationInfo"; -import { fetchPlotSearchList } from "plotSearch/actions"; -import { getPlotSearchList, getIsFetching as getIsFetchingPlotSearchList } from "plotSearch/selectors"; -import { preparePlotApplicationForSubmission } from "plotApplications/helpers"; -import PlotApplicationCreate from "plotApplications/components/PlotApplicationCreate"; -import type { PlotApplication as PlotApplicationType } from "plotApplications/types"; +import { FormNames } from "@/enums"; +import AuthorizationError from "@/components/authorization/AuthorizationError"; +import FullWidthContainer from "@/components/content/FullWidthContainer"; +import PageContainer from "@/components/content/PageContainer"; +import Loader from "@/components/loader/Loader"; +import TabContent from "@/components/tabs/TabContent"; +import TabPane from "@/components/tabs/TabPane"; +import Tabs from "@/components/tabs/Tabs"; +import ContentContainer from "@/components/content/ContentContainer"; +import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "@/usersPermissions/selectors"; +import PageNavigationWrapper from "@/components/content/PageNavigationWrapper"; +import ControlButtonBar from "@/components/controlButtons/ControlButtonBar"; +import ControlButtons from "@/components/controlButtons/ControlButtons"; +import { withPlotApplicationsAttributes } from "@/components/attributes/PlotApplicationsAttributes"; +import { receiveTopNavigationSettings } from "@/components/topNavigation/actions"; +import { getRouteById, Routes } from "@/root/routes"; +import { Methods, PermissionMissingTexts } from "@/enums"; +import { getSessionStorageItem, removeSessionStorageItem, setSessionStorageItem } from "@/util/storage"; +import { getIsFetching, getCurrentPlotApplication, getIsSaveClicked, getIsFormValidById, getIsFormValidFlags, getIsPerformingFileOperation, getIsSaving } from "@/plotApplications/selectors"; +import { fetchSinglePlotApplication, showEditMode, receiveIsSaveClicked, hideEditMode, clearFormValidFlags, receiveFormValidFlags, editPlotApplication, createPlotApplication } from "@/plotApplications/actions"; +import { getUrlParams, setPageTitle, isMethodAllowed, getSearchQuery, scrollToTopPage } from "@/util/helpers"; +import PlotApplicationInfo from "@/plotApplications/components/PlotApplicationInfo"; +import { fetchPlotSearchList } from "@/plotSearch/actions"; +import { getPlotSearchList, getIsFetching as getIsFetchingPlotSearchList } from "@/plotSearch/selectors"; +import { preparePlotApplicationForSubmission } from "@/plotApplications/helpers"; +import PlotApplicationCreate from "@/plotApplications/components/PlotApplicationCreate"; +import type { PlotApplication as PlotApplicationType } from "@/plotApplications/types"; import type { Attributes, Methods as MethodsType } from "types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type OwnProps = ContextRouter; type Props = OwnProps & { clearFormValidFlags: (...args: Array) => any; diff --git a/src/plotApplications/components/PlotApplicationEdit.tsx b/src/plotApplications/components/PlotApplicationEdit.tsx index 13d509d5e..90304bc77 100644 --- a/src/plotApplications/components/PlotApplicationEdit.tsx +++ b/src/plotApplications/components/PlotApplicationEdit.tsx @@ -1,24 +1,24 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import { orderBy } from "lodash"; -import { getApplicationRelatedForm, getApplicationRelatedPlotSearch, getCurrentPlotApplication, getIsFetchingApplicationRelatedPlotSearch } from "plotApplications/selectors"; -import { reshapeSavedApplicationObject } from "plotApplications/helpers"; -import { getFieldAttributes } from "util/helpers"; -import { getIsFetchingForm } from "plotSearch/selectors"; -import ApplicationAnswersSection from "application/components/ApplicationAnswersSection"; -import Loader from "components/loader/Loader"; -import Title from "components/content/Title"; -import Divider from "components/content/Divider"; -import PlotApplicationTargetInfoCheckEdit from "plotApplications/components/infoCheck/PlotApplicationTargetInfoCheckEdit"; -import PlotApplicationApplicantInfoCheckEdit from "plotApplications/components/infoCheck/PlotApplicationApplicantInfoCheckEdit"; -import { transformApplicantSectionTitle, transformTargetSectionTitle } from "application/helpers"; -import { getApplicationRelatedAttachments, getFormAttributes, getIsFetchingApplicationRelatedAttachments, getIsFetchingFormAttributes } from "application/selectors"; -import { APPLICANT_SECTION_IDENTIFIER, TARGET_SECTION_IDENTIFIER } from "application/constants"; -import Collapse from "components/collapse/Collapse"; -import PlotApplicationOpeningRecordForm from "plotApplications/components/PlotApplicationOpeningRecordForm"; -import type { RootState } from "root/types"; -import type { PlotApplication } from "plotApplications/types"; -import type { SectionExtraComponentProps } from "application/types"; +import { getApplicationRelatedForm, getApplicationRelatedPlotSearch, getCurrentPlotApplication, getIsFetchingApplicationRelatedPlotSearch } from "@/plotApplications/selectors"; +import { reshapeSavedApplicationObject } from "@/plotApplications/helpers"; +import { getFieldAttributes } from "@/util/helpers"; +import { getIsFetchingForm } from "@/plotSearch/selectors"; +import ApplicationAnswersSection from "@/application/components/ApplicationAnswersSection"; +import Loader from "@/components/loader/Loader"; +import Title from "@/components/content/Title"; +import Divider from "@/components/content/Divider"; +import PlotApplicationTargetInfoCheckEdit from "@/plotApplications/components/infoCheck/PlotApplicationTargetInfoCheckEdit"; +import PlotApplicationApplicantInfoCheckEdit from "@/plotApplications/components/infoCheck/PlotApplicationApplicantInfoCheckEdit"; +import { transformApplicantSectionTitle, transformTargetSectionTitle } from "@/application/helpers"; +import { getApplicationRelatedAttachments, getFormAttributes, getIsFetchingApplicationRelatedAttachments, getIsFetchingFormAttributes } from "@/application/selectors"; +import { APPLICANT_SECTION_IDENTIFIER, TARGET_SECTION_IDENTIFIER } from "@/application/constants"; +import Collapse from "@/components/collapse/Collapse"; +import PlotApplicationOpeningRecordForm from "@/plotApplications/components/PlotApplicationOpeningRecordForm"; +import type { RootState } from "@/root/types"; +import type { PlotApplication } from "@/plotApplications/types"; +import type { SectionExtraComponentProps } from "@/application/types"; import type { Attributes } from "types"; type OwnProps = {}; type Props = OwnProps & { diff --git a/src/plotApplications/components/PlotApplicationOpeningRecordForm.tsx b/src/plotApplications/components/PlotApplicationOpeningRecordForm.tsx index ce910b58e..4b5bf299a 100644 --- a/src/plotApplications/components/PlotApplicationOpeningRecordForm.tsx +++ b/src/plotApplications/components/PlotApplicationOpeningRecordForm.tsx @@ -4,16 +4,16 @@ import { Column, Row } from "react-foundation"; import { get } from "lodash/object"; import { flowRight } from "lodash/util"; import { connect } from "react-redux"; -import FormField from "components/form/FormField"; -import type { RootState } from "root/types"; -import { getAttributes } from "application/selectors"; +import FormField from "@/components/form/FormField"; +import type { RootState } from "@/root/types"; +import { getAttributes } from "@/application/selectors"; import type { Attributes } from "types"; -import { FieldTypes, FormNames } from "enums"; -import { getCurrentPlotApplication, getIsSaveClicked } from "plotApplications/selectors"; -import { getContentUser } from "users/helpers"; -import { PlotApplicationOpeningRecordLabels, PlotApplicationOpeningRecordPaths } from "plotApplications/enums"; -import { isFieldAllowedToRead } from "util/helpers"; -import Authorization from "components/authorization/Authorization"; +import { FieldTypes, FormNames } from "@/enums"; +import { getCurrentPlotApplication, getIsSaveClicked } from "@/plotApplications/selectors"; +import { getContentUser } from "@/users/helpers"; +import { PlotApplicationOpeningRecordLabels, PlotApplicationOpeningRecordPaths } from "@/plotApplications/enums"; +import { isFieldAllowedToRead } from "@/util/helpers"; +import Authorization from "@/components/authorization/Authorization"; type Props = {}; type InnerProps = Props & { attributes: Attributes; diff --git a/src/plotApplications/components/PlotApplicationPage.tsx b/src/plotApplications/components/PlotApplicationPage.tsx index 09a8dfb3f..e9ab758a0 100644 --- a/src/plotApplications/components/PlotApplicationPage.tsx +++ b/src/plotApplications/components/PlotApplicationPage.tsx @@ -7,41 +7,41 @@ import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; import { initialize, isDirty, destroy, getFormValues, isValid, change } from "redux-form"; import type { ContextRouter } from "react-router"; -import { FormNames } from "enums"; -import AuthorizationError from "components/authorization/AuthorizationError"; -import FullWidthContainer from "components/content/FullWidthContainer"; -import PageContainer from "components/content/PageContainer"; -import { ButtonColors } from "components/enums"; -import Loader from "components/loader/Loader"; -import TabContent from "components/tabs/TabContent"; -import TabPane from "components/tabs/TabPane"; -import Tabs from "components/tabs/Tabs"; -import ContentContainer from "components/content/ContentContainer"; -import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "usersPermissions/selectors"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; -import PageNavigationWrapper from "components/content/PageNavigationWrapper"; -import ControlButtonBar from "components/controlButtons/ControlButtonBar"; -import ControlButtons from "components/controlButtons/ControlButtons"; -import { withPlotApplicationsAttributes } from "components/attributes/PlotApplicationsAttributes"; -import { receiveTopNavigationSettings } from "components/topNavigation/actions"; -import { getRouteById, Routes } from "root/routes"; -import { ConfirmationModalTexts, Methods, PermissionMissingTexts } from "enums"; -import { getSessionStorageItem, removeSessionStorageItem, setSessionStorageItem } from "util/storage"; -import { getIsFetching, getCurrentPlotApplication, getIsEditMode, getIsSaveClicked, getIsFormValidFlags, getIsPerformingFileOperation, getIsSaving, getIsSingleAllowed, getApplicationRelatedPlotSearch, getApplicationApplicantInfoCheckData, getApplicationTargetInfoCheckData } from "plotApplications/selectors"; -import { fetchSinglePlotApplication, showEditMode, receiveIsSaveClicked, hideEditMode, clearFormValidFlags, receiveFormValidFlags, batchEditApplicationModels } from "plotApplications/actions"; -import type { PlotApplication as PlotApplicationType } from "plotApplications/types"; -import { getUrlParams, setPageTitle, isMethodAllowed, getSearchQuery, scrollToTopPage } from "util/helpers"; +import { FormNames } from "@/enums"; +import AuthorizationError from "@/components/authorization/AuthorizationError"; +import FullWidthContainer from "@/components/content/FullWidthContainer"; +import PageContainer from "@/components/content/PageContainer"; +import { ButtonColors } from "@/components/enums"; +import Loader from "@/components/loader/Loader"; +import TabContent from "@/components/tabs/TabContent"; +import TabPane from "@/components/tabs/TabPane"; +import Tabs from "@/components/tabs/Tabs"; +import ContentContainer from "@/components/content/ContentContainer"; +import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "@/usersPermissions/selectors"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; +import PageNavigationWrapper from "@/components/content/PageNavigationWrapper"; +import ControlButtonBar from "@/components/controlButtons/ControlButtonBar"; +import ControlButtons from "@/components/controlButtons/ControlButtons"; +import { withPlotApplicationsAttributes } from "@/components/attributes/PlotApplicationsAttributes"; +import { receiveTopNavigationSettings } from "@/components/topNavigation/actions"; +import { getRouteById, Routes } from "@/root/routes"; +import { ConfirmationModalTexts, Methods, PermissionMissingTexts } from "@/enums"; +import { getSessionStorageItem, removeSessionStorageItem, setSessionStorageItem } from "@/util/storage"; +import { getIsFetching, getCurrentPlotApplication, getIsEditMode, getIsSaveClicked, getIsFormValidFlags, getIsPerformingFileOperation, getIsSaving, getIsSingleAllowed, getApplicationRelatedPlotSearch, getApplicationApplicantInfoCheckData, getApplicationTargetInfoCheckData } from "@/plotApplications/selectors"; +import { fetchSinglePlotApplication, showEditMode, receiveIsSaveClicked, hideEditMode, clearFormValidFlags, receiveFormValidFlags, batchEditApplicationModels } from "@/plotApplications/actions"; +import type { PlotApplication as PlotApplicationType } from "@/plotApplications/types"; +import { getUrlParams, setPageTitle, isMethodAllowed, getSearchQuery, scrollToTopPage } from "@/util/helpers"; import type { Attributes, Methods as MethodsType } from "types"; -import PlotApplicationInfo from "plotApplications/components/PlotApplicationInfo"; -import PlotApplication from "plotApplications/components/PlotApplication"; -import PlotApplicationEdit from "plotApplications/components/PlotApplicationEdit"; -import { getPlotSearchList } from "plotSearch/selectors"; -import { getInitialTargetInfoCheckValues, getTargetInfoCheckFormName } from "plotApplications/helpers"; -import type { PlotSearch } from "plotSearch/types"; -import type { InfoCheckBatchEditData } from "plotApplications/types"; -import { clearUnsavedChanges } from "contacts/helpers"; -import ConfirmationModal from "components/modal/ConfirmationModal"; -import { getApplicantInfoCheckFormName, getApplicantInfoCheckItems, prepareApplicantInfoCheckForSubmission } from "application/helpers"; +import PlotApplicationInfo from "@/plotApplications/components/PlotApplicationInfo"; +import PlotApplication from "@/plotApplications/components/PlotApplication"; +import PlotApplicationEdit from "@/plotApplications/components/PlotApplicationEdit"; +import { getPlotSearchList } from "@/plotSearch/selectors"; +import { getInitialTargetInfoCheckValues, getTargetInfoCheckFormName } from "@/plotApplications/helpers"; +import type { PlotSearch } from "@/plotSearch/types"; +import type { InfoCheckBatchEditData } from "@/plotApplications/types"; +import { clearUnsavedChanges } from "@/contacts/helpers"; +import ConfirmationModal from "@/components/modal/ConfirmationModal"; +import { getApplicantInfoCheckFormName, getApplicantInfoCheckItems, prepareApplicantInfoCheckForSubmission } from "@/application/helpers"; type OwnProps = {}; type Props = ContextRouter & OwnProps & { clearFormValidFlags: (...args: Array) => any; diff --git a/src/plotApplications/components/PlotApplicationsListOpeningModal.tsx b/src/plotApplications/components/PlotApplicationsListOpeningModal.tsx index 04fabcb5a..46d402171 100644 --- a/src/plotApplications/components/PlotApplicationsListOpeningModal.tsx +++ b/src/plotApplications/components/PlotApplicationsListOpeningModal.tsx @@ -1,16 +1,16 @@ import React, { Component } from "react"; import { connect } from "react-redux"; -import Modal from "components/modal/Modal"; -import ModalButtonWrapper from "components/modal/ModalButtonWrapper"; -import Button from "components/button/Button"; -import { createPlotApplicationOpeningRecord } from "plotApplications/actions"; -import { getLoggedInUser } from "auth/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getHoursAndMinutes } from "util/date"; -import { formatDate, hasPermissions } from "util/helpers"; -import type { RootState } from "root/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import Modal from "@/components/modal/Modal"; +import ModalButtonWrapper from "@/components/modal/ModalButtonWrapper"; +import Button from "@/components/button/Button"; +import { createPlotApplicationOpeningRecord } from "@/plotApplications/actions"; +import { getLoggedInUser } from "@/auth/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getHoursAndMinutes } from "@/util/date"; +import { formatDate, hasPermissions } from "@/util/helpers"; +import type { RootState } from "@/root/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { isOpen: boolean; onClose: (...args: Array) => any; diff --git a/src/plotApplications/components/PlotApplicationsListPage.tsx b/src/plotApplications/components/PlotApplicationsListPage.tsx index d3190ad63..130d2b103 100644 --- a/src/plotApplications/components/PlotApplicationsListPage.tsx +++ b/src/plotApplications/components/PlotApplicationsListPage.tsx @@ -7,38 +7,38 @@ import { withRouter } from "react-router"; import type { ContextRouter } from "react-router"; import { Row, Column } from "react-foundation"; import { initialize } from "redux-form"; -import Search from "plotApplications/components/search/Search"; -import { receiveTopNavigationSettings } from "components/topNavigation/actions"; -import { fetchPlotApplicationsList, fetchPlotApplicationsByBBox } from "plotApplications/actions"; -import Authorization from "components/authorization/Authorization"; -import AuthorizationError from "components/authorization/AuthorizationError"; -import IconRadioButtons from "components/button/IconRadioButtons"; -import AddButtonSecondary from "components/form/AddButtonSecondary"; -import { LIST_TABLE_PAGE_SIZE } from "util/constants"; -import ExternalLink from "components/links/ExternalLink"; -import SortableTable from "components/table/SortableTable"; -import TableFilters from "components/table/TableFilters"; -import TableFilterWrapper from "components/table/TableFilterWrapper"; -import TableWrapper from "components/table/TableWrapper"; -import TableIcon from "components/icons/TableIcon"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import { getRouteById, Routes } from "root/routes"; -import { FormNames, Methods, PermissionMissingTexts } from "enums"; -import PageContainer from "components/content/PageContainer"; -import { withPlotApplicationsAttributes } from "components/attributes/PlotApplicationsAttributes"; -import Pagination from "components/table/Pagination"; -import VisualisationTypeWrapper from "components/table/VisualisationTypeWrapper"; -import MapIcon from "components/icons/MapIcon"; -import { getContentPlotApplicationsListResults } from "plotApplications/helpers"; -import { isMethodAllowed, getUrlParams, setPageTitle, getApiResponseCount, getApiResponseMaxPage, getSearchQuery } from "util/helpers"; -import { getIsFetching, getPlotApplicationsList, getIsFetchingByBBox } from "plotApplications/selectors"; -import { DEFAULT_PLOT_APPLICATIONS_STATES, BOUNDING_BOX_FOR_SEARCH_QUERY, MAX_ZOOM_LEVEL_TO_FETCH_LEASES } from "plotApplications/constants"; +import Search from "@/plotApplications/components/search/Search"; +import { receiveTopNavigationSettings } from "@/components/topNavigation/actions"; +import { fetchPlotApplicationsList, fetchPlotApplicationsByBBox } from "@/plotApplications/actions"; +import Authorization from "@/components/authorization/Authorization"; +import AuthorizationError from "@/components/authorization/AuthorizationError"; +import IconRadioButtons from "@/components/button/IconRadioButtons"; +import AddButtonSecondary from "@/components/form/AddButtonSecondary"; +import { LIST_TABLE_PAGE_SIZE } from "@/util/constants"; +import ExternalLink from "@/components/links/ExternalLink"; +import SortableTable from "@/components/table/SortableTable"; +import TableFilters from "@/components/table/TableFilters"; +import TableFilterWrapper from "@/components/table/TableFilterWrapper"; +import TableWrapper from "@/components/table/TableWrapper"; +import TableIcon from "@/components/icons/TableIcon"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import { getRouteById, Routes } from "@/root/routes"; +import { FormNames, Methods, PermissionMissingTexts } from "@/enums"; +import PageContainer from "@/components/content/PageContainer"; +import { withPlotApplicationsAttributes } from "@/components/attributes/PlotApplicationsAttributes"; +import Pagination from "@/components/table/Pagination"; +import VisualisationTypeWrapper from "@/components/table/VisualisationTypeWrapper"; +import MapIcon from "@/components/icons/MapIcon"; +import { getContentPlotApplicationsListResults } from "@/plotApplications/helpers"; +import { isMethodAllowed, getUrlParams, setPageTitle, getApiResponseCount, getApiResponseMaxPage, getSearchQuery } from "@/util/helpers"; +import { getIsFetching, getPlotApplicationsList, getIsFetchingByBBox } from "@/plotApplications/selectors"; +import { DEFAULT_PLOT_APPLICATIONS_STATES, BOUNDING_BOX_FOR_SEARCH_QUERY, MAX_ZOOM_LEVEL_TO_FETCH_LEASES } from "@/plotApplications/constants"; import type { Attributes, Methods as MethodsType } from "types"; -import { fetchPlotSearchList, fetchAttributes as fetchPlotSearchAttributes } from "plotSearch/actions"; -import ApplicationListMap from "plotApplications/components/map/ApplicationListMap"; -import { getPlotApplicationsListByBBox } from "plotApplications/selectors"; -import PlotApplicationsListOpeningModal from "plotApplications/components/PlotApplicationsListOpeningModal"; +import { fetchPlotSearchList, fetchAttributes as fetchPlotSearchAttributes } from "@/plotSearch/actions"; +import ApplicationListMap from "@/plotApplications/components/map/ApplicationListMap"; +import { getPlotApplicationsListByBBox } from "@/plotApplications/selectors"; +import PlotApplicationsListOpeningModal from "@/plotApplications/components/PlotApplicationsListOpeningModal"; const VisualizationTypes = { MAP: 'map', TABLE: 'table' diff --git a/src/plotApplications/components/exportModal/PlotSearchExportModal.tsx b/src/plotApplications/components/exportModal/PlotSearchExportModal.tsx index 0725e6710..55cc2f5aa 100644 --- a/src/plotApplications/components/exportModal/PlotSearchExportModal.tsx +++ b/src/plotApplications/components/exportModal/PlotSearchExportModal.tsx @@ -2,19 +2,19 @@ import React, { Component } from "react"; import { flowRight } from "lodash/util"; import { change, formValueSelector, reduxForm } from "redux-form"; import { connect } from "react-redux"; -import Modal from "components/modal/Modal"; -import ModalButtonWrapper from "components/modal/ModalButtonWrapper"; -import Button from "components/button/Button"; -import { ButtonColors } from "components/enums"; -import FormField from "components/form/FormField"; -import { FieldTypes } from "enums"; -import FileDownloadButton from "components/file/FileDownloadButton"; -import createUrl from "api/createUrl"; -import type { Column } from "components/table/SortableTable"; -import PlotSearchExportModalTargetTable from "plotApplications/components/exportModal/PlotSearchExportModalTargetTable"; -import { fetchTargetInfoChecksForPlotSearch } from "plotApplications/actions"; -import { getIsFetchingTargetInfoChecksForCurrentPlotSearch, getTargetInfoChecksForCurrentPlotSearch } from "plotApplications/selectors"; -import Loader from "components/loader/Loader"; +import Modal from "@/components/modal/Modal"; +import ModalButtonWrapper from "@/components/modal/ModalButtonWrapper"; +import Button from "@/components/button/Button"; +import { ButtonColors } from "@/components/enums"; +import FormField from "@/components/form/FormField"; +import { FieldTypes } from "@/enums"; +import FileDownloadButton from "@/components/file/FileDownloadButton"; +import createUrl from "@/api/createUrl"; +import type { Column } from "@/components/table/SortableTable"; +import PlotSearchExportModalTargetTable from "@/plotApplications/components/exportModal/PlotSearchExportModalTargetTable"; +import { fetchTargetInfoChecksForPlotSearch } from "@/plotApplications/actions"; +import { getIsFetchingTargetInfoChecksForCurrentPlotSearch, getTargetInfoChecksForCurrentPlotSearch } from "@/plotApplications/selectors"; +import Loader from "@/components/loader/Loader"; type OwnProps = { isOpen: boolean; onClose: () => void; diff --git a/src/plotApplications/components/exportModal/PlotSearchExportModalTargetTable.tsx b/src/plotApplications/components/exportModal/PlotSearchExportModalTargetTable.tsx index c5d6d3b8a..086960510 100644 --- a/src/plotApplications/components/exportModal/PlotSearchExportModalTargetTable.tsx +++ b/src/plotApplications/components/exportModal/PlotSearchExportModalTargetTable.tsx @@ -1,9 +1,9 @@ import React from "react"; import { groupBy } from "lodash/collection"; -import SortableTable from "components/table/SortableTable"; -import FormField from "components/form/FormField"; -import { FieldTypes } from "enums"; -import type { Column } from "components/table/SortableTable"; +import SortableTable from "@/components/table/SortableTable"; +import FormField from "@/components/form/FormField"; +import { FieldTypes } from "@/enums"; +import type { Column } from "@/components/table/SortableTable"; type Props = { items: Array>; onItemChange: (arg0: Record, arg1: boolean) => void; diff --git a/src/plotApplications/components/infoCheck/PlotApplicationApplicantInfoCheck.tsx b/src/plotApplications/components/infoCheck/PlotApplicationApplicantInfoCheck.tsx index 0f300e611..1ef810ed2 100644 --- a/src/plotApplications/components/infoCheck/PlotApplicationApplicantInfoCheck.tsx +++ b/src/plotApplications/components/infoCheck/PlotApplicationApplicantInfoCheck.tsx @@ -1,14 +1,14 @@ import React, { PureComponent } from "react"; import { Column, Row } from "react-foundation"; import { connect } from "react-redux"; -import { getFieldOptions, getLabelOfOption } from "util/helpers"; -import { getUserFullName } from "users/helpers"; +import { getFieldOptions, getLabelOfOption } from "@/util/helpers"; +import { getUserFullName } from "@/users/helpers"; import type { Attributes } from "types"; -import PlotApplicationInfoCheckCollapse from "plotApplications/components/infoCheck/PlotApplicationInfoCheckCollapse"; -import { getApplicationApplicantInfoCheckData } from "plotApplications/selectors"; -import ApplicantInfoCheck from "application/components/infoCheck/ApplicantInfoCheck"; -import { getApplicantInfoCheckAttributes } from "application/selectors"; -import { getApplicantInfoCheckItems } from "application/helpers"; +import PlotApplicationInfoCheckCollapse from "@/plotApplications/components/infoCheck/PlotApplicationInfoCheckCollapse"; +import { getApplicationApplicantInfoCheckData } from "@/plotApplications/selectors"; +import ApplicantInfoCheck from "@/application/components/infoCheck/ApplicantInfoCheck"; +import { getApplicantInfoCheckAttributes } from "@/application/selectors"; +import { getApplicantInfoCheckItems } from "@/application/helpers"; type OwnProps = { section: Record; identifier: string; diff --git a/src/plotApplications/components/infoCheck/PlotApplicationApplicantInfoCheckEdit.tsx b/src/plotApplications/components/infoCheck/PlotApplicationApplicantInfoCheckEdit.tsx index d9f851b64..7f28ed6f5 100644 --- a/src/plotApplications/components/infoCheck/PlotApplicationApplicantInfoCheckEdit.tsx +++ b/src/plotApplications/components/infoCheck/PlotApplicationApplicantInfoCheckEdit.tsx @@ -2,11 +2,11 @@ import React, { PureComponent } from "react"; import { connect } from "react-redux"; import { change } from "redux-form"; import type { Attributes } from "types"; -import PlotApplicationInfoCheckCollapse from "plotApplications/components/infoCheck/PlotApplicationInfoCheckCollapse"; -import { getApplicantInfoCheckSubmissionErrors, getApplicationApplicantInfoCheckData } from "plotApplications/selectors"; -import { getApplicantInfoCheckAttributes } from "application/selectors"; -import ApplicantInfoCheckEdit from "application/components/infoCheck/ApplicantInfoCheckEdit"; -import { getApplicantInfoCheckFormName } from "application/helpers"; +import PlotApplicationInfoCheckCollapse from "@/plotApplications/components/infoCheck/PlotApplicationInfoCheckCollapse"; +import { getApplicantInfoCheckSubmissionErrors, getApplicationApplicantInfoCheckData } from "@/plotApplications/selectors"; +import { getApplicantInfoCheckAttributes } from "@/application/selectors"; +import ApplicantInfoCheckEdit from "@/application/components/infoCheck/ApplicantInfoCheckEdit"; +import { getApplicantInfoCheckFormName } from "@/application/helpers"; type OwnProps = { section: Record; identifier: string; diff --git a/src/plotApplications/components/infoCheck/PlotApplicationInfoCheckCollapse.tsx b/src/plotApplications/components/infoCheck/PlotApplicationInfoCheckCollapse.tsx index f016db05c..5798469e5 100644 --- a/src/plotApplications/components/infoCheck/PlotApplicationInfoCheckCollapse.tsx +++ b/src/plotApplications/components/infoCheck/PlotApplicationInfoCheckCollapse.tsx @@ -1,6 +1,6 @@ import React from "react"; import classNames from "classnames"; -import Collapse from "components/collapse/Collapse"; +import Collapse from "@/components/collapse/Collapse"; type Props = { children?: React.ReactNode | null | undefined; className?: string; diff --git a/src/plotApplications/components/infoCheck/PlotApplicationTargetInfoCheck.tsx b/src/plotApplications/components/infoCheck/PlotApplicationTargetInfoCheck.tsx index 80af3ebe4..9f0dcda54 100644 --- a/src/plotApplications/components/infoCheck/PlotApplicationTargetInfoCheck.tsx +++ b/src/plotApplications/components/infoCheck/PlotApplicationTargetInfoCheck.tsx @@ -3,19 +3,19 @@ import { Column, Row } from "react-foundation"; import flowRight from "lodash/flowRight"; import { connect } from "react-redux"; import get from "lodash/get"; -import { formatDate, getFieldOptions, getLabelOfOption, isFieldAllowedToRead } from "util/helpers"; -import Authorization from "components/authorization/Authorization"; -import FormTextTitle from "components/form/FormTextTitle"; -import FormText from "components/form/FormText"; -import FileDownloadLink from "components/file/FileDownloadLink"; -import type { RootState } from "root/types"; +import { formatDate, getFieldOptions, getLabelOfOption, isFieldAllowedToRead } from "@/util/helpers"; +import Authorization from "@/components/authorization/Authorization"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import FormText from "@/components/form/FormText"; +import FileDownloadLink from "@/components/file/FileDownloadLink"; +import type { RootState } from "@/root/types"; import type { Attributes } from "types"; -import { getUserFullName } from "users/helpers"; -import PlotApplicationInfoCheckCollapse from "plotApplications/components/infoCheck/PlotApplicationInfoCheckCollapse"; -import { getApplicationRelatedPlotSearch, getApplicationTargetInfoCheckData } from "plotApplications/selectors"; -import { PlotApplicationTargetInfoCheckFieldPaths, PlotApplicationTargetInfoCheckFieldTitles } from "plotApplications/enums"; -import { getInitialTargetInfoCheckValues, getMeetingMemoDownloadLink } from "plotApplications/helpers"; -import { getAttributes } from "application/selectors"; +import { getUserFullName } from "@/users/helpers"; +import PlotApplicationInfoCheckCollapse from "@/plotApplications/components/infoCheck/PlotApplicationInfoCheckCollapse"; +import { getApplicationRelatedPlotSearch, getApplicationTargetInfoCheckData } from "@/plotApplications/selectors"; +import { PlotApplicationTargetInfoCheckFieldPaths, PlotApplicationTargetInfoCheckFieldTitles } from "@/plotApplications/enums"; +import { getInitialTargetInfoCheckValues, getMeetingMemoDownloadLink } from "@/plotApplications/helpers"; +import { getAttributes } from "@/application/selectors"; type TargetSubFieldSetProps = { values: any; attributes: Attributes; diff --git a/src/plotApplications/components/infoCheck/PlotApplicationTargetInfoCheckEdit.tsx b/src/plotApplications/components/infoCheck/PlotApplicationTargetInfoCheckEdit.tsx index 9fcf85380..a6528fc93 100644 --- a/src/plotApplications/components/infoCheck/PlotApplicationTargetInfoCheckEdit.tsx +++ b/src/plotApplications/components/infoCheck/PlotApplicationTargetInfoCheckEdit.tsx @@ -4,30 +4,30 @@ import flowRight from "lodash/flowRight"; import { connect } from "react-redux"; import get from "lodash/get"; import { FieldArray, getFormValues, reduxForm } from "redux-form"; -import FormField from "components/form/FormField"; -import { formatDate, getFieldAttributes, isFieldAllowedToRead } from "util/helpers"; -import Authorization from "components/authorization/Authorization"; -import RemoveButton from "components/form/RemoveButton"; -import FormTextTitle from "components/form/FormTextTitle"; -import { ButtonColors } from "components/enums"; -import AddButtonThird from "components/form/AddButtonThird"; -import FormFieldLabel from "components/form/FormFieldLabel"; -import AddFileButton from "components/form/AddFileButton"; -import FormText from "components/form/FormText"; -import FileDownloadLink from "components/file/FileDownloadLink"; -import type { RootState } from "root/types"; +import FormField from "@/components/form/FormField"; +import { formatDate, getFieldAttributes, isFieldAllowedToRead } from "@/util/helpers"; +import Authorization from "@/components/authorization/Authorization"; +import RemoveButton from "@/components/form/RemoveButton"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import { ButtonColors } from "@/components/enums"; +import AddButtonThird from "@/components/form/AddButtonThird"; +import FormFieldLabel from "@/components/form/FormFieldLabel"; +import AddFileButton from "@/components/form/AddFileButton"; +import FormText from "@/components/form/FormText"; +import FileDownloadLink from "@/components/file/FileDownloadLink"; +import type { RootState } from "@/root/types"; import type { Attributes } from "types"; -import { getUserFullName } from "users/helpers"; -import { ConfirmationModalTexts, FieldTypes } from "enums"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import PlotApplicationInfoCheckCollapse from "plotApplications/components/infoCheck/PlotApplicationInfoCheckCollapse"; -import { getIsPerformingFileOperation, getIsSaveClicked, getIsSaving, getTargetInfoCheckSubmissionErrors } from "plotApplications/selectors"; -import { PlotApplicationTargetInfoCheckFieldPaths, PlotApplicationTargetInfoCheckFieldTitles } from "plotApplications/enums"; -import { getMeetingMemoDownloadLink, getTargetInfoCheckFormName } from "plotApplications/helpers"; -import { deleteTargetInfoCheckMeetingMemo, uploadTargetInfoCheckMeetingMemo } from "plotApplications/actions"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import Loader from "components/loader/Loader"; -import { getAttributes } from "application/selectors"; +import { getUserFullName } from "@/users/helpers"; +import { ConfirmationModalTexts, FieldTypes } from "@/enums"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import PlotApplicationInfoCheckCollapse from "@/plotApplications/components/infoCheck/PlotApplicationInfoCheckCollapse"; +import { getIsPerformingFileOperation, getIsSaveClicked, getIsSaving, getTargetInfoCheckSubmissionErrors } from "@/plotApplications/selectors"; +import { PlotApplicationTargetInfoCheckFieldPaths, PlotApplicationTargetInfoCheckFieldTitles } from "@/plotApplications/enums"; +import { getMeetingMemoDownloadLink, getTargetInfoCheckFormName } from "@/plotApplications/helpers"; +import { deleteTargetInfoCheckMeetingMemo, uploadTargetInfoCheckMeetingMemo } from "@/plotApplications/actions"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import Loader from "@/components/loader/Loader"; +import { getAttributes } from "@/application/selectors"; type TargetSubFieldSetProps = { fields: any; attributes: Attributes; diff --git a/src/plotApplications/components/map/ApplicationListMap.tsx b/src/plotApplications/components/map/ApplicationListMap.tsx index 2c97cd7ae..0f5f35c89 100644 --- a/src/plotApplications/components/map/ApplicationListMap.tsx +++ b/src/plotApplications/components/map/ApplicationListMap.tsx @@ -3,20 +3,20 @@ import { connect } from "react-redux"; import { withRouter } from "react-router"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; -import AreaNotesEditMap from "areaNote/components/AreaNotesEditMap"; -import TargetListLayer from "plotApplications/components/map/TargetListLayer"; -import { DEFAULT_ZOOM, MAP_COLORS } from "util/constants"; -import { MAX_ZOOM_LEVEL_TO_FETCH_LEASES } from "leases/constants"; -import { getApplicationTargetGeoJson } from "plotApplications/helpers"; -import { getApiResponseResults, getUrlParams } from "util/helpers"; -import { getBoundsFromBBox, getBoundsFromFeatures } from "util/map"; -import { getAreaNoteList } from "areaNote/selectors"; -import { getApplicationsByBBox } from "plotApplications/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; +import AreaNotesEditMap from "@/areaNote/components/AreaNotesEditMap"; +import TargetListLayer from "@/plotApplications/components/map/TargetListLayer"; +import { DEFAULT_ZOOM, MAP_COLORS } from "@/util/constants"; +import { MAX_ZOOM_LEVEL_TO_FETCH_LEASES } from "@/leases/constants"; +import { getApplicationTargetGeoJson } from "@/plotApplications/helpers"; +import { getApiResponseResults, getUrlParams } from "@/util/helpers"; +import { getBoundsFromBBox, getBoundsFromFeatures } from "@/util/map"; +import { getAreaNoteList } from "@/areaNote/selectors"; +import { getApplicationsByBBox } from "@/plotApplications/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; import type { LeafletGeoJson } from "types"; -import type { AreaNoteList } from "areaNote/types"; -import type { PlotApplicationsList } from "plotApplications/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { AreaNoteList } from "@/areaNote/types"; +import type { PlotApplicationsList } from "@/plotApplications/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; const getMapBounds = () => { const { diff --git a/src/plotApplications/components/map/TargetListLayer.tsx b/src/plotApplications/components/map/TargetListLayer.tsx index 6787d4ac5..10ccee16f 100644 --- a/src/plotApplications/components/map/TargetListLayer.tsx +++ b/src/plotApplications/components/map/TargetListLayer.tsx @@ -3,7 +3,7 @@ import { withRouter } from "react-router"; import { FeatureGroup, GeoJSON, Popup } from "react-leaflet"; import flowRight from "lodash/flowRight"; import { Link } from "react-router-dom"; -import { getRouteById, Routes } from "root/routes"; +import { getRouteById, Routes } from "@/root/routes"; import type { LeafletGeoJson } from "types"; type OwnProps = { color: string; diff --git a/src/plotApplications/components/search/Search.tsx b/src/plotApplications/components/search/Search.tsx index fa5557ec0..d8a5ae6c8 100644 --- a/src/plotApplications/components/search/Search.tsx +++ b/src/plotApplications/components/search/Search.tsx @@ -7,22 +7,22 @@ import debounce from "lodash/debounce"; import flowRight from "lodash/flowRight"; import isEqual from "lodash/isEqual"; import isEmpty from "lodash/isEmpty"; -import { getUrlParams, getFieldOptions } from "util/helpers"; -import { getAttributes as getPlotSearchAttributes, getPlotSearchList } from "plotSearch/selectors"; -import FormField from "components/form/FormField"; -import SearchClearLink from "components/search/SearchClearLink"; -import SearchChangeTypeLink from "components/search/SearchChangeTypeLink"; -import SearchContainer from "components/search/SearchContainer"; -import SearchRow from "components/search/SearchRow"; -import SearchLabelColumn from "components/search/SearchLabelColumn"; -import SearchLabel from "components/search/SearchLabel"; -import SearchInputColumn from "components/search/SearchInputColumn"; -import { FieldTypes, FormNames } from "enums"; -import { PlotSearchFieldPaths } from "plotSearch/enums"; -import type { PlotSearchList } from "plotSearch/types"; +import { getUrlParams, getFieldOptions } from "@/util/helpers"; +import { getAttributes as getPlotSearchAttributes, getPlotSearchList } from "@/plotSearch/selectors"; +import FormField from "@/components/form/FormField"; +import SearchClearLink from "@/components/search/SearchClearLink"; +import SearchChangeTypeLink from "@/components/search/SearchChangeTypeLink"; +import SearchContainer from "@/components/search/SearchContainer"; +import SearchRow from "@/components/search/SearchRow"; +import SearchLabelColumn from "@/components/search/SearchLabelColumn"; +import SearchLabel from "@/components/search/SearchLabel"; +import SearchInputColumn from "@/components/search/SearchInputColumn"; +import { FieldTypes, FormNames } from "@/enums"; +import { PlotSearchFieldPaths } from "@/plotSearch/enums"; +import type { PlotSearchList } from "@/plotSearch/types"; import type { Attributes } from "types"; -import { fetchPlotSearchSubtypes } from "plotApplications/actions"; -import { getPlotSearchSubTypes } from "plotApplications/selectors"; +import { fetchPlotSearchSubtypes } from "@/plotApplications/actions"; +import { getPlotSearchSubTypes } from "@/plotApplications/selectors"; type OwnProps = { isSearchInitialized: boolean; onSearch: (...args: Array) => any; diff --git a/src/plotApplications/constants.ts b/src/plotApplications/constants.ts index 3b0e3252b..d3c26b5ad 100644 --- a/src/plotApplications/constants.ts +++ b/src/plotApplications/constants.ts @@ -1,4 +1,4 @@ -import { TableSortOrder } from "enums"; +import { TableSortOrder } from "@/enums"; /** * Default plotApplications states value for plotSearch list search diff --git a/src/plotApplications/helpers.ts b/src/plotApplications/helpers.ts index 6df73f7ac..2cc7224e0 100644 --- a/src/plotApplications/helpers.ts +++ b/src/plotApplications/helpers.ts @@ -1,17 +1,17 @@ import get from "lodash/get"; import _ from "lodash"; import { formValueSelector } from "redux-form"; -import { getApiResponseResults, getFieldAttributes } from "util/helpers"; -import createUrl from "api/createUrl"; -import { store } from "root/startApp"; -import { FormNames } from "enums"; -import { getCurrentEditorTargets } from "plotApplications/selectors"; -import { getTargetTitle, getTargetType, prepareApplicationForSubmission } from "application/helpers"; -import { TargetIdentifierTypes } from "application/enums"; +import { getApiResponseResults, getFieldAttributes } from "@/util/helpers"; +import createUrl from "@/api/createUrl"; +import { store } from "@/index"; +import { FormNames } from "@/enums"; +import { getCurrentEditorTargets } from "@/plotApplications/selectors"; +import { getTargetTitle, getTargetType, prepareApplicationForSubmission } from "@/application/helpers"; +import { TargetIdentifierTypes } from "@/application/enums"; import type { Attributes, LeafletFeature, LeafletGeoJson } from "types"; -import type { ApplicationFormState } from "plotApplications/types"; -import type { PlotSearch } from "plotSearch/types"; -import type { Form } from "application/types"; +import type { ApplicationFormState } from "@/plotApplications/types"; +import type { PlotSearch } from "@/plotSearch/types"; +import type { Form } from "@/application/types"; /** * Get plotApplication list results diff --git a/src/plotApplications/reducer.ts b/src/plotApplications/reducer.ts index c18045f6e..17dfe167e 100644 --- a/src/plotApplications/reducer.ts +++ b/src/plotApplications/reducer.ts @@ -3,9 +3,9 @@ import type { Action } from "redux"; import { combineReducers } from "redux"; import { handleActions } from "redux-actions"; import { sortBy } from "lodash/collection"; -import { FormNames } from "enums"; +import { FormNames } from "@/enums"; import type { Attributes, Reducer } from "types"; -import type { InfoCheckBatchEditErrors, PlotApplication, PlotApplicationsList, PlotApplicationsState, ReceiveApplicationRelatedFormAction, ReceiveApplicationRelatedPlotSearchAction, ReceiveCollapseStatesAction, ReceiveFormValidFlagsAction, ReceiveIsSaveClickedAction, ReceivePlotApplicationInfoCheckBatchEditFailureAction, ReceivePlotApplicationsByBBoxAction, ReceivePlotApplicationsListAction, ReceivePlotSearchSubtypesAction, ReceiveSinglePlotApplicationAction, ReceiveTargetInfoCheckAttributesAction, ReceiveTargetInfoChecksForPlotSearchAction } from "plotApplications/types"; +import type { InfoCheckBatchEditErrors, PlotApplication, PlotApplicationsList, PlotApplicationsState, ReceiveApplicationRelatedFormAction, ReceiveApplicationRelatedPlotSearchAction, ReceiveCollapseStatesAction, ReceiveFormValidFlagsAction, ReceiveIsSaveClickedAction, ReceivePlotApplicationInfoCheckBatchEditFailureAction, ReceivePlotApplicationsByBBoxAction, ReceivePlotApplicationsListAction, ReceivePlotSearchSubtypesAction, ReceiveSinglePlotApplicationAction, ReceiveTargetInfoCheckAttributesAction, ReceiveTargetInfoChecksForPlotSearchAction } from "@/plotApplications/types"; const isFetchingReducer: Reducer = handleActions({ ['mvj/plotApplications/FETCH_ALL']: () => true, ['mvj/plotApplications/RECEIVE_ALL']: () => false, diff --git a/src/plotApplications/requests.ts b/src/plotApplications/requests.ts index 720a03d66..83c130622 100644 --- a/src/plotApplications/requests.ts +++ b/src/plotApplications/requests.ts @@ -1,6 +1,6 @@ -import callApi from "api/callApi"; -import createUrl from "api/createUrl"; -import callUploadRequest from "api/callUploadRequest"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; +import callUploadRequest from "@/api/callUploadRequest"; export const fetchPlotApplications = (params: Record | null | undefined): Generator => { return callApi(new Request(createUrl('answer/', params))); }; diff --git a/src/plotApplications/saga.ts b/src/plotApplications/saga.ts index 158162751..320398b11 100644 --- a/src/plotApplications/saga.ts +++ b/src/plotApplications/saga.ts @@ -1,16 +1,16 @@ import { all, call, fork, put, select, takeEvery, takeLatest } from "redux-saga/effects"; import { SubmissionError } from "redux-form"; import { push } from "react-router-redux"; -import { displayUIMessage } from "util/helpers"; -import { applicationRelatedFormNotFound, applicationRelatedPlotSearchNotFound, applicationsNotFound, fetchApplicationRelatedForm, fetchApplicationRelatedPlotSearch, fetchSinglePlotApplication, hideEditMode, notFoundByBBox, plotSearchSubtypesNotFound, receiveApplicationRelatedForm, receiveApplicationRelatedPlotSearch, receiveBatchInfoCheckEditFailure, receiveBatchInfoCheckEditSuccess, receiveFileOperationFinished, receivePlotApplicationSaved, receivePlotApplicationSaveFailed, receivePlotApplicationsByBBox, receivePlotApplicationsList, receivePlotSearchSubtypes, receiveSinglePlotApplication, receiveTargetInfoCheckMeetingMemoUploaded, receiveTargetInfoChecksForPlotSearch, showEditMode, singlePlotApplicationNotAllowed, singlePlotApplicationNotFound, targetInfoCheckMeetingMemoDeleteFailed, targetInfoCheckMeetingMemoUploadFailed, targetInfoChecksForPlotSearchNotFound } from "plotApplications/actions"; -import { receiveError } from "api/actions"; -import { createMeetingMemoRequest, createOpeningRecordRequest, deleteMeetingMemoRequest, editApplicantInfoCheckItemRequest, editOpeningRecordRequest, editTargetInfoCheckItemRequest, fetchPlotApplications, fetchPlotSearchSubtypesRequest, fetchSinglePlotApplication as fetchSinglePlotApplicationRequest, fetchTargetInfoChecksForPlotSearchRequest } from "plotApplications/requests"; -import { fetchFormRequest, fetchSinglePlotSearch } from "plotSearch/requests"; -import { getRouteById, Routes } from "root/routes"; -import { getCurrentPlotApplication } from "plotApplications/selectors"; -import { fetchApplicantInfoCheckAttributes, fetchApplicationRelatedAttachments, fetchFormAttributes, receiveUpdatedApplicantInfoCheckItem, receiveUpdatedTargetInfoCheckItem } from "application/actions"; -import { createApplicationRequest, editApplicationRequest } from "application/requests"; -import type { BatchEditPlotApplicationModelsAction, DeleteTargetInfoCheckMeetingMemoAction, InfoCheckBatchEditErrors, PlotApplication, UploadTargetInfoCheckMeetingMemoAction } from "plotApplications/types"; +import { displayUIMessage } from "@/util/helpers"; +import { applicationRelatedFormNotFound, applicationRelatedPlotSearchNotFound, applicationsNotFound, fetchApplicationRelatedForm, fetchApplicationRelatedPlotSearch, fetchSinglePlotApplication, hideEditMode, notFoundByBBox, plotSearchSubtypesNotFound, receiveApplicationRelatedForm, receiveApplicationRelatedPlotSearch, receiveBatchInfoCheckEditFailure, receiveBatchInfoCheckEditSuccess, receiveFileOperationFinished, receivePlotApplicationSaved, receivePlotApplicationSaveFailed, receivePlotApplicationsByBBox, receivePlotApplicationsList, receivePlotSearchSubtypes, receiveSinglePlotApplication, receiveTargetInfoCheckMeetingMemoUploaded, receiveTargetInfoChecksForPlotSearch, showEditMode, singlePlotApplicationNotAllowed, singlePlotApplicationNotFound, targetInfoCheckMeetingMemoDeleteFailed, targetInfoCheckMeetingMemoUploadFailed, targetInfoChecksForPlotSearchNotFound } from "@/plotApplications/actions"; +import { receiveError } from "@/api/actions"; +import { createMeetingMemoRequest, createOpeningRecordRequest, deleteMeetingMemoRequest, editApplicantInfoCheckItemRequest, editOpeningRecordRequest, editTargetInfoCheckItemRequest, fetchPlotApplications, fetchPlotSearchSubtypesRequest, fetchSinglePlotApplication as fetchSinglePlotApplicationRequest, fetchTargetInfoChecksForPlotSearchRequest } from "@/plotApplications/requests"; +import { fetchFormRequest, fetchSinglePlotSearch } from "@/plotSearch/requests"; +import { getRouteById, Routes } from "@/root/routes"; +import { getCurrentPlotApplication } from "@/plotApplications/selectors"; +import { fetchApplicantInfoCheckAttributes, fetchApplicationRelatedAttachments, fetchFormAttributes, receiveUpdatedApplicantInfoCheckItem, receiveUpdatedTargetInfoCheckItem } from "@/application/actions"; +import { createApplicationRequest, editApplicationRequest } from "@/application/requests"; +import type { BatchEditPlotApplicationModelsAction, DeleteTargetInfoCheckMeetingMemoAction, InfoCheckBatchEditErrors, PlotApplication, UploadTargetInfoCheckMeetingMemoAction } from "@/plotApplications/types"; function* fetchPlotApplicationsSaga({ payload: query, diff --git a/src/plotApplications/selectors.ts b/src/plotApplications/selectors.ts index cbac7b073..6132d9166 100644 --- a/src/plotApplications/selectors.ts +++ b/src/plotApplications/selectors.ts @@ -1,9 +1,9 @@ import get from "lodash/get"; import isEmpty from "lodash/isEmpty"; import type { Selector } from "types"; -import type { RootState } from "root/types"; -import type { InfoCheckBatchEditErrorsItem, PlotApplication, PlotApplicationsList } from "plotApplications/types"; -import type { PlotSearch } from "plotSearch/types"; +import type { RootState } from "@/root/types"; +import type { InfoCheckBatchEditErrorsItem, PlotApplication, PlotApplicationsList } from "@/plotApplications/types"; +import type { PlotSearch } from "@/plotSearch/types"; export const getApplicationsByBBox: Selector = (state: RootState): PlotApplicationsList => state.plotApplications.listByBBox; export const getIsFetching: Selector = (state: RootState): boolean => state.plotApplications.isFetching; export const getIsFetchingByBBox: Selector = (state: RootState): boolean => state.plotApplications.isFetchingByBBox; diff --git a/src/plotApplications/spec.ts b/src/plotApplications/spec.ts index 1c561d98a..564699ff1 100644 --- a/src/plotApplications/spec.ts +++ b/src/plotApplications/spec.ts @@ -1,7 +1,7 @@ import { expect } from "chai"; -import { fetchPlotApplicationsList, receivePlotApplicationsList, fetchSinglePlotApplication, receiveSinglePlotApplication, hideEditMode, showEditMode, receiveIsSaveClicked, receiveCollapseStates, receiveFormValidFlags, clearFormValidFlags, editPlotApplication } from "plotApplications/actions"; -import plotApplicationReducer from "plotApplications/reducer"; -import type { PlotApplicationsState } from "plotApplications/types"; +import { fetchPlotApplicationsList, receivePlotApplicationsList, fetchSinglePlotApplication, receiveSinglePlotApplication, hideEditMode, showEditMode, receiveIsSaveClicked, receiveCollapseStates, receiveFormValidFlags, clearFormValidFlags, editPlotApplication } from "@/plotApplications/actions"; +import plotApplicationReducer from "@/plotApplications/reducer"; +import type { PlotApplicationsState } from "@/plotApplications/types"; const baseState: PlotApplicationsState = { currentEditorTargets: [], form: null, diff --git a/src/plotApplications/types.ts b/src/plotApplications/types.ts index c86aeeb7d..802399844 100644 --- a/src/plotApplications/types.ts +++ b/src/plotApplications/types.ts @@ -1,6 +1,6 @@ import type { Action, Attributes } from "types"; -import type { PlotSearch } from "plotSearch/types"; -import type { ApplicationFormSection } from "application/types"; +import type { PlotSearch } from "@/plotSearch/types"; +import type { ApplicationFormSection } from "@/application/types"; export type PlotApplicationsState = { isFetching: boolean; list: PlotApplicationsList; diff --git a/src/plotSearch/actions.ts b/src/plotSearch/actions.ts index 547046efe..4d5d82836 100644 --- a/src/plotSearch/actions.ts +++ b/src/plotSearch/actions.ts @@ -1,6 +1,6 @@ import { createAction } from "redux-actions"; import type { Attributes, Methods } from "types"; -import type { AddPlanUnitDecisionsAction, BatchCreateReservationIdentifiersAction, ClearFormValidFlagsAction, CreatePlotSearchAction, CustomDetailedPlan, CustomDetailedPlanAttributesNotFoundAction, CustomDetailedPlanNotFoundAction, DeletePlotSearchAction, EditFormAction, EditPlotSearchAction, FetchAttributesAction, FetchCustomDetailedPlanAction, FetchCustomDetailedPlanAttributesAction, FetchFormAction, FetchPlanUnitAction, FetchPlanUnitAttributesAction, FetchPlotSearchListAction, FetchPlotSearchStagesAction, FetchPlotSearchSubtypesAction, FetchReservationIdentifierUnitListsAction, FetchSinglePlotSearchAction, FetchSinglePlotSearchAfterEditAction, FetchSinglePlotSearchAfterEditPayload, FetchTemplateFormsAction, FormNotFoundAction, HideEditModeAction, NullPlanUnitsAction, PlanUnit, PlanUnitAttributesNotFoundAction, PlanUnitNotFoundAction, PlotSearch, PlotSearchAttributesNotFoundAction, PlotSearchId, PlotSearchList, PlotSearchNotFoundAction, PlotSearchStagesNotFoundAction, PlotSearchSubtypesNotFoundAction, ReceiveAttributesAction, ReceiveCollapseStatesAction, ReceiveCustomDetailedPlanAttributesAction, ReceiveFormAction, ReceiveFormValidFlagsAction, ReceiveIsSaveClickedAction, ReceiveMethodsAction, ReceivePlanUnitAttributesAction, ReceivePlotSearchListAction, ReceivePlotSearchStagesAction, ReceivePlotSearchSubtypesAction, ReceiveReservationIdentifierUnitListsAction, ReceiveSingleCustomDetailedPlanAction, ReceiveSinglePlanUnitAction, ReceiveSinglePlotSearchAction, ReceiveTemplateFormsAction, RemovePlanUnitDecisionsAction, ReservationIdentifiersCreatedAction, ReservationIdentifiersCreationFailedAction, ReservationIdentifierUnitListsNotFoundAction, CreateDirectReservationLinkAction, DirectReservationLinkCreatedAction, DirectReservationLinkCreationFailedAction, ResetPlanUnitDecisionsAction, ShowEditModeAction, TemplateFormsNotFoundAction, ClearSectionEditorCollapseStatesAction, SetSectionEditorCollapseStateAction, InitializeSectionEditorCollapseStatesAction, ReceivePlotSearchRelatedApplicationsAction, FetchPlotSearchRelatedApplicationsAction, PlotSearchRelatedApplicationsNotFoundAction } from "plotSearch/types"; +import type { AddPlanUnitDecisionsAction, BatchCreateReservationIdentifiersAction, ClearFormValidFlagsAction, CreatePlotSearchAction, CustomDetailedPlan, CustomDetailedPlanAttributesNotFoundAction, CustomDetailedPlanNotFoundAction, DeletePlotSearchAction, EditFormAction, EditPlotSearchAction, FetchAttributesAction, FetchCustomDetailedPlanAction, FetchCustomDetailedPlanAttributesAction, FetchFormAction, FetchPlanUnitAction, FetchPlanUnitAttributesAction, FetchPlotSearchListAction, FetchPlotSearchStagesAction, FetchPlotSearchSubtypesAction, FetchReservationIdentifierUnitListsAction, FetchSinglePlotSearchAction, FetchSinglePlotSearchAfterEditAction, FetchSinglePlotSearchAfterEditPayload, FetchTemplateFormsAction, FormNotFoundAction, HideEditModeAction, NullPlanUnitsAction, PlanUnit, PlanUnitAttributesNotFoundAction, PlanUnitNotFoundAction, PlotSearch, PlotSearchAttributesNotFoundAction, PlotSearchId, PlotSearchList, PlotSearchNotFoundAction, PlotSearchStagesNotFoundAction, PlotSearchSubtypesNotFoundAction, ReceiveAttributesAction, ReceiveCollapseStatesAction, ReceiveCustomDetailedPlanAttributesAction, ReceiveFormAction, ReceiveFormValidFlagsAction, ReceiveIsSaveClickedAction, ReceiveMethodsAction, ReceivePlanUnitAttributesAction, ReceivePlotSearchListAction, ReceivePlotSearchStagesAction, ReceivePlotSearchSubtypesAction, ReceiveReservationIdentifierUnitListsAction, ReceiveSingleCustomDetailedPlanAction, ReceiveSinglePlanUnitAction, ReceiveSinglePlotSearchAction, ReceiveTemplateFormsAction, RemovePlanUnitDecisionsAction, ReservationIdentifiersCreatedAction, ReservationIdentifiersCreationFailedAction, ReservationIdentifierUnitListsNotFoundAction, CreateDirectReservationLinkAction, DirectReservationLinkCreatedAction, DirectReservationLinkCreationFailedAction, ResetPlanUnitDecisionsAction, ShowEditModeAction, TemplateFormsNotFoundAction, ClearSectionEditorCollapseStatesAction, SetSectionEditorCollapseStateAction, InitializeSectionEditorCollapseStatesAction, ReceivePlotSearchRelatedApplicationsAction, FetchPlotSearchRelatedApplicationsAction, PlotSearchRelatedApplicationsNotFoundAction } from "@/plotSearch/types"; export const fetchAttributes = (): FetchAttributesAction => createAction('mvj/plotSearch/FETCH_ATTRIBUTES')(); export const receiveMethods = (methods: Methods): ReceiveMethodsAction => createAction('mvj/plotSearch/RECEIVE_METHODS')(methods); export const attributesNotFound = (): PlotSearchAttributesNotFoundAction => createAction('mvj/plotSearch/ATTRIBUTES_NOT_FOUND')(); diff --git a/src/plotSearch/components/CreatePlotSearchForm.tsx b/src/plotSearch/components/CreatePlotSearchForm.tsx index 1968ad92e..f6d7a30eb 100644 --- a/src/plotSearch/components/CreatePlotSearchForm.tsx +++ b/src/plotSearch/components/CreatePlotSearchForm.tsx @@ -4,13 +4,13 @@ import { change, formValueSelector, reduxForm } from "redux-form"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; import get from "lodash/get"; -import Button from "components/button/Button"; -import FormField from "components/form/FormField"; -import ModalButtonWrapper from "components/modal/ModalButtonWrapper"; -import { FormNames } from "enums"; -import { ButtonColors } from "components/enums"; -import { getAttributes } from "plotSearch/selectors"; -import { PlotSearchFieldTitles } from "plotSearch/enums"; +import Button from "@/components/button/Button"; +import FormField from "@/components/form/FormField"; +import ModalButtonWrapper from "@/components/modal/ModalButtonWrapper"; +import { FormNames } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { getAttributes } from "@/plotSearch/selectors"; +import { PlotSearchFieldTitles } from "@/plotSearch/enums"; import type { Attributes } from "types"; type OwnProps = { onClose: (...args: Array) => any; diff --git a/src/plotSearch/components/CreatePlotSearchModal.tsx b/src/plotSearch/components/CreatePlotSearchModal.tsx index 1f0048325..a8ee0f65c 100644 --- a/src/plotSearch/components/CreatePlotSearchModal.tsx +++ b/src/plotSearch/components/CreatePlotSearchModal.tsx @@ -1,6 +1,6 @@ import React, { Component } from "react"; -import CreatePlotSearchForm from "plotSearch/components/CreatePlotSearchForm"; -import Modal from "components/modal/Modal"; +import CreatePlotSearchForm from "@/plotSearch/components/CreatePlotSearchForm"; +import Modal from "@/components/modal/Modal"; type Props = { isOpen: boolean; onClose: (...args: Array) => any; diff --git a/src/plotSearch/components/PlotSearchListPage.tsx b/src/plotSearch/components/PlotSearchListPage.tsx index b79b083eb..15ac69fd4 100644 --- a/src/plotSearch/components/PlotSearchListPage.tsx +++ b/src/plotSearch/components/PlotSearchListPage.tsx @@ -5,37 +5,37 @@ import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; import { initialize } from "redux-form"; import { withRouter } from "react-router"; -import Authorization from "components/authorization/Authorization"; -import AuthorizationError from "components/authorization/AuthorizationError"; -import { FormNames, Methods, PermissionMissingTexts } from "enums"; -import ExternalLink from "components/links/ExternalLink"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import IconRadioButtons from "components/button/IconRadioButtons"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import MapIcon from "components/icons/MapIcon"; -import PageContainer from "components/content/PageContainer"; -import Pagination from "components/table/Pagination"; -import { receiveTopNavigationSettings } from "components/topNavigation/actions"; -import Search from "plotSearch/components/search/Search"; -import { LIST_TABLE_PAGE_SIZE } from "util/constants"; -import SortableTable from "components/table/SortableTable"; -import TableFilters from "components/table/TableFilters"; -import TableFilterWrapper from "components/table/TableFilterWrapper"; -import TableWrapper from "components/table/TableWrapper"; -import TableIcon from "components/icons/TableIcon"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; -import VisualisationTypeWrapper from "components/table/VisualisationTypeWrapper"; -import { createPlotSearch, fetchPlotSearchList } from "plotSearch/actions"; -import { getIsFetching, getPlotSearchList } from "plotSearch/selectors"; -import { getRouteById, Routes } from "root/routes"; -import { formatDate, getLabelOfOption, setPageTitle, getFieldOptions, getSearchQuery, getApiResponseCount, getApiResponseMaxPage, getUrlParams, isMethodAllowed } from "util/helpers"; -import { DEFAULT_SORT_KEY, DEFAULT_SORT_ORDER, DEFAULT_PLOT_SEARCH_STATES } from "plotSearch/constants"; -import { getContentPlotSearchListResults } from "plotSearch/helpers"; -import type { PlotSearch, PlotSearchList } from "plotSearch/types"; -import CreatePlotSearchModal from "plotSearch/components/CreatePlotSearchModal"; -import AddButtonSecondary from "components/form/AddButtonSecondary"; -import { withPlotSearchAttributes } from "components/attributes/PlotSearchAttributes"; +import Authorization from "@/components/authorization/Authorization"; +import AuthorizationError from "@/components/authorization/AuthorizationError"; +import { FormNames, Methods, PermissionMissingTexts } from "@/enums"; +import ExternalLink from "@/components/links/ExternalLink"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import IconRadioButtons from "@/components/button/IconRadioButtons"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import MapIcon from "@/components/icons/MapIcon"; +import PageContainer from "@/components/content/PageContainer"; +import Pagination from "@/components/table/Pagination"; +import { receiveTopNavigationSettings } from "@/components/topNavigation/actions"; +import Search from "@/plotSearch/components/search/Search"; +import { LIST_TABLE_PAGE_SIZE } from "@/util/constants"; +import SortableTable from "@/components/table/SortableTable"; +import TableFilters from "@/components/table/TableFilters"; +import TableFilterWrapper from "@/components/table/TableFilterWrapper"; +import TableWrapper from "@/components/table/TableWrapper"; +import TableIcon from "@/components/icons/TableIcon"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; +import VisualisationTypeWrapper from "@/components/table/VisualisationTypeWrapper"; +import { createPlotSearch, fetchPlotSearchList } from "@/plotSearch/actions"; +import { getIsFetching, getPlotSearchList } from "@/plotSearch/selectors"; +import { getRouteById, Routes } from "@/root/routes"; +import { formatDate, getLabelOfOption, setPageTitle, getFieldOptions, getSearchQuery, getApiResponseCount, getApiResponseMaxPage, getUrlParams, isMethodAllowed } from "@/util/helpers"; +import { DEFAULT_SORT_KEY, DEFAULT_SORT_ORDER, DEFAULT_PLOT_SEARCH_STATES } from "@/plotSearch/constants"; +import { getContentPlotSearchListResults } from "@/plotSearch/helpers"; +import type { PlotSearch, PlotSearchList } from "@/plotSearch/types"; +import CreatePlotSearchModal from "@/plotSearch/components/CreatePlotSearchModal"; +import AddButtonSecondary from "@/components/form/AddButtonSecondary"; +import { withPlotSearchAttributes } from "@/components/attributes/PlotSearchAttributes"; import type { Attributes, Methods as MethodsType } from "types"; const VisualizationTypes = { MAP: 'map', diff --git a/src/plotSearch/components/PlotSearchPage.tsx b/src/plotSearch/components/PlotSearchPage.tsx index 9c3627617..31e5a3bbd 100644 --- a/src/plotSearch/components/PlotSearchPage.tsx +++ b/src/plotSearch/components/PlotSearchPage.tsx @@ -5,46 +5,46 @@ import { withRouter } from "react-router"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; import { change, getFormValues, initialize, destroy, isDirty } from "redux-form"; -import { withUiDataList } from "components/uiData/UiDataListHOC"; -import AuthorizationError from "components/authorization/AuthorizationError"; -import Loader from "components/loader/Loader"; -import ContentContainer from "components/content/ContentContainer"; -import ControlButtonBar from "components/controlButtons/ControlButtonBar"; -import ControlButtons from "components/controlButtons/ControlButtons"; -import ConfirmationModal from "components/modal/ConfirmationModal"; -import FullWidthContainer from "components/content/FullWidthContainer"; -import PageContainer from "components/content/PageContainer"; -import PageNavigationWrapper from "components/content/PageNavigationWrapper"; -import TabContent from "components/tabs/TabContent"; -import TabPane from "components/tabs/TabPane"; -import Tabs from "components/tabs/Tabs"; -import { getRouteById, Routes } from "root/routes"; -import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "usersPermissions/selectors"; -import { getSessionStorageItem, removeSessionStorageItem, setSessionStorageItem } from "util/storage"; -import { receiveTopNavigationSettings } from "components/topNavigation/actions"; -import { getIsEditMode, getCurrentPlotSearch, getIsSaveClicked, getIsFormValidById, getIsFormValidFlags, getIsFetching, getForm, getIsFetchingAnyPlanUnits, getIsFetchingPlanUnitAttributes, areTargetsAllowedToHaveType, isLockedForModifications, isFetchingStages, getIsFetchingSubtypes, getIsFetchingRelatedApplications } from "plotSearch/selectors"; -import { editPlotSearch, hideEditMode, showEditMode, clearFormValidFlags, fetchSinglePlotSearch, receiveIsSaveClicked, receiveSinglePlotSearch, receiveFormValidFlags, deletePlotSearch, fetchPlotSearchRelatedApplications } from "plotSearch/actions"; -import { FormNames, ConfirmationModalTexts, Methods, PermissionMissingTexts } from "enums"; -import { ButtonColors } from "components/enums"; -import { getUrlParams, getSearchQuery, setPageTitle, scrollToTopPage, isMethodAllowed } from "util/helpers"; -import { getContentBasicInformation, getContentApplication, clearUnsavedChanges, cleanTargets, cleanDecisions } from "plotSearch/helpers"; -import PlotSearchInfo from "plotSearch/components/plotSearchSections/plotSearchInfo/PlotSearchInfo"; -import BasicInfo from "plotSearch/components/plotSearchSections/basicInfo/BasicInfo"; -import BasicInfoEdit from "plotSearch/components/plotSearchSections/basicInfo/BasicInfoEdit"; -import Application from "plotSearch/components/plotSearchSections/application/Application"; -import ApplicationEdit from "plotSearch/components/plotSearchSections/application/ApplicationEdit"; -import ApplicationMap from "plotSearch/components/plotSearchSections/map/ApplicationMap"; -import { withPlotSearchAttributes } from "components/attributes/PlotSearchAttributes"; -import { FIELDS_LOCKED_FOR_EDITING } from "plotSearch/constants"; -import PlotSearchExportModal from "plotApplications/components/exportModal/PlotSearchExportModal"; -import ReservationIdentifiersModal from "plotSearch/components/reservationIdentifiers/ReservationIdentifiersModal"; -import DirectReservationLinkModal from "plotSearch/components/directReservationLinkModal/DirectReservationLinkModal"; -import { fetchAttributes as fetchApplicationAttributes } from "application/actions"; -import { getIsFetchingAttributes as getIsFetchingApplicationAttributes } from "application/selectors"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import { withUiDataList } from "@/components/uiData/UiDataListHOC"; +import AuthorizationError from "@/components/authorization/AuthorizationError"; +import Loader from "@/components/loader/Loader"; +import ContentContainer from "@/components/content/ContentContainer"; +import ControlButtonBar from "@/components/controlButtons/ControlButtonBar"; +import ControlButtons from "@/components/controlButtons/ControlButtons"; +import ConfirmationModal from "@/components/modal/ConfirmationModal"; +import FullWidthContainer from "@/components/content/FullWidthContainer"; +import PageContainer from "@/components/content/PageContainer"; +import PageNavigationWrapper from "@/components/content/PageNavigationWrapper"; +import TabContent from "@/components/tabs/TabContent"; +import TabPane from "@/components/tabs/TabPane"; +import Tabs from "@/components/tabs/Tabs"; +import { getRouteById, Routes } from "@/root/routes"; +import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "@/usersPermissions/selectors"; +import { getSessionStorageItem, removeSessionStorageItem, setSessionStorageItem } from "@/util/storage"; +import { receiveTopNavigationSettings } from "@/components/topNavigation/actions"; +import { getIsEditMode, getCurrentPlotSearch, getIsSaveClicked, getIsFormValidById, getIsFormValidFlags, getIsFetching, getForm, getIsFetchingAnyPlanUnits, getIsFetchingPlanUnitAttributes, areTargetsAllowedToHaveType, isLockedForModifications, isFetchingStages, getIsFetchingSubtypes, getIsFetchingRelatedApplications } from "@/plotSearch/selectors"; +import { editPlotSearch, hideEditMode, showEditMode, clearFormValidFlags, fetchSinglePlotSearch, receiveIsSaveClicked, receiveSinglePlotSearch, receiveFormValidFlags, deletePlotSearch, fetchPlotSearchRelatedApplications } from "@/plotSearch/actions"; +import { FormNames, ConfirmationModalTexts, Methods, PermissionMissingTexts } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { getUrlParams, getSearchQuery, setPageTitle, scrollToTopPage, isMethodAllowed } from "@/util/helpers"; +import { getContentBasicInformation, getContentApplication, clearUnsavedChanges, cleanTargets, cleanDecisions } from "@/plotSearch/helpers"; +import PlotSearchInfo from "@/plotSearch/components/plotSearchSections/plotSearchInfo/PlotSearchInfo"; +import BasicInfo from "@/plotSearch/components/plotSearchSections/basicInfo/BasicInfo"; +import BasicInfoEdit from "@/plotSearch/components/plotSearchSections/basicInfo/BasicInfoEdit"; +import Application from "@/plotSearch/components/plotSearchSections/application/Application"; +import ApplicationEdit from "@/plotSearch/components/plotSearchSections/application/ApplicationEdit"; +import ApplicationMap from "@/plotSearch/components/plotSearchSections/map/ApplicationMap"; +import { withPlotSearchAttributes } from "@/components/attributes/PlotSearchAttributes"; +import { FIELDS_LOCKED_FOR_EDITING } from "@/plotSearch/constants"; +import PlotSearchExportModal from "@/plotApplications/components/exportModal/PlotSearchExportModal"; +import ReservationIdentifiersModal from "@/plotSearch/components/reservationIdentifiers/ReservationIdentifiersModal"; +import DirectReservationLinkModal from "@/plotSearch/components/directReservationLinkModal/DirectReservationLinkModal"; +import { fetchAttributes as fetchApplicationAttributes } from "@/application/actions"; +import { getIsFetchingAttributes as getIsFetchingApplicationAttributes } from "@/application/selectors"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; import type { Attributes, Methods as MethodType } from "types"; -import type { PlotSearch } from "plotSearch/types"; -import type { Form } from "application/types"; +import type { PlotSearch } from "@/plotSearch/types"; +import type { Form } from "@/application/types"; type OwnProps = {}; type Props = OwnProps & { applicationFormValues: Record; diff --git a/src/plotSearch/components/directReservationLinkModal/DirectReservationLinkModal.tsx b/src/plotSearch/components/directReservationLinkModal/DirectReservationLinkModal.tsx index 22c1969f1..a3f199231 100644 --- a/src/plotSearch/components/directReservationLinkModal/DirectReservationLinkModal.tsx +++ b/src/plotSearch/components/directReservationLinkModal/DirectReservationLinkModal.tsx @@ -3,18 +3,18 @@ import { flowRight } from "lodash/util"; import { connect } from "react-redux"; import { FieldArray, getFormValues, reduxForm, change, initialize } from "redux-form"; import { Row, Column } from "react-foundation"; -import Modal from "components/modal/Modal"; -import ModalButtonWrapper from "components/modal/ModalButtonWrapper"; -import Button from "components/button/Button"; -import { ButtonColors } from "components/enums"; -import { FormNames } from "enums"; -import FormField from "components/form/FormField"; -import { FieldTypes } from "enums"; -import FormFieldLabel from "components/form/FormFieldLabel"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import Loader from "components/loader/Loader"; -import { getIsCreatingDirectReservationLink } from "plotSearch/selectors"; -import { createDirectReservationLink } from "plotSearch/actions"; +import Modal from "@/components/modal/Modal"; +import ModalButtonWrapper from "@/components/modal/ModalButtonWrapper"; +import Button from "@/components/button/Button"; +import { ButtonColors } from "@/components/enums"; +import { FormNames } from "@/enums"; +import FormField from "@/components/form/FormField"; +import { FieldTypes } from "@/enums"; +import FormFieldLabel from "@/components/form/FormFieldLabel"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import Loader from "@/components/loader/Loader"; +import { getIsCreatingDirectReservationLink } from "@/plotSearch/selectors"; +import { createDirectReservationLink } from "@/plotSearch/actions"; type OwnProps = { isOpen: boolean; onClose: () => void; diff --git a/src/plotSearch/components/plotSearchSections/application/Application.tsx b/src/plotSearch/components/plotSearchSections/application/Application.tsx index 373720410..daef5f59b 100644 --- a/src/plotSearch/components/plotSearchSections/application/Application.tsx +++ b/src/plotSearch/components/plotSearchSections/application/Application.tsx @@ -1,17 +1,17 @@ import React, { Fragment, PureComponent } from "react"; import { connect } from "react-redux"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import Loader from "components/loader/Loader"; -import { FormNames, ViewModes } from "enums"; -import Divider from "components/content/Divider"; -import Title from "components/content/Title"; -import { getCollapseStateByKey, getIsFetchingForm, getForm, getIsFetchingTemplateForms } from "plotSearch/selectors"; -import { receiveCollapseStates } from "plotSearch/actions"; -import { ApplicationFieldTitles } from "plotSearch/enums"; -import ApplicationPreviewSection from "plotSearch/components/plotSearchSections/application/ApplicationPreviewSection"; -import FormText from "components/form/FormText"; -import { getIsFetchingFormAttributes } from "application/selectors"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import Loader from "@/components/loader/Loader"; +import { FormNames, ViewModes } from "@/enums"; +import Divider from "@/components/content/Divider"; +import Title from "@/components/content/Title"; +import { getCollapseStateByKey, getIsFetchingForm, getForm, getIsFetchingTemplateForms } from "@/plotSearch/selectors"; +import { receiveCollapseStates } from "@/plotSearch/actions"; +import { ApplicationFieldTitles } from "@/plotSearch/enums"; +import ApplicationPreviewSection from "@/plotSearch/components/plotSearchSections/application/ApplicationPreviewSection"; +import FormText from "@/components/form/FormText"; +import { getIsFetchingFormAttributes } from "@/application/selectors"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type OwnProps = {}; type Props = OwnProps & { usersPermissions: UsersPermissionsType; diff --git a/src/plotSearch/components/plotSearchSections/application/ApplicationEdit.tsx b/src/plotSearch/components/plotSearchSections/application/ApplicationEdit.tsx index f4e5d2ed5..49c5fd344 100644 --- a/src/plotSearch/components/plotSearchSections/application/ApplicationEdit.tsx +++ b/src/plotSearch/components/plotSearchSections/application/ApplicationEdit.tsx @@ -5,29 +5,29 @@ import { reduxForm, formValues } from "redux-form"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; import get from "lodash/get"; -import TitleH3 from "components/content/TitleH3"; -import WhiteBox from "components/content/WhiteBox"; -import Collapse from "components/collapse/Collapse"; -import Divider from "components/content/Divider"; -import { getUiDataLeaseKey } from "uiData/helpers"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import { ApplicationFieldPaths, ApplicationFieldTitles } from "plotSearch/enums"; -import Title from "components/content/Title"; -import { FormNames, ViewModes } from "enums"; -import FormField from "components/form/FormField"; -import { receiveCollapseStates } from "plotSearch/actions"; -import { getAttributes, getCollapseStateByKey, getIsSaveClicked, getErrorsByFormName, getIsFetchingTemplateForms, getTemplateForms, getCurrentPlotSearch, getForm, isLockedForModifications } from "plotSearch/selectors"; -import EditPlotApplicationSectionModal from "plotSearch/components/plotSearchSections/application/EditPlotApplicationSectionModal"; -import Loader from "components/loader/Loader"; -import ApplicationPreviewSection from "plotSearch/components/plotSearchSections/application/ApplicationPreviewSection"; -import { hasMinimumRequiredFieldsFilled } from "plotSearch/helpers"; -import WarningField from "components/form/WarningField"; -import { getFormAttributes, getIsFetchingFormAttributes } from "application/selectors"; -import { fetchFormAttributes } from "application/actions"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import TitleH3 from "@/components/content/TitleH3"; +import WhiteBox from "@/components/content/WhiteBox"; +import Collapse from "@/components/collapse/Collapse"; +import Divider from "@/components/content/Divider"; +import { getUiDataLeaseKey } from "@/uiData/helpers"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import { ApplicationFieldPaths, ApplicationFieldTitles } from "@/plotSearch/enums"; +import Title from "@/components/content/Title"; +import { FormNames, ViewModes } from "@/enums"; +import FormField from "@/components/form/FormField"; +import { receiveCollapseStates } from "@/plotSearch/actions"; +import { getAttributes, getCollapseStateByKey, getIsSaveClicked, getErrorsByFormName, getIsFetchingTemplateForms, getTemplateForms, getCurrentPlotSearch, getForm, isLockedForModifications } from "@/plotSearch/selectors"; +import EditPlotApplicationSectionModal from "@/plotSearch/components/plotSearchSections/application/EditPlotApplicationSectionModal"; +import Loader from "@/components/loader/Loader"; +import ApplicationPreviewSection from "@/plotSearch/components/plotSearchSections/application/ApplicationPreviewSection"; +import { hasMinimumRequiredFieldsFilled } from "@/plotSearch/helpers"; +import WarningField from "@/components/form/WarningField"; +import { getFormAttributes, getIsFetchingFormAttributes } from "@/application/selectors"; +import { fetchFormAttributes } from "@/application/actions"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; import type { Attributes } from "types"; -import type { PlotSearch } from "plotSearch/types"; -import type { Form } from "application/types"; +import type { PlotSearch } from "@/plotSearch/types"; +import type { Form } from "@/application/types"; type OwnProps = {}; type Props = OwnProps & { collapseStateBasic: boolean; diff --git a/src/plotSearch/components/plotSearchSections/application/ApplicationPreviewSection.tsx b/src/plotSearch/components/plotSearchSections/application/ApplicationPreviewSection.tsx index 821cf3d49..aad47805d 100644 --- a/src/plotSearch/components/plotSearchSections/application/ApplicationPreviewSection.tsx +++ b/src/plotSearch/components/plotSearchSections/application/ApplicationPreviewSection.tsx @@ -5,17 +5,17 @@ import flowRight from "lodash/flowRight"; import get from "lodash/get"; import classNames from "classnames"; import { connect } from "react-redux"; -import { FormNames } from "enums"; -import SubTitle from "components/content/SubTitle"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import FormField from "components/form/FormField"; -import FormHintText from "components/form/FormHintText"; -import AddButtonThird from "components/form/AddButtonThird"; -import Collapse from "components/collapse/Collapse"; -import Button from "components/button/Button"; -import { ButtonColors } from "components/enums"; -import { getFormAttributes } from "application/selectors"; +import { FormNames } from "@/enums"; +import SubTitle from "@/components/content/SubTitle"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import FormField from "@/components/form/FormField"; +import FormHintText from "@/components/form/FormHintText"; +import AddButtonThird from "@/components/form/AddButtonThird"; +import Collapse from "@/components/collapse/Collapse"; +import Button from "@/components/button/Button"; +import { ButtonColors } from "@/components/enums"; +import { getFormAttributes } from "@/application/selectors"; import type { Attributes } from "types"; type OwnProps = { section: Record; diff --git a/src/plotSearch/components/plotSearchSections/application/EditPlotApplicationSectionFieldForm.tsx b/src/plotSearch/components/plotSearchSections/application/EditPlotApplicationSectionFieldForm.tsx index 2cbed5ec6..2564ab918 100644 --- a/src/plotSearch/components/plotSearchSections/application/EditPlotApplicationSectionFieldForm.tsx +++ b/src/plotSearch/components/plotSearchSections/application/EditPlotApplicationSectionFieldForm.tsx @@ -3,22 +3,22 @@ import { connect } from "react-redux"; import { Column, Row } from "react-foundation"; import get from "lodash/get"; import { change, FieldArray, formValueSelector } from "redux-form"; -import FormField from "components/form/FormField"; -import InfoIcon from "components/icons/InfoIcon"; -import Tooltip from "components/tooltip/Tooltip"; -import { FieldTypes, FormNames } from "enums"; -import TooltipToggleButton from "components/tooltip/TooltipToggleButton"; -import TooltipWrapper from "components/tooltip/TooltipWrapper"; -import { getFieldTypeMapping, getFormAttributes } from "application/selectors"; -import SubTitle from "components/content/SubTitle"; -import { generateFieldIdentifierFromName } from "plotSearch/helpers"; -import { FIELD_TYPE_FEATURES_BY_FIELD_TYPE_NAME, FieldTypeFeatures, FieldTypeLabels } from "plotSearch/constants"; -import IconButton from "components/button/IconButton"; -import TrashIcon from "components/icons/TrashIcon"; -import AddIcon from "components/icons/AddIcon"; -import EditIcon from "components/icons/EditIcon"; -import MoveUpIcon from "components/icons/MoveUpIcon"; -import MoveDownIcon from "components/icons/MoveDownIcon"; +import FormField from "@/components/form/FormField"; +import InfoIcon from "@/components/icons/InfoIcon"; +import Tooltip from "@/components/tooltip/Tooltip"; +import { FieldTypes, FormNames } from "@/enums"; +import TooltipToggleButton from "@/components/tooltip/TooltipToggleButton"; +import TooltipWrapper from "@/components/tooltip/TooltipWrapper"; +import { getFieldTypeMapping, getFormAttributes } from "@/application/selectors"; +import SubTitle from "@/components/content/SubTitle"; +import { generateFieldIdentifierFromName } from "@/plotSearch/helpers"; +import { FIELD_TYPE_FEATURES_BY_FIELD_TYPE_NAME, FieldTypeFeatures, FieldTypeLabels } from "@/plotSearch/constants"; +import IconButton from "@/components/button/IconButton"; +import TrashIcon from "@/components/icons/TrashIcon"; +import AddIcon from "@/components/icons/AddIcon"; +import EditIcon from "@/components/icons/EditIcon"; +import MoveUpIcon from "@/components/icons/MoveUpIcon"; +import MoveDownIcon from "@/components/icons/MoveDownIcon"; import type { Attributes } from "types"; type ChoiceProps = { attributes: Attributes; diff --git a/src/plotSearch/components/plotSearchSections/application/EditPlotApplicationSectionForm.tsx b/src/plotSearch/components/plotSearchSections/application/EditPlotApplicationSectionForm.tsx index f5f2b098e..68db121ac 100644 --- a/src/plotSearch/components/plotSearchSections/application/EditPlotApplicationSectionForm.tsx +++ b/src/plotSearch/components/plotSearchSections/application/EditPlotApplicationSectionForm.tsx @@ -6,28 +6,28 @@ import flowRight from "lodash/flowRight"; import get from "lodash/get"; import classNames from "classnames"; import { FieldArray } from "redux-form"; -import Button from "components/button/Button"; -import FormField from "components/form/FormField"; -import ModalButtonWrapper from "components/modal/ModalButtonWrapper"; -import { ConfirmationModalTexts, FieldTypes, FormNames } from "enums"; -import { ButtonColors } from "components/enums"; -import EditPlotApplicationSectionFieldForm from "plotSearch/components/plotSearchSections/application/EditPlotApplicationSectionFieldForm"; -import Collapse from "components/collapse/Collapse"; -import SubTitle from "components/content/SubTitle"; -import { getFieldTypeMapping, getFormAttributes } from "application/selectors"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import IconButton from "components/button/IconButton"; -import TrashIcon from "components/icons/TrashIcon"; -import MoveUpIcon from "components/icons/MoveUpIcon"; -import MoveDownIcon from "components/icons/MoveDownIcon"; +import Button from "@/components/button/Button"; +import FormField from "@/components/form/FormField"; +import ModalButtonWrapper from "@/components/modal/ModalButtonWrapper"; +import { ConfirmationModalTexts, FieldTypes, FormNames } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import EditPlotApplicationSectionFieldForm from "@/plotSearch/components/plotSearchSections/application/EditPlotApplicationSectionFieldForm"; +import Collapse from "@/components/collapse/Collapse"; +import SubTitle from "@/components/content/SubTitle"; +import { getFieldTypeMapping, getFormAttributes } from "@/application/selectors"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import IconButton from "@/components/button/IconButton"; +import TrashIcon from "@/components/icons/TrashIcon"; +import MoveUpIcon from "@/components/icons/MoveUpIcon"; +import MoveDownIcon from "@/components/icons/MoveDownIcon"; import type { Attributes } from "types"; -import type { FormSection } from "application/types"; -import { generateSectionIdentifierFromName, getDefaultNewFormField, getDefaultNewFormSection, getInitialFormSectionEditorData, transformCommittedFormSectionEditorData } from "plotSearch/helpers"; -import { APPLICANT_SECTION_IDENTIFIER } from "application/constants"; -import { getSectionEditorCollapseStates } from "plotSearch/selectors"; -import { clearSectionEditorCollapseStates, initializeSectionEditorCollapseStates, setSectionEditorCollapseState } from "plotSearch/actions"; +import type { FormSection } from "@/application/types"; +import { generateSectionIdentifierFromName, getDefaultNewFormField, getDefaultNewFormSection, getInitialFormSectionEditorData, transformCommittedFormSectionEditorData } from "@/plotSearch/helpers"; +import { APPLICANT_SECTION_IDENTIFIER } from "@/application/constants"; +import { getSectionEditorCollapseStates } from "@/plotSearch/selectors"; +import { clearSectionEditorCollapseStates, initializeSectionEditorCollapseStates, setSectionEditorCollapseState } from "@/plotSearch/actions"; import { uniq } from "lodash/array"; -import ErrorBlock from "components/form/ErrorBlock"; +import ErrorBlock from "@/components/form/ErrorBlock"; type SectionFieldProps = { disabled: boolean; fields: any; diff --git a/src/plotSearch/components/plotSearchSections/application/EditPlotApplicationSectionModal.tsx b/src/plotSearch/components/plotSearchSections/application/EditPlotApplicationSectionModal.tsx index ea54b63e2..dc11c74a3 100644 --- a/src/plotSearch/components/plotSearchSections/application/EditPlotApplicationSectionModal.tsx +++ b/src/plotSearch/components/plotSearchSections/application/EditPlotApplicationSectionModal.tsx @@ -1,6 +1,6 @@ import React, { Component } from "react"; -import Modal from "components/modal/Modal"; -import EditPlotApplicationSectionForm from "plotSearch/components/plotSearchSections/application/EditPlotApplicationSectionForm"; +import Modal from "@/components/modal/Modal"; +import EditPlotApplicationSectionForm from "@/plotSearch/components/plotSearchSections/application/EditPlotApplicationSectionForm"; type Props = { isOpen: boolean; onClose: (...args: Array) => any; diff --git a/src/plotSearch/components/plotSearchSections/basicInfo/BasicInfo.tsx b/src/plotSearch/components/plotSearchSections/basicInfo/BasicInfo.tsx index 21e9b2a37..084efbd3f 100644 --- a/src/plotSearch/components/plotSearchSections/basicInfo/BasicInfo.tsx +++ b/src/plotSearch/components/plotSearchSections/basicInfo/BasicInfo.tsx @@ -1,32 +1,32 @@ import React, { Fragment, PureComponent } from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; -import Authorization from "components/authorization/Authorization"; -import { getUserFullName } from "users/helpers"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import { FormNames, ViewModes } from "enums"; -import ExternalLink from "components/links/ExternalLink"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import Collapse from "components/collapse/Collapse"; -import Divider from "components/content/Divider"; -import Title from "components/content/Title"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; -import { getAttributes, getCollapseStateByKey, getCurrentPlotSearch, getPlanUnit, getPlotSearchSubTypes, getRelatedApplications } from "plotSearch/selectors"; -import { receiveCollapseStates } from "plotSearch/actions"; -import { PlotSearchFieldTitles, PlotSearchStageTypes } from "plotSearch/enums"; -import { getContentBasicInformation, formatDecisionName } from "plotSearch/helpers"; -import { getUiDataPlotSearchKey } from "uiData/helpers"; -import { getFieldOptions, getLabelOfOption, formatDate, isFieldAllowedToRead } from "util/helpers"; -import { getHoursAndMinutes } from "util/date"; -import { PlotSearchFieldPaths } from "plotSearch/enums"; +import Authorization from "@/components/authorization/Authorization"; +import { getUserFullName } from "@/users/helpers"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import { FormNames, ViewModes } from "@/enums"; +import ExternalLink from "@/components/links/ExternalLink"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import Collapse from "@/components/collapse/Collapse"; +import Divider from "@/components/content/Divider"; +import Title from "@/components/content/Title"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; +import { getAttributes, getCollapseStateByKey, getCurrentPlotSearch, getPlanUnit, getPlotSearchSubTypes, getRelatedApplications } from "@/plotSearch/selectors"; +import { receiveCollapseStates } from "@/plotSearch/actions"; +import { PlotSearchFieldTitles, PlotSearchStageTypes } from "@/plotSearch/enums"; +import { getContentBasicInformation, formatDecisionName } from "@/plotSearch/helpers"; +import { getUiDataPlotSearchKey } from "@/uiData/helpers"; +import { getFieldOptions, getLabelOfOption, formatDate, isFieldAllowedToRead } from "@/util/helpers"; +import { getHoursAndMinutes } from "@/util/date"; +import { PlotSearchFieldPaths } from "@/plotSearch/enums"; import type { Attributes } from "types"; -import type { PlotSearch } from "plotSearch/types"; -import { fetchPlanUnit, fetchPlanUnitAttributes, fetchCustomDetailedPlanAttributes } from "plotSearch/actions"; -import { getRouteById, Routes } from "root/routes"; -import PlotSearchTargetListing from "plotSearch/components/plotSearchSections/basicInfo/PlotSearchTargetListing"; -import DocumentsButton from "components/form/DocumentsButton"; -import Button from "components/button/Button"; +import type { PlotSearch } from "@/plotSearch/types"; +import { fetchPlanUnit, fetchPlanUnitAttributes, fetchCustomDetailedPlanAttributes } from "@/plotSearch/actions"; +import { getRouteById, Routes } from "@/root/routes"; +import PlotSearchTargetListing from "@/plotSearch/components/plotSearchSections/basicInfo/PlotSearchTargetListing"; +import DocumentsButton from "@/components/form/DocumentsButton"; +import Button from "@/components/button/Button"; type OwnProps = { openExportModal: (...args: Array) => any; openReservationIdentifiersModal: (...args: Array) => any; diff --git a/src/plotSearch/components/plotSearchSections/basicInfo/BasicInfoDecisionEdit.tsx b/src/plotSearch/components/plotSearchSections/basicInfo/BasicInfoDecisionEdit.tsx index f5020b9fc..ad145d319 100644 --- a/src/plotSearch/components/plotSearchSections/basicInfo/BasicInfoDecisionEdit.tsx +++ b/src/plotSearch/components/plotSearchSections/basicInfo/BasicInfoDecisionEdit.tsx @@ -2,14 +2,14 @@ import React from "react"; import { connect } from "react-redux"; import { formValueSelector } from "redux-form"; import { Row, Column } from "react-foundation"; -import Authorization from "components/authorization/Authorization"; -import RemoveButton from "components/form/RemoveButton"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import { getAttributes, getIsSaveClicked } from "plotSearch/selectors"; +import Authorization from "@/components/authorization/Authorization"; +import RemoveButton from "@/components/form/RemoveButton"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import { getAttributes, getIsSaveClicked } from "@/plotSearch/selectors"; import type { Attributes } from "types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; -import DecisionSelectInput from "components/form/DecisionSelectInput"; -import { formatDecisionName } from "plotSearch/helpers"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; +import DecisionSelectInput from "@/components/form/DecisionSelectInput"; +import { formatDecisionName } from "@/plotSearch/helpers"; type OwnProps = { disabled: boolean; field: any; diff --git a/src/plotSearch/components/plotSearchSections/basicInfo/BasicInfoEdit.tsx b/src/plotSearch/components/plotSearchSections/basicInfo/BasicInfoEdit.tsx index 8f1eabd72..21f8c50ec 100644 --- a/src/plotSearch/components/plotSearchSections/basicInfo/BasicInfoEdit.tsx +++ b/src/plotSearch/components/plotSearchSections/basicInfo/BasicInfoEdit.tsx @@ -5,38 +5,38 @@ import { formValueSelector, FieldArray, reduxForm, change } from "redux-form"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; import get from "lodash/get"; -import Authorization from "components/authorization/Authorization"; -import { ConfirmationModalTexts, FieldTypes, FormNames, ViewModes } from "enums"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import AddButtonThird from "components/form/AddButtonThird"; -import ErrorField from "components/form/ErrorField"; -import BasicInfoDecisionEdit from "plotSearch/components/plotSearchSections/basicInfo/BasicInfoDecisionEdit"; -import { ButtonColors } from "components/enums"; -import Collapse from "components/collapse/Collapse"; -import FormTextTitle from "components/form/FormTextTitle"; -import Divider from "components/content/Divider"; -import { getUiDataPlotSearchKey } from "uiData/helpers"; -import { FieldTypes as FieldTypeOptions } from "enums"; -import { isFieldAllowedToRead } from "util/helpers"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import { PlotSearchFieldTitles, PlotSearchFieldPaths } from "plotSearch/enums"; -import WhiteBox from "components/content/WhiteBox"; -import SubTitle from "components/content/SubTitle"; -import Title from "components/content/Title"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; -import FormField from "components/form/FormField"; -import { receiveCollapseStates, receiveIsSaveClicked, receiveFormValidFlags, removePlanUnitDecisions, fetchCustomDetailedPlanAttributes, fetchPlanUnitAttributes } from "plotSearch/actions"; -import { getAttributes, getCollapseStateByKey, getIsSaveClicked, getErrorsByFormName, getPlotSearchSubTypes, getDecisionCandidates } from "plotSearch/selectors"; -import { filterSubTypes } from "plotSearch/helpers"; -import PlotSearchSiteEdit from "plotSearch/components/plotSearchSections/basicInfo/PlotSearchSiteEdit"; +import Authorization from "@/components/authorization/Authorization"; +import { ConfirmationModalTexts, FieldTypes, FormNames, ViewModes } from "@/enums"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import AddButtonThird from "@/components/form/AddButtonThird"; +import ErrorField from "@/components/form/ErrorField"; +import BasicInfoDecisionEdit from "@/plotSearch/components/plotSearchSections/basicInfo/BasicInfoDecisionEdit"; +import { ButtonColors } from "@/components/enums"; +import Collapse from "@/components/collapse/Collapse"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import Divider from "@/components/content/Divider"; +import { getUiDataPlotSearchKey } from "@/uiData/helpers"; +import { FieldTypes as FieldTypeOptions } from "@/enums"; +import { isFieldAllowedToRead } from "@/util/helpers"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import { PlotSearchFieldTitles, PlotSearchFieldPaths } from "@/plotSearch/enums"; +import WhiteBox from "@/components/content/WhiteBox"; +import SubTitle from "@/components/content/SubTitle"; +import Title from "@/components/content/Title"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; +import FormField from "@/components/form/FormField"; +import { receiveCollapseStates, receiveIsSaveClicked, receiveFormValidFlags, removePlanUnitDecisions, fetchCustomDetailedPlanAttributes, fetchPlanUnitAttributes } from "@/plotSearch/actions"; +import { getAttributes, getCollapseStateByKey, getIsSaveClicked, getErrorsByFormName, getPlotSearchSubTypes, getDecisionCandidates } from "@/plotSearch/selectors"; +import { filterSubTypes } from "@/plotSearch/helpers"; +import PlotSearchSiteEdit from "@/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSiteEdit"; import type { Attributes } from "types"; -import { hasMinimumRequiredFieldsFilled } from "plotSearch/helpers"; -import WarningField from "components/form/WarningField"; -import { getCurrentPlotSearch, getCurrentPlotSearchStage, getStages, isLockedForModifications } from "plotSearch/selectors"; -import PlotSearchTargetListing from "plotSearch/components/plotSearchSections/basicInfo/PlotSearchTargetListing"; -import { AUTOMATIC_PLOT_SEARCH_STAGES } from "plotSearch/constants"; -import { PlotSearchStageTypes } from "plotSearch/enums"; -import PlotSearchApplicationsOpeningSection from "plotSearch/components/plotSearchSections/basicInfo/PlotSearchApplicationsOpeningSection"; +import { hasMinimumRequiredFieldsFilled } from "@/plotSearch/helpers"; +import WarningField from "@/components/form/WarningField"; +import { getCurrentPlotSearch, getCurrentPlotSearchStage, getStages, isLockedForModifications } from "@/plotSearch/selectors"; +import PlotSearchTargetListing from "@/plotSearch/components/plotSearchSections/basicInfo/PlotSearchTargetListing"; +import { AUTOMATIC_PLOT_SEARCH_STAGES } from "@/plotSearch/constants"; +import { PlotSearchStageTypes } from "@/plotSearch/enums"; +import PlotSearchApplicationsOpeningSection from "@/plotSearch/components/plotSearchSections/basicInfo/PlotSearchApplicationsOpeningSection"; type DecisionsProps = { attributes: Attributes; disabled: boolean; diff --git a/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchApplicationsOpeningSection.tsx b/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchApplicationsOpeningSection.tsx index 0e089b6a6..2e117dbe2 100644 --- a/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchApplicationsOpeningSection.tsx +++ b/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchApplicationsOpeningSection.tsx @@ -1,23 +1,23 @@ import React, { Component } from "react"; -import { FieldTypes, FormNames } from "enums"; +import { FieldTypes, FormNames } from "@/enums"; import { formValueSelector, reduxForm } from "redux-form"; import { connect } from "react-redux"; import { flowRight } from "lodash/util"; -import type { RootState } from "root/types"; +import type { RootState } from "@/root/types"; import { Column, Row } from "react-foundation"; -import FormField from "components/form/FormField"; -import { PlotApplicationOpeningRecordLabels, PlotApplicationOpeningRecordPaths } from "plotApplications/enums"; +import FormField from "@/components/form/FormField"; +import { PlotApplicationOpeningRecordLabels, PlotApplicationOpeningRecordPaths } from "@/plotApplications/enums"; import { get } from "lodash/object"; -import { getAttributes } from "application/selectors"; +import { getAttributes } from "@/application/selectors"; import type { Attributes } from "types"; -import Authorization from "components/authorization/Authorization"; -import { formatDate, isFieldAllowedToRead } from "util/helpers"; -import { getCurrentPlotSearch } from "plotSearch/selectors"; -import FormTextTitle from "components/form/FormTextTitle"; -import FormText from "components/form/FormText"; -import type { PlotSearch } from "plotSearch/types"; -import Collapse from "components/collapse/Collapse"; -import { getHoursAndMinutes } from "util/date"; +import Authorization from "@/components/authorization/Authorization"; +import { formatDate, isFieldAllowedToRead } from "@/util/helpers"; +import { getCurrentPlotSearch } from "@/plotSearch/selectors"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import FormText from "@/components/form/FormText"; +import type { PlotSearch } from "@/plotSearch/types"; +import Collapse from "@/components/collapse/Collapse"; +import { getHoursAndMinutes } from "@/util/date"; type Props = {}; type InnerProps = Props & { enabled: boolean; diff --git a/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchReservationRecipients.tsx b/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchReservationRecipients.tsx index 53a670143..bf61412b0 100644 --- a/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchReservationRecipients.tsx +++ b/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchReservationRecipients.tsx @@ -1,8 +1,8 @@ import React, { Fragment } from "react"; import { Column, Row } from "react-foundation"; -import FormTextTitle from "components/form/FormTextTitle"; -import FormText from "components/form/FormText"; -import { PlotSearchFieldTitles } from "plotSearch/enums"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import FormText from "@/components/form/FormText"; +import { PlotSearchFieldTitles } from "@/plotSearch/enums"; type Props = { reservationRecipients: Array>; }; diff --git a/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSiteCustomDetailedPlan.tsx b/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSiteCustomDetailedPlan.tsx index 72fcc2302..a929b0df9 100644 --- a/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSiteCustomDetailedPlan.tsx +++ b/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSiteCustomDetailedPlan.tsx @@ -2,22 +2,22 @@ import React, { PureComponent, Fragment } from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; import get from "lodash/get"; -import { receiveCollapseStates } from "plotSearch/actions"; -import { FormNames, ViewModes } from "enums"; -import { Routes, getRouteById } from "root/routes"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import Collapse from "components/collapse/Collapse"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import ExternalLink from "components/links/ExternalLink"; -import { createPTPPlanReportUrl } from "util/helpers"; -import { formatDate, getFieldOptions, getLabelOfOption } from "util/helpers"; -import { getAttributes, getCollapseStateByKey, getIsFetchingCustomDetailedPlanAttributes, getRelatedApplications } from "plotSearch/selectors"; +import { receiveCollapseStates } from "@/plotSearch/actions"; +import { FormNames, ViewModes } from "@/enums"; +import { Routes, getRouteById } from "@/root/routes"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import Collapse from "@/components/collapse/Collapse"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import ExternalLink from "@/components/links/ExternalLink"; +import { createPTPPlanReportUrl } from "@/util/helpers"; +import { formatDate, getFieldOptions, getLabelOfOption } from "@/util/helpers"; +import { getAttributes, getCollapseStateByKey, getIsFetchingCustomDetailedPlanAttributes, getRelatedApplications } from "@/plotSearch/selectors"; import type { Attributes } from "types"; -import { PlotSearchFieldTitles } from "plotSearch/enums"; -import { getInfoLinkLanguageDisplayText } from "plotSearch/helpers"; -import PlotSearchReservationRecipients from "plotSearch/components/plotSearchSections/basicInfo/PlotSearchReservationRecipients"; +import { PlotSearchFieldTitles } from "@/plotSearch/enums"; +import { getInfoLinkLanguageDisplayText } from "@/plotSearch/helpers"; +import PlotSearchReservationRecipients from "@/plotSearch/components/plotSearchSections/basicInfo/PlotSearchReservationRecipients"; type OwnProps = { plotSearchSite: Record; index: number; diff --git a/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSiteEdit.tsx b/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSiteEdit.tsx index f6c630bab..c8204feec 100644 --- a/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSiteEdit.tsx +++ b/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSiteEdit.tsx @@ -5,33 +5,33 @@ import { Row, Column } from "react-foundation"; import get from "lodash/get"; import isEmpty from "lodash/isEmpty"; import flowRight from "lodash/flowRight"; -import Loader from "components/loader/Loader"; -import ExternalLink from "components/links/ExternalLink"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import PlanUnitSelectInput from "components/inputs/PlanUnitSelectInput"; -import { ActionTypes, AppConsumer } from "app/AppContext"; -import AddButtonThird from "components/form/AddButtonThird"; -import { ButtonColors } from "components/enums"; -import { ConfirmationModalTexts } from "enums"; -import Collapse from "components/collapse/Collapse"; -import FormField from "components/form/FormField"; -import { FormNames, ViewModes } from "enums"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import WarningContainer from "components/content/WarningContainer"; -import WarningField from "components/form/WarningField"; -import { createPTPPlanReportUrl } from "util/helpers"; -import { receiveCollapseStates, receiveIsSaveClicked, fetchPlanUnit, fetchCustomDetailedPlan } from "plotSearch/actions"; -import { PlotSearchFieldTitles } from "plotSearch/enums"; -import { formatDate, getFieldOptions, getLabelOfOption } from "util/helpers"; -import { areTargetsAllowedToHaveType, getAttributes, getIsSaveClicked, getCollapseStateByKey, getErrorsByFormName, getPlanUnitAttributes, getPlanUnit, getCustomDetailedPlan, getCustomDetailedPlanAttributes, getIsFetchingCustomDetailedPlanAttributes, getIsFetchingCustomDetailedPlan, getIsFetchingPlanUnit, getIsFetchingPlanUnitAttributes, getCurrentPlotSearch } from "plotSearch/selectors"; -import SuggestedEdit from "plotSearch/components/plotSearchSections/basicInfo/SuggestedEdit"; -import RemoveButton from "components/form/RemoveButton"; -import PlotSearchSiteEditCustomDetailedPlan from "plotSearch/components/plotSearchSections/basicInfo/PlotSearchSiteEditCustomDetailedPlan"; -import { TargetIdentifierTypes } from "application/enums"; +import Loader from "@/components/loader/Loader"; +import ExternalLink from "@/components/links/ExternalLink"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import PlanUnitSelectInput from "@/components/inputs/PlanUnitSelectInput"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; +import AddButtonThird from "@/components/form/AddButtonThird"; +import { ButtonColors } from "@/components/enums"; +import { ConfirmationModalTexts } from "@/enums"; +import Collapse from "@/components/collapse/Collapse"; +import FormField from "@/components/form/FormField"; +import { FormNames, ViewModes } from "@/enums"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import WarningContainer from "@/components/content/WarningContainer"; +import WarningField from "@/components/form/WarningField"; +import { createPTPPlanReportUrl } from "@/util/helpers"; +import { receiveCollapseStates, receiveIsSaveClicked, fetchPlanUnit, fetchCustomDetailedPlan } from "@/plotSearch/actions"; +import { PlotSearchFieldTitles } from "@/plotSearch/enums"; +import { formatDate, getFieldOptions, getLabelOfOption } from "@/util/helpers"; +import { areTargetsAllowedToHaveType, getAttributes, getIsSaveClicked, getCollapseStateByKey, getErrorsByFormName, getPlanUnitAttributes, getPlanUnit, getCustomDetailedPlan, getCustomDetailedPlanAttributes, getIsFetchingCustomDetailedPlanAttributes, getIsFetchingCustomDetailedPlan, getIsFetchingPlanUnit, getIsFetchingPlanUnitAttributes, getCurrentPlotSearch } from "@/plotSearch/selectors"; +import SuggestedEdit from "@/plotSearch/components/plotSearchSections/basicInfo/SuggestedEdit"; +import RemoveButton from "@/components/form/RemoveButton"; +import PlotSearchSiteEditCustomDetailedPlan from "@/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSiteEditCustomDetailedPlan"; +import { TargetIdentifierTypes } from "@/application/enums"; import type { Attributes } from "types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type SuggestedProps = { attributes: Attributes; disabled: boolean; diff --git a/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSiteEditCustomDetailedPlan.tsx b/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSiteEditCustomDetailedPlan.tsx index 31e8e6e63..94811d8cc 100644 --- a/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSiteEditCustomDetailedPlan.tsx +++ b/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSiteEditCustomDetailedPlan.tsx @@ -2,18 +2,18 @@ import React, { Component } from "react"; import { Row, Column } from "react-foundation"; import get from "lodash/get"; import isEmpty from "lodash/isEmpty"; -import Collapse from "components/collapse/Collapse"; -import FormField from "components/form/FormField"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import ExternalLink from "components/links/ExternalLink"; -import Loader from "components/loader/Loader"; -import PlanUnitSelectInput from "components/inputs/PlanUnitSelectInput"; -import { createPTPPlanReportUrl } from "util/helpers"; -import { PlotSearchFieldTitles } from "plotSearch/enums"; -import { formatDate, getFieldOptions, getLabelOfOption } from "util/helpers"; -import { getInfoLinkLanguageDisplayText } from "plotSearch/helpers"; +import Collapse from "@/components/collapse/Collapse"; +import FormField from "@/components/form/FormField"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import ExternalLink from "@/components/links/ExternalLink"; +import Loader from "@/components/loader/Loader"; +import PlanUnitSelectInput from "@/components/inputs/PlanUnitSelectInput"; +import { createPTPPlanReportUrl } from "@/util/helpers"; +import { PlotSearchFieldTitles } from "@/plotSearch/enums"; +import { formatDate, getFieldOptions, getLabelOfOption } from "@/util/helpers"; +import { getInfoLinkLanguageDisplayText } from "@/plotSearch/helpers"; import type { Attributes } from "types"; type Props = { handleNew: (...args: Array) => any; diff --git a/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSitePlanUnit.tsx b/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSitePlanUnit.tsx index 17c2c8830..f2b87e782 100644 --- a/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSitePlanUnit.tsx +++ b/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSitePlanUnit.tsx @@ -2,23 +2,23 @@ import React, { PureComponent, Fragment } from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; import get from "lodash/get"; -import { receiveCollapseStates } from "plotSearch/actions"; -import { FormNames, ViewModes } from "enums"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import Collapse from "components/collapse/Collapse"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import ExternalLink from "components/links/ExternalLink"; -import WarningContainer from "components/content/WarningContainer"; -import WarningField from "components/form/WarningField"; -import { createPTPPlanReportUrl } from "util/helpers"; -import { Routes, getRouteById } from "root/routes"; -import { formatDate, getFieldOptions, getLabelOfOption } from "util/helpers"; -import { getAttributes, getCollapseStateByKey, getIsFetchingPlanUnitAttributes, getRelatedApplications } from "plotSearch/selectors"; +import { receiveCollapseStates } from "@/plotSearch/actions"; +import { FormNames, ViewModes } from "@/enums"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import Collapse from "@/components/collapse/Collapse"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import ExternalLink from "@/components/links/ExternalLink"; +import WarningContainer from "@/components/content/WarningContainer"; +import WarningField from "@/components/form/WarningField"; +import { createPTPPlanReportUrl } from "@/util/helpers"; +import { Routes, getRouteById } from "@/root/routes"; +import { formatDate, getFieldOptions, getLabelOfOption } from "@/util/helpers"; +import { getAttributes, getCollapseStateByKey, getIsFetchingPlanUnitAttributes, getRelatedApplications } from "@/plotSearch/selectors"; import type { Attributes } from "types"; -import { PlotSearchFieldTitles } from "plotSearch/enums"; -import PlotSearchReservationRecipients from "plotSearch/components/plotSearchSections/basicInfo/PlotSearchReservationRecipients"; +import { PlotSearchFieldTitles } from "@/plotSearch/enums"; +import PlotSearchReservationRecipients from "@/plotSearch/components/plotSearchSections/basicInfo/PlotSearchReservationRecipients"; type OwnProps = { plotSearchSite: Record; index: number; diff --git a/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchTargetListing.tsx b/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchTargetListing.tsx index 6d88bd926..cb3efc841 100644 --- a/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchTargetListing.tsx +++ b/src/plotSearch/components/plotSearchSections/basicInfo/PlotSearchTargetListing.tsx @@ -1,14 +1,14 @@ import React from "react"; import { Row } from "react-foundation"; import { connect } from "react-redux"; -import { getCurrentPlotSearch, getPlanUnitAttributes, getCustomDetailedPlanAttributes } from "plotSearch/selectors"; -import type { PlotSearch } from "plotSearch/types"; -import WhiteBox from "components/content/WhiteBox"; -import SubTitle from "components/content/SubTitle"; -import { PlotSearchTargetType } from "plotSearch/enums"; +import { getCurrentPlotSearch, getPlanUnitAttributes, getCustomDetailedPlanAttributes } from "@/plotSearch/selectors"; +import type { PlotSearch } from "@/plotSearch/types"; +import WhiteBox from "@/components/content/WhiteBox"; +import SubTitle from "@/components/content/SubTitle"; +import { PlotSearchTargetType } from "@/plotSearch/enums"; import type { Attributes } from "types"; -import PlotSearchSitePlanUnit from "plotSearch/components/plotSearchSections/basicInfo/PlotSearchSitePlanUnit"; -import PlotSearchSiteCustomDetailedPlan from "plotSearch/components/plotSearchSections/basicInfo/PlotSearchSiteCustomDetailedPlan"; +import PlotSearchSitePlanUnit from "@/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSitePlanUnit"; +import PlotSearchSiteCustomDetailedPlan from "@/plotSearch/components/plotSearchSections/basicInfo/PlotSearchSiteCustomDetailedPlan"; type OwnProps = {}; type Props = { plotSearch: PlotSearch; diff --git a/src/plotSearch/components/plotSearchSections/basicInfo/SuggestedEdit.tsx b/src/plotSearch/components/plotSearchSections/basicInfo/SuggestedEdit.tsx index 8bc3d2353..00e669743 100644 --- a/src/plotSearch/components/plotSearchSections/basicInfo/SuggestedEdit.tsx +++ b/src/plotSearch/components/plotSearchSections/basicInfo/SuggestedEdit.tsx @@ -3,14 +3,14 @@ import { connect } from "react-redux"; import { formValueSelector } from "redux-form"; import { Row, Column } from "react-foundation"; import get from "lodash/get"; -import Authorization from "components/authorization/Authorization"; -import FormField from "components/form/FormField"; -import RemoveButton from "components/form/RemoveButton"; -import { getFieldOptions } from "util/helpers"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import { getAttributes, getIsSaveClicked } from "plotSearch/selectors"; +import Authorization from "@/components/authorization/Authorization"; +import FormField from "@/components/form/FormField"; +import RemoveButton from "@/components/form/RemoveButton"; +import { getFieldOptions } from "@/util/helpers"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import { getAttributes, getIsSaveClicked } from "@/plotSearch/selectors"; import type { Attributes } from "types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type OwnProps = { disabled: boolean; field: any; diff --git a/src/plotSearch/components/plotSearchSections/map/ApplicationMap.tsx b/src/plotSearch/components/plotSearchSections/map/ApplicationMap.tsx index 027be1e0e..141bfbe58 100644 --- a/src/plotSearch/components/plotSearchSections/map/ApplicationMap.tsx +++ b/src/plotSearch/components/plotSearchSections/map/ApplicationMap.tsx @@ -2,15 +2,15 @@ import React, { Component } from "react"; import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; -import AreaNotesEditMap from "areaNote/components/AreaNotesEditMap"; -import AreaNotesLayer from "areaNote/components/AreaNotesLayer"; -import { fetchAreaNoteList } from "areaNote/actions"; -import { UsersPermissions } from "usersPermissions/enums"; -import { hasPermissions } from "util/helpers"; -import { getAreaNoteList } from "areaNote/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import type { AreaNoteList } from "areaNote/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import AreaNotesEditMap from "@/areaNote/components/AreaNotesEditMap"; +import AreaNotesLayer from "@/areaNote/components/AreaNotesLayer"; +import { fetchAreaNoteList } from "@/areaNote/actions"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { hasPermissions } from "@/util/helpers"; +import { getAreaNoteList } from "@/areaNote/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import type { AreaNoteList } from "@/areaNote/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type OwnProps = {}; type Props = OwnProps & { areaNotes: AreaNoteList; diff --git a/src/plotSearch/components/reservationIdentifiers/ReservationIdentifiersModal.tsx b/src/plotSearch/components/reservationIdentifiers/ReservationIdentifiersModal.tsx index 0e772b786..9bd87dbfa 100644 --- a/src/plotSearch/components/reservationIdentifiers/ReservationIdentifiersModal.tsx +++ b/src/plotSearch/components/reservationIdentifiers/ReservationIdentifiersModal.tsx @@ -4,25 +4,25 @@ import { connect } from "react-redux"; import { flowRight } from "lodash/util"; import classNames from "classnames"; import { padStart } from "lodash/string"; -import Modal from "components/modal/Modal"; -import ModalButtonWrapper from "components/modal/ModalButtonWrapper"; -import Button from "components/button/Button"; -import { ButtonColors } from "components/enums"; -import SortableTable from "components/table/SortableTable"; -import { getCurrentPlotSearch, getIsBatchCreatingReservationIdentifiers, getLastBatchReservationCreationError, getReservationIdentifierUnitLists } from "plotSearch/selectors"; -import type { PlotSearch } from "plotSearch/types"; -import EditButton from "components/form/EditButton"; -import CreateLeaseForm from "leases/components/createLease/CreateLeaseForm"; -import { FieldTypes, FormNames } from "enums"; -import { fetchAttributes as fetchLeaseAttributes } from "leases/actions"; -import { getAttributes as getLeaseAttributes } from "leases/selectors"; -import { LeaseFieldPaths, LeaseState } from "leases/enums"; -import SubTitle from "components/content/SubTitle"; -import { batchCreateReservationIdentifiers, fetchReservationIdentifierUnitLists, fetchSinglePlotSearch } from "plotSearch/actions"; -import FormField from "components/form/FormField"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import ErrorBlock from "components/form/ErrorBlock"; +import Modal from "@/components/modal/Modal"; +import ModalButtonWrapper from "@/components/modal/ModalButtonWrapper"; +import Button from "@/components/button/Button"; +import { ButtonColors } from "@/components/enums"; +import SortableTable from "@/components/table/SortableTable"; +import { getCurrentPlotSearch, getIsBatchCreatingReservationIdentifiers, getLastBatchReservationCreationError, getReservationIdentifierUnitLists } from "@/plotSearch/selectors"; +import type { PlotSearch } from "@/plotSearch/types"; +import EditButton from "@/components/form/EditButton"; +import CreateLeaseForm from "@/leases/components/createLease/CreateLeaseForm"; +import { FieldTypes, FormNames } from "@/enums"; +import { fetchAttributes as fetchLeaseAttributes } from "@/leases/actions"; +import { getAttributes as getLeaseAttributes } from "@/leases/selectors"; +import { LeaseFieldPaths, LeaseState } from "@/leases/enums"; +import SubTitle from "@/components/content/SubTitle"; +import { batchCreateReservationIdentifiers, fetchReservationIdentifierUnitLists, fetchSinglePlotSearch } from "@/plotSearch/actions"; +import FormField from "@/components/form/FormField"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import ErrorBlock from "@/components/form/ErrorBlock"; type OwnProps = { isOpen: boolean; onClose: () => void; diff --git a/src/plotSearch/components/search/Search.tsx b/src/plotSearch/components/search/Search.tsx index 5f0c5d5b3..8a402f6df 100644 --- a/src/plotSearch/components/search/Search.tsx +++ b/src/plotSearch/components/search/Search.tsx @@ -8,18 +8,18 @@ import flowRight from "lodash/flowRight"; import isEqual from "lodash/isEqual"; import isEmpty from "lodash/isEmpty"; import type { ContextRouter } from "react-router"; -import { getFieldOptions, getUrlParams } from "util/helpers"; -import { getAttributes, getPlotSearchSubTypes } from "plotSearch/selectors"; -import FormField from "components/form/FormField"; -import SearchChangeTypeLink from "components/search/SearchChangeTypeLink"; -import SearchClearLink from "components/search/SearchClearLink"; -import SearchContainer from "components/search/SearchContainer"; -import SearchInputColumn from "components/search/SearchInputColumn"; -import SearchLabel from "components/search/SearchLabel"; -import SearchLabelColumn from "components/search/SearchLabelColumn"; -import SearchRow from "components/search/SearchRow"; -import { FieldTypes, FormNames } from "enums"; -import { PlotSearchFieldPaths } from "plotSearch/enums"; +import { getFieldOptions, getUrlParams } from "@/util/helpers"; +import { getAttributes, getPlotSearchSubTypes } from "@/plotSearch/selectors"; +import FormField from "@/components/form/FormField"; +import SearchChangeTypeLink from "@/components/search/SearchChangeTypeLink"; +import SearchClearLink from "@/components/search/SearchClearLink"; +import SearchContainer from "@/components/search/SearchContainer"; +import SearchInputColumn from "@/components/search/SearchInputColumn"; +import SearchLabel from "@/components/search/SearchLabel"; +import SearchLabelColumn from "@/components/search/SearchLabelColumn"; +import SearchRow from "@/components/search/SearchRow"; +import { FieldTypes, FormNames } from "@/enums"; +import { PlotSearchFieldPaths } from "@/plotSearch/enums"; import type { Attributes } from "types"; type OwnProps = { handleSubmit: (...args: Array) => any; diff --git a/src/plotSearch/constants.ts b/src/plotSearch/constants.ts index b4b47b5b8..87701fa41 100644 --- a/src/plotSearch/constants.ts +++ b/src/plotSearch/constants.ts @@ -1,6 +1,6 @@ -import { TableSortOrder } from "enums"; -import { PlotSearchStageTypes } from "plotSearch/enums"; -import type { ProtectedFormPathsSections } from "plotSearch/types"; +import { TableSortOrder } from "@/enums"; +import { PlotSearchStageTypes } from "@/plotSearch/enums"; +import type { ProtectedFormPathsSections } from "@/plotSearch/types"; /** * Default plotSearch states value for plotSearch list search diff --git a/src/plotSearch/helpers.ts b/src/plotSearch/helpers.ts index 48d4e7395..62730481e 100644 --- a/src/plotSearch/helpers.ts +++ b/src/plotSearch/helpers.ts @@ -3,15 +3,15 @@ import isEmpty from "lodash/isEmpty"; import { kebabCase } from "lodash/string"; import { cloneDeep } from "lodash/lang"; import { formValueSelector } from "redux-form"; -import { getContentUser } from "users/helpers"; -import { removeSessionStorageItem } from "util/storage"; -import { FormNames } from "enums"; -import { formatDate, getApiResponseResults } from "util/helpers"; -import { PlotSearchTargetType } from "plotSearch/enums"; -import { FIELD_TYPE_FEATURES_BY_FIELD_TYPE_NAME, FieldTypeFeatures, PROTECTED_FORM_PATHS } from "plotSearch/constants"; -import type { PlotSearch, PlotSearchState, ProtectedFormPathsSectionNode } from "plotSearch/types"; +import { getContentUser } from "@/users/helpers"; +import { removeSessionStorageItem } from "@/util/storage"; +import { FormNames } from "@/enums"; +import { formatDate, getApiResponseResults } from "@/util/helpers"; +import { PlotSearchTargetType } from "@/plotSearch/enums"; +import { FIELD_TYPE_FEATURES_BY_FIELD_TYPE_NAME, FieldTypeFeatures, PROTECTED_FORM_PATHS } from "@/plotSearch/constants"; +import type { PlotSearch, PlotSearchState, ProtectedFormPathsSectionNode } from "@/plotSearch/types"; import type { Attributes } from "types"; -import type { Form, FormField, FormSection } from "application/types"; +import type { Form, FormField, FormSection } from "@/application/types"; /** * Get plotSearch basic information content diff --git a/src/plotSearch/reducer.ts b/src/plotSearch/reducer.ts index 464a71099..873ba1823 100644 --- a/src/plotSearch/reducer.ts +++ b/src/plotSearch/reducer.ts @@ -1,9 +1,9 @@ import merge from "lodash/merge"; import { combineReducers } from "redux"; import { handleActions } from "redux-actions"; -import { FormNames } from "enums"; -import { annotatePlanUnitDecision } from "plotSearch/helpers"; -import type { AddPlanUnitDecisionsAction, CustomDetailedPlan, PlanUnit, PlotSearch, PlotSearchList, PlotSearchState, ReceiveAttributesAction, ReceiveCollapseStatesAction, ReceiveFormAction, ReceiveFormValidFlagsAction, ReceiveIsSaveClickedAction, ReceiveMethodsAction, ReceivePlotSearchListAction, ReceivePlotSearchStagesAction, ReceivePlotSearchSubtypesAction, ReceiveSingleCustomDetailedPlanAction, ReceiveSinglePlotSearchAction, ReceiveTemplateFormsAction, RemovePlanUnitDecisionsAction } from "plotSearch/types"; +import { FormNames } from "@/enums"; +import { annotatePlanUnitDecision } from "@/plotSearch/helpers"; +import type { AddPlanUnitDecisionsAction, CustomDetailedPlan, PlanUnit, PlotSearch, PlotSearchList, PlotSearchState, ReceiveAttributesAction, ReceiveCollapseStatesAction, ReceiveFormAction, ReceiveFormValidFlagsAction, ReceiveIsSaveClickedAction, ReceiveMethodsAction, ReceivePlotSearchListAction, ReceivePlotSearchStagesAction, ReceivePlotSearchSubtypesAction, ReceiveSingleCustomDetailedPlanAction, ReceiveSinglePlotSearchAction, ReceiveTemplateFormsAction, RemovePlanUnitDecisionsAction } from "@/plotSearch/types"; import type { Attributes, Methods, Reducer } from "types"; const attributesReducer: Reducer = handleActions({ ['mvj/plotSearch/RECEIVE_ATTRIBUTES']: (state: Attributes, { diff --git a/src/plotSearch/requests.ts b/src/plotSearch/requests.ts index 6bc58a1f6..97f8387a6 100644 --- a/src/plotSearch/requests.ts +++ b/src/plotSearch/requests.ts @@ -1,6 +1,6 @@ -import callApi from "api/callApi"; -import createUrl from "api/createUrl"; -import type { PlotSearch } from "plotSearch/types"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; +import type { PlotSearch } from "@/plotSearch/types"; export const fetchAttributes = (): Generator => { return callApi(new Request(createUrl('plot_search/'), { method: 'OPTIONS' diff --git a/src/plotSearch/requestsAsync.ts b/src/plotSearch/requestsAsync.ts index 63c8d9126..c021c3906 100644 --- a/src/plotSearch/requestsAsync.ts +++ b/src/plotSearch/requestsAsync.ts @@ -1,5 +1,5 @@ -import createUrl from "api/createUrl"; -import callApiAsync from "api/callApiAsync"; +import createUrl from "@/api/createUrl"; +import callApiAsync from "@/api/callApiAsync"; export const fetchPlanUnitListWithIdentifiersList = async (query?: Record): Promise>> => { const { response: { diff --git a/src/plotSearch/saga.ts b/src/plotSearch/saga.ts index 4a4a0c143..920209377 100644 --- a/src/plotSearch/saga.ts +++ b/src/plotSearch/saga.ts @@ -1,15 +1,15 @@ import { all, fork, put, takeLatest, call, takeEvery, take } from "redux-saga/effects"; import { push } from "react-router-redux"; import { SubmissionError } from "redux-form"; -import { displayUIMessage, getSearchQuery, getUrlParams } from "util/helpers"; -import { hideEditMode, receiveAttributes, receivePlotSearchList, receiveSinglePlotSearch, receiveMethods, attributesNotFound, notFound, receiveIsSaveClicked, fetchSinglePlotSearchAfterEdit, receivePlanUnitAttributes, planUnitAttributesNotFound, receiveSinglePlanUnit, planUnitNotFound, customDetailedPlanAttributesNotFound, customDetailedPlanNotFound, receiveCustomDetailedPlanAttributes, receiveSingleCustomDetailedPlan, receivePlotSearchSubtype, plotSearchSubtypesNotFound, nullPlanUnits, receiveForm, formNotFound, fetchTemplateForms, receiveTemplateForms, templateFormsNotFound, addPlanUnitDecisions, resetPlanUnitDecisions, editForm, receiveStages, stagesNotFound, fetchStages, reservationIdentifiersCreated, reservationIdentifiersCreationFailed, reservationIdentifierUnitListsNotFound, receiveReservationIdentifierUnitLists, directReservationLinkCreated, directReservationLinkCreationFailed, receivePlotSearchRelatedApplications, plotSearchRelatedApplicationsNotFound, fetchPlotSearchRelatedApplications } from "plotSearch/actions"; -import { receiveError } from "api/actions"; -import { getRouteById, Routes } from "root/routes"; -import { fetchAttributes, createPlotSearch, fetchPlotSearches, fetchSinglePlotSearch, editPlotSearch as editPlotSearchRequest, deletePlotSearch, fetchPlanUnitAttributes, fetchPlanUnit, fetchCustomDetailedPlanAttributes, fetchCustomDetailedPlan, fetchPlotSearchSubtypesRequest, fetchFormRequest, fetchTemplateFormsRequest, editFormRequest, fetchStagesRequest, editTargetPlotSearchRelationRequest, fetchAllMunicipalitiesRequest, fetchAllDistrictsRequest, createDirectReservationLinkRequest, fetchPlotSearchApplicationsRequest, createPlotSearchApplicationsOpeningRecords } from "plotSearch/requests"; -import { createLease } from "leases/requests"; -import { RelationTypes } from "leases/enums"; -import { fetchLeaseTypes } from "leaseType/requests"; -import { fetchFormAttributes } from "application/actions"; +import { displayUIMessage, getSearchQuery, getUrlParams } from "@/util/helpers"; +import { hideEditMode, receiveAttributes, receivePlotSearchList, receiveSinglePlotSearch, receiveMethods, attributesNotFound, notFound, receiveIsSaveClicked, fetchSinglePlotSearchAfterEdit, receivePlanUnitAttributes, planUnitAttributesNotFound, receiveSinglePlanUnit, planUnitNotFound, customDetailedPlanAttributesNotFound, customDetailedPlanNotFound, receiveCustomDetailedPlanAttributes, receiveSingleCustomDetailedPlan, receivePlotSearchSubtype, plotSearchSubtypesNotFound, nullPlanUnits, receiveForm, formNotFound, fetchTemplateForms, receiveTemplateForms, templateFormsNotFound, addPlanUnitDecisions, resetPlanUnitDecisions, editForm, receiveStages, stagesNotFound, fetchStages, reservationIdentifiersCreated, reservationIdentifiersCreationFailed, reservationIdentifierUnitListsNotFound, receiveReservationIdentifierUnitLists, directReservationLinkCreated, directReservationLinkCreationFailed, receivePlotSearchRelatedApplications, plotSearchRelatedApplicationsNotFound, fetchPlotSearchRelatedApplications } from "@/plotSearch/actions"; +import { receiveError } from "@/api/actions"; +import { getRouteById, Routes } from "@/root/routes"; +import { fetchAttributes, createPlotSearch, fetchPlotSearches, fetchSinglePlotSearch, editPlotSearch as editPlotSearchRequest, deletePlotSearch, fetchPlanUnitAttributes, fetchPlanUnit, fetchCustomDetailedPlanAttributes, fetchCustomDetailedPlan, fetchPlotSearchSubtypesRequest, fetchFormRequest, fetchTemplateFormsRequest, editFormRequest, fetchStagesRequest, editTargetPlotSearchRelationRequest, fetchAllMunicipalitiesRequest, fetchAllDistrictsRequest, createDirectReservationLinkRequest, fetchPlotSearchApplicationsRequest, createPlotSearchApplicationsOpeningRecords } from "@/plotSearch/requests"; +import { createLease } from "@/leases/requests"; +import { RelationTypes } from "@/leases/enums"; +import { fetchLeaseTypes } from "@/leaseType/requests"; +import { fetchFormAttributes } from "@/application/actions"; function* fetchAttributesSaga(): Generator { try { diff --git a/src/plotSearch/selectors.ts b/src/plotSearch/selectors.ts index b7cf46bef..8eb274729 100644 --- a/src/plotSearch/selectors.ts +++ b/src/plotSearch/selectors.ts @@ -1,11 +1,11 @@ import get from "lodash/get"; import isEmpty from "lodash/isEmpty"; import type { Attributes, Methods, Selector } from "types"; -import type { RootState } from "root/types"; -import type { CustomDetailedPlan, PlanUnit, PlotSearch, PlotSearchList } from "plotSearch/types"; +import type { RootState } from "@/root/types"; +import type { CustomDetailedPlan, PlanUnit, PlotSearch, PlotSearchList } from "@/plotSearch/types"; import { formValueSelector } from "redux-form"; -import { FormNames } from "enums"; -import { PlotSearchStageTypes } from "plotSearch/enums"; +import { FormNames } from "@/enums"; +import { PlotSearchStageTypes } from "@/plotSearch/enums"; export const getAttributes: Selector = (state: RootState): Attributes => state.plotSearch.attributes; export const getIsEditMode: Selector = (state: RootState): boolean => state.plotSearch.isEditMode; export const getCollapseStateByKey: Selector | null | undefined, string> = (state: RootState, key: string): Record | null | undefined => { diff --git a/src/plotSearch/spec.ts b/src/plotSearch/spec.ts index d8b1b9313..11452dbb5 100644 --- a/src/plotSearch/spec.ts +++ b/src/plotSearch/spec.ts @@ -1,11 +1,11 @@ import { expect } from "chai"; -import { attributesNotFound, fetchAttributes, receiveAttributes, fetchPlotSearchList, receivePlotSearchList, fetchSinglePlotSearch, receiveSinglePlotSearch, editPlotSearch, createPlotSearch, notFound, hideEditMode, showEditMode, receiveCollapseStates, receiveIsSaveClicked, receiveFormValidFlags, clearFormValidFlags, receiveMethods, deletePlotSearch, fetchSinglePlotSearchAfterEdit, planUnitNotFound, fetchPlanUnit, receiveSinglePlanUnit, fetchPlanUnitAttributes, planUnitAttributesNotFound, receivePlanUnitAttributes, fetchPlotSearchSubtypes, plotSearchSubtypesNotFound, receivePlotSearchSubtype, nullPlanUnits, receiveForm, formNotFound, receiveTemplateForms, fetchForm, removePlanUnitDecisions, addPlanUnitDecisions, resetPlanUnitDecisions } from "plotSearch/actions"; -import mockData from "plotSearch/mock-data.json"; -import mockAttributes from "plotSearch/attributes-mock-data.json"; -import plotSearchReducer from "plotSearch/reducer"; -import type { PlotSearchState } from "plotSearch/types"; -import { isLockedForModifications } from "plotSearch/selectors"; -import { getTestRootState } from "util/testUtil"; +import { attributesNotFound, fetchAttributes, receiveAttributes, fetchPlotSearchList, receivePlotSearchList, fetchSinglePlotSearch, receiveSinglePlotSearch, editPlotSearch, createPlotSearch, notFound, hideEditMode, showEditMode, receiveCollapseStates, receiveIsSaveClicked, receiveFormValidFlags, clearFormValidFlags, receiveMethods, deletePlotSearch, fetchSinglePlotSearchAfterEdit, planUnitNotFound, fetchPlanUnit, receiveSinglePlanUnit, fetchPlanUnitAttributes, planUnitAttributesNotFound, receivePlanUnitAttributes, fetchPlotSearchSubtypes, plotSearchSubtypesNotFound, receivePlotSearchSubtype, nullPlanUnits, receiveForm, formNotFound, receiveTemplateForms, fetchForm, removePlanUnitDecisions, addPlanUnitDecisions, resetPlanUnitDecisions } from "@/plotSearch/actions"; +import mockData from "@/plotSearch/mock-data.json"; +import mockAttributes from "@/plotSearch/attributes-mock-data.json"; +import plotSearchReducer from "@/plotSearch/reducer"; +import type { PlotSearchState } from "@/plotSearch/types"; +import { isLockedForModifications } from "@/plotSearch/selectors"; +import { getTestRootState } from "@/util/testUtil"; const mockForm = mockData[0].form; const baseState: PlotSearchState = { attributes: null, diff --git a/src/previewInvoices/reducer.ts b/src/previewInvoices/reducer.ts index 7f16c95f4..1c3c46d75 100644 --- a/src/previewInvoices/reducer.ts +++ b/src/previewInvoices/reducer.ts @@ -1,7 +1,7 @@ import { combineReducers } from "redux"; import { handleActions } from "redux-actions"; -import type { Reducer } from "../types"; -import type { PreviewInvoices, ReceivePreviewInvoicesAction } from "previewInvoices/types"; +import type { Reducer } from "@/types"; +import type { PreviewInvoices, ReceivePreviewInvoicesAction } from "@/previewInvoices/types"; const isFetchingReducer: Reducer = handleActions({ 'mvj/previewInvoices/FETCH_ALL': () => true, 'mvj/previewInvoices/NOT_FOUND': () => false, diff --git a/src/previewInvoices/requests.ts b/src/previewInvoices/requests.ts index 480af6716..23a97e2ff 100644 --- a/src/previewInvoices/requests.ts +++ b/src/previewInvoices/requests.ts @@ -1,6 +1,6 @@ -import callApi from "../api/callApi"; -import createUrl from "../api/createUrl"; -import { getSearchQuery } from "util/helpers"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; +import { getSearchQuery } from "@/util/helpers"; import type { FetchPreviewInvoicesPayload } from "./types"; export const fetchPreviewInvoices = ({ lease, diff --git a/src/previewInvoices/saga.ts b/src/previewInvoices/saga.ts index b860bd866..78e80b5f2 100644 --- a/src/previewInvoices/saga.ts +++ b/src/previewInvoices/saga.ts @@ -1,6 +1,6 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects"; import { notFound, receivePreviewInvoices } from "./actions"; -import { receiveError } from "api/actions"; +import { receiveError } from "@/api/actions"; import { fetchPreviewInvoices } from "./requests"; function* fetchPreviewInvoicesSaga({ diff --git a/src/previewInvoices/selectors.ts b/src/previewInvoices/selectors.ts index 561e5d6ee..db7a1afb2 100644 --- a/src/previewInvoices/selectors.ts +++ b/src/previewInvoices/selectors.ts @@ -1,5 +1,5 @@ import type { Selector } from "types"; import type { PreviewInvoices } from "./types"; -import type { RootState } from "root/types"; +import type { RootState } from "@/root/types"; export const getIsFetching: Selector = (state: RootState): boolean => state.previewInvoices.isFetching; export const getPreviewInvoices: Selector = (state: RootState): PreviewInvoices => state.previewInvoices.list; \ No newline at end of file diff --git a/src/previewInvoices/types.ts b/src/previewInvoices/types.ts index c951c02e5..f24d0bb8e 100644 --- a/src/previewInvoices/types.ts +++ b/src/previewInvoices/types.ts @@ -1,5 +1,5 @@ import type { Action } from "types"; -import type { LeaseId } from "leases/types"; +import type { LeaseId } from "@/leases/types"; export type PreviewInvoicesState = { isFetching: boolean; list: PreviewInvoices; diff --git a/src/relatedLease/requests.ts b/src/relatedLease/requests.ts index 4fa082958..79f086928 100644 --- a/src/relatedLease/requests.ts +++ b/src/relatedLease/requests.ts @@ -1,5 +1,5 @@ -import callApi from "../api/callApi"; -import createUrl from "../api/createUrl"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; import type { CreateRelatedLeasePayload, CreateRelatedPlotApplicationPayload } from "./types"; export const createRelatedLease = (payload: CreateRelatedLeasePayload): Generator => { const body = JSON.stringify(payload); diff --git a/src/relatedLease/saga.ts b/src/relatedLease/saga.ts index e80c51d85..e73d88164 100644 --- a/src/relatedLease/saga.ts +++ b/src/relatedLease/saga.ts @@ -1,8 +1,8 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects"; import { SubmissionError } from "redux-form"; -import { receiveError } from "api/actions"; -import { fetchSingleLeaseAfterEdit } from "leases/actions"; -import { displayUIMessage } from "util/helpers"; +import { receiveError } from "@/api/actions"; +import { fetchSingleLeaseAfterEdit } from "@/leases/actions"; +import { displayUIMessage } from "@/util/helpers"; import { createRelatedLease, createRelatedPlotApplication, deleteReleatedLease, deleteRelatedPlotApplication } from "./requests"; function* createReleatedLeaseSaga({ diff --git a/src/relatedLease/types.ts b/src/relatedLease/types.ts index 50511f4e4..f5621488c 100644 --- a/src/relatedLease/types.ts +++ b/src/relatedLease/types.ts @@ -1,5 +1,5 @@ import type { Action } from "types"; -import type { LeaseId } from "leases/types"; +import type { LeaseId } from "@/leases/types"; export type CreateRelatedLeasePayload = { from_lease: LeaseId; to_lease: LeaseId; diff --git a/src/rentForPeriod/reducer.ts b/src/rentForPeriod/reducer.ts index b5774fd1f..d4e8509c9 100644 --- a/src/rentForPeriod/reducer.ts +++ b/src/rentForPeriod/reducer.ts @@ -1,7 +1,7 @@ import { combineReducers } from "redux"; import { handleActions } from "redux-actions"; import isArray from "lodash/isArray"; -import type { Reducer } from "../types"; +import type { Reducer } from "@/types"; import type { RentForPeriod, ReceiveRentForPeriodByLeaseAction, DeleteRentForPeriodByLeaseAction, ReceiveIsSaveClickedAction } from "./types"; const isFetchingReducer: Reducer = handleActions({ 'mvj/rentforperiod/FETCH_ALL': () => true, diff --git a/src/rentForPeriod/requests.ts b/src/rentForPeriod/requests.ts index 803afd7a5..841c84de3 100644 --- a/src/rentForPeriod/requests.ts +++ b/src/rentForPeriod/requests.ts @@ -1,5 +1,5 @@ -import callApi from "../api/callApi"; -import createUrl from "../api/createUrl"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; import type { FetchRentForPeriodPayload } from "./types"; export const fetchRentForPeriod = (payload: FetchRentForPeriodPayload): Generator => { return callApi(new Request(createUrl(`lease_rent_for_period/?lease=${payload.leaseId}&start_date=${payload.startDate}&end_date=${payload.endDate}`))); diff --git a/src/rentForPeriod/saga.ts b/src/rentForPeriod/saga.ts index 10fe7c64c..c060d7e70 100644 --- a/src/rentForPeriod/saga.ts +++ b/src/rentForPeriod/saga.ts @@ -1,7 +1,7 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects"; import { notFound, receiveIsSaveClicked, receiveRentForPeriodByLease } from "./actions"; import { fetchRentForPeriod } from "./requests"; -import { receiveError } from "../api/actions"; +import { receiveError } from "@/api/actions"; function* fetchRentForPeriodSaga({ payload, diff --git a/src/rentForPeriod/selectors.ts b/src/rentForPeriod/selectors.ts index db413f35d..fa049b2fb 100644 --- a/src/rentForPeriod/selectors.ts +++ b/src/rentForPeriod/selectors.ts @@ -1,7 +1,7 @@ import type { Selector } from "types"; -import type { RootState } from "../root/types"; +import type { RootState } from "@/root/types"; import type { RentForPeriod } from "./types"; -import type { LeaseId } from "leases/types"; +import type { LeaseId } from "@/leases/types"; export const getIsFetching: Selector = (state: RootState): boolean => state.rentForPeriod.isFetching; export const getRentForPeriodArrayByLease: Selector = (state: RootState, leaseId: LeaseId): RentForPeriod => { return state.rentForPeriod.byLease[leaseId]; diff --git a/src/rentForPeriod/types.ts b/src/rentForPeriod/types.ts index cd82e5a88..144fcf8be 100644 --- a/src/rentForPeriod/types.ts +++ b/src/rentForPeriod/types.ts @@ -1,5 +1,5 @@ import type { Action } from "types"; -import type { LeaseId } from "leases/types"; +import type { LeaseId } from "@/leases/types"; export type RentForPeriodId = number; export type RentForPeriodState = { byLease: Record; diff --git a/src/rentbasis/components/NewRentBasisPage.tsx b/src/rentbasis/components/NewRentBasisPage.tsx index f13e53e2a..ecebb0321 100644 --- a/src/rentbasis/components/NewRentBasisPage.tsx +++ b/src/rentbasis/components/NewRentBasisPage.tsx @@ -3,28 +3,28 @@ import { withRouter } from "react-router"; import { connect } from "react-redux"; import { getFormValues, isDirty } from "redux-form"; import flowRight from "lodash/flowRight"; -import AuthorizationError from "components/authorization/AuthorizationError"; -import ContentContainer from "components/content/ContentContainer"; -import ControlButtonBar from "components/controlButtons/ControlButtonBar"; -import ControlButtons from "components/controlButtons/ControlButtons"; -import FullWidthContainer from "components/content/FullWidthContainer"; -import GreenBox from "components/content/GreenBox"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import PageContainer from "components/content/PageContainer"; -import PageNavigationWrapper from "components/content/PageNavigationWrapper"; +import AuthorizationError from "@/components/authorization/AuthorizationError"; +import ContentContainer from "@/components/content/ContentContainer"; +import ControlButtonBar from "@/components/controlButtons/ControlButtonBar"; +import ControlButtons from "@/components/controlButtons/ControlButtons"; +import FullWidthContainer from "@/components/content/FullWidthContainer"; +import GreenBox from "@/components/content/GreenBox"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import PageContainer from "@/components/content/PageContainer"; +import PageNavigationWrapper from "@/components/content/PageNavigationWrapper"; import RentBasisForm from "./forms/RentBasisForm"; -import { createRentBasis, hideEditMode, receiveIsSaveClicked, showEditMode } from "rentbasis/actions"; -import { receiveTopNavigationSettings } from "components/topNavigation/actions"; -import { FormNames, Methods, PermissionMissingTexts } from "enums"; -import { getPayloadRentBasis } from "rentbasis/helpers"; -import { isMethodAllowed, setPageTitle } from "util/helpers"; -import { getRouteById, Routes } from "root/routes"; -import { getIsFormValid, getIsSaveClicked, getIsSaving } from "rentbasis/selectors"; -import { withRentBasisAttributes } from "components/attributes/RentBasisAttributes"; -import { withUiDataList } from "components/uiData/UiDataListHOC"; +import { createRentBasis, hideEditMode, receiveIsSaveClicked, showEditMode } from "@/rentbasis/actions"; +import { receiveTopNavigationSettings } from "@/components/topNavigation/actions"; +import { FormNames, Methods, PermissionMissingTexts } from "@/enums"; +import { getPayloadRentBasis } from "@/rentbasis/helpers"; +import { isMethodAllowed, setPageTitle } from "@/util/helpers"; +import { getRouteById, Routes } from "@/root/routes"; +import { getIsFormValid, getIsSaveClicked, getIsSaving } from "@/rentbasis/selectors"; +import { withRentBasisAttributes } from "@/components/attributes/RentBasisAttributes"; +import { withUiDataList } from "@/components/uiData/UiDataListHOC"; import type { Methods as MethodsType } from "types"; -import type { RootState } from "root/types"; +import type { RootState } from "@/root/types"; type Props = { createRentBasis: (...args: Array) => any; editedRentBasis: Record; diff --git a/src/rentbasis/components/RentBasisInfo.tsx b/src/rentbasis/components/RentBasisInfo.tsx index 71537da7f..9572dcbb0 100644 --- a/src/rentbasis/components/RentBasisInfo.tsx +++ b/src/rentbasis/components/RentBasisInfo.tsx @@ -1,10 +1,10 @@ import React from "react"; import { connect } from "react-redux"; -import Authorization from "components/authorization/Authorization"; -import FormTextTitle from "components/form/FormTextTitle"; -import { RentBasisFieldPaths, RentBasisFieldTitles } from "rentbasis/enums"; -import { isFieldAllowedToRead } from "util/helpers"; -import { getAttributes as getRentBasisAttributes } from "rentbasis/selectors"; +import Authorization from "@/components/authorization/Authorization"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import { RentBasisFieldPaths, RentBasisFieldTitles } from "@/rentbasis/enums"; +import { isFieldAllowedToRead } from "@/util/helpers"; +import { getAttributes as getRentBasisAttributes } from "@/rentbasis/selectors"; import type { Attributes } from "types"; type Props = { identifier: string | null | undefined; diff --git a/src/rentbasis/components/RentBasisListPage.tsx b/src/rentbasis/components/RentBasisListPage.tsx index 5af75a28c..737e00350 100644 --- a/src/rentbasis/components/RentBasisListPage.tsx +++ b/src/rentbasis/components/RentBasisListPage.tsx @@ -5,30 +5,30 @@ import { Row, Column } from "react-foundation"; import { withRouter } from "react-router"; import flowRight from "lodash/flowRight"; import get from "lodash/get"; -import AddButtonSecondary from "components/form/AddButtonSecondary"; -import Authorization from "components/authorization/Authorization"; -import AuthorizationError from "components/authorization/AuthorizationError"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import PageContainer from "components/content/PageContainer"; -import Pagination from "components/table/Pagination"; +import AddButtonSecondary from "@/components/form/AddButtonSecondary"; +import Authorization from "@/components/authorization/Authorization"; +import AuthorizationError from "@/components/authorization/AuthorizationError"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import PageContainer from "@/components/content/PageContainer"; +import Pagination from "@/components/table/Pagination"; import Search from "./search/Search"; -import SortableTable from "components/table/SortableTable"; -import TableFilters from "components/table/TableFilters"; -import TableWrapper from "components/table/TableWrapper"; -import { fetchRentBasisList, initializeRentBasis } from "rentbasis/actions"; -import { receiveTopNavigationSettings } from "components/topNavigation/actions"; -import { LIST_TABLE_PAGE_SIZE } from "util/constants"; -import { DEFAULT_SORT_KEY, DEFAULT_SORT_ORDER } from "rentbasis/constants"; -import { FormNames, Methods, PermissionMissingTexts } from "enums"; -import { RentBasisFieldPaths, RentBasisPropertyIdentifiersFieldPaths, RentBasisRentRatesFieldPaths } from "rentbasis/enums"; -import { mapRentBasisSearchFilters } from "rentbasis/helpers"; -import { formatDate, getApiResponseCount, getApiResponseMaxPage, getApiResponseResults, getFieldOptions, getLabelOfOption, getSearchQuery, getUrlParams, isFieldAllowedToRead, isMethodAllowed, setPageTitle } from "util/helpers"; -import { getRouteById, Routes } from "root/routes"; -import { getIsFetching, getRentBasisList } from "rentbasis/selectors"; -import { withRentBasisAttributes } from "components/attributes/RentBasisAttributes"; +import SortableTable from "@/components/table/SortableTable"; +import TableFilters from "@/components/table/TableFilters"; +import TableWrapper from "@/components/table/TableWrapper"; +import { fetchRentBasisList, initializeRentBasis } from "@/rentbasis/actions"; +import { receiveTopNavigationSettings } from "@/components/topNavigation/actions"; +import { LIST_TABLE_PAGE_SIZE } from "@/util/constants"; +import { DEFAULT_SORT_KEY, DEFAULT_SORT_ORDER } from "@/rentbasis/constants"; +import { FormNames, Methods, PermissionMissingTexts } from "@/enums"; +import { RentBasisFieldPaths, RentBasisPropertyIdentifiersFieldPaths, RentBasisRentRatesFieldPaths } from "@/rentbasis/enums"; +import { mapRentBasisSearchFilters } from "@/rentbasis/helpers"; +import { formatDate, getApiResponseCount, getApiResponseMaxPage, getApiResponseResults, getFieldOptions, getLabelOfOption, getSearchQuery, getUrlParams, isFieldAllowedToRead, isMethodAllowed, setPageTitle } from "@/util/helpers"; +import { getRouteById, Routes } from "@/root/routes"; +import { getIsFetching, getRentBasisList } from "@/rentbasis/selectors"; +import { withRentBasisAttributes } from "@/components/attributes/RentBasisAttributes"; import type { Attributes, Methods as MethodsType } from "types"; -import type { RentBasisList } from "rentbasis/types"; +import type { RentBasisList } from "@/rentbasis/types"; type Props = { fetchRentBasisList: (...args: Array) => any; history: Record; diff --git a/src/rentbasis/components/RentBasisPage.tsx b/src/rentbasis/components/RentBasisPage.tsx index 1af7bc89a..97367c19b 100644 --- a/src/rentbasis/components/RentBasisPage.tsx +++ b/src/rentbasis/components/RentBasisPage.tsx @@ -5,44 +5,44 @@ import { withRouter } from "react-router"; import { change, getFormValues, isDirty } from "redux-form"; import isEmpty from "lodash/isEmpty"; import flowRight from "lodash/flowRight"; -import Authorization from "components/authorization/Authorization"; -import AuthorizationError from "components/authorization/AuthorizationError"; -import ConfirmationModal from "components/modal/ConfirmationModal"; -import ContentContainer from "components/content/ContentContainer"; -import ControlButtonBar from "components/controlButtons/ControlButtonBar"; -import ControlButtons from "components/controlButtons/ControlButtons"; -import Divider from "components/content/Divider"; -import FullWidthContainer from "components/content/FullWidthContainer"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import PageContainer from "components/content/PageContainer"; -import PageNavigationWrapper from "components/content/PageNavigationWrapper"; +import Authorization from "@/components/authorization/Authorization"; +import AuthorizationError from "@/components/authorization/AuthorizationError"; +import ConfirmationModal from "@/components/modal/ConfirmationModal"; +import ContentContainer from "@/components/content/ContentContainer"; +import ControlButtonBar from "@/components/controlButtons/ControlButtonBar"; +import ControlButtons from "@/components/controlButtons/ControlButtons"; +import Divider from "@/components/content/Divider"; +import FullWidthContainer from "@/components/content/FullWidthContainer"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import PageContainer from "@/components/content/PageContainer"; +import PageNavigationWrapper from "@/components/content/PageNavigationWrapper"; import RentBasisEdit from "./sections/basicInfo/RentBasisEdit"; import RentBasisInfo from "./RentBasisInfo"; import RentBasisReadonly from "./sections/basicInfo/RentBasisReadonly"; import SingleRentBasisMap from "./sections/map/SingleRentBasisMap"; -import Tabs from "components/tabs/Tabs"; -import TabContent from "components/tabs/TabContent"; -import TabPane from "components/tabs/TabPane"; -import Title from "components/content/Title"; -import { editRentBasis, fetchSingleRentBasis, hideEditMode, initializeRentBasis, receiveIsSaveClicked, showEditMode } from "rentbasis/actions"; -import { receiveTopNavigationSettings } from "components/topNavigation/actions"; -import { ConfirmationModalTexts, Methods, PermissionMissingTexts } from "enums"; -import { getSearchQuery, getUrlParams, isFieldAllowedToRead, isMethodAllowed, scrollToTopPage, setPageTitle } from "util/helpers"; -import { FormNames } from "enums"; -import { RentBasisFieldPaths, RentBasisFieldTitles } from "rentbasis/enums"; -import { clearUnsavedChanges, getPayloadRentBasis, getCopyOfRentBasis, getContentRentBasis } from "rentbasis/helpers"; -import { getUiDataRentBasisKey } from "uiData/helpers"; -import { getRouteById, Routes } from "root/routes"; -import { getIsEditMode, getIsFetching, getIsFormValid, getIsSaveClicked, getIsSaving, getRentBasis } from "rentbasis/selectors"; -import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "usersPermissions/selectors"; -import { getSessionStorageItem, removeSessionStorageItem, setSessionStorageItem } from "util/storage"; -import { withRentBasisAttributes } from "components/attributes/RentBasisAttributes"; -import { withUiDataList } from "components/uiData/UiDataListHOC"; +import Tabs from "@/components/tabs/Tabs"; +import TabContent from "@/components/tabs/TabContent"; +import TabPane from "@/components/tabs/TabPane"; +import Title from "@/components/content/Title"; +import { editRentBasis, fetchSingleRentBasis, hideEditMode, initializeRentBasis, receiveIsSaveClicked, showEditMode } from "@/rentbasis/actions"; +import { receiveTopNavigationSettings } from "@/components/topNavigation/actions"; +import { ConfirmationModalTexts, Methods, PermissionMissingTexts } from "@/enums"; +import { getSearchQuery, getUrlParams, isFieldAllowedToRead, isMethodAllowed, scrollToTopPage, setPageTitle } from "@/util/helpers"; +import { FormNames } from "@/enums"; +import { RentBasisFieldPaths, RentBasisFieldTitles } from "@/rentbasis/enums"; +import { clearUnsavedChanges, getPayloadRentBasis, getCopyOfRentBasis, getContentRentBasis } from "@/rentbasis/helpers"; +import { getUiDataRentBasisKey } from "@/uiData/helpers"; +import { getRouteById, Routes } from "@/root/routes"; +import { getIsEditMode, getIsFetching, getIsFormValid, getIsSaveClicked, getIsSaving, getRentBasis } from "@/rentbasis/selectors"; +import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "@/usersPermissions/selectors"; +import { getSessionStorageItem, removeSessionStorageItem, setSessionStorageItem } from "@/util/storage"; +import { withRentBasisAttributes } from "@/components/attributes/RentBasisAttributes"; +import { withUiDataList } from "@/components/uiData/UiDataListHOC"; import type { Attributes, Methods as MethodsType } from "types"; -import type { RentBasis } from "rentbasis/types"; -import type { RootState } from "root/types"; -import type { UsersPermissions } from "usersPermissions/types"; +import type { RentBasis } from "@/rentbasis/types"; +import type { RootState } from "@/root/types"; +import type { UsersPermissions } from "@/usersPermissions/types"; type Props = { change: (...args: Array) => any; editedRentBasis: Record; diff --git a/src/rentbasis/components/forms/RentBasisForm.tsx b/src/rentbasis/components/forms/RentBasisForm.tsx index 23c568388..d160bbf7e 100644 --- a/src/rentbasis/components/forms/RentBasisForm.tsx +++ b/src/rentbasis/components/forms/RentBasisForm.tsx @@ -2,30 +2,30 @@ import React, { Fragment, PureComponent, ReactNode } from "react"; import { connect } from "react-redux"; import { FieldArray, reduxForm } from "redux-form"; import { Row, Column } from "react-foundation"; -import { ActionTypes, AppConsumer } from "app/AppContext"; +import { ActionTypes, AppConsumer } from "@/app/AppContext"; import flowRight from "lodash/flowRight"; -import AddButtonThird from "components/form/AddButtonThird"; -import Authorization from "components/authorization/Authorization"; -import FieldAndRemoveButtonWrapper from "components/form/FieldAndRemoveButtonWrapper"; -import FormField from "components/form/FormField"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import RemoveButton from "components/form/RemoveButton"; -import SubTitle from "components/content/SubTitle"; -import { receiveFormValid } from "rentbasis/actions"; -import { ConfirmationModalTexts, FieldTypes, FormNames } from "enums"; -import { ButtonColors } from "components/enums"; -import { RentBasisFieldPaths, RentBasisFieldTitles, RentBasisDecisionsFieldPaths, RentBasisDecisionsFieldTitles, RentBasisPropertyIdentifiersFieldPaths, RentBasisPropertyIdentifiersFieldTitles, RentBasisRentRatesFieldPaths, RentBasisRentRatesFieldTitles } from "rentbasis/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getUiDataRentBasisKey } from "uiData/helpers"; -import { getFieldAttributes, getFieldOptions, hasPermissions, isEmptyValue, isFieldAllowedToRead, isFieldRequired } from "util/helpers"; -import { validateRentBasisForm } from "rentbasis/formValidators"; -import { getAttributes as getRentBasisAttributes, getIsFormValid, getIsSaveClicked, getRentBasisInitialValues } from "rentbasis/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; -import { referenceNumber } from "components/form/validations"; +import AddButtonThird from "@/components/form/AddButtonThird"; +import Authorization from "@/components/authorization/Authorization"; +import FieldAndRemoveButtonWrapper from "@/components/form/FieldAndRemoveButtonWrapper"; +import FormField from "@/components/form/FormField"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import RemoveButton from "@/components/form/RemoveButton"; +import SubTitle from "@/components/content/SubTitle"; +import { receiveFormValid } from "@/rentbasis/actions"; +import { ConfirmationModalTexts, FieldTypes, FormNames } from "@/enums"; +import { ButtonColors } from "@/components/enums"; +import { RentBasisFieldPaths, RentBasisFieldTitles, RentBasisDecisionsFieldPaths, RentBasisDecisionsFieldTitles, RentBasisPropertyIdentifiersFieldPaths, RentBasisPropertyIdentifiersFieldTitles, RentBasisRentRatesFieldPaths, RentBasisRentRatesFieldTitles } from "@/rentbasis/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getUiDataRentBasisKey } from "@/uiData/helpers"; +import { getFieldAttributes, getFieldOptions, hasPermissions, isEmptyValue, isFieldAllowedToRead, isFieldRequired } from "@/util/helpers"; +import { validateRentBasisForm } from "@/rentbasis/formValidators"; +import { getAttributes as getRentBasisAttributes, getIsFormValid, getIsSaveClicked, getRentBasisInitialValues } from "@/rentbasis/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; +import { referenceNumber } from "@/components/form/validations"; import type { Attributes } from "types"; -import type { RootState } from "root/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { RootState } from "@/root/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type PropertyIdentifiersProps = { fields: any; isSaveClicked: boolean; diff --git a/src/rentbasis/components/search/Search.tsx b/src/rentbasis/components/search/Search.tsx index c70d37022..e3e879737 100644 --- a/src/rentbasis/components/search/Search.tsx +++ b/src/rentbasis/components/search/Search.tsx @@ -7,18 +7,18 @@ import flowRight from "lodash/flowRight"; import debounce from "lodash/debounce"; import isEmpty from "lodash/isEmpty"; import isEqual from "lodash/isEqual"; -import FormField from "components/form/FormField"; -import SearchChangeTypeLink from "components/search/SearchChangeTypeLink"; -import SearchClearLink from "components/search/SearchClearLink"; -import SearchContainer from "components/search/SearchContainer"; -import SearchInputColumn from "components/search/SearchInputColumn"; -import SearchLabel from "components/search/SearchLabel"; -import SearchLabelColumn from "components/search/SearchLabelColumn"; -import SearchRow from "components/search/SearchRow"; -import { FieldTypes, FormNames } from "enums"; -import { RentBasisDecisionsFieldPaths } from "rentbasis/enums"; -import { getFieldOptions, getUrlParams } from "util/helpers"; -import { getAttributes as getRentBasisAttributes } from "rentbasis/selectors"; +import FormField from "@/components/form/FormField"; +import SearchChangeTypeLink from "@/components/search/SearchChangeTypeLink"; +import SearchClearLink from "@/components/search/SearchClearLink"; +import SearchContainer from "@/components/search/SearchContainer"; +import SearchInputColumn from "@/components/search/SearchInputColumn"; +import SearchLabel from "@/components/search/SearchLabel"; +import SearchLabelColumn from "@/components/search/SearchLabelColumn"; +import SearchRow from "@/components/search/SearchRow"; +import { FieldTypes, FormNames } from "@/enums"; +import { RentBasisDecisionsFieldPaths } from "@/rentbasis/enums"; +import { getFieldOptions, getUrlParams } from "@/util/helpers"; +import { getAttributes as getRentBasisAttributes } from "@/rentbasis/selectors"; import type { Attributes } from "types"; type Props = { formValues: Record; diff --git a/src/rentbasis/components/sections/basicInfo/RentBasisEdit.tsx b/src/rentbasis/components/sections/basicInfo/RentBasisEdit.tsx index 855ee8301..4c5edd6cd 100644 --- a/src/rentbasis/components/sections/basicInfo/RentBasisEdit.tsx +++ b/src/rentbasis/components/sections/basicInfo/RentBasisEdit.tsx @@ -1,6 +1,6 @@ import React from "react"; -import GreenBox from "components/content/GreenBox"; -import RentBasisForm from "rentbasis/components/forms/RentBasisForm"; +import GreenBox from "@/components/content/GreenBox"; +import RentBasisForm from "@/rentbasis/components/forms/RentBasisForm"; const RentBasisEdit = () => diff --git a/src/rentbasis/components/sections/basicInfo/RentBasisReadonly.tsx b/src/rentbasis/components/sections/basicInfo/RentBasisReadonly.tsx index 0e83120ab..e81d019fa 100644 --- a/src/rentbasis/components/sections/basicInfo/RentBasisReadonly.tsx +++ b/src/rentbasis/components/sections/basicInfo/RentBasisReadonly.tsx @@ -2,20 +2,20 @@ import React from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; import get from "lodash/get"; -import Authorization from "components/authorization/Authorization"; -import ExternalLink from "components/links/ExternalLink"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import GreenBox from "components/content/GreenBox"; -import ListItem from "components/content/ListItem"; -import ListItems from "components/content/ListItems"; -import SubTitle from "components/content/SubTitle"; -import { RentBasisFieldPaths, RentBasisFieldTitles, RentBasisDecisionsFieldPaths, RentBasisDecisionsFieldTitles, RentBasisPropertyIdentifiersFieldPaths, RentBasisPropertyIdentifiersFieldTitles, RentBasisRentRatesFieldPaths, RentBasisRentRatesFieldTitles } from "rentbasis/enums"; -import { getUiDataRentBasisKey } from "uiData/helpers"; -import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, getReferenceNumberLink, isEmptyValue, isFieldAllowedToRead } from "util/helpers"; -import { getAttributes as getRentBasisAttributes } from "rentbasis/selectors"; +import Authorization from "@/components/authorization/Authorization"; +import ExternalLink from "@/components/links/ExternalLink"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import GreenBox from "@/components/content/GreenBox"; +import ListItem from "@/components/content/ListItem"; +import ListItems from "@/components/content/ListItems"; +import SubTitle from "@/components/content/SubTitle"; +import { RentBasisFieldPaths, RentBasisFieldTitles, RentBasisDecisionsFieldPaths, RentBasisDecisionsFieldTitles, RentBasisPropertyIdentifiersFieldPaths, RentBasisPropertyIdentifiersFieldTitles, RentBasisRentRatesFieldPaths, RentBasisRentRatesFieldTitles } from "@/rentbasis/enums"; +import { getUiDataRentBasisKey } from "@/uiData/helpers"; +import { formatDate, formatNumber, getFieldOptions, getLabelOfOption, getReferenceNumberLink, isEmptyValue, isFieldAllowedToRead } from "@/util/helpers"; +import { getAttributes as getRentBasisAttributes } from "@/rentbasis/selectors"; import type { Attributes } from "types"; -import type { RentBasis } from "rentbasis/types"; +import type { RentBasis } from "@/rentbasis/types"; type Props = { rentBasis: RentBasis; rentBasisAttributes: Attributes; diff --git a/src/rentbasis/components/sections/map/RentBasisLayer.tsx b/src/rentbasis/components/sections/map/RentBasisLayer.tsx index 72159ad9e..3063a71b3 100644 --- a/src/rentbasis/components/sections/map/RentBasisLayer.tsx +++ b/src/rentbasis/components/sections/map/RentBasisLayer.tsx @@ -1,6 +1,6 @@ import React from "react"; import { GeoJSON } from "react-leaflet"; -import { formatDate, getLabelOfOption } from "util/helpers"; +import { formatDate, getLabelOfOption } from "@/util/helpers"; import type { LeafletGeoJson } from "types"; type Props = { color: string; diff --git a/src/rentbasis/components/sections/map/SingleRentBasisMap.tsx b/src/rentbasis/components/sections/map/SingleRentBasisMap.tsx index a18f90b35..8fc110cac 100644 --- a/src/rentbasis/components/sections/map/SingleRentBasisMap.tsx +++ b/src/rentbasis/components/sections/map/SingleRentBasisMap.tsx @@ -2,23 +2,23 @@ import React, { Component } from "react"; import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; -import AreaNotesEditMap from "areaNote/components/AreaNotesEditMap"; -import AreaNotesLayer from "areaNote/components/AreaNotesLayer"; +import AreaNotesEditMap from "@/areaNote/components/AreaNotesEditMap"; +import AreaNotesLayer from "@/areaNote/components/AreaNotesLayer"; import RentBasisLayer from "./RentBasisLayer"; -import { fetchAreaNoteList } from "areaNote/actions"; -import { MAP_COLORS } from "util/constants"; -import { RentBasisFieldPaths } from "rentbasis/enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { getContentRentBasisGeoJson } from "rentbasis/helpers"; -import { getFieldOptions, hasPermissions, isFieldAllowedToRead } from "util/helpers"; -import { getBoundsFromCoordinates, getCenterFromCoordinates, getCoordinatesOfGeometry } from "util/map"; -import { getAreaNoteList } from "areaNote/selectors"; -import { getAttributes as getRentBasisAttributes, getRentBasis } from "rentbasis/selectors"; -import { getUsersPermissions } from "usersPermissions/selectors"; +import { fetchAreaNoteList } from "@/areaNote/actions"; +import { MAP_COLORS } from "@/util/constants"; +import { RentBasisFieldPaths } from "@/rentbasis/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { getContentRentBasisGeoJson } from "@/rentbasis/helpers"; +import { getFieldOptions, hasPermissions, isFieldAllowedToRead } from "@/util/helpers"; +import { getBoundsFromCoordinates, getCenterFromCoordinates, getCoordinatesOfGeometry } from "@/util/map"; +import { getAreaNoteList } from "@/areaNote/selectors"; +import { getAttributes as getRentBasisAttributes, getRentBasis } from "@/rentbasis/selectors"; +import { getUsersPermissions } from "@/usersPermissions/selectors"; import type { Attributes, LeafletGeoJson } from "types"; -import type { RentBasis } from "rentbasis/types"; -import type { AreaNoteList } from "areaNote/types"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import type { RentBasis } from "@/rentbasis/types"; +import type { AreaNoteList } from "@/areaNote/types"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { areaNotes: AreaNoteList; fetchAreaNoteList: (...args: Array) => any; diff --git a/src/rentbasis/constants.ts b/src/rentbasis/constants.ts index af5eba227..c14404806 100644 --- a/src/rentbasis/constants.ts +++ b/src/rentbasis/constants.ts @@ -1,4 +1,4 @@ -import { TableSortOrder } from "enums"; +import { TableSortOrder } from "@/enums"; /** * Default sort key of basis of rent list page diff --git a/src/rentbasis/formValidators.ts b/src/rentbasis/formValidators.ts index abcda6947..ea8e6b7f9 100644 --- a/src/rentbasis/formValidators.ts +++ b/src/rentbasis/formValidators.ts @@ -1,4 +1,4 @@ -import { dateGreaterOrEqual } from "components/form/validations"; +import { dateGreaterOrEqual } from "@/components/form/validations"; /** * Validate basis of rent form diff --git a/src/rentbasis/helpers.ts b/src/rentbasis/helpers.ts index aa1da0dca..0ebdc2f9a 100644 --- a/src/rentbasis/helpers.ts +++ b/src/rentbasis/helpers.ts @@ -1,13 +1,13 @@ import get from "lodash/get"; import { isDirty } from "redux-form"; import isEmpty from "lodash/isEmpty"; -import { FormNames, TableSortOrder } from "enums"; -import { convertStrToDecimalNumber } from "util/helpers"; -import { getIsEditMode } from "rentbasis/selectors"; -import { removeSessionStorageItem } from "util/storage"; +import { FormNames, TableSortOrder } from "@/enums"; +import { convertStrToDecimalNumber } from "@/util/helpers"; +import { getIsEditMode } from "@/rentbasis/selectors"; +import { removeSessionStorageItem } from "@/util/storage"; import type { LeafletGeoJson } from "types"; import type { RentBasis } from "./types"; -import type { RootState } from "root/types"; +import type { RootState } from "@/root/types"; /** * Get basis of rent rent rates diff --git a/src/rentbasis/reducer.ts b/src/rentbasis/reducer.ts index 650870296..359941b8f 100644 --- a/src/rentbasis/reducer.ts +++ b/src/rentbasis/reducer.ts @@ -1,6 +1,6 @@ import { combineReducers } from "redux"; import { handleActions } from "redux-actions"; -import type { Attributes, Methods, Reducer } from "../types"; +import type { Attributes, Methods, Reducer } from "@/types"; import type { ReceiveAttributesAction, ReceiveMethodsAction, RentBasis, RentBasisList, ReceiveRentBasisListAction, ReceiveRentBasisInitialValuesAction, ReceiveSingleRentBasisAction, ReceiveFormValidAction, ReceiveIsSaveClickedAction } from "./types"; const isEditModeReducer: Reducer = handleActions({ 'mvj/rentbasis/HIDE_EDIT': () => false, diff --git a/src/rentbasis/requests.ts b/src/rentbasis/requests.ts index df9e1f2da..4aca261f0 100644 --- a/src/rentbasis/requests.ts +++ b/src/rentbasis/requests.ts @@ -1,5 +1,5 @@ -import callApi from "../api/callApi"; -import createUrl from "../api/createUrl"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; import type { RentBasis, RentBasisId } from "./types"; export const fetchAttributes = () => { return callApi(new Request(createUrl('basis_of_rent/'), { diff --git a/src/rentbasis/saga.ts b/src/rentbasis/saga.ts index 24f871543..4ddfe8139 100644 --- a/src/rentbasis/saga.ts +++ b/src/rentbasis/saga.ts @@ -2,10 +2,10 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects"; import { push } from "react-router-redux"; import { SubmissionError } from "redux-form"; import { hideEditMode, attributesNotFound, notFound, receiveAttributes, receiveMethods, receiveRentBasisList, receiveSingleRentBasis } from "./actions"; -import { receiveError } from "../api/actions"; -import { displayUIMessage } from "util/helpers"; +import { receiveError } from "@/api/actions"; +import { displayUIMessage } from "@/util/helpers"; import { createRentBasis, editRentBasis, fetchAttributes, fetchRentBasisList, fetchSingleRentBasis } from "./requests"; -import { getRouteById, Routes } from "../root/routes"; +import { getRouteById, Routes } from "@/root/routes"; function* fetchAttributesSaga(): Generator { try { diff --git a/src/rentbasis/selectors.ts b/src/rentbasis/selectors.ts index e08022866..35c3989bb 100644 --- a/src/rentbasis/selectors.ts +++ b/src/rentbasis/selectors.ts @@ -1,5 +1,5 @@ import type { Attributes, Methods, Selector } from "types"; -import type { RootState } from "root/types"; +import type { RootState } from "@/root/types"; import type { RentBasis, RentBasisList } from "./types"; export const getIsEditMode: Selector = (state: RootState): boolean => state.rentBasis.isEditMode; export const getIsFetching: Selector = (state: RootState): boolean => state.rentBasis.isFetching; diff --git a/src/root/Root.tsx b/src/root/Root.tsx index 406f8911c..9a194cb5b 100644 --- a/src/root/Root.tsx +++ b/src/root/Root.tsx @@ -2,7 +2,7 @@ import React from "react"; import { Provider } from "react-redux"; import { ConnectedRouter } from "connected-react-router"; import { OidcProvider } from "redux-oidc"; -import userManager from "../auth/util/user-manager"; +import userManager from "@/auth/util/user-manager"; import routes from "./routes"; export type RootProps = { history: any; diff --git a/src/root/configureStore.ts b/src/root/configureStore.ts index 732323c38..ccbf7b016 100644 --- a/src/root/configureStore.ts +++ b/src/root/configureStore.ts @@ -5,7 +5,7 @@ import createRootReducer from "./createRootReducer"; import createSagaMiddleware from "redux-saga"; import createRootSaga from "./createRootSaga"; import { loadUser } from "redux-oidc"; -import userManager from "../auth/util/user-manager"; +import userManager from "@/auth/util/user-manager"; export const history = createBrowserHistory(); // needed so Typescript doesn't complain about the window object not having the __REDUX_DEVTOOLS_EXTENSION__ property @@ -25,15 +25,15 @@ export default (() => { loadUser(store, userManager); sagaMiddleware.run(rootSaga); - // $FlowFixMe - if (module.hot) { - // $FlowFixMe - module.hot.accept('./createRootReducer', () => { - const nextRootReducer = require('./createRootReducer').default(history); + // // $FlowFixMe + // if (module.hot) { + // // $FlowFixMe + // module.hot.accept('./createRootReducer', () => { + // const nextRootReducer = require('./createRootReducer').default(history); - store.replaceReducer(nextRootReducer); - }); - } + // store.replaceReducer(nextRootReducer); + // }); + // } return store; }); \ No newline at end of file diff --git a/src/root/createRootReducer.ts b/src/root/createRootReducer.ts index e08bcc59b..c0eed24df 100644 --- a/src/root/createRootReducer.ts +++ b/src/root/createRootReducer.ts @@ -3,54 +3,54 @@ import { reducer as formReducer } from "redux-form"; import { reducer as oidc } from "redux-oidc"; import { reducer as toastrReducer } from "react-redux-toastr"; import { connectRouter } from "connected-react-router"; -import apiReducer from "api/reducer"; -import areaNoteReducer from "areaNote/reducer"; -import areaSearchReducer from "areaSearch/reducer"; -import auditLogReducer from "auditLog/reducer"; -import authReducer from "auth/reducer"; -import batchrunReducer from "batchrun/reducer"; -import billingPeriodReducer from "billingPeriods/reducer"; -import collectionCourtDecisionReducer from "collectionCourtDecision/reducer"; -import collectionLetterReducer from "collectionLetter/reducer"; -import collectionNoteReducer from "collectionNote/reducer"; -import commentsReducer from "comments/reducer"; -import contactsReducer from "contacts/reducer"; -import contractFileReducer from "contractFile/reducer"; -import createCollectionLetterReducer from "createCollectionLetter/reducer"; -import creditDecisionReducer from "creditDecision/reducer"; -import leaseStatisticReportReducer from "leaseStatisticReport/reducer"; -import districtsReducer from "district/reducer"; -import indexReducer from "index/reducer"; -import infillDevelopmentReducer from "infillDevelopment/reducer"; -import infillDevelopmentAttachmentReducer from "infillDevelopmentAttachment/reducer"; -import invoiceReducer from "invoices/reducer"; -import invoiceNoteReducer from "invoiceNote/reducer"; -import invoiceSetReducer from "invoiceSets/reducer"; -import landUseInvoiceReducer from "landUseInvoices/reducer"; -import landUseContractReducer from "landUseContract/reducer"; -import landUseAgreementAttachmentReducer from "landUseAgreementAttachment/reducer"; -import leaseReducer from "leases/reducer"; -import plotSearchReducer from "plotSearch/reducer"; -import plotApplicationsReducer from "plotApplications/reducer"; -import applicationReducer from "application/reducer"; -import leaseCreateChargeReducer from "leaseCreateCharge/reducer"; -import leaseholdTransferReducer from "leaseholdTransfer/reducer"; -import leaseTypeReducer from "leaseType/reducer"; -import lessorReducer from "lessor/reducer"; -import penaltyInterestReducer from "penaltyInterest/reducer"; -import previewInvoicesReducer from "previewInvoices/reducer"; -import rentBasisReducer from "rentbasis/reducer"; -import rentForPeriodReducer from "rentForPeriod/reducer"; -import sapInvoiceReducer from "sapInvoice/reducer"; -import serviceUnitsReducer from "serviceUnits/reducer"; -import topNavigationReducer from "components/topNavigation/reducer"; -import tradeRegisterReducer from "tradeRegister/reducer"; -import uiDataReducer from "uiData/reducer"; -import usersReducer from "users/reducer"; -import usersPermissionsReducer from "usersPermissions/reducer"; -import vatReducer from "vat/reducer"; -import type { Reducer } from "types"; -import type { RootState } from "root/types"; +import apiReducer from "@/api/reducer"; +import areaNoteReducer from "@/areaNote/reducer"; +import areaSearchReducer from "@/areaSearch/reducer"; +import auditLogReducer from "@/auditLog/reducer"; +import authReducer from "@/auth/reducer"; +import batchrunReducer from "@/batchrun/reducer"; +import billingPeriodReducer from "@/billingPeriods/reducer"; +import collectionCourtDecisionReducer from "@/collectionCourtDecision/reducer"; +import collectionLetterReducer from "@/collectionLetter/reducer"; +import collectionNoteReducer from "@/collectionNote/reducer"; +import commentsReducer from "@/comments/reducer"; +import contactsReducer from "@/contacts/reducer"; +import contractFileReducer from "@/contractFile/reducer"; +import createCollectionLetterReducer from "@/createCollectionLetter/reducer"; +import creditDecisionReducer from "@/creditDecision/reducer"; +import leaseStatisticReportReducer from "@/leaseStatisticReport/reducer"; +import districtsReducer from "@/district/reducer"; +import indexReducer from "@/index/reducer"; +import infillDevelopmentReducer from "@/infillDevelopment/reducer"; +import infillDevelopmentAttachmentReducer from "@/infillDevelopmentAttachment/reducer"; +import invoiceReducer from "@/invoices/reducer"; +import invoiceNoteReducer from "@/invoiceNote/reducer"; +import invoiceSetReducer from "@/invoiceSets/reducer"; +import landUseInvoiceReducer from "@/landUseInvoices/reducer"; +import landUseContractReducer from "@/landUseContract/reducer"; +import landUseAgreementAttachmentReducer from "@/landUseAgreementAttachment/reducer"; +import leaseReducer from "@/leases/reducer"; +import plotSearchReducer from "@/plotSearch/reducer"; +import plotApplicationsReducer from "@/plotApplications/reducer"; +import applicationReducer from "@/application/reducer"; +import leaseCreateChargeReducer from "@/leaseCreateCharge/reducer"; +import leaseholdTransferReducer from "@/leaseholdTransfer/reducer"; +import leaseTypeReducer from "@/leaseType/reducer"; +import lessorReducer from "@/lessor/reducer"; +import penaltyInterestReducer from "@/penaltyInterest/reducer"; +import previewInvoicesReducer from "@/previewInvoices/reducer"; +import rentBasisReducer from "@/rentbasis/reducer"; +import rentForPeriodReducer from "@/rentForPeriod/reducer"; +import sapInvoiceReducer from "@/sapInvoice/reducer"; +import serviceUnitsReducer from "@/serviceUnits/reducer"; +import topNavigationReducer from "@/components/topNavigation/reducer"; +import tradeRegisterReducer from "@/tradeRegister/reducer"; +import uiDataReducer from "@/uiData/reducer"; +import usersReducer from "@/users/reducer"; +import usersPermissionsReducer from "@/usersPermissions/reducer"; +import vatReducer from "@/vat/reducer"; +import type { Reducer } from "@/types"; +import type { RootState } from "@/root/types"; export default ((history: Record): Reducer => combineReducers, any>({ api: apiReducer, areaNote: areaNoteReducer, diff --git a/src/root/createRootSaga.ts b/src/root/createRootSaga.ts index 750ee52a4..3b2b4c1bd 100644 --- a/src/root/createRootSaga.ts +++ b/src/root/createRootSaga.ts @@ -1,51 +1,51 @@ import { all, fork } from "redux-saga/effects"; -import areaNoteSaga from "areaNote/saga"; -import auditLogSaga from "auditLog/saga"; -import authSaga from "auth/saga"; -import areaSearchSaga from "areaSearch/saga"; -import batchrunSaga from "batchrun/saga"; -import billingPeriodsSaga from "billingPeriods/saga"; -import collectionCourtDecisionSaga from "collectionCourtDecision/saga"; -import collectionLetterSaga from "collectionLetter/saga"; -import collectionNoteSaga from "collectionNote/saga"; -import commentSaga from "comments/saga"; -import contactSaga from "contacts/saga"; -import contractFileSaga from "contractFile/saga"; -import createCollectionLetterSaga from "createCollectionLetter/saga"; -import creditDecisionSaga from "creditDecision/saga"; -import districtSaga from "district/saga"; -import indexSaga from "index/saga"; -import infillDevelopmentSaga from "infillDevelopment/saga"; -import infillDevelopmentAttachmentSaga from "infillDevelopmentAttachment/saga"; -import invoiceSaga from "invoices/saga"; -import landUseinvoiceSaga from "landUseInvoices/saga"; -import invoiceNoteSaga from "invoiceNote/saga"; -import invoiceSetSaga from "invoiceSets/saga"; -import landUseContractSaga from "landUseContract/saga"; -import landUseAgreementAttachmentSaga from "landUseAgreementAttachment/saga"; -import leaseSaga from "leases/saga"; -import leaseAreaAttachmentSaga from "leaseAreaAttachment/saga"; -import leaseInspectionAttachmentSaga from "leaseInspectionAttachment/saga"; -import leaseCreateChargeSaga from "leaseCreateCharge/saga"; -import leaseholdTransferSaga from "leaseholdTransfer/saga"; -import leaseStatisticReportSaga from "leaseStatisticReport/saga"; -import leaseTypeSaga from "leaseType/saga"; -import lessorSaga from "lessor/saga"; -import penaltyInterestSaga from "penaltyInterest/saga"; -import previewInvoicesSaga from "previewInvoices/saga"; -import relatedLeaseSaga from "relatedLease/saga"; -import rentBasisSaga from "rentbasis/saga"; -import rentForPeriodSaga from "rentForPeriod/saga"; -import sapInvoicesSaga from "sapInvoice/saga"; -import serviceUnitsSaga from "serviceUnits/saga"; -import tradeRegisterSaga from "tradeRegister/saga"; -import uiDataSaga from "uiData/saga"; -import userSaga from "users/saga"; -import usersPermissionsSaga from "usersPermissions/saga"; -import vatSaga from "vat/saga"; -import plotSearchSaga from "plotSearch/saga"; -import plotApplicationsSaga from "plotApplications/saga"; -import applicationSaga from "application/saga"; +import areaNoteSaga from "@/areaNote/saga"; +import auditLogSaga from "@/auditLog/saga"; +import authSaga from "@/auth/saga"; +import areaSearchSaga from "@/areaSearch/saga"; +import batchrunSaga from "@/batchrun/saga"; +import billingPeriodsSaga from "@/billingPeriods/saga"; +import collectionCourtDecisionSaga from "@/collectionCourtDecision/saga"; +import collectionLetterSaga from "@/collectionLetter/saga"; +import collectionNoteSaga from "@/collectionNote/saga"; +import commentSaga from "@/comments/saga"; +import contactSaga from "@/contacts/saga"; +import contractFileSaga from "@/contractFile/saga"; +import createCollectionLetterSaga from "@/createCollectionLetter/saga"; +import creditDecisionSaga from "@/creditDecision/saga"; +import districtSaga from "@/district/saga"; +import indexSaga from "@/index/saga"; +import infillDevelopmentSaga from "@/infillDevelopment/saga"; +import infillDevelopmentAttachmentSaga from "@/infillDevelopmentAttachment/saga"; +import invoiceSaga from "@/invoices/saga"; +import landUseinvoiceSaga from "@/landUseInvoices/saga"; +import invoiceNoteSaga from "@/invoiceNote/saga"; +import invoiceSetSaga from "@/invoiceSets/saga"; +import landUseContractSaga from "@/landUseContract/saga"; +import landUseAgreementAttachmentSaga from "@/landUseAgreementAttachment/saga"; +import leaseSaga from "@/leases/saga"; +import leaseAreaAttachmentSaga from "@/leaseAreaAttachment/saga"; +import leaseInspectionAttachmentSaga from "@/leaseInspectionAttachment/saga"; +import leaseCreateChargeSaga from "@/leaseCreateCharge/saga"; +import leaseholdTransferSaga from "@/leaseholdTransfer/saga"; +import leaseStatisticReportSaga from "@/leaseStatisticReport/saga"; +import leaseTypeSaga from "@/leaseType/saga"; +import lessorSaga from "@/lessor/saga"; +import penaltyInterestSaga from "@/penaltyInterest/saga"; +import previewInvoicesSaga from "@/previewInvoices/saga"; +import relatedLeaseSaga from "@/relatedLease/saga"; +import rentBasisSaga from "@/rentbasis/saga"; +import rentForPeriodSaga from "@/rentForPeriod/saga"; +import sapInvoicesSaga from "@/sapInvoice/saga"; +import serviceUnitsSaga from "@/serviceUnits/saga"; +import tradeRegisterSaga from "@/tradeRegister/saga"; +import uiDataSaga from "@/uiData/saga"; +import userSaga from "@/users/saga"; +import usersPermissionsSaga from "@/usersPermissions/saga"; +import vatSaga from "@/vat/saga"; +import plotSearchSaga from "@/plotSearch/saga"; +import plotApplicationsSaga from "@/plotApplications/saga"; +import applicationSaga from "@/application/saga"; export default (() => function* rootSaga() { diff --git a/src/root/routes.tsx b/src/root/routes.tsx index 2aded735d..16a909921 100644 --- a/src/root/routes.tsx +++ b/src/root/routes.tsx @@ -1,39 +1,39 @@ import React from "react"; import { Redirect, Route, Switch } from "react-router"; -import ErrorPage from "errorPage/ErrorPage"; -import App from "app/App"; -import AreaNoteListPage from "areaNote/components/AreaNoteListPage"; -import BasisOfRentCalculatorPage from "basisOfRentCalculator/components/BasisOfRentCalculatorPage"; -import BatchRunPage from "batchrun/components/BatchRunPage"; -import CallbackPage from "auth/components/CallbackPage"; -import ContactListPage from "contacts/components/ContactsListPage"; -import ContactPage from "contacts/components/ContactPage"; -import CreditDecisionSearchPage from "creditDecision/components/CreditDecisionSearchPage"; -import IndexListPage from "index/components/IndexListPage"; -import InfillDevelopmentPage from "infillDevelopment/components/InfillDevelopmentPage"; -import InfillDevelopmentListPage from "infillDevelopment/components/InfillDevelopmentListPage"; -import InvoiceNoteListPage from "invoiceNote/components/InvoiceNoteListPage"; -import LandUseContractListPage from "landUseContract/components/LandUseContractListPage"; -import LandUseContractPage from "landUseContract/components/LandUseContractPage"; -import LeaseListPage from "leases/components/LeaseListPage"; -import LeasePage from "leases/components/LeasePage"; -import LeaseholdTransferListPage from "leaseholdTransfer/components/LeaseholdTransferListPage"; -import NewContactPage from "contacts/components/NewContactPage"; -import NewInfillDevelopmentPage from "infillDevelopment/components/NewInfillDevelopmentPage"; -import NewRentBasisPage from "rentbasis/components/NewRentBasisPage"; -import PlotSearchListPage from "plotSearch/components/PlotSearchListPage"; -import PlotApplicationsListPage from "plotApplications/components/PlotApplicationsListPage"; -import PlotSearchPage from "plotSearch/components/PlotSearchPage"; -import PlotApplicationsPage from "plotApplications/components/PlotApplicationPage"; -import RentBasisListPage from "rentbasis/components/RentBasisListPage"; -import RentBasisPage from "rentbasis/components/RentBasisPage"; -import SapInvoicesListPage from "sapInvoice/components/SapInvoicesListPage"; -import LeaseStatisticReport from "leaseStatisticReport/components/LeaseStatisticReportPage"; -import TradeRegisterSearchPage from "tradeRegister/components/TradeRegisterSearchPage"; -import PlotApplicationCreatePage from "plotApplications/components/PlotApplicationCreatePage"; -import AreaSearchApplicationListPage from "areaSearch/components/AreaSearchApplicationListPage"; -import AreaSearchApplicationPage from "areaSearch/components/AreaSearchApplicationPage"; -import AreaSearchApplicationCreatePage from "areaSearch/components/AreaSearchApplicationCreatePage"; +import ErrorPage from "@/errorPage/ErrorPage"; +import App from "@/app/App"; +import AreaNoteListPage from "@/areaNote/components/AreaNoteListPage"; +import BasisOfRentCalculatorPage from "@/basisOfRentCalculator/components/BasisOfRentCalculatorPage"; +import BatchRunPage from "@/batchrun/components/BatchRunPage"; +import CallbackPage from "@/auth/components/CallbackPage"; +import ContactListPage from "@/contacts/components/ContactsListPage"; +import ContactPage from "@/contacts/components/ContactPage"; +import CreditDecisionSearchPage from "@/creditDecision/components/CreditDecisionSearchPage"; +import IndexListPage from "@/index/components/IndexListPage"; +import InfillDevelopmentPage from "@/infillDevelopment/components/InfillDevelopmentPage"; +import InfillDevelopmentListPage from "@/infillDevelopment/components/InfillDevelopmentListPage"; +import InvoiceNoteListPage from "@/invoiceNote/components/InvoiceNoteListPage"; +import LandUseContractListPage from "@/landUseContract/components/LandUseContractListPage"; +import LandUseContractPage from "@/landUseContract/components/LandUseContractPage"; +import LeaseListPage from "@/leases/components/LeaseListPage"; +import LeasePage from "@/leases/components/LeasePage"; +import LeaseholdTransferListPage from "@/leaseholdTransfer/components/LeaseholdTransferListPage"; +import NewContactPage from "@/contacts/components/NewContactPage"; +import NewInfillDevelopmentPage from "@/infillDevelopment/components/NewInfillDevelopmentPage"; +import NewRentBasisPage from "@/rentbasis/components/NewRentBasisPage"; +import PlotSearchListPage from "@/plotSearch/components/PlotSearchListPage"; +import PlotApplicationsListPage from "@/plotApplications/components/PlotApplicationsListPage"; +import PlotSearchPage from "@/plotSearch/components/PlotSearchPage"; +import PlotApplicationsPage from "@/plotApplications/components/PlotApplicationPage"; +import RentBasisListPage from "@/rentbasis/components/RentBasisListPage"; +import RentBasisPage from "@/rentbasis/components/RentBasisPage"; +import SapInvoicesListPage from "@/sapInvoice/components/SapInvoicesListPage"; +import LeaseStatisticReport from "@/leaseStatisticReport/components/LeaseStatisticReportPage"; +import TradeRegisterSearchPage from "@/tradeRegister/components/TradeRegisterSearchPage"; +import PlotApplicationCreatePage from "@/plotApplications/components/PlotApplicationCreatePage"; +import AreaSearchApplicationListPage from "@/areaSearch/components/AreaSearchApplicationListPage"; +import AreaSearchApplicationPage from "@/areaSearch/components/AreaSearchApplicationPage"; +import AreaSearchApplicationCreatePage from "@/areaSearch/components/AreaSearchApplicationCreatePage"; /** * Routes enumerate diff --git a/src/sapInvoice/actions.ts b/src/sapInvoice/actions.ts index b29588175..cb9b80fa8 100644 --- a/src/sapInvoice/actions.ts +++ b/src/sapInvoice/actions.ts @@ -1,5 +1,5 @@ import { createAction } from "redux-actions"; -import type { SapInvoiceList, FetchSapInvoicesAction, ReceiveSapInvoicesAction, NotFoundAction } from "sapInvoice/types"; +import type { SapInvoiceList, FetchSapInvoicesAction, ReceiveSapInvoicesAction, NotFoundAction } from "@/sapInvoice/types"; export const fetchSapInvoices = (query?: Record): FetchSapInvoicesAction => createAction('mvj/sapInvoice/FETCH_ALL')(query); export const receiveSapInvoices = (invoices: SapInvoiceList): ReceiveSapInvoicesAction => createAction('mvj/sapInvoice/RECEIVE_ALL')(invoices); export const notFound = (): NotFoundAction => createAction('mvj/sapInvoice/NOT_FOUND')(); \ No newline at end of file diff --git a/src/sapInvoice/components/SapInvoicesListPage.tsx b/src/sapInvoice/components/SapInvoicesListPage.tsx index 4e66e0e29..091f662c0 100644 --- a/src/sapInvoice/components/SapInvoicesListPage.tsx +++ b/src/sapInvoice/components/SapInvoicesListPage.tsx @@ -5,34 +5,34 @@ import { withRouter } from "react-router"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; -import AuthorizationError from "components/authorization/AuthorizationError"; -import ExternalLinkIcon from "components/icons/ExternalLinkIcon"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import PageContainer from "components/content/PageContainer"; -import Pagination from "components/table/Pagination"; +import AuthorizationError from "@/components/authorization/AuthorizationError"; +import ExternalLinkIcon from "@/components/icons/ExternalLinkIcon"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import PageContainer from "@/components/content/PageContainer"; +import Pagination from "@/components/table/Pagination"; import Search from "./Search"; -import SortableTable from "components/table/SortableTable"; -import TableFilters from "components/table/TableFilters"; -import TableWrapper from "components/table/TableWrapper"; -import { fetchSapInvoices } from "sapInvoice/actions"; -import { receiveTopNavigationSettings } from "components/topNavigation/actions"; -import { LIST_TABLE_PAGE_SIZE } from "util/constants"; -import { DEFAULT_SORT_KEY, DEFAULT_SORT_ORDER } from "sapInvoice/constants"; -import { FormNames, Methods, PermissionMissingTexts } from "enums"; -import { InvoiceFieldPaths, InvoiceRowsFieldPaths } from "invoices/enums"; -import { getContactFullName } from "contacts/helpers"; -import { formatReceivableTypesString } from "invoices/helpers"; -import { getContentLeaseIdentifier } from "leases/helpers"; -import { getSapInvoices, mapSapInvoiceSearchFilters } from "sapInvoice/helpers"; -import { formatDate, formatNumber, getApiResponseCount, getApiResponseMaxPage, getFieldOptions, getSearchQuery, getUrlParams, isEmptyValue, isFieldAllowedToRead, isMethodAllowed, setPageTitle } from "util/helpers"; -import { getRouteById, Routes } from "root/routes"; -import { getIsFetching, getSapInvoices as getSapInvoiceList } from "sapInvoice/selectors"; -import { withSapInvoicesAttributes } from "components/attributes/SapInvoicesAttributes"; -import { getUserActiveServiceUnit } from "usersPermissions/selectors"; +import SortableTable from "@/components/table/SortableTable"; +import TableFilters from "@/components/table/TableFilters"; +import TableWrapper from "@/components/table/TableWrapper"; +import { fetchSapInvoices } from "@/sapInvoice/actions"; +import { receiveTopNavigationSettings } from "@/components/topNavigation/actions"; +import { LIST_TABLE_PAGE_SIZE } from "@/util/constants"; +import { DEFAULT_SORT_KEY, DEFAULT_SORT_ORDER } from "@/sapInvoice/constants"; +import { FormNames, Methods, PermissionMissingTexts } from "@/enums"; +import { InvoiceFieldPaths, InvoiceRowsFieldPaths } from "@/invoices/enums"; +import { getContactFullName } from "@/contacts/helpers"; +import { formatReceivableTypesString } from "@/invoices/helpers"; +import { getContentLeaseIdentifier } from "@/leases/helpers"; +import { getSapInvoices, mapSapInvoiceSearchFilters } from "@/sapInvoice/helpers"; +import { formatDate, formatNumber, getApiResponseCount, getApiResponseMaxPage, getFieldOptions, getSearchQuery, getUrlParams, isEmptyValue, isFieldAllowedToRead, isMethodAllowed, setPageTitle } from "@/util/helpers"; +import { getRouteById, Routes } from "@/root/routes"; +import { getIsFetching, getSapInvoices as getSapInvoiceList } from "@/sapInvoice/selectors"; +import { withSapInvoicesAttributes } from "@/components/attributes/SapInvoicesAttributes"; +import { getUserActiveServiceUnit } from "@/usersPermissions/selectors"; import type { Attributes, Methods as MethodsType } from "types"; -import type { SapInvoiceList } from "sapInvoice/types"; -import type { UserServiceUnit } from "usersPermissions/types"; +import type { SapInvoiceList } from "@/sapInvoice/types"; +import type { UserServiceUnit } from "@/usersPermissions/types"; const getColumns = (invoiceAttributes: Attributes) => { const receivableTypeOptions = getFieldOptions(invoiceAttributes, InvoiceRowsFieldPaths.RECEIVABLE_TYPE); diff --git a/src/sapInvoice/components/Search.tsx b/src/sapInvoice/components/Search.tsx index 28a980770..dc2c25798 100644 --- a/src/sapInvoice/components/Search.tsx +++ b/src/sapInvoice/components/Search.tsx @@ -5,12 +5,12 @@ import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; import isEqual from "lodash/isEqual"; import isEmpty from "lodash/isEmpty"; -import FormField from "components/form/FormField"; -import SearchContainer from "components/search/SearchContainer"; -import { FieldTypes, FormNames } from "enums"; -import { fetchServiceUnits } from "serviceUnits/actions"; -import { getServiceUnits, getIsFetching as getIsFetchingServiceUnits } from "serviceUnits/selectors"; -import type { ServiceUnits } from "serviceUnits/types"; +import FormField from "@/components/form/FormField"; +import SearchContainer from "@/components/search/SearchContainer"; +import { FieldTypes, FormNames } from "@/enums"; +import { fetchServiceUnits } from "@/serviceUnits/actions"; +import { getServiceUnits, getIsFetching as getIsFetchingServiceUnits } from "@/serviceUnits/selectors"; +import type { ServiceUnits } from "@/serviceUnits/types"; type Props = { formValues: Record; fetchServiceUnits: (...args: Array) => any; diff --git a/src/sapInvoice/constants.ts b/src/sapInvoice/constants.ts index 10570e0aa..4134c9b79 100644 --- a/src/sapInvoice/constants.ts +++ b/src/sapInvoice/constants.ts @@ -1,4 +1,4 @@ -import { TableSortOrder } from "enums"; +import { TableSortOrder } from "@/enums"; /** * Default sort key of sap invoices list page diff --git a/src/sapInvoice/helpers.ts b/src/sapInvoice/helpers.ts index 013ed4f4a..a93a7c0e4 100644 --- a/src/sapInvoice/helpers.ts +++ b/src/sapInvoice/helpers.ts @@ -1,9 +1,9 @@ import format from "date-fns/format"; import subMonths from "date-fns/subMonths"; -import { TableSortOrder } from "enums"; -import { getContentInvoiceReceivableTypes } from "invoices/helpers"; -import { getApiResponseResults } from "util/helpers"; -import type { SapInvoiceList } from "sapInvoice/types"; +import { TableSortOrder } from "@/enums"; +import { getContentInvoiceReceivableTypes } from "@/invoices/helpers"; +import { getApiResponseResults } from "@/util/helpers"; +import type { SapInvoiceList } from "@/sapInvoice/types"; /** * Get sap invoices from API response diff --git a/src/sapInvoice/reducer.ts b/src/sapInvoice/reducer.ts index e1dd8e444..87710b84d 100644 --- a/src/sapInvoice/reducer.ts +++ b/src/sapInvoice/reducer.ts @@ -1,6 +1,6 @@ import { combineReducers } from "redux"; import { handleActions } from "redux-actions"; -import type { Reducer } from "../types"; +import type { Reducer } from "@/types"; import type { SapInvoiceList, ReceiveSapInvoicesAction } from "./types"; const isFetchingReducer: Reducer = handleActions({ 'mvj/sapInvoice/FETCH_ALL': () => true, diff --git a/src/sapInvoice/saga.ts b/src/sapInvoice/saga.ts index 8001e92e5..764c5329c 100644 --- a/src/sapInvoice/saga.ts +++ b/src/sapInvoice/saga.ts @@ -1,7 +1,7 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects"; import { notFound, receiveSapInvoices } from "./actions"; -import { receiveError } from "api/actions"; -import { fetchInvoices } from "invoices/requests"; +import { receiveError } from "@/api/actions"; +import { fetchInvoices } from "@/invoices/requests"; function* fetchSapInvoicesSaga({ payload: query, diff --git a/src/sapInvoice/selectors.ts b/src/sapInvoice/selectors.ts index 962d1cc26..ea7689f99 100644 --- a/src/sapInvoice/selectors.ts +++ b/src/sapInvoice/selectors.ts @@ -1,5 +1,5 @@ import type { Selector } from "types"; -import type { SapInvoiceList } from "sapInvoice/types"; -import type { RootState } from "root/types"; +import type { SapInvoiceList } from "@/sapInvoice/types"; +import type { RootState } from "@/root/types"; export const getIsFetching: Selector = (state: RootState): boolean => state.sapInvoice.isFetching; export const getSapInvoices: Selector = (state: RootState): SapInvoiceList => state.sapInvoice.list; \ No newline at end of file diff --git a/src/sapInvoice/types.ts b/src/sapInvoice/types.ts index 287401c56..284f01653 100644 --- a/src/sapInvoice/types.ts +++ b/src/sapInvoice/types.ts @@ -1,4 +1,4 @@ -import type { Action } from "../types"; +import type { Action } from "@/types"; export type SapInvoicesState = { isFetching: boolean; list: SapInvoiceList; diff --git a/src/serviceUnits/reducer.ts b/src/serviceUnits/reducer.ts index b1b7fda05..3431f9847 100644 --- a/src/serviceUnits/reducer.ts +++ b/src/serviceUnits/reducer.ts @@ -1,6 +1,6 @@ import { combineReducers } from "redux"; import { handleActions } from "redux-actions"; -import type { Reducer } from "../types"; +import type { Reducer } from "@/types"; import type { ServiceUnits, ReceiveServiceUnitsAction } from "./types"; const isFetchingReducer: Reducer = handleActions({ 'mvj/serviceUnits/FETCH_ALL': () => true, diff --git a/src/serviceUnits/requests.ts b/src/serviceUnits/requests.ts index 2db45d798..1d52333c5 100644 --- a/src/serviceUnits/requests.ts +++ b/src/serviceUnits/requests.ts @@ -1,5 +1,5 @@ -import callApi from "../api/callApi"; -import createUrl from "../api/createUrl"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; export const fetchServiceUnits = (): Generator => { return callApi(new Request(createUrl('service_unit/'))); }; \ No newline at end of file diff --git a/src/serviceUnits/saga.ts b/src/serviceUnits/saga.ts index 864850a0c..f78cecd56 100644 --- a/src/serviceUnits/saga.ts +++ b/src/serviceUnits/saga.ts @@ -1,7 +1,7 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects"; import { receiveServiceUnits, notFound } from "./actions"; import { fetchServiceUnits } from "./requests"; -import { receiveError } from "../api/actions"; +import { receiveError } from "@/api/actions"; function* fetchServiceUnitsSaga(): Generator { try { diff --git a/src/serviceUnits/selectors.ts b/src/serviceUnits/selectors.ts index 34c8a47b6..d7a100780 100644 --- a/src/serviceUnits/selectors.ts +++ b/src/serviceUnits/selectors.ts @@ -1,5 +1,5 @@ import type { Selector } from "types"; -import type { RootState } from "root/types"; +import type { RootState } from "@/root/types"; import type { ServiceUnits } from "./types"; export const getIsFetching: Selector = (state: RootState): boolean => state.serviceUnits.isFetching; export const getServiceUnits: Selector = (state: RootState): ServiceUnits => state.serviceUnits.serviceUnits; \ No newline at end of file diff --git a/src/serviceUnits/types.ts b/src/serviceUnits/types.ts index bfdc8ea13..64993f5cd 100644 --- a/src/serviceUnits/types.ts +++ b/src/serviceUnits/types.ts @@ -1,4 +1,4 @@ -import type { Action } from "../types"; +import type { Action } from "@/types"; export type ServiceUnit = { id: number, name: string }; export type ServiceUnits = Array>; export type ServiceUnitState = { diff --git a/src/tradeRegister/actions.ts b/src/tradeRegister/actions.ts index 76716b9ab..7b34c4e20 100644 --- a/src/tradeRegister/actions.ts +++ b/src/tradeRegister/actions.ts @@ -1,5 +1,5 @@ import { createAction } from "redux-actions"; -import type { TradeRegisterDataMap, FetchTradeRegisterCompanyExtendedByIdAction, ReceiveTradeRegisterCompanyExtendedByIdAction, CompanyExtendedNotFoundByIdAction, FetchTradeRegisterCompanyNoticeByIdAction, ReceiveTradeRegisterCompanyNoticeByIdAction, CompanyNoticeNotFoundByIdAction, FetchTradeRegisterCompanyRepresentByIdAction, ReceiveTradeRegisterCompanyRepresentByIdAction, CompanyRepresentNotFoundByIdAction, ReceiveCollapseStatesAction } from "tradeRegister/types"; +import type { TradeRegisterDataMap, FetchTradeRegisterCompanyExtendedByIdAction, ReceiveTradeRegisterCompanyExtendedByIdAction, CompanyExtendedNotFoundByIdAction, FetchTradeRegisterCompanyNoticeByIdAction, ReceiveTradeRegisterCompanyNoticeByIdAction, CompanyNoticeNotFoundByIdAction, FetchTradeRegisterCompanyRepresentByIdAction, ReceiveTradeRegisterCompanyRepresentByIdAction, CompanyRepresentNotFoundByIdAction, ReceiveCollapseStatesAction } from "@/tradeRegister/types"; export const fetchTradeRegisterCompanyExtendedById = (businessId: string): FetchTradeRegisterCompanyExtendedByIdAction => createAction('mvj/tradeRegister/FETCH_COMPANY_EXTENDED_BY_ID')(businessId); export const receiveTradeRegisterCompanyExtendedById = (payload: TradeRegisterDataMap): ReceiveTradeRegisterCompanyExtendedByIdAction => createAction('mvj/tradeRegister/RECEIVE_COMPANY_EXTENDED_BY_ID')(payload); export const companyExtendedNotFoundById = (businessId: string): CompanyExtendedNotFoundByIdAction => createAction('mvj/tradeRegister/COMPANY_EXTENDED_NOT_FOUND_BY_ID')(businessId); diff --git a/src/tradeRegister/components/CompanyExtended.tsx b/src/tradeRegister/components/CompanyExtended.tsx index 0186ef0b3..320750d20 100644 --- a/src/tradeRegister/components/CompanyExtended.tsx +++ b/src/tradeRegister/components/CompanyExtended.tsx @@ -2,21 +2,21 @@ import React, { Fragment } from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; import get from "lodash/get"; -import Collapse from "components/collapse/Collapse"; -import ExternalLink from "components/links/ExternalLink"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import ListItem from "components/content/ListItem"; -import ListItems from "components/content/ListItems"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import ShowMore from "components/showMore/ShowMore"; -import SubTitle from "components/content/SubTitle"; -import { receiveCollapseStates } from "tradeRegister/actions"; -import { CollapseStatePaths, CompanyStates, CompanyExtendedFieldPaths, CompanyExtendedFieldTitles } from "tradeRegister/enums"; -import { getUiDataTradeRegisterCompanyExtendedKey } from "uiData/helpers"; -import { formatDate, formatNumber, formatNumberWithThousandSeparator } from "util/helpers"; -import { getCollapseStateByKey, getCompanyExtendedById, getIsFetchingCompanyExtendedById } from "tradeRegister/selectors"; +import Collapse from "@/components/collapse/Collapse"; +import ExternalLink from "@/components/links/ExternalLink"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import ListItem from "@/components/content/ListItem"; +import ListItems from "@/components/content/ListItems"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import ShowMore from "@/components/showMore/ShowMore"; +import SubTitle from "@/components/content/SubTitle"; +import { receiveCollapseStates } from "@/tradeRegister/actions"; +import { CollapseStatePaths, CompanyStates, CompanyExtendedFieldPaths, CompanyExtendedFieldTitles } from "@/tradeRegister/enums"; +import { getUiDataTradeRegisterCompanyExtendedKey } from "@/uiData/helpers"; +import { formatDate, formatNumber, formatNumberWithThousandSeparator } from "@/util/helpers"; +import { getCollapseStateByKey, getCompanyExtendedById, getIsFetchingCompanyExtendedById } from "@/tradeRegister/selectors"; type Props = { businessId: string; companyExtended: Record | null | undefined; diff --git a/src/tradeRegister/components/CompanyNotice.tsx b/src/tradeRegister/components/CompanyNotice.tsx index 5d8437463..2c0c1937f 100644 --- a/src/tradeRegister/components/CompanyNotice.tsx +++ b/src/tradeRegister/components/CompanyNotice.tsx @@ -3,21 +3,21 @@ import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; import get from "lodash/get"; -import BoxItem from "components/content/BoxItem"; -import BoxItemContainer from "components/content/BoxItemContainer"; -import Collapse from "components/collapse/Collapse"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import ListItem from "components/content/ListItem"; -import ListItems from "components/content/ListItems"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import { receiveCollapseStates } from "tradeRegister/actions"; -import { CollapseStatePaths, CompanyNoticeFieldPaths, CompanyNoticeFieldTitles } from "tradeRegister/enums"; -import { formatDate } from "util/helpers"; -import { getUiDataTradeRegisterCompanyNoticeKey } from "uiData/helpers"; -import { getCollapseStateByKey, getCompanyNoticeById, getIsFetchingCompanyNoticeById } from "tradeRegister/selectors"; -import { withWindowResize } from "components/resize/WindowResizeHandler"; +import BoxItem from "@/components/content/BoxItem"; +import BoxItemContainer from "@/components/content/BoxItemContainer"; +import Collapse from "@/components/collapse/Collapse"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import ListItem from "@/components/content/ListItem"; +import ListItems from "@/components/content/ListItems"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import { receiveCollapseStates } from "@/tradeRegister/actions"; +import { CollapseStatePaths, CompanyNoticeFieldPaths, CompanyNoticeFieldTitles } from "@/tradeRegister/enums"; +import { formatDate } from "@/util/helpers"; +import { getUiDataTradeRegisterCompanyNoticeKey } from "@/uiData/helpers"; +import { getCollapseStateByKey, getCompanyNoticeById, getIsFetchingCompanyNoticeById } from "@/tradeRegister/selectors"; +import { withWindowResize } from "@/components/resize/WindowResizeHandler"; type Props = { businessId: string; companyNotice: Record | null | undefined; diff --git a/src/tradeRegister/components/CompanyRepresent.tsx b/src/tradeRegister/components/CompanyRepresent.tsx index 5a07f2fcd..483e94e66 100644 --- a/src/tradeRegister/components/CompanyRepresent.tsx +++ b/src/tradeRegister/components/CompanyRepresent.tsx @@ -3,20 +3,20 @@ import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; import get from "lodash/get"; -import BoxItem from "components/content/BoxItem"; -import BoxItemContainer from "components/content/BoxItemContainer"; -import Collapse from "components/collapse/Collapse"; -import FormText from "components/form/FormText"; -import FormTextTitle from "components/form/FormTextTitle"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import ShowMore from "components/showMore/ShowMore"; -import SubTitle from "components/content/SubTitle"; -import { receiveCollapseStates } from "tradeRegister/actions"; -import { CollapseStatePaths, CompanyRepresentFieldPaths, CompanyRepresentFieldTitles } from "tradeRegister/enums"; -import { formatDate } from "util/helpers"; -import { getUiDataTradeRegisterCompanyRepresentKey } from "uiData/helpers"; -import { getCollapseStateByKey, getCompanyRepresentById, getIsFetchingCompanyRepresentById } from "tradeRegister/selectors"; +import BoxItem from "@/components/content/BoxItem"; +import BoxItemContainer from "@/components/content/BoxItemContainer"; +import Collapse from "@/components/collapse/Collapse"; +import FormText from "@/components/form/FormText"; +import FormTextTitle from "@/components/form/FormTextTitle"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import ShowMore from "@/components/showMore/ShowMore"; +import SubTitle from "@/components/content/SubTitle"; +import { receiveCollapseStates } from "@/tradeRegister/actions"; +import { CollapseStatePaths, CompanyRepresentFieldPaths, CompanyRepresentFieldTitles } from "@/tradeRegister/enums"; +import { formatDate } from "@/util/helpers"; +import { getUiDataTradeRegisterCompanyRepresentKey } from "@/uiData/helpers"; +import { getCollapseStateByKey, getCompanyRepresentById, getIsFetchingCompanyRepresentById } from "@/tradeRegister/selectors"; type JusristicPersonProps = { person: Record; }; diff --git a/src/tradeRegister/components/DownloadableFiles.tsx b/src/tradeRegister/components/DownloadableFiles.tsx index d470d409d..bbfa228d1 100644 --- a/src/tradeRegister/components/DownloadableFiles.tsx +++ b/src/tradeRegister/components/DownloadableFiles.tsx @@ -1,15 +1,15 @@ import React, { Fragment } from "react"; import { connect } from "react-redux"; import { Row, Column } from "react-foundation"; -import Collapse from "components/collapse/Collapse"; -import FormText from "components/form/FormText"; -import FileDownloadLink from "components/file/FileDownloadLink"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import { receiveCollapseStates } from "tradeRegister/actions"; -import { CollapseStatePaths } from "tradeRegister/enums"; -import { getCollapseStateByKey, getCompanyExtendedById, getIsFetchingCompanyExtendedById } from "tradeRegister/selectors"; -import createUrlWithoutVersionSuffix from "api/createUrlWithoutVersionSuffix"; +import Collapse from "@/components/collapse/Collapse"; +import FormText from "@/components/form/FormText"; +import FileDownloadLink from "@/components/file/FileDownloadLink"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import { receiveCollapseStates } from "@/tradeRegister/actions"; +import { CollapseStatePaths } from "@/tradeRegister/enums"; +import { getCollapseStateByKey, getCompanyExtendedById, getIsFetchingCompanyExtendedById } from "@/tradeRegister/selectors"; +import createUrlWithoutVersionSuffix from "@/api/createUrlWithoutVersionSuffix"; type Props = { businessId: string; companyExtended: Record | null | undefined; diff --git a/src/tradeRegister/components/Search.tsx b/src/tradeRegister/components/Search.tsx index 3609d8108..fa9bd4acb 100644 --- a/src/tradeRegister/components/Search.tsx +++ b/src/tradeRegister/components/Search.tsx @@ -3,14 +3,14 @@ import { connect } from "react-redux"; import { getFormValues, reduxForm } from "redux-form"; import { Row, Column } from "react-foundation"; import flowRight from "lodash/flowRight"; -import Button from "components/button/Button"; -import FormField from "components/form/FormField"; -import SearchInputColumn from "components/search/SearchInputColumn"; -import SearchLabel from "components/search/SearchLabel"; -import SearchLabelColumn from "components/search/SearchLabelColumn"; -import SearchRow from "components/search/SearchRow"; -import { FieldTypes, FormNames } from "enums"; -import { ButtonColors } from "components/enums"; +import Button from "@/components/button/Button"; +import FormField from "@/components/form/FormField"; +import SearchInputColumn from "@/components/search/SearchInputColumn"; +import SearchLabel from "@/components/search/SearchLabel"; +import SearchLabelColumn from "@/components/search/SearchLabelColumn"; +import SearchRow from "@/components/search/SearchRow"; +import { FieldTypes, FormNames } from "@/enums"; +import { ButtonColors } from "@/components/enums"; type Props = { formValues?: Record; handleSubmit?: (...args: Array) => any; diff --git a/src/tradeRegister/components/TradeRegisterSearchPage.tsx b/src/tradeRegister/components/TradeRegisterSearchPage.tsx index 1b7d78604..da7f7f27f 100644 --- a/src/tradeRegister/components/TradeRegisterSearchPage.tsx +++ b/src/tradeRegister/components/TradeRegisterSearchPage.tsx @@ -5,20 +5,20 @@ import { Row, Column } from "react-foundation"; import { withRouter } from "react-router"; import flowRight from "lodash/flowRight"; import isEmpty from "lodash/isEmpty"; -import AuthorizationError from "components/authorization/AuthorizationError"; -import ContentContainer from "components/content/ContentContainer"; -import Divider from "components/content/Divider"; -import Loader from "components/loader/Loader"; -import PageContainer from "components/content/PageContainer"; -import Search from "tradeRegister/components/Search"; -import TradeRegisterTemplate from "tradeRegister/components/TradeRegisterTemplate"; -import { receiveTopNavigationSettings } from "components/topNavigation/actions"; -import { FormNames, PermissionMissingTexts } from "enums"; -import { UsersPermissions } from "usersPermissions/enums"; -import { hasPermissions, getSearchQuery, getUrlParams, setPageTitle } from "util/helpers"; -import { getRouteById, Routes } from "root/routes"; -import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "usersPermissions/selectors"; -import type { UsersPermissions as UsersPermissionsType } from "usersPermissions/types"; +import AuthorizationError from "@/components/authorization/AuthorizationError"; +import ContentContainer from "@/components/content/ContentContainer"; +import Divider from "@/components/content/Divider"; +import Loader from "@/components/loader/Loader"; +import PageContainer from "@/components/content/PageContainer"; +import Search from "@/tradeRegister/components/Search"; +import TradeRegisterTemplate from "@/tradeRegister/components/TradeRegisterTemplate"; +import { receiveTopNavigationSettings } from "@/components/topNavigation/actions"; +import { FormNames, PermissionMissingTexts } from "@/enums"; +import { UsersPermissions } from "@/usersPermissions/enums"; +import { hasPermissions, getSearchQuery, getUrlParams, setPageTitle } from "@/util/helpers"; +import { getRouteById, Routes } from "@/root/routes"; +import { getIsFetching as getIsFetchingUsersPermissions, getUsersPermissions } from "@/usersPermissions/selectors"; +import type { UsersPermissions as UsersPermissionsType } from "@/usersPermissions/types"; type Props = { history: Record; initialize: (...args: Array) => any; diff --git a/src/tradeRegister/components/TradeRegisterTemplate.tsx b/src/tradeRegister/components/TradeRegisterTemplate.tsx index e87bcef9c..85c17e9f1 100644 --- a/src/tradeRegister/components/TradeRegisterTemplate.tsx +++ b/src/tradeRegister/components/TradeRegisterTemplate.tsx @@ -1,14 +1,14 @@ import React, { Fragment, PureComponent } from "react"; import { connect } from "react-redux"; import flowRight from "lodash/flowRight"; -import CompanyExtended from "tradeRegister/components/CompanyExtended"; -import CompanyNotice from "tradeRegister/components/CompanyNotice"; -import CompanyRepresent from "tradeRegister/components/CompanyRepresent"; -import DownloadableFiles from "tradeRegister/components/DownloadableFiles"; -import Loader from "components/loader/Loader"; -import LoaderWrapper from "components/loader/LoaderWrapper"; -import { fetchTradeRegisterCompanyExtendedById, fetchTradeRegisterCompanyNoticeById, fetchTradeRegisterCompanyRepresentById } from "tradeRegister/actions"; -import { getCompanyExtendedById, getCompanyNoticeById, getCompanyRepresentById, getIsFetchingCompanyExtendedById, getIsFetchingCompanyNoticeById, getIsFetchingCompanyRepresentById } from "tradeRegister/selectors"; +import CompanyExtended from "@/tradeRegister/components/CompanyExtended"; +import CompanyNotice from "@/tradeRegister/components/CompanyNotice"; +import CompanyRepresent from "@/tradeRegister/components/CompanyRepresent"; +import DownloadableFiles from "@/tradeRegister/components/DownloadableFiles"; +import Loader from "@/components/loader/Loader"; +import LoaderWrapper from "@/components/loader/LoaderWrapper"; +import { fetchTradeRegisterCompanyExtendedById, fetchTradeRegisterCompanyNoticeById, fetchTradeRegisterCompanyRepresentById } from "@/tradeRegister/actions"; +import { getCompanyExtendedById, getCompanyNoticeById, getCompanyRepresentById, getIsFetchingCompanyExtendedById, getIsFetchingCompanyNoticeById, getIsFetchingCompanyRepresentById } from "@/tradeRegister/selectors"; type Props = { businessId: string; companyExtended: Record | null | undefined; diff --git a/src/tradeRegister/reducer.ts b/src/tradeRegister/reducer.ts index af74d05c0..884dab529 100644 --- a/src/tradeRegister/reducer.ts +++ b/src/tradeRegister/reducer.ts @@ -1,7 +1,7 @@ import { combineReducers } from "redux"; import { handleActions } from "redux-actions"; import type { Reducer } from "types"; -import type { TradeRegisterDataMap, TradeRegisterIsFetchingMap, FetchTradeRegisterCompanyExtendedByIdAction, ReceiveTradeRegisterCompanyExtendedByIdAction, CompanyExtendedNotFoundByIdAction, FetchTradeRegisterCompanyNoticeByIdAction, ReceiveTradeRegisterCompanyNoticeByIdAction, CompanyNoticeNotFoundByIdAction, FetchTradeRegisterCompanyRepresentByIdAction, ReceiveTradeRegisterCompanyRepresentByIdAction, CompanyRepresentNotFoundByIdAction, ReceiveCollapseStatesAction } from "tradeRegister/types"; +import type { TradeRegisterDataMap, TradeRegisterIsFetchingMap, FetchTradeRegisterCompanyExtendedByIdAction, ReceiveTradeRegisterCompanyExtendedByIdAction, CompanyExtendedNotFoundByIdAction, FetchTradeRegisterCompanyNoticeByIdAction, ReceiveTradeRegisterCompanyNoticeByIdAction, CompanyNoticeNotFoundByIdAction, FetchTradeRegisterCompanyRepresentByIdAction, ReceiveTradeRegisterCompanyRepresentByIdAction, CompanyRepresentNotFoundByIdAction, ReceiveCollapseStatesAction } from "@/tradeRegister/types"; const isFetchingCompanyExtendedByIdReducer: Reducer = handleActions({ ['mvj/tradeRegister/FETCH_COMPANY_EXTENDED_BY_ID']: (state: TradeRegisterIsFetchingMap, { payload: businessId diff --git a/src/tradeRegister/requests.ts b/src/tradeRegister/requests.ts index 415755db9..e940aa649 100644 --- a/src/tradeRegister/requests.ts +++ b/src/tradeRegister/requests.ts @@ -1,5 +1,5 @@ -import callApi from "api/callApi"; -import createUrlWithoutVersionSuffix from "api/createUrlWithoutVersionSuffix"; +import callApi from "@/api/callApi"; +import createUrlWithoutVersionSuffix from "@/api/createUrlWithoutVersionSuffix"; export const fetchCompanyExtended = (businessId: string): Generator => { return callApi(new Request(createUrlWithoutVersionSuffix(`trade_register/company_extended/${businessId}/`))); }; diff --git a/src/tradeRegister/saga.ts b/src/tradeRegister/saga.ts index aeebd00f6..3ce93ea8a 100644 --- a/src/tradeRegister/saga.ts +++ b/src/tradeRegister/saga.ts @@ -1,5 +1,5 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects"; -import { receiveError } from "api/actions"; +import { receiveError } from "@/api/actions"; import { receiveTradeRegisterCompanyExtendedById, companyExtendedNotFoundById, receiveTradeRegisterCompanyNoticeById, companyNoticeNotFoundById, receiveTradeRegisterCompanyRepresentById, companyRepresentNotFoundById } from "./actions"; import { fetchCompanyExtended, fetchCompanyNotice, fetchCompanyRepresent } from "./requests"; diff --git a/src/tradeRegister/selectors.ts b/src/tradeRegister/selectors.ts index c19914fa5..70ec339a3 100644 --- a/src/tradeRegister/selectors.ts +++ b/src/tradeRegister/selectors.ts @@ -1,4 +1,4 @@ -import type { RootState } from "root/types"; +import type { RootState } from "@/root/types"; import type { Selector } from "types"; export const getIsFetchingCompanyExtendedById: Selector = (state: RootState, businessId: string): boolean => state.tradeRegister.isFetchingCompanyExtendedById[businessId]; export const getCompanyExtendedById: Selector | null | undefined, string> = (state: RootState, businessId: string): Record | null | undefined => state.tradeRegister.companyExtendedById[businessId]; diff --git a/src/types.ts b/src/types.ts index 50d9e89c3..cad89edd8 100644 --- a/src/types.ts +++ b/src/types.ts @@ -1,4 +1,4 @@ -import type { RootState } from "root/types"; +import type { RootState } from "@/root/types"; export type Action = { type: Type; payload: Payload; diff --git a/src/uiData/actions.ts b/src/uiData/actions.ts index f13ecbd65..0a96e973c 100644 --- a/src/uiData/actions.ts +++ b/src/uiData/actions.ts @@ -1,6 +1,6 @@ import { createAction } from "redux-actions"; import type { Attributes, Methods } from "types"; -import type { UiDataList, CreateUiDataPayload, EditUiDataPayload, FetchAttributesAction, ReceiveAttributesAction, ReceiveMethodsAction, AttributesNotFoundAction, FetchUiDataListAction, ReceiveUiDataListAction, CreateUiDataAction, DeleteUiDataAction, EditUiDataAction, NotFoundAction } from "uiData/types"; +import type { UiDataList, CreateUiDataPayload, EditUiDataPayload, FetchAttributesAction, ReceiveAttributesAction, ReceiveMethodsAction, AttributesNotFoundAction, FetchUiDataListAction, ReceiveUiDataListAction, CreateUiDataAction, DeleteUiDataAction, EditUiDataAction, NotFoundAction } from "@/uiData/types"; export const fetchAttributes = (): FetchAttributesAction => createAction('mvj/uiData/FETCH_ATTRIBUTES')(); export const receiveAttributes = (attributes: Attributes): ReceiveAttributesAction => createAction('mvj/uiData/RECEIVE_ATTRIBUTES')(attributes); export const receiveMethods = (methods: Methods): ReceiveMethodsAction => createAction('mvj/uiData/RECEIVE_METHODS')(methods); diff --git a/src/uiData/helpers.ts b/src/uiData/helpers.ts index f23bead29..ddb957f37 100644 --- a/src/uiData/helpers.ts +++ b/src/uiData/helpers.ts @@ -1,4 +1,4 @@ -import { UiDataPrefixes } from "uiData/enums"; +import { UiDataPrefixes } from "@/uiData/enums"; import type { UiDataList } from "./types"; /** diff --git a/src/uiData/reducer.ts b/src/uiData/reducer.ts index 6d8828670..9932eddfa 100644 --- a/src/uiData/reducer.ts +++ b/src/uiData/reducer.ts @@ -1,7 +1,7 @@ import { combineReducers } from "redux"; import { handleActions } from "redux-actions"; import type { Attributes, Methods, Reducer } from "types"; -import type { UiDataList, ReceiveAttributesAction, ReceiveMethodsAction, ReceiveUiDataListAction } from "uiData/types"; +import type { UiDataList, ReceiveAttributesAction, ReceiveMethodsAction, ReceiveUiDataListAction } from "@/uiData/types"; const isFetchingAttributesReducer: Reducer = handleActions({ 'mvj/uiData/FETCH_ATTRIBUTES': () => true, 'mvj/uiData/RECEIVE_METHODS': () => false, diff --git a/src/uiData/requests.ts b/src/uiData/requests.ts index 785a0449c..fc67975e5 100644 --- a/src/uiData/requests.ts +++ b/src/uiData/requests.ts @@ -1,5 +1,5 @@ -import callApi from "api/callApi"; -import createUrl from "api/createUrl"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; export const fetchAttributes = () => { return callApi(new Request(createUrl('ui_data/'), { method: 'OPTIONS' diff --git a/src/uiData/saga.ts b/src/uiData/saga.ts index c89702757..c818e9926 100644 --- a/src/uiData/saga.ts +++ b/src/uiData/saga.ts @@ -1,8 +1,8 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects"; import { SubmissionError } from "redux-form"; -import { receiveError } from "api/actions"; +import { receiveError } from "@/api/actions"; import { attributesNotFound, fetchUiDataList as fetchUiDataListAction, receiveAttributes, receiveMethods, receiveUiDataList, notFound } from "./actions"; -import { displayUIMessage } from "util/helpers"; +import { displayUIMessage } from "@/util/helpers"; import { createUiData, deleteUiData, editUiData, fetchAttributes, fetchUiDataList } from "./requests"; function* fetchAttributesSaga(): Generator { diff --git a/src/uiData/selectors.ts b/src/uiData/selectors.ts index 87aa269bb..0295dc1e9 100644 --- a/src/uiData/selectors.ts +++ b/src/uiData/selectors.ts @@ -1,5 +1,5 @@ -import type { Attributes, Methods, Selector } from "../types"; -import type { RootState } from "../root/types"; +import type { Attributes, Methods, Selector } from "@/types"; +import type { RootState } from "@/root/types"; import type { UiDataList } from "./types"; export const getIsFetchingAttributes: Selector = (state: RootState): boolean => state.uiData.isFetchingAttributes; export const getAttributes: Selector = (state: RootState): Attributes => state.uiData.attributes; diff --git a/src/users/helpers.ts b/src/users/helpers.ts index 9d017f617..69807163c 100644 --- a/src/users/helpers.ts +++ b/src/users/helpers.ts @@ -1,4 +1,4 @@ -import { sortStringByKeyAsc } from "util/helpers"; +import { sortStringByKeyAsc } from "@/util/helpers"; import type { UserList } from "./types"; /** diff --git a/src/users/reducer.ts b/src/users/reducer.ts index 70a474d0c..bfe7f5461 100644 --- a/src/users/reducer.ts +++ b/src/users/reducer.ts @@ -1,6 +1,6 @@ import { combineReducers } from "redux"; import { handleActions } from "redux-actions"; -import type { Reducer } from "../types"; +import type { Reducer } from "@/types"; import type { UserList, ReceiveUsersAction } from "./types"; const isFetchingReducer: Reducer = handleActions({ 'mvj/users/FETCH_ALL': () => true, diff --git a/src/users/requests.ts b/src/users/requests.ts index 2833962cf..82a1abbd2 100644 --- a/src/users/requests.ts +++ b/src/users/requests.ts @@ -1,5 +1,5 @@ -import callApi from "../api/callApi"; -import createUrl from "../api/createUrl"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; export const fetchUsers = (search: string): Generator => { return callApi(new Request(createUrl(`user/${search || ''}`))); }; \ No newline at end of file diff --git a/src/users/requestsAsync.ts b/src/users/requestsAsync.ts index 8c57a9cff..4d677460d 100644 --- a/src/users/requestsAsync.ts +++ b/src/users/requestsAsync.ts @@ -1,5 +1,5 @@ -import createUrl from "api/createUrl"; -import callApiAsync from "api/callApiAsync"; +import createUrl from "@/api/createUrl"; +import callApiAsync from "@/api/callApiAsync"; export const fetchUsers = async (query?: Record): Promise>> => { const { response: { diff --git a/src/users/saga.ts b/src/users/saga.ts index da84255b8..9d8767e36 100644 --- a/src/users/saga.ts +++ b/src/users/saga.ts @@ -2,7 +2,7 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects"; import get from "lodash/get"; import { receiveUsers, notFound } from "./actions"; import { fetchUsers } from "./requests"; -import { receiveError } from "../api/actions"; +import { receiveError } from "@/api/actions"; function* fetchUsersSaga({ payload: search, diff --git a/src/users/selectors.ts b/src/users/selectors.ts index e858eb595..d257c78b4 100644 --- a/src/users/selectors.ts +++ b/src/users/selectors.ts @@ -1,5 +1,5 @@ import type { Selector } from "types"; -import type { RootState } from "root/types"; +import type { RootState } from "@/root/types"; import type { UserList } from "./types"; export const getIsFetching: Selector = (state: RootState): boolean => state.user.isFetching; export const getUsers: Selector = (state: RootState): UserList => state.user.list; \ No newline at end of file diff --git a/src/users/types.ts b/src/users/types.ts index 3e26b7191..5e704a17a 100644 --- a/src/users/types.ts +++ b/src/users/types.ts @@ -1,4 +1,4 @@ -import type { Action } from "../types"; +import type { Action } from "@/types"; export type UserState = { isFetching: boolean; list: UserList; diff --git a/src/usersPermissions/reducer.ts b/src/usersPermissions/reducer.ts index 6bbf0c6f0..a282f0a5a 100644 --- a/src/usersPermissions/reducer.ts +++ b/src/usersPermissions/reducer.ts @@ -1,6 +1,6 @@ import { combineReducers } from "redux"; import { handleActions } from "redux-actions"; -import type { Reducer } from "../types"; +import type { Reducer } from "@/types"; import type { UserGroups, UsersPermissions, UserServiceUnits, UserServiceUnit, ReceiveUserGroupsAction, ReceiveUsersPermissionsAction, ReceiveUserServiceUnitsAction, SetUserActiveServiceUnitAction } from "./types"; const isFetchingReducer: Reducer = handleActions({ 'mvj/usersPermissions/FETCH_ALL': () => true, diff --git a/src/usersPermissions/requests.ts b/src/usersPermissions/requests.ts index 0d4a1ea92..41a134130 100644 --- a/src/usersPermissions/requests.ts +++ b/src/usersPermissions/requests.ts @@ -1,5 +1,5 @@ -import callApi from "../api/callApi"; -import createUrl from "../api/createUrl"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; export const fetchUsersPermissions = (): Generator => { return callApi(new Request(createUrl('users_permissions/'))); }; \ No newline at end of file diff --git a/src/usersPermissions/saga.ts b/src/usersPermissions/saga.ts index e28f80ecd..1a47852a0 100644 --- a/src/usersPermissions/saga.ts +++ b/src/usersPermissions/saga.ts @@ -1,7 +1,7 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects"; import { receiveUserGroups, receiveUsersPermissions, receiveUserServiceUnits, setUserActiveServiceUnit, notFound } from "./actions"; import { fetchUsersPermissions } from "./requests"; -import { receiveError } from "../api/actions"; +import { receiveError } from "@/api/actions"; function* fetchUsersPermissionsSaga(): Generator { try { diff --git a/src/usersPermissions/selectors.ts b/src/usersPermissions/selectors.ts index e2e475f2a..707ad547a 100644 --- a/src/usersPermissions/selectors.ts +++ b/src/usersPermissions/selectors.ts @@ -1,5 +1,5 @@ import type { Selector } from "types"; -import type { RootState } from "root/types"; +import type { RootState } from "@/root/types"; import type { UserGroups, UsersPermissions, UserServiceUnit, UserServiceUnits } from "./types"; export const getIsFetching: Selector = (state: RootState): boolean => state.usersPermissions.isFetching; export const getUserGroups: Selector = (state: RootState): UserGroups => state.usersPermissions.groups; diff --git a/src/usersPermissions/types.ts b/src/usersPermissions/types.ts index f6c9c1e41..4d940aa8c 100644 --- a/src/usersPermissions/types.ts +++ b/src/usersPermissions/types.ts @@ -1,4 +1,4 @@ -import type { Action } from "../types"; +import type { Action } from "@/types"; export type UserGroups = Array; export type UsersPermissions = Array>; export type UserServiceUnit = Record; diff --git a/src/util/forms.ts b/src/util/forms.ts index 7ab5f0013..066276792 100644 --- a/src/util/forms.ts +++ b/src/util/forms.ts @@ -1,9 +1,9 @@ -import { isContactFormDirty } from "contacts/helpers"; -import { isInfillDevelopmentFormDirty } from "infillDevelopment/helpers"; -import { isAnyLandUseContractFormDirty } from "landUseContract/helpers"; -import { isAnyLeaseFormDirty } from "leases/helpers"; -import { isRentBasisFormDirty } from "rentbasis/helpers"; -import { store } from "root/startApp"; +import { isContactFormDirty } from "@/contacts/helpers"; +import { isInfillDevelopmentFormDirty } from "@/infillDevelopment/helpers"; +import { isAnyLandUseContractFormDirty } from "@/landUseContract/helpers"; +import { isAnyLeaseFormDirty } from "@/leases/helpers"; +import { isRentBasisFormDirty } from "@/rentbasis/helpers"; +import { store } from "@/index"; /** * Test has any page dirty forms diff --git a/src/util/helpers.tsx b/src/util/helpers.tsx index 756a12655..ee222cd8a 100644 --- a/src/util/helpers.tsx +++ b/src/util/helpers.tsx @@ -8,11 +8,11 @@ import isArray from "lodash/isArray"; import isEmpty from "lodash/isEmpty"; import isNumber from "lodash/isNumber"; import { toastr } from "react-redux-toastr"; -import ToastrIcons from "components/toastr/ToastrIcons"; -import { PAIKKATIETOPALVELU_URL } from "util/constants"; -import { Breakpoints } from "foundation/enums"; -import type { ApiResponse, Attributes, Methods } from "types"; -import type { UsersPermissions } from "usersPermissions/types"; +import ToastrIcons from "@/components/toastr/ToastrIcons"; +import { PAIKKATIETOPALVELU_URL } from "@/util/constants"; +import { Breakpoints } from "@/foundation/enums"; +import type { ApiResponse, Attributes, Methods } from "@/types"; +import type { UsersPermissions } from "@/usersPermissions/types"; /** * Compose page title diff --git a/src/util/map.ts b/src/util/map.ts index 37b72768b..975814b06 100644 --- a/src/util/map.ts +++ b/src/util/map.ts @@ -1,4 +1,5 @@ import isArray from "lodash/isArray"; +import L from "leaflet"; import type { LatLngBounds } from "leaflet"; /** @@ -7,8 +8,6 @@ import type { LatLngBounds } from "leaflet"; /* istanbul ignore next */ export const localizeMap = () => { - const L = require('leaflet'); - L.drawLocal.draw.handlers.circle.tooltip.start = 'Klikkaa ja raahaa piirtääksesi ympyrän'; L.drawLocal.draw.handlers.circle.radius = 'Säde'; L.drawLocal.draw.handlers.polygon.tooltip.start = 'Aloita alueen piirtäminen klikkaamalla.'; @@ -81,8 +80,6 @@ export const getCoordinatesOfGeometry = (geometry: any): Array<[number, number]> /* istanbul ignore next */ export const formatCoordsToLatLng = (geojson: Record | null | undefined): (Record | null | undefined) | null => { - const L = require('leaflet'); - let crs; if (geojson) { @@ -109,7 +106,6 @@ export const formatCoordsToLatLng = (geojson: Record | null | undef /* istanbul ignore next */ export const getBoundsFromBBox = (bbox: Array>): Record => { - const L = require('leaflet'); if (!bbox || !isArray(bbox) || bbox.length < 4) return null; const maxBoundsSouthWest = new L.LatLng(bbox[3], bbox[2]), @@ -125,8 +121,6 @@ export const getBoundsFromBBox = (bbox: Array>): Record): LatLngBounds => { - const L = require('leaflet'); - const lats = [], lons = []; coordinates.forEach(coordinate => { @@ -148,8 +142,6 @@ export const getBoundsFromCoordinates = (coordinates: Array): LatLngBounds * @returns Object */ export const getBoundsFromFeatures = (leasesGeoJson: Record): Record => { - const L = require('leaflet'); - const lats = [], lons = []; if (leasesGeoJson && leasesGeoJson.features) leasesGeoJson.features.forEach(feature => { @@ -189,8 +181,6 @@ export const getCenterFromCoordinates = (coordinates: Array): [number, numb return [lng, lat]; }; export const getAreaFromGeoJSON = (geometry: Record): number => { - const L = require('leaflet'); - let area = 0; switch (geometry.type) { diff --git a/src/util/testUtil.ts b/src/util/testUtil.ts index c2ece6bb4..ec6af2361 100644 --- a/src/util/testUtil.ts +++ b/src/util/testUtil.ts @@ -1,8 +1,8 @@ import { $Shape } from "utility-types"; -import type { RootState } from "../root/types"; +import type { RootState } from "@/root/types"; import { createStore } from "redux"; import { createMemoryHistory } from "history"; -import createRootReducer from "../root/createRootReducer"; +import createRootReducer from "@/root/createRootReducer"; export const getTestRootState = (overrides: $Shape = {}): RootState => { const history = createMemoryHistory(); const rootState = createStore(createRootReducer(history)); diff --git a/src/vat/reducer.ts b/src/vat/reducer.ts index b3d2adcf8..de4916bc8 100644 --- a/src/vat/reducer.ts +++ b/src/vat/reducer.ts @@ -1,6 +1,6 @@ import { combineReducers } from "redux"; import { handleActions } from "redux-actions"; -import type { Reducer } from "../types"; +import type { Reducer } from "@/types"; import type { VatList, ReceiveVatsAction } from "./types"; const isFetchingReducer: Reducer = handleActions({ 'mvj/vat/FETCH_ALL': () => true, diff --git a/src/vat/requests.ts b/src/vat/requests.ts index e2c292d52..ce7bd7b27 100644 --- a/src/vat/requests.ts +++ b/src/vat/requests.ts @@ -1,5 +1,5 @@ -import callApi from "../api/callApi"; -import createUrl from "../api/createUrl"; +import callApi from "@/api/callApi"; +import createUrl from "@/api/createUrl"; export const fetchVats = (): Generator => { return callApi(new Request(createUrl(`vat/?limit=10000`))); }; \ No newline at end of file diff --git a/src/vat/saga.ts b/src/vat/saga.ts index 62eeaac39..eb233e072 100644 --- a/src/vat/saga.ts +++ b/src/vat/saga.ts @@ -1,7 +1,7 @@ import { all, call, fork, put, takeLatest } from "redux-saga/effects"; import { notFound, receiveVats } from "./actions"; import { fetchVats } from "./requests"; -import { receiveError } from "api/actions"; +import { receiveError } from "@/api/actions"; function* fetchVatsSaga(): Generator { try { diff --git a/src/vat/selectors.ts b/src/vat/selectors.ts index cb67bbd75..bf6c3b4a3 100644 --- a/src/vat/selectors.ts +++ b/src/vat/selectors.ts @@ -1,5 +1,5 @@ -import type { Selector } from "../types"; -import type { RootState } from "../root/types"; +import type { Selector } from "@/types"; +import type { RootState } from "@/root/types"; import type { VatList } from "./types"; export const getIsFetching: Selector = (state: RootState): boolean => state.vat.isFetching; export const getVats: Selector = (state: RootState): VatList => { diff --git a/src/vat/types.ts b/src/vat/types.ts index 81e84a3c0..28d7375dd 100644 --- a/src/vat/types.ts +++ b/src/vat/types.ts @@ -1,4 +1,4 @@ -import type { Action } from "../types"; +import type { Action } from "@/types"; export type VatState = { isFetching: boolean; list: VatList; From cbe1da092299a95691222607ab1d77b83b15664b Mon Sep 17 00:00:00 2001 From: Henri Nieminen Date: Tue, 13 Aug 2024 15:58:42 +0300 Subject: [PATCH 04/24] remove webpack --- config/env.js | 57 -------- config/paths.js | 58 -------- config/polyfills.js | 19 --- config/webpack.config.dev.js | 166 ---------------------- config/webpack.config.prod.js | 223 ------------------------------ config/webpackDevServer.config.js | 52 ------- defs/react-leaflet.js | 5 - defs/redux-actions.js | 17 --- package.json | 29 +--- scripts/compile.js | 127 ----------------- scripts/start.js | 108 --------------- src/root/enableOfflineMode.ts | 11 -- src/root/renderApp.tsx | 8 -- 13 files changed, 5 insertions(+), 875 deletions(-) delete mode 100644 config/env.js delete mode 100644 config/paths.js delete mode 100644 config/polyfills.js delete mode 100644 config/webpack.config.dev.js delete mode 100644 config/webpack.config.prod.js delete mode 100644 config/webpackDevServer.config.js delete mode 100644 defs/react-leaflet.js delete mode 100644 defs/redux-actions.js delete mode 100644 scripts/compile.js delete mode 100644 scripts/start.js delete mode 100644 src/root/enableOfflineMode.ts delete mode 100644 src/root/renderApp.tsx diff --git a/config/env.js b/config/env.js deleted file mode 100644 index 0b340c861..000000000 --- a/config/env.js +++ /dev/null @@ -1,57 +0,0 @@ -'use strict'; - -const fs = require('fs'); -const paths = require('./paths'); - -// Make sure that including paths.js after env.js will read .env variables. -delete require.cache[require.resolve('./paths')]; - -const NODE_ENV = process.env.NODE_ENV; -if (!NODE_ENV) { - throw new Error( - 'The NODE_ENV environment variable is required but was not specified.' - ); -} - -// https://github.com/bkeepers/dotenv#what-other-env-files-can-i-use -var dotenvFiles = [ - paths.dotenv, -].filter(Boolean); - -// Load environment variables from .env* files. Suppress warnings using silent -// if this file is missing. dotenv will never modify any environment variables -// that have already been set. -// https://github.com/motdotla/dotenv -dotenvFiles.forEach(dotenvFile => { - if (fs.existsSync(dotenvFile)) { - require('dotenv').config({ - path: dotenvFile, - }); - } -}); - -function getClientEnvironment() { - const raw = Object.keys(process.env) - .reduce( - (env, key) => { - env[key] = process.env[key]; - return env; - }, - { - // Useful for determining whether we’re running in production mode. - // Most importantly, it switches React into the correct mode. - NODE_ENV: process.env.NODE_ENV || 'development', - } - ); - // Stringify all values so we can feed into Webpack DefinePlugin - const stringified = { - 'process.env': Object.keys(raw).reduce((env, key) => { - env[key] = JSON.stringify(raw[key]); - return env; - }, {}), - }; - - return {raw, stringified}; -} - -module.exports = getClientEnvironment; diff --git a/config/paths.js b/config/paths.js deleted file mode 100644 index e9bdfcf8c..000000000 --- a/config/paths.js +++ /dev/null @@ -1,58 +0,0 @@ -'use strict'; - -const path = require('path'); -const fs = require('fs'); -const url = require('url'); - -// Make sure any symlinks in the project folder are resolved: -// https://github.com/facebookincubator/create-react-app/issues/637 -const appDirectory = fs.realpathSync(process.cwd()); -const resolveApp = relativePath => path.resolve(appDirectory, relativePath); - -const envPublicUrl = import.meta.env.PUBLIC_URL; - -function ensureSlash(path, needsSlash) { - const hasSlash = path.endsWith('/'); - if (hasSlash && !needsSlash) { - return path.substr(path, path.length - 1); - } else if (!hasSlash && needsSlash) { - return `${path}/`; - } else { - return path; - } -} - - -const getPublicUrl = appPackageJson => - envPublicUrl || require(appPackageJson).homepage; - -// We use `PUBLIC_URL` environment variable or "homepage" field to infer -// "public path" at which the app is served. -// Webpack needs to know it to put the right