diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 0eeb23eb98..139011e11e 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -5,9 +5,10 @@ "clear": true }, "options": { + "cwd": "${workspaceFolder}/webapp", "env": { - "cwd": "${workspaceFolder}/webapp", - "NODE_OPTIONS": "--max-old-space-size=8192" + "NODE_OPTIONS": "--max-old-space-size=8192", + "MAVEN_OPTS": "-Xmx8192m" } }, "tasks": [ diff --git a/webapp/packages/eslint-config/eslint-config.json b/webapp/packages/eslint-config/eslint-config.json index fb2cb11670..876ae38b60 100644 --- a/webapp/packages/eslint-config/eslint-config.json +++ b/webapp/packages/eslint-config/eslint-config.json @@ -1,14 +1,9 @@ { "parser": "@typescript-eslint/parser", - "plugins": [ - "@typescript-eslint", - "eslint-plugin-import-helpers" - ], + "plugins": ["@typescript-eslint"], "overrides": [ { - "files": [ - "**/*.cjs" - ], + "files": ["**/*.cjs"], "env": { "node": true } @@ -42,6 +37,7 @@ "no-inner-declarations": "off", "no-constant-condition": "off", "space-before-blocks": "error", + "@typescript-eslint/no-explicit-any": "off", "@typescript-eslint/no-invalid-void-type": "off", "@typescript-eslint/dot-notation": "off", "@typescript-eslint/no-throw-literal": "off", @@ -64,10 +60,7 @@ "@typescript-eslint/no-non-null-assertion": "off", "@typescript-eslint/explicit-function-return-type": "off", "@typescript-eslint/no-empty-function": "off", - "@typescript-eslint/semi": [ - "error", - "always" - ], + "@typescript-eslint/semi": ["error", "always"], "@typescript-eslint/consistent-type-assertions": [ "error", { @@ -88,25 +81,12 @@ } } ], - "@typescript-eslint/comma-spacing": [ - "error" - ], - "@typescript-eslint/default-param-last": [ - "error" - ], - "@typescript-eslint/func-call-spacing": [ - "error" - ], - "@typescript-eslint/keyword-spacing": [ - "error" - ], - "@typescript-eslint/no-duplicate-imports": [ - "error" - ], - "@typescript-eslint/object-curly-spacing": [ - "error", - "always" - ], + "@typescript-eslint/comma-spacing": ["error"], + "@typescript-eslint/default-param-last": ["error"], + "@typescript-eslint/func-call-spacing": ["error"], + "@typescript-eslint/keyword-spacing": ["error"], + "@typescript-eslint/no-duplicate-imports": ["error"], + "@typescript-eslint/object-curly-spacing": ["error", "always"], "@typescript-eslint/quotes": [ "error", "single", @@ -128,46 +108,27 @@ "int32Hint": false } ], - "@typescript-eslint/no-confusing-non-null-assertion": [ - "warn" - ], + "@typescript-eslint/no-confusing-non-null-assertion": ["warn"], "@typescript-eslint/no-confusing-void-expression": "off", - "@typescript-eslint/prefer-function-type": [ - "warn" - ], + "@typescript-eslint/prefer-function-type": ["warn"], "arrow-spacing": "error", "import/no-duplicates": "off", "import/export": "off", "standard/no-callback-literal": "off", "no-empty": "off", - "curly": [ - "error", - "all" - ], - "arrow-body-style": [ - "error", - "as-needed" - ], - "function-call-argument-newline": [ - "error", - "consistent" - ], + "curly": ["error", "all"], + "arrow-body-style": ["error", "as-needed"], + "function-call-argument-newline": ["error", "consistent"], "prefer-arrow-callback": [ "error", { "allowNamedFunctions": true } ], - "operator-linebreak": [ - "warn", - "before" - ], + "operator-linebreak": "off", "multiline-ternary": "off", "no-nested-ternary": "warn", - "arrow-parens": [ - "error", - "as-needed" - ], + "arrow-parens": ["error", "as-needed"], "comma-dangle": [ "warn", { @@ -188,32 +149,10 @@ "ignorePattern": "^export\\s(const\\s\\w+:?.+=.+function\\s|function\\s)\\w+\\s*\\(.*\\{$" } ], - "import-helpers/order-imports": [ - "warn", - { - "newlinesBetween": "always", - "groups": [ - "module", - "/^@/", - "/^~/", - [ - "parent", - "sibling", - "index" - ] - ], - "alphabetize": { - "order": "asc", - "ignoreCase": true - } - } - ], "no-restricted-imports": [ "error", { - "patterns": [ - "@cloudbeaver/*/src/*" - ] + "patterns": ["@cloudbeaver/*/src/*"] } ], "react/destructuring-assignment": "off", @@ -229,19 +168,10 @@ "react/jsx-closing-tag-location": "error", "react/jsx-boolean-value": "error", "react/self-closing-comp": "error", - "react/jsx-curly-newline": "error", - "react/jsx-curly-brace-presence": [ - "error", - "never" - ], - "react/jsx-fragments": [ - "off", - "syntax" - ], - "react/jsx-equals-spacing": [ - "error", - "never" - ], + "react/jsx-curly-newline": "off", + "react/jsx-curly-brace-presence": ["error", "never"], + "react/jsx-fragments": ["off", "syntax"], + "react/jsx-equals-spacing": ["error", "never"], "react/jsx-curly-spacing": [ "error", { @@ -249,10 +179,7 @@ "children": true } ], - "react/jsx-first-prop-new-line": [ - "warn", - "multiline" - ], + "react/jsx-first-prop-new-line": ["warn", "multiline"], "react/jsx-max-props-per-line": [ 1, { @@ -291,4 +218,4 @@ } ] } -} \ No newline at end of file +} diff --git a/webapp/packages/eslint-config/package.json b/webapp/packages/eslint-config/package.json index 7145a8b9d9..f40fd8c417 100644 --- a/webapp/packages/eslint-config/package.json +++ b/webapp/packages/eslint-config/package.json @@ -20,7 +20,6 @@ "eslint-config-prettier": "^8.8.0", "eslint-import-resolver-typescript": "~3.5.3", "eslint-plugin-import": "~2.27.5", - "eslint-plugin-import-helpers": "~1.3.1", "eslint-plugin-jest": "~27.2.1", "eslint-plugin-jsx-a11y": "~6.7.1", "eslint-plugin-node": "~11.1.0", diff --git a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationService.ts b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationService.ts index 780b73de75..f28e342395 100644 --- a/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationService.ts +++ b/webapp/packages/plugin-administration/src/ConfigurationWizard/ServerConfiguration/ServerConfigurationService.ts @@ -115,10 +115,14 @@ export class ServerConfigurationService { async loadConfig(reset = false): Promise { try { if (!this.stateLinked) { - this.state = this.administrationScreenService.getItemState('server-configuration', () => { - reset = true; - return serverConfigStateContext(); - }); + this.state = this.administrationScreenService.getItemState( + 'server-configuration', + () => { + reset = true; + return serverConfigStateContext(); + }, + true, + ); this.stateLinked = true; await this.serverConfigResource.load(); diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 5954fa56a2..360a7c1ee3 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -7713,11 +7713,6 @@ eslint-plugin-es@^3.0.0: eslint-utils "^2.0.0" regexpp "^3.0.0" -eslint-plugin-import-helpers@~1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-import-helpers/-/eslint-plugin-import-helpers-1.3.1.tgz#48721a702e758b5d2220ee119d6199e6e29b6819" - integrity sha512-MrACDozK6TmTJoCFHD71Ew3r5210Za3zlTrhX+fQGsyvxceaFvAI9AcvZ/8oSU0pZ61G3nDEn6mXY0T4S8cJEg== - eslint-plugin-import@~2.27.5: version "2.27.5" resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.27.5.tgz#876a6d03f52608a3e5bb439c2550588e51dd6c65"