diff --git a/.eslintrc.json b/.eslintrc.json index a0a0ca82a2c7..4f495e599f14 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -10,7 +10,7 @@ "error", { "enforceBuildableLibDependency": true, - "allow": [], + "allow": ["infra/src/dsl/"], "depConstraints": [ { "sourceTag": "*", @@ -318,13 +318,17 @@ { "allowSingleExtends": true } - ] + ], + "no-extra-semi": "off" } }, { "files": ["*.js", "*.jsx"], "extends": ["plugin:@nx/javascript"], - "rules": {} + "rules": { + "@typescript-eslint/no-extra-semi": "error", + "no-extra-semi": "off" + } }, { "files": ["schema.d.ts"], diff --git a/.github/actions/ci-io.ts b/.github/actions/ci-io.ts index ebbc82025a29..0f194875aaac 100644 --- a/.github/actions/ci-io.ts +++ b/.github/actions/ci-io.ts @@ -11,6 +11,7 @@ import { Octokit } from '@octokit/rest' import { Endpoints } from '@octokit/types' import Debug from 'debug' import * as unzipper from 'unzipper' + const app = Debug('change-detection:io') const repository = process.env.GITHUB_REPOSITORY || 'island-is/island.is' @@ -44,6 +45,7 @@ export const chunk = (arr: ElementType[], size: number) => export class LocalRunner implements GitActionStatus { constructor(private octokit: Octokit) {} + async getChangedComponents( git: SimpleGit, sha1: string, @@ -70,8 +72,9 @@ export class LocalRunner implements GitActionStatus { `npx`, [ `nx`, - `print-affected`, - `--select=projects`, + `show`, + `projects`, + `--affected`, ...chunk(changedFiles, 20).map( (chunk) => `--files=${chunk.join(',')}`, ), @@ -84,22 +87,18 @@ export class LocalRunner implements GitActionStatus { ) if (printAffected.status !== 0) { log( - `Error running nx print-affected. Error is %O, stderr is %O`, + `Error running nx show projects --affected. Error is %O, stderr is %O`, printAffected.error, printAffected.stderr, ) - printAffected = spawnSync( - `npx`, - [`nx`, `print-affected`, `--select=projects`, '--all'], - { - encoding: 'utf-8', - cwd: git.cwd, - shell: git.shell, - }, - ) + printAffected = spawnSync(`npx`, [`nx`, `show`, `projects`, '--all'], { + encoding: 'utf-8', + cwd: git.cwd, + shell: git.shell, + }) if (printAffected.status !== 0) { log( - `Error running print-affected --all. Error is %O\nstderr: %O\nstdout: %O`, + `Error running show projects --all. Error is %O\nstderr: %O\nstdout: %O`, printAffected.stderr, printAffected.stdout, ) diff --git a/.github/actions/dist/main.js b/.github/actions/dist/main.js index d4ad424ecedd..91be3fefdc8f 100644 --- a/.github/actions/dist/main.js +++ b/.github/actions/dist/main.js @@ -13700,9 +13700,9 @@ var require_glob = __commonJS({ } }); -// node_modules/rimraf/rimraf.js +// node_modules/fstream/node_modules/rimraf/rimraf.js var require_rimraf = __commonJS({ - "node_modules/rimraf/rimraf.js"(exports2, module2) { + "node_modules/fstream/node_modules/rimraf/rimraf.js"(exports2, module2) { module2.exports = rimraf; rimraf.sync = rimrafSync; var assert = require("assert"); @@ -13994,9 +13994,9 @@ var require_rimraf = __commonJS({ } }); -// node_modules/mkdirp/index.js +// node_modules/fstream/node_modules/mkdirp/index.js var require_mkdirp = __commonJS({ - "node_modules/mkdirp/index.js"(exports2, module2) { + "node_modules/fstream/node_modules/mkdirp/index.js"(exports2, module2) { var path = require("path"); var fs = require("fs"); var _0777 = parseInt("0777", 8); @@ -18901,9 +18901,9 @@ var require_public_api = __commonJS({ } }); -// ../../node_modules/safer-buffer/safer.js +// node_modules/safer-buffer/safer.js var require_safer = __commonJS({ - "../../node_modules/safer-buffer/safer.js"(exports2, module2) { + "node_modules/safer-buffer/safer.js"(exports2, module2) { "use strict"; var buffer = require("buffer"); var Buffer2 = buffer.Buffer; @@ -18973,9 +18973,9 @@ var require_safer = __commonJS({ } }); -// ../../node_modules/iconv-lite/lib/bom-handling.js +// node_modules/iconv-lite/lib/bom-handling.js var require_bom_handling = __commonJS({ - "../../node_modules/iconv-lite/lib/bom-handling.js"(exports2) { + "node_modules/iconv-lite/lib/bom-handling.js"(exports2) { "use strict"; var BOMChar = "\uFEFF"; exports2.PrependBOM = PrependBOMWrapper; @@ -19017,9 +19017,9 @@ var require_bom_handling = __commonJS({ } }); -// ../../node_modules/iconv-lite/encodings/internal.js +// node_modules/iconv-lite/encodings/internal.js var require_internal = __commonJS({ - "../../node_modules/iconv-lite/encodings/internal.js"(exports2, module2) { + "node_modules/iconv-lite/encodings/internal.js"(exports2, module2) { "use strict"; var Buffer2 = require_safer().Buffer; module2.exports = { @@ -19167,9 +19167,9 @@ var require_internal = __commonJS({ } }); -// ../../node_modules/iconv-lite/encodings/utf32.js +// node_modules/iconv-lite/encodings/utf32.js var require_utf32 = __commonJS({ - "../../node_modules/iconv-lite/encodings/utf32.js"(exports2) { + "node_modules/iconv-lite/encodings/utf32.js"(exports2) { "use strict"; var Buffer2 = require_safer().Buffer; exports2._utf32 = Utf32Codec; @@ -19392,9 +19392,9 @@ var require_utf32 = __commonJS({ } }); -// ../../node_modules/iconv-lite/encodings/utf16.js +// node_modules/iconv-lite/encodings/utf16.js var require_utf16 = __commonJS({ - "../../node_modules/iconv-lite/encodings/utf16.js"(exports2) { + "node_modules/iconv-lite/encodings/utf16.js"(exports2) { "use strict"; var Buffer2 = require_safer().Buffer; exports2.utf16be = Utf16BECodec; @@ -19532,9 +19532,9 @@ var require_utf16 = __commonJS({ } }); -// ../../node_modules/iconv-lite/encodings/utf7.js +// node_modules/iconv-lite/encodings/utf7.js var require_utf7 = __commonJS({ - "../../node_modules/iconv-lite/encodings/utf7.js"(exports2) { + "node_modules/iconv-lite/encodings/utf7.js"(exports2) { "use strict"; var Buffer2 = require_safer().Buffer; exports2.utf7 = Utf7Codec; @@ -19733,9 +19733,9 @@ var require_utf7 = __commonJS({ } }); -// ../../node_modules/iconv-lite/encodings/sbcs-codec.js +// node_modules/iconv-lite/encodings/sbcs-codec.js var require_sbcs_codec = __commonJS({ - "../../node_modules/iconv-lite/encodings/sbcs-codec.js"(exports2) { + "node_modules/iconv-lite/encodings/sbcs-codec.js"(exports2) { "use strict"; var Buffer2 = require_safer().Buffer; exports2._sbcs = SBCSCodec; @@ -19789,9 +19789,9 @@ var require_sbcs_codec = __commonJS({ } }); -// ../../node_modules/iconv-lite/encodings/sbcs-data.js +// node_modules/iconv-lite/encodings/sbcs-data.js var require_sbcs_data = __commonJS({ - "../../node_modules/iconv-lite/encodings/sbcs-data.js"(exports2, module2) { + "node_modules/iconv-lite/encodings/sbcs-data.js"(exports2, module2) { "use strict"; module2.exports = { "10029": "maccenteuro", @@ -19940,9 +19940,9 @@ var require_sbcs_data = __commonJS({ } }); -// ../../node_modules/iconv-lite/encodings/sbcs-data-generated.js +// node_modules/iconv-lite/encodings/sbcs-data-generated.js var require_sbcs_data_generated = __commonJS({ - "../../node_modules/iconv-lite/encodings/sbcs-data-generated.js"(exports2, module2) { + "node_modules/iconv-lite/encodings/sbcs-data-generated.js"(exports2, module2) { "use strict"; module2.exports = { "437": "cp437", @@ -20395,9 +20395,9 @@ var require_sbcs_data_generated = __commonJS({ } }); -// ../../node_modules/iconv-lite/encodings/dbcs-codec.js +// node_modules/iconv-lite/encodings/dbcs-codec.js var require_dbcs_codec = __commonJS({ - "../../node_modules/iconv-lite/encodings/dbcs-codec.js"(exports2) { + "node_modules/iconv-lite/encodings/dbcs-codec.js"(exports2) { "use strict"; var Buffer2 = require_safer().Buffer; exports2._dbcs = DBCSCodec; @@ -20816,9 +20816,9 @@ var require_dbcs_codec = __commonJS({ } }); -// ../../node_modules/iconv-lite/encodings/tables/shiftjis.json +// node_modules/iconv-lite/encodings/tables/shiftjis.json var require_shiftjis = __commonJS({ - "../../node_modules/iconv-lite/encodings/tables/shiftjis.json"(exports2, module2) { + "node_modules/iconv-lite/encodings/tables/shiftjis.json"(exports2, module2) { module2.exports = [ ["0", "\0", 128], ["a1", "\uFF61", 62], @@ -20947,9 +20947,9 @@ var require_shiftjis = __commonJS({ } }); -// ../../node_modules/iconv-lite/encodings/tables/eucjp.json +// node_modules/iconv-lite/encodings/tables/eucjp.json var require_eucjp = __commonJS({ - "../../node_modules/iconv-lite/encodings/tables/eucjp.json"(exports2, module2) { + "node_modules/iconv-lite/encodings/tables/eucjp.json"(exports2, module2) { module2.exports = [ ["0", "\0", 127], ["8ea1", "\uFF61", 62], @@ -21135,9 +21135,9 @@ var require_eucjp = __commonJS({ } }); -// ../../node_modules/iconv-lite/encodings/tables/cp936.json +// node_modules/iconv-lite/encodings/tables/cp936.json var require_cp936 = __commonJS({ - "../../node_modules/iconv-lite/encodings/tables/cp936.json"(exports2, module2) { + "node_modules/iconv-lite/encodings/tables/cp936.json"(exports2, module2) { module2.exports = [ ["0", "\0", 127, "\u20AC"], ["8140", "\u4E02\u4E04\u4E05\u4E06\u4E0F\u4E12\u4E17\u4E1F\u4E20\u4E21\u4E23\u4E26\u4E29\u4E2E\u4E2F\u4E31\u4E33\u4E35\u4E37\u4E3C\u4E40\u4E41\u4E42\u4E44\u4E46\u4E4A\u4E51\u4E55\u4E57\u4E5A\u4E5B\u4E62\u4E63\u4E64\u4E65\u4E67\u4E68\u4E6A", 5, "\u4E72\u4E74", 9, "\u4E7F", 6, "\u4E87\u4E8A"], @@ -21405,9 +21405,9 @@ var require_cp936 = __commonJS({ } }); -// ../../node_modules/iconv-lite/encodings/tables/gbk-added.json +// node_modules/iconv-lite/encodings/tables/gbk-added.json var require_gbk_added = __commonJS({ - "../../node_modules/iconv-lite/encodings/tables/gbk-added.json"(exports2, module2) { + "node_modules/iconv-lite/encodings/tables/gbk-added.json"(exports2, module2) { module2.exports = [ ["a140", "\uE4C6", 62], ["a180", "\uE505", 32], @@ -21467,16 +21467,16 @@ var require_gbk_added = __commonJS({ } }); -// ../../node_modules/iconv-lite/encodings/tables/gb18030-ranges.json +// node_modules/iconv-lite/encodings/tables/gb18030-ranges.json var require_gb18030_ranges = __commonJS({ - "../../node_modules/iconv-lite/encodings/tables/gb18030-ranges.json"(exports2, module2) { + "node_modules/iconv-lite/encodings/tables/gb18030-ranges.json"(exports2, module2) { module2.exports = { uChars: [128, 165, 169, 178, 184, 216, 226, 235, 238, 244, 248, 251, 253, 258, 276, 284, 300, 325, 329, 334, 364, 463, 465, 467, 469, 471, 473, 475, 477, 506, 594, 610, 712, 716, 730, 930, 938, 962, 970, 1026, 1104, 1106, 8209, 8215, 8218, 8222, 8231, 8241, 8244, 8246, 8252, 8365, 8452, 8454, 8458, 8471, 8482, 8556, 8570, 8596, 8602, 8713, 8720, 8722, 8726, 8731, 8737, 8740, 8742, 8748, 8751, 8760, 8766, 8777, 8781, 8787, 8802, 8808, 8816, 8854, 8858, 8870, 8896, 8979, 9322, 9372, 9548, 9588, 9616, 9622, 9634, 9652, 9662, 9672, 9676, 9680, 9702, 9735, 9738, 9793, 9795, 11906, 11909, 11913, 11917, 11928, 11944, 11947, 11951, 11956, 11960, 11964, 11979, 12284, 12292, 12312, 12319, 12330, 12351, 12436, 12447, 12535, 12543, 12586, 12842, 12850, 12964, 13200, 13215, 13218, 13253, 13263, 13267, 13270, 13384, 13428, 13727, 13839, 13851, 14617, 14703, 14801, 14816, 14964, 15183, 15471, 15585, 16471, 16736, 17208, 17325, 17330, 17374, 17623, 17997, 18018, 18212, 18218, 18301, 18318, 18760, 18811, 18814, 18820, 18823, 18844, 18848, 18872, 19576, 19620, 19738, 19887, 40870, 59244, 59336, 59367, 59413, 59417, 59423, 59431, 59437, 59443, 59452, 59460, 59478, 59493, 63789, 63866, 63894, 63976, 63986, 64016, 64018, 64021, 64025, 64034, 64037, 64042, 65074, 65093, 65107, 65112, 65127, 65132, 65375, 65510, 65536], gbChars: [0, 36, 38, 45, 50, 81, 89, 95, 96, 100, 103, 104, 105, 109, 126, 133, 148, 172, 175, 179, 208, 306, 307, 308, 309, 310, 311, 312, 313, 341, 428, 443, 544, 545, 558, 741, 742, 749, 750, 805, 819, 820, 7922, 7924, 7925, 7927, 7934, 7943, 7944, 7945, 7950, 8062, 8148, 8149, 8152, 8164, 8174, 8236, 8240, 8262, 8264, 8374, 8380, 8381, 8384, 8388, 8390, 8392, 8393, 8394, 8396, 8401, 8406, 8416, 8419, 8424, 8437, 8439, 8445, 8482, 8485, 8496, 8521, 8603, 8936, 8946, 9046, 9050, 9063, 9066, 9076, 9092, 9100, 9108, 9111, 9113, 9131, 9162, 9164, 9218, 9219, 11329, 11331, 11334, 11336, 11346, 11361, 11363, 11366, 11370, 11372, 11375, 11389, 11682, 11686, 11687, 11692, 11694, 11714, 11716, 11723, 11725, 11730, 11736, 11982, 11989, 12102, 12336, 12348, 12350, 12384, 12393, 12395, 12397, 12510, 12553, 12851, 12962, 12973, 13738, 13823, 13919, 13933, 14080, 14298, 14585, 14698, 15583, 15847, 16318, 16434, 16438, 16481, 16729, 17102, 17122, 17315, 17320, 17402, 17418, 17859, 17909, 17911, 17915, 17916, 17936, 17939, 17961, 18664, 18703, 18814, 18962, 19043, 33469, 33470, 33471, 33484, 33485, 33490, 33497, 33501, 33505, 33513, 33520, 33536, 33550, 37845, 37921, 37948, 38029, 38038, 38064, 38065, 38066, 38069, 38075, 38076, 38078, 39108, 39109, 39113, 39114, 39115, 39116, 39265, 39394, 189e3] }; } }); -// ../../node_modules/iconv-lite/encodings/tables/cp949.json +// node_modules/iconv-lite/encodings/tables/cp949.json var require_cp949 = __commonJS({ - "../../node_modules/iconv-lite/encodings/tables/cp949.json"(exports2, module2) { + "node_modules/iconv-lite/encodings/tables/cp949.json"(exports2, module2) { module2.exports = [ ["0", "\0", 127], ["8141", "\uAC02\uAC03\uAC05\uAC06\uAC0B", 4, "\uAC18\uAC1E\uAC1F\uAC21\uAC22\uAC23\uAC25", 6, "\uAC2E\uAC32\uAC33\uAC34"], @@ -21753,9 +21753,9 @@ var require_cp949 = __commonJS({ } }); -// ../../node_modules/iconv-lite/encodings/tables/cp950.json +// node_modules/iconv-lite/encodings/tables/cp950.json var require_cp950 = __commonJS({ - "../../node_modules/iconv-lite/encodings/tables/cp950.json"(exports2, module2) { + "node_modules/iconv-lite/encodings/tables/cp950.json"(exports2, module2) { module2.exports = [ ["0", "\0", 127], ["a140", "\u3000\uFF0C\u3001\u3002\uFF0E\u2027\uFF1B\uFF1A\uFF1F\uFF01\uFE30\u2026\u2025\uFE50\uFE51\uFE52\xB7\uFE54\uFE55\uFE56\uFE57\uFF5C\u2013\uFE31\u2014\uFE33\u2574\uFE34\uFE4F\uFF08\uFF09\uFE35\uFE36\uFF5B\uFF5D\uFE37\uFE38\u3014\u3015\uFE39\uFE3A\u3010\u3011\uFE3B\uFE3C\u300A\u300B\uFE3D\uFE3E\u3008\u3009\uFE3F\uFE40\u300C\u300D\uFE41\uFE42\u300E\u300F\uFE43\uFE44\uFE59\uFE5A"], @@ -21936,9 +21936,9 @@ var require_cp950 = __commonJS({ } }); -// ../../node_modules/iconv-lite/encodings/tables/big5-added.json +// node_modules/iconv-lite/encodings/tables/big5-added.json var require_big5_added = __commonJS({ - "../../node_modules/iconv-lite/encodings/tables/big5-added.json"(exports2, module2) { + "node_modules/iconv-lite/encodings/tables/big5-added.json"(exports2, module2) { module2.exports = [ ["8740", "\u43F0\u4C32\u4603\u45A6\u4578\u{27267}\u4D77\u45B3\u{27CB1}\u4CE2\u{27CC5}\u3B95\u4736\u4744\u4C47\u4C40\u{242BF}\u{23617}\u{27352}\u{26E8B}\u{270D2}\u4C57\u{2A351}\u474F\u45DA\u4C85\u{27C6C}\u4D07\u4AA4\u46A1\u{26B23}\u7225\u{25A54}\u{21A63}\u{23E06}\u{23F61}\u664D\u56FB"], ["8767", "\u7D95\u591D\u{28BB9}\u3DF4\u9734\u{27BEF}\u5BDB\u{21D5E}\u5AA4\u3625\u{29EB0}\u5AD1\u5BB7\u5CFC\u676E\u8593\u{29945}\u7461\u749D\u3875\u{21D53}\u{2369E}\u{26021}\u3EEC"], @@ -22064,9 +22064,9 @@ var require_big5_added = __commonJS({ } }); -// ../../node_modules/iconv-lite/encodings/dbcs-data.js +// node_modules/iconv-lite/encodings/dbcs-data.js var require_dbcs_data = __commonJS({ - "../../node_modules/iconv-lite/encodings/dbcs-data.js"(exports2, module2) { + "node_modules/iconv-lite/encodings/dbcs-data.js"(exports2, module2) { "use strict"; module2.exports = { "shiftjis": { @@ -22238,9 +22238,9 @@ var require_dbcs_data = __commonJS({ } }); -// ../../node_modules/iconv-lite/encodings/index.js +// node_modules/iconv-lite/encodings/index.js var require_encodings = __commonJS({ - "../../node_modules/iconv-lite/encodings/index.js"(exports2, module2) { + "node_modules/iconv-lite/encodings/index.js"(exports2, module2) { "use strict"; var modules = [ require_internal(), @@ -22265,9 +22265,9 @@ var require_encodings = __commonJS({ } }); -// ../../node_modules/iconv-lite/lib/streams.js +// node_modules/iconv-lite/lib/streams.js var require_streams = __commonJS({ - "../../node_modules/iconv-lite/lib/streams.js"(exports2, module2) { + "node_modules/iconv-lite/lib/streams.js"(exports2, module2) { "use strict"; var Buffer2 = require_safer().Buffer; module2.exports = function(stream_module) { @@ -22364,9 +22364,9 @@ var require_streams = __commonJS({ } }); -// ../../node_modules/iconv-lite/lib/index.js +// node_modules/iconv-lite/lib/index.js var require_lib2 = __commonJS({ - "../../node_modules/iconv-lite/lib/index.js"(exports2, module2) { + "node_modules/iconv-lite/lib/index.js"(exports2, module2) { "use strict"; var Buffer2 = require_safer().Buffer; var bomHandling = require_bom_handling(); @@ -22484,9 +22484,9 @@ var require_lib2 = __commonJS({ } }); -// ../../node_modules/encoding/lib/encoding.js +// node_modules/encoding/lib/encoding.js var require_encoding = __commonJS({ - "../../node_modules/encoding/lib/encoding.js"(exports2, module2) { + "node_modules/encoding/lib/encoding.js"(exports2, module2) { "use strict"; var iconvLite = require_lib2(); module2.exports.convert = convert; @@ -25797,8 +25797,9 @@ var LocalRunner = class { `npx`, [ `nx`, - `print-affected`, - `--select=projects`, + `show`, + `projects`, + `--affected`, ...chunk(changedFiles, 20).map( (chunk2) => `--files=${chunk2.join(",")}` ) @@ -25811,22 +25812,18 @@ var LocalRunner = class { ); if (printAffected.status !== 0) { log( - `Error running nx print-affected. Error is %O, stderr is %O`, + `Error running nx show projects --affected. Error is %O, stderr is %O`, printAffected.error, printAffected.stderr ); - printAffected = (0, import_child_process.spawnSync)( - `npx`, - [`nx`, `print-affected`, `--select=projects`, "--all"], - { - encoding: "utf-8", - cwd: git.cwd, - shell: git.shell - } - ); + printAffected = (0, import_child_process.spawnSync)(`npx`, [`nx`, `show`, `projects`, "--all"], { + encoding: "utf-8", + cwd: git.cwd, + shell: git.shell + }); if (printAffected.status !== 0) { log( - `Error running print-affected --all. Error is %O + `Error running show projects --all. Error is %O stderr: %O stdout: %O`, printAffected.stderr, diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 0832e3c5e458..eec91d5b6123 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -24,3 +24,11 @@ updates: labels: - automerge - dependencies + + - package-ecosystem: npm + directory: /scripts/ci/cache + schedule: + interval: daily + labels: + - automerge + - dependencies diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 462c5726eb2e..8414b309d1f1 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -167,7 +167,7 @@ jobs: timeout-minutes: 35 env: AFFECTED_PROJECTS: ${{ matrix.projects }} - MAX_JOBS: 3 + MAX_JOBS: 1 strategy: fail-fast: false matrix: ${{ fromJson(needs.prepare.outputs.TEST_CHUNKS) }} diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index e0180d675844..73d242737016 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -419,7 +419,7 @@ jobs: timeout-minutes: 35 env: AFFECTED_PROJECTS: ${{ matrix.projects }} - MAX_JOBS: 3 + MAX_JOBS: 1 strategy: fail-fast: false matrix: ${{ fromJson(needs.prepare.outputs.TEST_CHUNKS) }} @@ -614,7 +614,7 @@ jobs: - name: Comment on PR if: needs.pre-checks.outputs.PRE_CHECK == 'feature-deploy' && !(needs.pre-checks.outputs.PRE_RELEASE == 'true') - uses: actions/github-script@v6 + uses: actions/github-script@v7 with: github-token: ${{secrets.GITHUB_TOKEN}} script: | diff --git a/.gitignore b/.gitignore index a94d20d71b99..e5cc4dfbeb64 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,9 @@ # See http://help.github.com/ignore-files/ for more about ignoring files. # compiled output -/dist -/tmp -/out-tsc +dist/ +tmp/ +out-tsc/ **/tsconfig.tsbuildinfo infra/mountebank-imposter-config.json infra/helm/**/*.tgz diff --git a/.nxignore b/.nxignore index 27bdae7f40df..485e6ed31a84 100644 --- a/.nxignore +++ b/.nxignore @@ -27,3 +27,6 @@ apps/financial-aid/api.graphql # Shared libs/shared/webpack + +# Ignoring tsconfig.base.json so changes to `paths` don't affect all projects +tsconfig.base.json diff --git a/.prettierignore b/.prettierignore index 00de72261656..bd39c451491d 100644 --- a/.prettierignore +++ b/.prettierignore @@ -11,4 +11,6 @@ /tools/**/*.js **/*.hbs .yarn -/infra/helm/ \ No newline at end of file +/infra/helm/ +/.nx/cache +/.nx/workspace-data \ No newline at end of file diff --git a/apps/air-discount-scheme/api/project.json b/apps/air-discount-scheme/api/project.json index 978e2bfb28aa..a1aefe63db7c 100644 --- a/apps/air-discount-scheme/api/project.json +++ b/apps/air-discount-scheme/api/project.json @@ -4,6 +4,7 @@ "sourceRoot": "apps/air-discount-scheme/api/src", "projectType": "application", "prefix": "air-discount-scheme-api", + "tags": ["scope:nest"], "generators": {}, "targets": { "build": { @@ -31,18 +32,12 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "apps/air-discount-scheme/api/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "apps/air-discount-scheme/api/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/air-discount-scheme/api/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/apps/air-discount-scheme/api"] }, @@ -53,7 +48,8 @@ }, "outputs": ["{projectRoot}/src/api.graphql"] }, - "docker-express": {} - }, - "tags": ["scope:nest"] + "docker-express": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-express`" + } + } } diff --git a/apps/air-discount-scheme/backend/project.json b/apps/air-discount-scheme/backend/project.json index e2bbecb734d6..2fd07b9a13b5 100644 --- a/apps/air-discount-scheme/backend/project.json +++ b/apps/air-discount-scheme/backend/project.json @@ -4,6 +4,7 @@ "sourceRoot": "apps/air-discount-scheme/backend/src", "projectType": "application", "prefix": "air-discount-scheme-backend", + "tags": ["scope:nest"], "generators": {}, "targets": { "build": { @@ -47,19 +48,16 @@ } }, "lint": { - "executor": "@nx/linter:eslint", + "executor": "@nx/eslint:lint", "options": { - "lintFilePatterns": [ - "apps/air-discount-scheme/backend/**/*.{ts,tsx,js,jsx}" - ] + "lintFilePatterns": ["apps/air-discount-scheme/backend/**/*.ts"] } }, "test": { "executor": "@nx/jest:jest", "options": { "jestConfig": "apps/air-discount-scheme/backend/jest.config.ts", - "runInBand": true, - "passWithNoTests": true + "runInBand": true }, "outputs": ["{workspaceRoot}/coverage/apps/air-discount-scheme/backend"] }, @@ -111,7 +109,8 @@ "cwd": "apps/air-discount-scheme/backend" } }, - "docker-express": {} - }, - "tags": ["scope:nest"] + "docker-express": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-express`" + } + } } diff --git a/apps/air-discount-scheme/web/.eslintrc.json b/apps/air-discount-scheme/web/.eslintrc.json index 986b1c505a49..e75b91693fa4 100644 --- a/apps/air-discount-scheme/web/.eslintrc.json +++ b/apps/air-discount-scheme/web/.eslintrc.json @@ -11,7 +11,7 @@ { "enforceBuildableLibDependency": true, "allowCircularSelfDependency": true, - "allow": [], + "allow": ["../../../infra/src/dsl"], "depConstraints": [ { "sourceTag": "*", @@ -22,7 +22,13 @@ ] } }, - { "files": ["*.ts", "*.tsx"], "rules": {} }, - { "files": ["*.js", "*.jsx"], "rules": {} } + { + "files": ["*.ts", "*.tsx"], + "rules": {} + }, + { + "files": ["*.js", "*.jsx"], + "rules": {} + } ] } diff --git a/apps/air-discount-scheme/web/project.json b/apps/air-discount-scheme/web/project.json index 703c42d01af8..2f37b4e1ce60 100644 --- a/apps/air-discount-scheme/web/project.json +++ b/apps/air-discount-scheme/web/project.json @@ -3,6 +3,7 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "apps/air-discount-scheme/web", "projectType": "application", + "tags": ["scope:react-next"], "generators": {}, "targets": { "build": { @@ -30,7 +31,8 @@ "maxWorkers": 2, "assets": [], "compiler": "tsc", - "target": "node" + "target": "node", + "webpackConfig": "apps/air-discount-scheme/web/webpack.config.js" }, "configurations": { "development": {}, @@ -84,18 +86,12 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "apps/air-discount-scheme/web/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "apps/air-discount-scheme/web/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/air-discount-scheme/web/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/apps/air-discount-scheme/web"] }, @@ -126,7 +122,8 @@ "{projectRoot}/graphql/possibleTypes.json" ] }, - "docker-next": {} - }, - "tags": ["scope:react-next"] + "docker-next": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-next`" + } + } } diff --git a/apps/air-discount-scheme/web/webpack.config.js b/apps/air-discount-scheme/web/webpack.config.js new file mode 100644 index 000000000000..95e68d080f5b --- /dev/null +++ b/apps/air-discount-scheme/web/webpack.config.js @@ -0,0 +1,8 @@ +const { composePlugins, withNx } = require('@nx/webpack') + +// Nx plugins for webpack. +module.exports = composePlugins(withNx(), (config) => { + // Note: This was added by an Nx migration. Webpack builds are required to have a corresponding Webpack config file. + // See: https://nx.dev/recipes/webpack/webpack-config-setup + return config +}) diff --git a/apps/api/dist/.nx-results b/apps/api/dist/.nx-results deleted file mode 100644 index 3f97465c84bb..000000000000 --- a/apps/api/dist/.nx-results +++ /dev/null @@ -1,6 +0,0 @@ -{ - "command": "codegen", - "results": { - "api-domains-application": false - } -} diff --git a/apps/api/project.json b/apps/api/project.json index ae26567962c1..2cf07ffbb76b 100644 --- a/apps/api/project.json +++ b/apps/api/project.json @@ -4,6 +4,7 @@ "sourceRoot": "apps/api/src", "projectType": "application", "prefix": "api", + "tags": ["scope:api"], "generators": {}, "targets": { "build": { @@ -31,16 +32,15 @@ } }, "lint": { - "executor": "@nx/linter:eslint", + "executor": "@nx/eslint:lint", "options": { - "lintFilePatterns": ["apps/api/**/*.{ts,tsx,js,jsx}"] + "lintFilePatterns": ["apps/api/**/*.ts"] } }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "apps/api/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/api/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/apps/api"] }, @@ -85,7 +85,8 @@ "parallel": true } }, - "docker-express": {} - }, - "tags": ["scope:api"] + "docker-express": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-express`" + } + } } diff --git a/apps/application-system/api/infra/application-system-api.ts b/apps/application-system/api/infra/application-system-api.ts index 38400d1d5453..c138e02c7c39 100644 --- a/apps/application-system/api/infra/application-system-api.ts +++ b/apps/application-system/api/infra/application-system-api.ts @@ -118,6 +118,8 @@ export const serviceSetup = (services: { documentsService: ServiceBuilder<'services-documents'> servicesEndorsementApi: ServiceBuilder<'services-endorsement-api'> skilavottordWs: ServiceBuilder<'skilavottord-ws'> + // The user profile service is named service-portal-api in infra setup + servicePortalApi: ServiceBuilder<'service-portal-api'> }): ServiceBuilder<'application-system-api'> => service('application-system-api') .namespace(namespace) @@ -249,6 +251,9 @@ export const serviceSetup = (services: { 'http://web-services-university-gateway.services-university-gateway.svc.cluster.local', prod: 'http://web-services-university-gateway.services-university-gateway.svc.cluster.local', }, + SERVICE_USER_PROFILE_URL: ref( + (h) => `http://${h.svc(services.servicePortalApi)}`, + ), }) .xroad( Base, diff --git a/apps/application-system/api/project.json b/apps/application-system/api/project.json index 2f69c1f8bce3..54ad13f86c6b 100644 --- a/apps/application-system/api/project.json +++ b/apps/application-system/api/project.json @@ -4,6 +4,7 @@ "sourceRoot": "apps/application-system/api/src", "projectType": "application", "prefix": "application-system-api", + "tags": ["scope:application-system-api"], "generators": {}, "targets": { "build": { @@ -103,17 +104,13 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["apps/application-system/api/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { "jestConfig": "apps/application-system/api/jest.config.ts", - "runInBand": true, - "passWithNoTests": true + "runInBand": true }, "outputs": ["{workspaceRoot}/coverage/apps/application-system/api"] }, @@ -159,7 +156,9 @@ "cwd": "apps/application-system/api" } }, - "docker-express": {}, + "docker-express": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-express`" + }, "dev-init": { "executor": "nx:run-commands", "options": { @@ -184,6 +183,5 @@ "parallel": true } } - }, - "tags": ["scope:application-system-api"] + } } diff --git a/apps/application-system/api/src/app/modules/application/e2e/delegationGuard.spec.ts b/apps/application-system/api/src/app/modules/application/e2e/delegationGuard.spec.ts index 998f9fc3c490..bfdefd6277f3 100644 --- a/apps/application-system/api/src/app/modules/application/e2e/delegationGuard.spec.ts +++ b/apps/application-system/api/src/app/modules/application/e2e/delegationGuard.spec.ts @@ -15,7 +15,7 @@ import * as uuid from 'uuidv4' import { getRequestMethod, TestEndpointOptions } from '@island.is/testing/nest' import { createNationalId } from '@island.is/testing/fixtures' -import { AuthDelegationType } from 'delegation' +import { AuthDelegationType } from '@island.is/shared/types' let app: INestApplication diff --git a/apps/application-system/api/src/app/modules/application/types/index.ts b/apps/application-system/api/src/app/modules/application/types/index.ts index 9dc3ab668e6a..aed3b6060553 100644 --- a/apps/application-system/api/src/app/modules/application/types/index.ts +++ b/apps/application-system/api/src/app/modules/application/types/index.ts @@ -1,6 +1,6 @@ import { ApplicationWithAttachments as Application } from '@island.is/application/types' import { ProviderErrorReason } from '@island.is/shared/problem' -import { StaticText } from 'static-text' +import { StaticText } from '@island.is/shared/types' export interface DecodedAssignmentToken { applicationId: string diff --git a/apps/application-system/form/dist/.nx-results b/apps/application-system/form/dist/.nx-results deleted file mode 100644 index 1d6f22311013..000000000000 --- a/apps/application-system/form/dist/.nx-results +++ /dev/null @@ -1,6 +0,0 @@ -{ - "command": "serve", - "results": { - "application-system-form": false - } -} diff --git a/apps/application-system/form/project.json b/apps/application-system/form/project.json index 9ccf8dcb83d4..16b789598793 100644 --- a/apps/application-system/form/project.json +++ b/apps/application-system/form/project.json @@ -3,6 +3,7 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "apps/application-system/form/src", "projectType": "application", + "tags": ["scope:application-system-web"], "generators": {}, "targets": { "build": { @@ -77,18 +78,12 @@ ] }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "apps/application-system/form/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "apps/application-system/form/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/application-system/form/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/apps/application-system/form"] }, @@ -118,7 +113,8 @@ "parallel": true } }, - "docker-static": {} - }, - "tags": ["scope:application-system-web"] + "docker-static": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-static`" + } + } } diff --git a/apps/auth-admin-web/components/Resource/forms/ApiScopeCreateForm.tsx b/apps/auth-admin-web/components/Resource/forms/ApiScopeCreateForm.tsx index 8db1effd7312..aa5bd9180175 100644 --- a/apps/auth-admin-web/components/Resource/forms/ApiScopeCreateForm.tsx +++ b/apps/auth-admin-web/components/Resource/forms/ApiScopeCreateForm.tsx @@ -254,7 +254,6 @@ const ApiScopeCreateForm: React.FC> = ( {...register('apiScope.domainName', { required: true, })} - placeholder={localization.fields['domainName'].placeholder} title={localization.fields['domainName'].helpText} > {domains.map((domain: Domain) => { diff --git a/apps/auth-admin-web/components/Resource/forms/ApiScopeGroupCreateForm.tsx b/apps/auth-admin-web/components/Resource/forms/ApiScopeGroupCreateForm.tsx index ef5ed2accc04..f1c1c432ad39 100644 --- a/apps/auth-admin-web/components/Resource/forms/ApiScopeGroupCreateForm.tsx +++ b/apps/auth-admin-web/components/Resource/forms/ApiScopeGroupCreateForm.tsx @@ -97,7 +97,6 @@ const ApiScopeGroupCreateForm: React.FC> = ( })} defaultValue={props.apiScopeGroup.domainName} className="api-resource-form__input" - placeholder={localization.fields['domainName'].placeholder} title={localization.fields['domainName'].helpText} > {domains.map((domain: Domain) => { diff --git a/apps/auth-admin-web/pages/api/auth/[...nextauth].js b/apps/auth-admin-web/pages/api/auth/[...nextauth].js index 5c8bcf7aef1e..db724181ce0e 100644 --- a/apps/auth-admin-web/pages/api/auth/[...nextauth].js +++ b/apps/auth-admin-web/pages/api/auth/[...nextauth].js @@ -51,8 +51,12 @@ callbacks.jwt = async function jwt(token, user) { !token.isRefreshTokenExpired ) { try { - ;[token.accessToken, token.refreshToken] = - await TokenService.refreshAccessToken(token.refreshToken) + const [accessToken, refreshToken] = await TokenService.refreshAccessToken( + token.refreshToken, + ) + + token.accessToken = accessToken + token.refreshToken = refreshToken } catch (error) { console.warn('Error refreshing access token.', error) // We don't know the refresh token lifetime, so we use the error response to check if it had expired diff --git a/apps/auth-admin-web/project.json b/apps/auth-admin-web/project.json index 7a0115072d51..ae760cd5cb05 100644 --- a/apps/auth-admin-web/project.json +++ b/apps/auth-admin-web/project.json @@ -3,6 +3,7 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "apps/auth-admin-web", "projectType": "application", + "tags": ["scope:react-next"], "generators": {}, "targets": { "build": { @@ -30,7 +31,8 @@ "maxWorkers": 2, "assets": [], "compiler": "tsc", - "target": "node" + "target": "node", + "webpackConfig": "apps/auth-admin-web/webpack.config.js" }, "configurations": { "development": {}, @@ -84,20 +86,17 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["apps/auth-admin-web/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "apps/auth-admin-web/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/auth-admin-web/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/apps/auth-admin-web"] }, - "docker-next": {} - }, - "tags": ["scope:react-next"] + "docker-next": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-next`" + } + } } diff --git a/apps/auth-admin-web/webpack.config.js b/apps/auth-admin-web/webpack.config.js new file mode 100644 index 000000000000..95e68d080f5b --- /dev/null +++ b/apps/auth-admin-web/webpack.config.js @@ -0,0 +1,8 @@ +const { composePlugins, withNx } = require('@nx/webpack') + +// Nx plugins for webpack. +module.exports = composePlugins(withNx(), (config) => { + // Note: This was added by an Nx migration. Webpack builds are required to have a corresponding Webpack config file. + // See: https://nx.dev/recipes/webpack/webpack-config-setup + return config +}) diff --git a/apps/consultation-portal/project.json b/apps/consultation-portal/project.json index 2d4d53f1b6c2..e141aecf9cc5 100644 --- a/apps/consultation-portal/project.json +++ b/apps/consultation-portal/project.json @@ -4,6 +4,7 @@ "sourceRoot": "apps/consultation-portal", "projectType": "application", "prefix": "consultation-portal", + "tags": ["scope:react-next"], "generators": {}, "targets": { "build": { @@ -31,7 +32,8 @@ "maxWorkers": 2, "assets": [], "compiler": "tsc", - "target": "node" + "target": "node", + "webpackConfig": "apps/consultation-portal/webpack.config.js" }, "configurations": { "development": {}, @@ -94,17 +96,14 @@ "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/apps/consultation-portal"], "options": { - "jestConfig": "apps/consultation-portal/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/consultation-portal/jest.config.ts" } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["apps/consultation-portal/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, - "docker-next": {} - }, - "tags": ["scope:react-next"] + "docker-next": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-next`" + } + } } diff --git a/apps/consultation-portal/webpack.config.js b/apps/consultation-portal/webpack.config.js new file mode 100644 index 000000000000..95e68d080f5b --- /dev/null +++ b/apps/consultation-portal/webpack.config.js @@ -0,0 +1,8 @@ +const { composePlugins, withNx } = require('@nx/webpack') + +// Nx plugins for webpack. +module.exports = composePlugins(withNx(), (config) => { + // Note: This was added by an Nx migration. Webpack builds are required to have a corresponding Webpack config file. + // See: https://nx.dev/recipes/webpack/webpack-config-setup + return config +}) diff --git a/apps/contentful-apps/components/content-import/FileDataTable.tsx b/apps/contentful-apps/components/content-import/FileDataTable.tsx index a56a18855854..32e3011e596b 100644 --- a/apps/contentful-apps/components/content-import/FileDataTable.tsx +++ b/apps/contentful-apps/components/content-import/FileDataTable.tsx @@ -1,5 +1,6 @@ import { useState } from 'react' -import { Box, Button, Flex, Table } from '@contentful/f36-components' +import { Box, Button, Flex } from '@contentful/f36-components' +import { Table } from '@contentful/f36-table' import { CONTENTFUL_ENVIRONMENT } from '../../constants' import { FileData } from './utils' diff --git a/apps/contentful-apps/pages/fields/manual-chapter-changelog-field.tsx b/apps/contentful-apps/pages/fields/manual-chapter-changelog-field.tsx index c6c738400b2f..3ee163e6c81c 100644 --- a/apps/contentful-apps/pages/fields/manual-chapter-changelog-field.tsx +++ b/apps/contentful-apps/pages/fields/manual-chapter-changelog-field.tsx @@ -1,15 +1,10 @@ import { useEffect, useState } from 'react' -import { - Button, - Box, - Table, - Datepicker, - Textarea, -} from '@contentful/f36-components' -import { DeleteIcon, PlusIcon } from '@contentful/f36-icons' +import { useDebounce } from 'react-use' import { FieldExtensionSDK } from '@contentful/app-sdk' +import { Box, Button, Datepicker, Textarea } from '@contentful/f36-components' +import { DeleteIcon, PlusIcon } from '@contentful/f36-icons' +import { Table } from '@contentful/f36-table' import { useSDK } from '@contentful/react-apps-toolkit' -import { useDebounce } from 'react-use' const DEBOUNCE_TIME = 150 const BOTTOM_PADDING = '330px' diff --git a/apps/contentful-apps/project.json b/apps/contentful-apps/project.json index 3cd25ccecfea..5195ad70e245 100644 --- a/apps/contentful-apps/project.json +++ b/apps/contentful-apps/project.json @@ -3,6 +3,7 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "apps/contentful-apps", "projectType": "application", + "tags": ["scope:react-next"], "targets": { "build": { "executor": "@nx/next:build", @@ -29,7 +30,8 @@ "maxWorkers": 2, "assets": [], "compiler": "tsc", - "target": "node" + "target": "node", + "webpackConfig": "apps/contentful-apps/webpack.config.js" }, "configurations": { "development": {}, @@ -86,18 +88,14 @@ "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/apps/contentful-apps"], "options": { - "jestConfig": "apps/contentful-apps/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/contentful-apps/jest.config.ts" } }, "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["apps/contentful-apps/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, - "docker-next": {} - }, - "tags": ["scope:react-next"] + "docker-next": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-next`" + } + } } diff --git a/apps/contentful-apps/webpack.config.js b/apps/contentful-apps/webpack.config.js new file mode 100644 index 000000000000..95e68d080f5b --- /dev/null +++ b/apps/contentful-apps/webpack.config.js @@ -0,0 +1,8 @@ +const { composePlugins, withNx } = require('@nx/webpack') + +// Nx plugins for webpack. +module.exports = composePlugins(withNx(), (config) => { + // Note: This was added by an Nx migration. Webpack builds are required to have a corresponding Webpack config file. + // See: https://nx.dev/recipes/webpack/webpack-config-setup + return config +}) diff --git a/apps/download-service/project.json b/apps/download-service/project.json index 645d9db3a90a..e9c5f33f0c98 100644 --- a/apps/download-service/project.json +++ b/apps/download-service/project.json @@ -4,6 +4,7 @@ "sourceRoot": "apps/download-service/src", "projectType": "application", "prefix": "download-service", + "tags": ["scope:nest"], "targets": { "build": { "executor": "./tools/executors/node:build", @@ -29,20 +30,17 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["apps/download-service/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/apps/download-service"], "options": { - "jestConfig": "apps/download-service/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/download-service/jest.config.ts" } }, - "docker-express": {} - }, - "tags": ["scope:nest"] + "docker-express": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-express`" + } + } } diff --git a/apps/external-contracts-tests/project.json b/apps/external-contracts-tests/project.json index a9c87531b2dd..83f9b95876a9 100644 --- a/apps/external-contracts-tests/project.json +++ b/apps/external-contracts-tests/project.json @@ -4,15 +4,11 @@ "sourceRoot": "apps/external-contracts-tests/src", "projectType": "application", "prefix": "external-contracts-tests", + "tags": ["scope:e2e"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "apps/external-contracts-tests/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "build": { "executor": "./tools/executors/node:build", @@ -33,12 +29,12 @@ "external-test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "apps/external-contracts-tests/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/external-contracts-tests/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/apps/external-contracts-tests"] }, - "docker-jest": {} - }, - "tags": ["scope:e2e"] + "docker-jest": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-jest`" + } + } } diff --git a/apps/financial-aid/api/project.json b/apps/financial-aid/api/project.json index 6aa9c4777303..eb8ddd7a2134 100644 --- a/apps/financial-aid/api/project.json +++ b/apps/financial-aid/api/project.json @@ -4,6 +4,7 @@ "sourceRoot": "apps/financial-aid/api/src", "projectType": "application", "prefix": "financial-aid-api", + "tags": ["scope:nest"], "generators": {}, "targets": { "build": { @@ -31,16 +32,12 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["apps/financial-aid/api/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "apps/financial-aid/api/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/financial-aid/api/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/apps/financial-aid/api"] }, @@ -51,7 +48,8 @@ }, "outputs": ["{projectRoot}/src/api.graphql"] }, - "docker-express": {} - }, - "tags": ["scope:nest"] + "docker-express": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-express`" + } + } } diff --git a/apps/financial-aid/backend/project.json b/apps/financial-aid/backend/project.json index ae67cfba8b3e..651a99f50265 100644 --- a/apps/financial-aid/backend/project.json +++ b/apps/financial-aid/backend/project.json @@ -4,6 +4,7 @@ "sourceRoot": "apps/financial-aid/backend/src", "projectType": "application", "prefix": "financial-aid-backend", + "tags": ["scope:nest"], "generators": {}, "targets": { "build": { @@ -47,17 +48,13 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["apps/financial-aid/backend/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { "jestConfig": "apps/financial-aid/backend/jest.config.ts", - "runInBand": true, - "passWithNoTests": true + "runInBand": true }, "outputs": ["{workspaceRoot}/coverage/apps/financial-aid/backend"] }, @@ -96,7 +93,8 @@ "cwd": "apps/financial-aid/backend" } }, - "docker-express": {} - }, - "tags": ["scope:nest"] + "docker-express": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-express`" + } + } } diff --git a/apps/financial-aid/open-api/project.json b/apps/financial-aid/open-api/project.json index 7b24fbd95508..220560c1298e 100644 --- a/apps/financial-aid/open-api/project.json +++ b/apps/financial-aid/open-api/project.json @@ -4,6 +4,7 @@ "sourceRoot": "apps/financial-aid/open-api/src", "projectType": "application", "prefix": "financial-aid-open-api", + "tags": ["scope:financial-aid-open-api"], "generators": {}, "targets": { "build": { @@ -30,16 +31,12 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["apps/financial-aid/open-api/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "apps/financial-aid/open-api/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/financial-aid/open-api/jest.config.ts" } }, "codegen/backend-schema": { @@ -49,7 +46,8 @@ }, "outputs": ["{projectRoot}/src/openapi.yaml"] }, - "docker-express": {} - }, - "tags": ["scope:financial-aid-open-api"] + "docker-express": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-express`" + } + } } diff --git a/apps/financial-aid/web-osk-e2e/project.json b/apps/financial-aid/web-osk-e2e/project.json index c3324ed260bd..85fff844d8b4 100644 --- a/apps/financial-aid/web-osk-e2e/project.json +++ b/apps/financial-aid/web-osk-e2e/project.json @@ -3,6 +3,8 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "apps/financial-aid/web-osk-e2e/src", "projectType": "application", + "tags": ["scope:js"], + "implicitDependencies": ["financial-aid-web-osk"], "targets": { "e2e": { "executor": "@nx/cypress:cypress", @@ -25,14 +27,7 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "apps/financial-aid/web-osk-e2e/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" } - }, - "tags": ["scope:js"], - "implicitDependencies": ["financial-aid-web-osk"] + } } diff --git a/apps/financial-aid/web-osk/dist/.nx-results b/apps/financial-aid/web-osk/dist/.nx-results deleted file mode 100644 index ad75cfeec646..000000000000 --- a/apps/financial-aid/web-osk/dist/.nx-results +++ /dev/null @@ -1,6 +0,0 @@ -{ - "command": "serve", - "results": { - "financial-aid-web-osk": false - } -} diff --git a/apps/financial-aid/web-osk/project.json b/apps/financial-aid/web-osk/project.json index c3f060b0cf7f..cdccf9faa2cc 100644 --- a/apps/financial-aid/web-osk/project.json +++ b/apps/financial-aid/web-osk/project.json @@ -3,6 +3,7 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "apps/financial-aid/web-osk", "projectType": "application", + "tags": ["scope:react-next"], "generators": {}, "targets": { "build": { @@ -37,7 +38,8 @@ "maxWorkers": 2, "assets": [], "compiler": "tsc", - "target": "node" + "target": "node", + "webpackConfig": "apps/financial-aid/web-osk/webpack.config.js" }, "configurations": { "development": {}, @@ -97,20 +99,17 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["apps/financial-aid/web-osk/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "apps/financial-aid/web-osk/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/financial-aid/web-osk/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/apps/financial-aid/web-osk"] }, - "docker-next": {} - }, - "tags": ["scope:react-next"] + "docker-next": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-next`" + } + } } diff --git a/apps/financial-aid/web-osk/webpack.config.js b/apps/financial-aid/web-osk/webpack.config.js new file mode 100644 index 000000000000..95e68d080f5b --- /dev/null +++ b/apps/financial-aid/web-osk/webpack.config.js @@ -0,0 +1,8 @@ +const { composePlugins, withNx } = require('@nx/webpack') + +// Nx plugins for webpack. +module.exports = composePlugins(withNx(), (config) => { + // Note: This was added by an Nx migration. Webpack builds are required to have a corresponding Webpack config file. + // See: https://nx.dev/recipes/webpack/webpack-config-setup + return config +}) diff --git a/apps/financial-aid/web-veita/dist/.nx-results b/apps/financial-aid/web-veita/dist/.nx-results deleted file mode 100644 index 489ca1fd51d0..000000000000 --- a/apps/financial-aid/web-veita/dist/.nx-results +++ /dev/null @@ -1,6 +0,0 @@ -{ - "command": "serve", - "results": { - "financial-aid-web-veita": false - } -} diff --git a/apps/financial-aid/web-veita/project.json b/apps/financial-aid/web-veita/project.json index 2f7c0ebc6e95..ac2bd146a579 100644 --- a/apps/financial-aid/web-veita/project.json +++ b/apps/financial-aid/web-veita/project.json @@ -3,6 +3,7 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "apps/financial-aid/web-veita", "projectType": "application", + "tags": ["scope:react-next"], "generators": {}, "targets": { "build": { @@ -37,7 +38,8 @@ "maxWorkers": 2, "assets": [], "compiler": "tsc", - "target": "node" + "target": "node", + "webpackConfig": "apps/financial-aid/web-veita/webpack.config.js" }, "configurations": { "development": {}, @@ -97,22 +99,17 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "apps/financial-aid/web-veita/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "apps/financial-aid/web-veita/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/financial-aid/web-veita/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/apps/financial-aid/web-veita"] }, - "docker-next": {} - }, - "tags": ["scope:react-next"] + "docker-next": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-next`" + } + } } diff --git a/apps/financial-aid/web-veita/webpack.config.js b/apps/financial-aid/web-veita/webpack.config.js new file mode 100644 index 000000000000..95e68d080f5b --- /dev/null +++ b/apps/financial-aid/web-veita/webpack.config.js @@ -0,0 +1,8 @@ +const { composePlugins, withNx } = require('@nx/webpack') + +// Nx plugins for webpack. +module.exports = composePlugins(withNx(), (config) => { + // Note: This was added by an Nx migration. Webpack builds are required to have a corresponding Webpack config file. + // See: https://nx.dev/recipes/webpack/webpack-config-setup + return config +}) diff --git a/apps/github-actions-cache/project.json b/apps/github-actions-cache/project.json index 2ae080bc38a0..6b25feb1bd80 100644 --- a/apps/github-actions-cache/project.json +++ b/apps/github-actions-cache/project.json @@ -4,6 +4,7 @@ "sourceRoot": "apps/github-actions-cache/src", "projectType": "application", "prefix": "github-actions-cache", + "tags": ["scope:node"], "targets": { "build": { "executor": "./tools/executors/node:build", @@ -29,20 +30,17 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["apps/github-actions-cache/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/apps/github-actions-cache"], "options": { - "jestConfig": "apps/github-actions-cache/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/github-actions-cache/jest.config.ts" } }, - "docker-express": {} - }, - "tags": ["scope:node"] + "docker-express": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-express`" + } + } } diff --git a/apps/icelandic-names-registry/backend/project.json b/apps/icelandic-names-registry/backend/project.json index 4f0ce7bf64a3..2b7b46400384 100644 --- a/apps/icelandic-names-registry/backend/project.json +++ b/apps/icelandic-names-registry/backend/project.json @@ -4,6 +4,7 @@ "sourceRoot": "apps/icelandic-names-registry/backend/src", "projectType": "application", "prefix": "icelandic-names-registry-backend", + "tags": ["scope:nest"], "targets": { "build": { "executor": "./tools/executors/node:build", @@ -56,12 +57,7 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "apps/icelandic-names-registry/backend/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -69,8 +65,7 @@ "{workspaceRoot}/coverage/apps/icelandic-names-registry/backend" ], "options": { - "jestConfig": "apps/icelandic-names-registry/backend/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/icelandic-names-registry/backend/jest.config.ts" } }, "dev-services": { @@ -108,7 +103,8 @@ "cwd": "apps/icelandic-names-registry/backend" } }, - "docker-express": {} - }, - "tags": ["scope:nest"] + "docker-express": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-express`" + } + } } diff --git a/apps/judicial-system/api/project.json b/apps/judicial-system/api/project.json index 11513b7bb070..eeb6787f3bcf 100644 --- a/apps/judicial-system/api/project.json +++ b/apps/judicial-system/api/project.json @@ -4,6 +4,7 @@ "sourceRoot": "apps/judicial-system/api/src", "projectType": "application", "prefix": "judicial-system-api", + "tags": ["scope:judicial-system-api"], "generators": {}, "targets": { "build": { @@ -31,16 +32,12 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["apps/judicial-system/api/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "apps/judicial-system/api/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/judicial-system/api/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/apps/judicial-system/api"] }, @@ -51,7 +48,8 @@ }, "outputs": ["{projectRoot}/src/api.graphql"] }, - "docker-express": {} - }, - "tags": ["scope:judicial-system-api"] + "docker-express": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-express`" + } + } } diff --git a/apps/judicial-system/backend/project.json b/apps/judicial-system/backend/project.json index d55e32b3feca..be771c66a772 100644 --- a/apps/judicial-system/backend/project.json +++ b/apps/judicial-system/backend/project.json @@ -4,6 +4,7 @@ "sourceRoot": "apps/judicial-system/backend/src", "projectType": "application", "prefix": "judicial-system-backend", + "tags": ["scope:judicial-system-api"], "generators": {}, "targets": { "build": { @@ -48,19 +49,13 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "apps/judicial-system/backend/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { "jestConfig": "apps/judicial-system/backend/jest.config.ts", "logHeapUsage": true, - "passWithNoTests": true, "workerIdleMemoryLimit": "1028" }, "outputs": ["{workspaceRoot}/coverage/apps/judicial-system/backend"] @@ -107,13 +102,14 @@ "cwd": "apps/judicial-system/backend" } }, - "docker-express": {}, + "docker-express": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-express`" + }, "extract-strings": { "executor": "nx:run-commands", "options": { "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'apps/judicial-system/backend/src/app/messages/**/*.ts'" } } - }, - "tags": ["scope:judicial-system-api"] + } } diff --git a/apps/judicial-system/backend/src/app/modules/case/case.controller.ts b/apps/judicial-system/backend/src/app/modules/case/case.controller.ts index 213d399f4209..e73b47b71811 100644 --- a/apps/judicial-system/backend/src/app/modules/case/case.controller.ts +++ b/apps/judicial-system/backend/src/app/modules/case/case.controller.ts @@ -84,6 +84,7 @@ import { courtOfAppealsRegistrarUpdateRule, districtCourtAssistantTransitionRule, districtCourtAssistantUpdateRule, + districtCourtJudgeSignRulingRule, districtCourtJudgeTransitionRule, districtCourtJudgeUpdateRule, districtCourtRegistrarTransitionRule, @@ -297,12 +298,6 @@ export class CaseController { break case CaseTransition.SUBMIT: if (isIndictmentCase(theCase.type)) { - if (!user.canConfirmIndictment) { - throw new ForbiddenException( - `User ${user.id} does not have permission to confirm indictments`, - ) - } - update.indictmentDeniedExplanation = null } break @@ -387,13 +382,6 @@ export class CaseController { update.appealRulingDecision = CaseAppealRulingDecision.DISCONTINUED } break - case CaseTransition.DENY_INDICTMENT: - if (!user.canConfirmIndictment) { - throw new ForbiddenException( - `User ${user.id} does not have permission to reject indictments`, - ) - } - break case CaseTransition.ASK_FOR_CONFIRMATION: update.indictmentReturnedExplanation = null break @@ -777,7 +765,7 @@ export class CaseController { new CaseTypeGuard([...restrictionCases, ...investigationCases]), CaseWriteGuard, ) - @RolesRules(districtCourtJudgeRule) + @RolesRules(districtCourtJudgeSignRulingRule) @Post('case/:caseId/ruling/signature') @ApiCreatedResponse({ type: SigningServiceResponse, @@ -790,12 +778,6 @@ export class CaseController { ): Promise { this.logger.debug(`Requesting a signature for the ruling of case ${caseId}`) - if (user.id !== theCase.judgeId) { - throw new ForbiddenException( - 'A ruling must be signed by the assigned judge', - ) - } - return this.caseService.requestRulingSignature(theCase).catch((error) => { if (error instanceof DokobitError) { throw new HttpException( @@ -820,7 +802,7 @@ export class CaseController { new CaseTypeGuard([...restrictionCases, ...investigationCases]), CaseWriteGuard, ) - @RolesRules(districtCourtJudgeRule) + @RolesRules(districtCourtJudgeSignRulingRule) @Get('case/:caseId/ruling/signature') @ApiOkResponse({ type: SignatureConfirmationResponse, @@ -835,12 +817,6 @@ export class CaseController { ): Promise { this.logger.debug(`Confirming a signature for the ruling of case ${caseId}`) - if (user.id !== theCase.judgeId) { - throw new ForbiddenException( - 'A ruling must be signed by the assigned judge', - ) - } - return this.caseService.getRulingSignatureConfirmation( theCase, user, diff --git a/apps/judicial-system/backend/src/app/modules/case/case.service.ts b/apps/judicial-system/backend/src/app/modules/case/case.service.ts index f34b319672b3..95fe5ea86d23 100644 --- a/apps/judicial-system/backend/src/app/modules/case/case.service.ts +++ b/apps/judicial-system/backend/src/app/modules/case/case.service.ts @@ -41,6 +41,7 @@ import { EventType, isCompletedCase, isIndictmentCase, + isRequestCase, isRestrictionCase, isTrafficViolationCase, NotificationType, @@ -448,9 +449,9 @@ export class CaseService { const theCase = await this.caseModel.create( { ...caseToCreate, - state: isIndictmentCase(caseToCreate.type) - ? CaseState.DRAFT - : CaseState.NEW, + state: isRequestCase(caseToCreate.type) + ? CaseState.NEW + : CaseState.DRAFT, }, { transaction }, ) @@ -702,6 +703,15 @@ export class CaseService { }) } + if (theCase.state === CaseState.WAITING_FOR_CANCELLATION) { + messages.push({ + type: MessageType.DELIVERY_TO_COURT_INDICTMENT_CANCELLATION_NOTICE, + user, + caseId: theCase.id, + body: { withCourtCaseNumber: false }, + }) + } + return this.messageService.sendMessagesToQueue(messages) } @@ -847,7 +857,10 @@ export class CaseService { return this.messageService.sendMessagesToQueue(messages) } - private getRevokeMessages(user: TUser, theCase: Case): CaseMessage[] { + private getRevokeNotificationMessages( + user: TUser, + theCase: Case, + ): CaseMessage[] { return [ { type: MessageType.NOTIFICATION, @@ -863,7 +876,7 @@ export class CaseService { user: TUser, ): Promise { return this.messageService.sendMessagesToQueue( - this.getRevokeMessages(user, theCase), + this.getRevokeNotificationMessages(user, theCase), ) } @@ -871,9 +884,18 @@ export class CaseService { theCase: Case, user: TUser, ): Promise { - return this.messageService.sendMessagesToQueue( - this.getRevokeMessages(user, theCase), - ) + const messages = this.getRevokeNotificationMessages(user, theCase) + + if (theCase.courtCaseNumber) { + messages.push({ + type: MessageType.DELIVERY_TO_COURT_INDICTMENT_CANCELLATION_NOTICE, + user, + caseId: theCase.id, + body: { withCourtCaseNumber: true }, + }) + } + + return this.messageService.sendMessagesToQueue(messages) } private async addMessagesForAppealedCaseToQueue( @@ -1186,7 +1208,7 @@ export class CaseService { if (updatedCase.courtCaseNumber) { if (updatedCase.courtCaseNumber !== theCase.courtCaseNumber) { // New court case number - if (isIndictmentCase(updatedCase.type)) { + if (isIndictment) { await this.addMessagesForIndictmentCourtCaseConnectionToQueue( updatedCase, user, @@ -1201,7 +1223,7 @@ export class CaseService { } if ( - !isIndictmentCase(updatedCase.type) && + !isIndictment && updatedCase.defenderEmail !== theCase.defenderEmail ) { // New defender email @@ -1211,7 +1233,7 @@ export class CaseService { } if ( - isIndictmentCase(updatedCase.type) && + isIndictment && ![ CaseState.DRAFT, CaseState.SUBMITTED, @@ -1305,7 +1327,9 @@ export class CaseService { creatingProsecutorId: user.id, prosecutorId: user.role === UserRole.PROSECUTOR ? user.id : undefined, - courtId: user.institution?.defaultCourtId, + courtId: isRequestCase(caseToCreate.type) + ? user.institution?.defaultCourtId + : undefined, prosecutorsOfficeId: user.institution?.id, } as CreateCaseDto, transaction, diff --git a/apps/judicial-system/backend/src/app/modules/case/dto/deliverCancellationNotice.dto.ts b/apps/judicial-system/backend/src/app/modules/case/dto/deliverCancellationNotice.dto.ts new file mode 100644 index 000000000000..c10aa1a301ea --- /dev/null +++ b/apps/judicial-system/backend/src/app/modules/case/dto/deliverCancellationNotice.dto.ts @@ -0,0 +1,12 @@ +import { IsBoolean, IsNotEmpty } from 'class-validator' + +import { ApiProperty } from '@nestjs/swagger' + +import { DeliverDto } from './deliver.dto' + +export class DeliverCancellationNoticeDto extends DeliverDto { + @IsNotEmpty() + @IsBoolean() + @ApiProperty({ type: Boolean }) + readonly withCourtCaseNumber!: boolean +} diff --git a/apps/judicial-system/backend/src/app/modules/case/guards/rolesRules.ts b/apps/judicial-system/backend/src/app/modules/case/guards/rolesRules.ts index 5857b0fa556e..ca71abf169c6 100644 --- a/apps/judicial-system/backend/src/app/modules/case/guards/rolesRules.ts +++ b/apps/judicial-system/backend/src/app/modules/case/guards/rolesRules.ts @@ -1,6 +1,12 @@ import { RolesRule, RulesType } from '@island.is/judicial-system/auth' -import { CaseTransition, UserRole } from '@island.is/judicial-system/types' +import { + CaseTransition, + CaseType, + User, + UserRole, +} from '@island.is/judicial-system/types' +import { TransitionCaseDto } from '../dto/transitionCase.dto' import { UpdateCaseDto } from '../dto/updateCase.dto' import { Case } from '../models/case.model' @@ -189,29 +195,39 @@ export const prosecutorTransitionRule: RolesRule = { dtoFieldValues: [ CaseTransition.OPEN, CaseTransition.ASK_FOR_CONFIRMATION, + CaseTransition.DENY_INDICTMENT, CaseTransition.SUBMIT, CaseTransition.ASK_FOR_CANCELLATION, CaseTransition.DELETE, CaseTransition.APPEAL, CaseTransition.WITHDRAW_APPEAL, - CaseTransition.DENY_INDICTMENT, ], canActivate: (request) => { + const user: User = request.user + const dto: TransitionCaseDto = request.body const theCase: Case = request.case - // Deny if the case is missing - shuould never happen - if (!theCase) { + // Deny if something is missing - shuould never happen + if (!user || !dto || !theCase) { return false } // Deny transition if prosecutor did not appeal the case if ( - request.body.transition === CaseTransition.WITHDRAW_APPEAL && + dto.transition === CaseTransition.WITHDRAW_APPEAL && !theCase.prosecutorPostponedAppealDate ) { return false } + if ( + (dto.transition === CaseTransition.SUBMIT && + theCase.type === CaseType.INDICTMENT) || + dto.transition === CaseTransition.DENY_INDICTMENT + ) { + return user.canConfirmIndictment + } + return true }, } @@ -221,7 +237,11 @@ export const prosecutorRepresentativeTransitionRule: RolesRule = { role: UserRole.PROSECUTOR_REPRESENTATIVE, type: RulesType.FIELD_VALUES, dtoField: 'transition', - dtoFieldValues: [CaseTransition.ASK_FOR_CONFIRMATION, CaseTransition.DELETE], + dtoFieldValues: [ + CaseTransition.ASK_FOR_CONFIRMATION, + CaseTransition.ASK_FOR_CANCELLATION, + CaseTransition.DELETE, + ], } // Allows defenders to transition cases @@ -231,16 +251,17 @@ export const defenderTransitionRule: RolesRule = { dtoField: 'transition', dtoFieldValues: [CaseTransition.APPEAL, CaseTransition.WITHDRAW_APPEAL], canActivate: (request) => { + const dto: TransitionCaseDto = request.body const theCase: Case = request.case - // Deny if the case is missing - should never happen - if (!theCase) { + // Deny if something is missing - shuould never happen + if (!dto || !theCase) { return false } // Deny withdrawal if defender did not appeal the case if ( - request.body.transition === CaseTransition.WITHDRAW_APPEAL && + dto.transition === CaseTransition.WITHDRAW_APPEAL && !theCase.accusedPostponedAppealDate ) { return false @@ -283,7 +304,7 @@ export const districtCourtRegistrarTransitionRule: RolesRule = { ], } -// Allows district court assistants to transition cases. +// Allows district court assistants to transition cases export const districtCourtAssistantTransitionRule: RolesRule = { role: UserRole.DISTRICT_COURT_ASSISTANT, type: RulesType.FIELD_VALUES, @@ -291,7 +312,7 @@ export const districtCourtAssistantTransitionRule: RolesRule = { dtoFieldValues: [CaseTransition.RECEIVE, CaseTransition.COMPLETE], } -// Allows court of appeals judges to transition cases. +// Allows court of appeals judges to transition cases export const courtOfAppealsJudgeTransitionRule: RolesRule = { role: UserRole.COURT_OF_APPEALS_JUDGE, type: RulesType.FIELD_VALUES, @@ -302,7 +323,7 @@ export const courtOfAppealsJudgeTransitionRule: RolesRule = { ], } -// Allows court of appeals registrars to transition cases. +// Allows court of appeals registrars to transition cases export const courtOfAppealsRegistrarTransitionRule: RolesRule = { role: UserRole.COURT_OF_APPEALS_REGISTRAR, type: RulesType.FIELD_VALUES, @@ -313,7 +334,7 @@ export const courtOfAppealsRegistrarTransitionRule: RolesRule = { ], } -// Allows court of appeals assistants to transition cases. +// Allows court of appeals assistants to transition cases export const courtOfAppealsAssistantTransitionRule: RolesRule = { role: UserRole.COURT_OF_APPEALS_ASSISTANT, type: RulesType.FIELD_VALUES, @@ -323,3 +344,20 @@ export const courtOfAppealsAssistantTransitionRule: RolesRule = { CaseTransition.REOPEN_APPEAL, ], } + +// Allows district court judges to sign a ruling +export const districtCourtJudgeSignRulingRule: RolesRule = { + role: UserRole.DISTRICT_COURT_JUDGE, + type: RulesType.BASIC, + canActivate: (request) => { + const user: User = request.user + const theCase: Case = request.case + + // Deny if something is missing - shuould never happen + if (!user || !theCase) { + return false + } + + return user.id === theCase.judgeId + }, +} diff --git a/apps/judicial-system/backend/src/app/modules/case/internalCase.controller.ts b/apps/judicial-system/backend/src/app/modules/case/internalCase.controller.ts index 464e5380b867..0f49489d0179 100644 --- a/apps/judicial-system/backend/src/app/modules/case/internalCase.controller.ts +++ b/apps/judicial-system/backend/src/app/modules/case/internalCase.controller.ts @@ -25,6 +25,7 @@ import { import { CaseEvent, EventService } from '../event' import { DeliverDto } from './dto/deliver.dto' +import { DeliverCancellationNoticeDto } from './dto/deliverCancellationNotice.dto' import { InternalCasesDto } from './dto/internalCases.dto' import { InternalCreateCaseDto } from './dto/internalCreateCase.dto' import { CurrentCase } from './guards/case.decorator' @@ -221,6 +222,34 @@ export class InternalCaseController { ) } + @UseGuards(CaseExistsGuard, new CaseTypeGuard(indictmentCases)) + @Post( + `case/:caseId/${ + messageEndpoint[ + MessageType.DELIVERY_TO_COURT_INDICTMENT_CANCELLATION_NOTICE + ] + }`, + ) + @ApiOkResponse({ + type: DeliverResponse, + description: 'Delivers an indictment cancellation notice to court', + }) + deliverIndictmentCancellationNoticeToCourt( + @Param('caseId') caseId: string, + @CurrentCase() theCase: Case, + @Body() deliverDto: DeliverCancellationNoticeDto, + ): Promise { + this.logger.debug( + `Delivering the cancellation notice for indictment case ${caseId} to court`, + ) + + return this.internalCaseService.deliverIndictmentCancellationNoticeToCourt( + theCase, + deliverDto.withCourtCaseNumber, + deliverDto.user, + ) + } + @UseGuards(CaseExistsGuard, new CaseTypeGuard(indictmentCases)) @Post( `case/:caseId/${ diff --git a/apps/judicial-system/backend/src/app/modules/case/internalCase.service.ts b/apps/judicial-system/backend/src/app/modules/case/internalCase.service.ts index c7a1a174bd35..eed487be849c 100644 --- a/apps/judicial-system/backend/src/app/modules/case/internalCase.service.ts +++ b/apps/judicial-system/backend/src/app/modules/case/internalCase.service.ts @@ -30,6 +30,7 @@ import { EventType, isIndictmentCase, isProsecutionUser, + isRequestCase, isRestrictionCase, isTrafficViolationCase, NotificationType, @@ -45,8 +46,9 @@ import { getCustodyNoticePdfAsString, getRequestPdfAsBuffer, getRequestPdfAsString, + stripHtmlTags, } from '../../formatters' -import { courtUpload } from '../../messages' +import { courtUpload, notifications } from '../../messages' import { AwsS3Service } from '../aws-s3' import { CourtDocumentFolder, CourtService } from '../court' import { courtSubtypes } from '../court/court.service' @@ -352,14 +354,16 @@ export class InternalCaseService { .create( { ...caseToCreate, - state: isIndictmentCase(caseToCreate.type) - ? CaseState.DRAFT - : CaseState.NEW, + state: isRequestCase(caseToCreate.type) + ? CaseState.NEW + : CaseState.DRAFT, origin: CaseOrigin.LOKE, creatingProsecutorId: creator.id, prosecutorId: creator.role === UserRole.PROSECUTOR ? creator.id : undefined, - courtId: creator.institution?.defaultCourtId, + courtId: isRequestCase(caseToCreate.type) + ? creator.institution?.defaultCourtId + : undefined, prosecutorsOfficeId: creator.institution?.id, }, { transaction }, @@ -679,6 +683,46 @@ export class InternalCaseService { return { delivered: false } }) } + + async deliverIndictmentCancellationNoticeToCourt( + theCase: Case, + withCourtCaseNumber: boolean, + user: TUser, + ): Promise { + await this.refreshFormatMessage() + + return this.courtService + .updateIndictmentCaseWithCancellationNotice( + user, + theCase.id, + theCase.court?.name, + theCase.courtCaseNumber, + this.formatMessage(notifications.courtRevokedIndictmentEmail.subject, { + courtCaseNumber: + (withCourtCaseNumber && theCase.courtCaseNumber) || 'NONE', + }), + stripHtmlTags( + `${this.formatMessage( + notifications.courtRevokedIndictmentEmail.body, + { + prosecutorsOffice: theCase.creatingProsecutor?.institution?.name, + courtCaseNumber: + (withCourtCaseNumber && theCase.courtCaseNumber) || 'NONE', + }, + )} ${this.formatMessage(notifications.emailTail)}`, + ), + ) + .then(() => ({ delivered: true })) + .catch((reason) => { + this.logger.error( + `Failed to update indictment case ${theCase.id} with cancellation notice`, + { reason }, + ) + + return { delivered: false } + }) + } + async deliverCaseFilesRecordToCourt( theCase: Case, policeCaseNumber: string, diff --git a/apps/judicial-system/backend/src/app/modules/case/test/caseController/create.spec.ts b/apps/judicial-system/backend/src/app/modules/case/test/caseController/create.spec.ts index 6dd00c817668..5f58bc59323f 100644 --- a/apps/judicial-system/backend/src/app/modules/case/test/caseController/create.spec.ts +++ b/apps/judicial-system/backend/src/app/modules/case/test/caseController/create.spec.ts @@ -138,7 +138,6 @@ describe('CaseController - Create', () => { origin: CaseOrigin.RVG, creatingProsecutorId: userId, prosecutorId: userId, - courtId, prosecutorsOfficeId, }, { transaction }, diff --git a/apps/judicial-system/backend/src/app/modules/case/test/caseController/getRulingSignatureConfirmation.spec.ts b/apps/judicial-system/backend/src/app/modules/case/test/caseController/getRulingSignatureConfirmation.spec.ts index 14298526ae74..25a9fa28deeb 100644 --- a/apps/judicial-system/backend/src/app/modules/case/test/caseController/getRulingSignatureConfirmation.spec.ts +++ b/apps/judicial-system/backend/src/app/modules/case/test/caseController/getRulingSignatureConfirmation.spec.ts @@ -1,8 +1,6 @@ import { Transaction } from 'sequelize/types' import { uuid } from 'uuidv4' -import { ForbiddenException } from '@nestjs/common' - import { MessageService, MessageType } from '@island.is/judicial-system/message' import { CaseFileState, @@ -212,25 +210,6 @@ describe('CaseController - Get ruling signature confirmation', () => { ]) }) }) - - describe('user is not the assigned judge', () => { - const caseId = uuid() - const theCase = { id: caseId, judgeId: uuid() } as Case - const documentToken = uuid() - let then: Then - - beforeEach(async () => { - then = await givenWhenThen(caseId, user, theCase, documentToken) - }) - - it('should throw ForbiddenException', () => { - expect(then.error).toBeInstanceOf(ForbiddenException) - expect(then.error.message).toBe( - 'A ruling must be signed by the assigned judge', - ) - }) - }) - describe('database update fails', () => { const caseId = uuid() const theCase = { diff --git a/apps/judicial-system/backend/src/app/modules/case/test/caseController/getRulingSignatureConfirmationRolesRules.spec.ts b/apps/judicial-system/backend/src/app/modules/case/test/caseController/getRulingSignatureConfirmationRolesRules.spec.ts index 9f9be3fe40c6..e41962b38178 100644 --- a/apps/judicial-system/backend/src/app/modules/case/test/caseController/getRulingSignatureConfirmationRolesRules.spec.ts +++ b/apps/judicial-system/backend/src/app/modules/case/test/caseController/getRulingSignatureConfirmationRolesRules.spec.ts @@ -1,5 +1,5 @@ -import { districtCourtJudgeRule } from '../../../../guards' import { CaseController } from '../../case.controller' +import { districtCourtJudgeSignRulingRule } from '../../guards/rolesRules' describe('CaseController - Get ruling signature confirmation rules', () => { // eslint-disable-next-line @typescript-eslint/no-explicit-any @@ -14,6 +14,6 @@ describe('CaseController - Get ruling signature confirmation rules', () => { it('should give permission to one roles', () => { expect(rules).toHaveLength(1) - expect(rules).toContain(districtCourtJudgeRule) + expect(rules).toContain(districtCourtJudgeSignRulingRule) }) }) diff --git a/apps/judicial-system/backend/src/app/modules/case/test/caseController/requestRulingSignature.spec.ts b/apps/judicial-system/backend/src/app/modules/case/test/caseController/requestRulingSignature.spec.ts index b3cf564df832..73dd58a8cd0e 100644 --- a/apps/judicial-system/backend/src/app/modules/case/test/caseController/requestRulingSignature.spec.ts +++ b/apps/judicial-system/backend/src/app/modules/case/test/caseController/requestRulingSignature.spec.ts @@ -1,7 +1,5 @@ import { uuid } from 'uuidv4' -import { ForbiddenException } from '@nestjs/common' - import { SigningServiceResponse } from '@island.is/dokobit-signing' import { User } from '@island.is/judicial-system/types' @@ -44,7 +42,7 @@ describe('CaseController - Request ruling signature', () => { } }) - describe('the user is the assigned judge', () => { + describe('signature requested', () => { const userId = uuid() const user = { id: userId } as User const caseId = uuid() @@ -62,22 +60,4 @@ describe('CaseController - Request ruling signature', () => { }) }) }) - - describe('the user is not the assigned judge', () => { - const user = { id: uuid() } as User - const caseId = uuid() - const theCase = { id: caseId, judgeId: uuid() } as Case - let then: Then - - beforeEach(async () => { - then = await givenWhenThen(caseId, user, theCase) - }) - - it('should throw ForbiddenException', () => { - expect(then.error).toBeInstanceOf(ForbiddenException) - expect(then.error.message).toBe( - 'A ruling must be signed by the assigned judge', - ) - }) - }) }) diff --git a/apps/judicial-system/backend/src/app/modules/case/test/caseController/requestRulingSignatureRolesRules.spec.ts b/apps/judicial-system/backend/src/app/modules/case/test/caseController/requestRulingSignatureRolesRules.spec.ts index 35c739008c99..81f956445bfd 100644 --- a/apps/judicial-system/backend/src/app/modules/case/test/caseController/requestRulingSignatureRolesRules.spec.ts +++ b/apps/judicial-system/backend/src/app/modules/case/test/caseController/requestRulingSignatureRolesRules.spec.ts @@ -1,5 +1,5 @@ -import { districtCourtJudgeRule } from '../../../../guards' import { CaseController } from '../../case.controller' +import { districtCourtJudgeSignRulingRule } from '../../guards/rolesRules' describe('CaseController - Request ruling signature rules', () => { // eslint-disable-next-line @typescript-eslint/no-explicit-any @@ -14,6 +14,6 @@ describe('CaseController - Request ruling signature rules', () => { it('should give permission to one roles', () => { expect(rules).toHaveLength(1) - expect(rules).toContain(districtCourtJudgeRule) + expect(rules).toContain(districtCourtJudgeSignRulingRule) }) }) diff --git a/apps/judicial-system/backend/src/app/modules/case/test/internalCaseController/create.spec.ts b/apps/judicial-system/backend/src/app/modules/case/test/internalCaseController/create.spec.ts index b70702fd26dd..1203feeb9d73 100644 --- a/apps/judicial-system/backend/src/app/modules/case/test/internalCaseController/create.spec.ts +++ b/apps/judicial-system/backend/src/app/modules/case/test/internalCaseController/create.spec.ts @@ -260,7 +260,6 @@ describe('InternalCaseController - Create', () => { origin: CaseOrigin.LOKE, state: CaseState.DRAFT, creatingProsecutorId: userId, - courtId, prosecutorsOfficeId, }, { diff --git a/apps/judicial-system/backend/src/app/modules/case/test/internalCaseController/deliverIndictmentCancellationNoticeToCourt.spec.ts b/apps/judicial-system/backend/src/app/modules/case/test/internalCaseController/deliverIndictmentCancellationNoticeToCourt.spec.ts new file mode 100644 index 000000000000..4acce978ca98 --- /dev/null +++ b/apps/judicial-system/backend/src/app/modules/case/test/internalCaseController/deliverIndictmentCancellationNoticeToCourt.spec.ts @@ -0,0 +1,113 @@ +import { uuid } from 'uuidv4' + +import { CaseType, User } from '@island.is/judicial-system/types' + +import { createTestingCaseModule } from '../createTestingCaseModule' + +import { CourtService } from '../../../court' +import { Case } from '../../models/case.model' +import { DeliverResponse } from '../../models/deliver.response' + +interface Then { + result: DeliverResponse + error: Error +} + +type GivenWhenThen = ( + caseId: string, + theCase: Case, + withCourtCaseNumber: boolean, +) => Promise + +describe('InternalCaseController - Deliver indictment cancellation notice to court', () => { + const user = { id: uuid() } as User + const caseId = uuid() + const courtName = uuid() + const courtCaseNumber = uuid() + const prosecutorsOffice = uuid() + + const theCase = { + id: caseId, + type: CaseType.INDICTMENT, + creatingProsecutor: { institution: { name: prosecutorsOffice } }, + court: { name: courtName }, + courtCaseNumber, + } as Case + + let mockCourtService: CourtService + let givenWhenThen: GivenWhenThen + + beforeAll(async () => { + const { courtService, internalCaseController } = + await createTestingCaseModule() + + mockCourtService = courtService + const mockUpdateIndictmentCaseWithCancellationNotice = + mockCourtService.updateIndictmentCaseWithCancellationNotice as jest.Mock + mockUpdateIndictmentCaseWithCancellationNotice.mockResolvedValue(uuid()) + + givenWhenThen = async ( + caseId: string, + theCase: Case, + withCourtCaseNumber: boolean, + ) => { + const then = {} as Then + + await internalCaseController + .deliverIndictmentCancellationNoticeToCourt(caseId, theCase, { + user, + withCourtCaseNumber, + }) + .then((result) => (then.result = result)) + .catch((error) => (then.error = error)) + + return then + } + }) + + describe('deliver cancellation notice with court case number', () => { + let then: Then + + beforeAll(async () => { + then = await givenWhenThen(caseId, theCase, true) + }) + + it('should deliver the cancellation notice', () => { + expect( + mockCourtService.updateIndictmentCaseWithCancellationNotice, + ).toHaveBeenCalledWith( + user, + caseId, + courtName, + courtCaseNumber, + `Ákæra afturkölluð í máli ${courtCaseNumber}`, + `${prosecutorsOffice} hefur afturkallað ákæru í máli ${courtCaseNumber}. Hægt er að nálgast yfirlitssíðu málsins á rettarvorslugatt.island.is.`, + ) + + expect(then.result).toEqual({ delivered: true }) + }) + }) + + describe('deliver cancellation notice without court case number', () => { + let then: Then + + beforeAll(async () => { + then = await givenWhenThen(caseId, theCase, false) + }) + + it('should deliver the cancellation notice', () => { + expect( + mockCourtService.updateIndictmentCaseWithCancellationNotice, + ).toHaveBeenCalledWith( + user, + caseId, + courtName, + courtCaseNumber, + 'Ákæra afturkölluð', + `${prosecutorsOffice} hefur afturkallað ákæru í máli sem ekki hefur enn fengið málsnúmer. Hægt er að nálgast yfirlitssíðu málsins á rettarvorslugatt.island.is.`, + ) + + expect(then.result).toEqual({ delivered: true }) + }) + }) +}) diff --git a/apps/judicial-system/backend/src/app/modules/case/test/internalCaseController/deliverIndictmentCancellationNoticeToCourtGuards.spec.ts b/apps/judicial-system/backend/src/app/modules/case/test/internalCaseController/deliverIndictmentCancellationNoticeToCourtGuards.spec.ts new file mode 100644 index 000000000000..cc56b5442f34 --- /dev/null +++ b/apps/judicial-system/backend/src/app/modules/case/test/internalCaseController/deliverIndictmentCancellationNoticeToCourtGuards.spec.ts @@ -0,0 +1,26 @@ +import { indictmentCases } from '@island.is/judicial-system/types' + +import { CaseExistsGuard } from '../../guards/caseExists.guard' +import { CaseTypeGuard } from '../../guards/caseType.guard' +import { InternalCaseController } from '../../internalCase.controller' + +describe('InternalCaseController - Deliver indictment cancellation noticde to court guards', () => { + // eslint-disable-next-line @typescript-eslint/no-explicit-any + let guards: any[] + + beforeEach(() => { + guards = Reflect.getMetadata( + '__guards__', + InternalCaseController.prototype + .deliverIndictmentCancellationNoticeToCourt, + ) + }) + + it('should have the right guard configuration', () => { + expect(new guards[0]()).toBeInstanceOf(CaseExistsGuard) + expect(guards[1]).toBeInstanceOf(CaseTypeGuard) + expect(guards[1]).toEqual({ + allowedCaseTypes: indictmentCases, + }) + }) +}) diff --git a/apps/judicial-system/backend/src/app/modules/court/court.service.ts b/apps/judicial-system/backend/src/app/modules/court/court.service.ts index b2b889ac715d..78d154cc509b 100644 --- a/apps/judicial-system/backend/src/app/modules/court/court.service.ts +++ b/apps/judicial-system/backend/src/app/modules/court/court.service.ts @@ -130,6 +130,7 @@ enum RobotEmailType { NEW_INDICTMENT_INFO = 'INDICTMENT_INFO', INDICTMENT_CASE_ASSIGNED_ROLES = 'INDICTMENT_CASE_ASSIGNED_ROLES', INDICTMENT_CASE_DEFENDER_INFO = 'INDICTMENT_CASE_DEFENDER_INFO', + INDICTMENT_CASE_CANCELLATION_NOTICE = 'INDICTMENT_CASE_CANCELLATION_NOTICE', } @Injectable() @@ -508,7 +509,7 @@ export class CourtService { }) } - async updateCaseWithConclusion( + updateCaseWithConclusion( user: User, caseId: string, courtName?: string, @@ -559,7 +560,7 @@ export class CourtService { } } - async updateIndictmentCaseWithIndictmentInfo( + updateIndictmentCaseWithIndictmentInfo( user: User, caseId: string, courtName?: string, @@ -607,7 +608,7 @@ export class CourtService { } } - async updateIndictmentCaseWithDefenderInfo( + updateIndictmentCaseWithDefenderInfo( user: User, caseId: string, courtName?: string, @@ -646,7 +647,7 @@ export class CourtService { } } - async updateIndictmentCaseWithAssignedRoles( + updateIndictmentCaseWithAssignedRoles( user: User, caseId: string, courtName?: string, @@ -678,7 +679,26 @@ export class CourtService { } } - async updateAppealCaseWithReceivedDate( + updateIndictmentCaseWithCancellationNotice( + user: User, + caseId: string, + courtName?: string, + courtCaseNumber?: string, + noticeSubject?: string, + noticeText?: string, + ): Promise { + const subject = `${courtName} - ${courtCaseNumber} - afturköllun` + const content = JSON.stringify({ subject: noticeSubject, text: noticeText }) + + return this.sendToRobot( + subject, + content, + RobotEmailType.INDICTMENT_CASE_CANCELLATION_NOTICE, + caseId, + ) + } + + updateAppealCaseWithReceivedDate( user: User, caseId: string, appealCaseNumber?: string, @@ -711,7 +731,7 @@ export class CourtService { } } - async updateAppealCaseWithAssignedRoles( + updateAppealCaseWithAssignedRoles( user: User, caseId: string, appealCaseNumber?: string, @@ -767,7 +787,7 @@ export class CourtService { } } - async updateAppealCaseWithConclusion( + updateAppealCaseWithConclusion( user: User, caseId: string, appealCaseNumber?: string, @@ -808,7 +828,7 @@ export class CourtService { } } - async updateAppealCaseWithFile( + updateAppealCaseWithFile( user: User, caseId: string, fileId: string, diff --git a/apps/judicial-system/digital-mailbox-api/project.json b/apps/judicial-system/digital-mailbox-api/project.json index 7b45df747a31..7b952e1fc333 100644 --- a/apps/judicial-system/digital-mailbox-api/project.json +++ b/apps/judicial-system/digital-mailbox-api/project.json @@ -4,6 +4,7 @@ "sourceRoot": "apps/judicial-system/digital-mailbox-api/src", "projectType": "application", "prefix": "judicial-system-digital-mailbox-api", + "tags": ["scope:judicial-system-api"], "generators": {}, "targets": { "build": { @@ -30,18 +31,12 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "apps/judicial-system/digital-mailbox-api/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "apps/judicial-system/digital-mailbox-api/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/judicial-system/digital-mailbox-api/jest.config.ts" } }, "codegen/backend-schema": { @@ -51,7 +46,8 @@ }, "outputs": ["{projectRoot}/src/openapi.yaml"] }, - "docker-express": {} - }, - "tags": ["scope:judicial-system-api"] + "docker-express": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-express`" + } + } } diff --git a/apps/judicial-system/digital-mailbox-api/src/app/modules/cases/dto/subpoena.dto.ts b/apps/judicial-system/digital-mailbox-api/src/app/modules/cases/dto/subpoena.dto.ts index 5b3dabf64f30..6a1dfd44d60a 100644 --- a/apps/judicial-system/digital-mailbox-api/src/app/modules/cases/dto/subpoena.dto.ts +++ b/apps/judicial-system/digital-mailbox-api/src/app/modules/cases/dto/subpoena.dto.ts @@ -18,11 +18,11 @@ export class UpdateSubpoenaDto { @IsOptional() @IsString() - @ApiProperty({ type: String }) + @ApiProperty({ type: String, required: false }) defenderNationalId?: string @IsOptional() @IsBoolean() - @ApiProperty({ type: Boolean }) + @ApiProperty({ type: Boolean, required: false }) acceptCompensationClaim?: boolean } diff --git a/apps/judicial-system/digital-mailbox-api/src/app/modules/cases/models/subpoena.response.ts b/apps/judicial-system/digital-mailbox-api/src/app/modules/cases/models/subpoena.response.ts index 9d8f184c1276..7be08add3f7c 100644 --- a/apps/judicial-system/digital-mailbox-api/src/app/modules/cases/models/subpoena.response.ts +++ b/apps/judicial-system/digital-mailbox-api/src/app/modules/cases/models/subpoena.response.ts @@ -1,3 +1,5 @@ +import { IsEnum } from 'class-validator' + import { ApiProperty } from '@nestjs/swagger' import { @@ -11,8 +13,9 @@ import { Groups } from './shared/groups.model' import { getTranslations } from './utils/translations.strings' class DefenderInfo { - @ApiProperty({ enum: () => DefenderChoice }) - defenderChoice?: DefenderChoice + @IsEnum(DefenderChoice) + @ApiProperty({ enum: DefenderChoice }) + defenderChoice!: DefenderChoice @ApiProperty({ type: () => String }) defenderName?: string @@ -52,14 +55,9 @@ export class SubpoenaResponse { defendant.nationalId === formattedNationalId || defendant.nationalId === defendantNationalId, ) - const hasChosenDefense = defendantInfo?.defenderChoice !== undefined + const waivedRight = defendantInfo?.defenderChoice === DefenderChoice.WAIVE const hasDefender = defendantInfo?.defenderName !== undefined - const defenseValue = waivedRight - ? t.waiveRightToCounsel - : hasDefender - ? defendantInfo?.defenderName - : t.notAvailable const subpoenaDateLog = internalCase.dateLogs?.find( (dateLog) => dateLog.dateType === DateType.ARRAIGNMENT_DATE, @@ -85,7 +83,6 @@ export class SubpoenaResponse { ], [t.location, subpoenaDateLog?.location ?? ''], [t.courtCeremony, t.parliamentaryConfirmation], - hasChosenDefense ? [t.defender, defenseValue] : [], ].map((item) => ({ label: item[0] ?? '', value: item[1] ?? t.notAvailable, @@ -94,7 +91,7 @@ export class SubpoenaResponse { ], }, - defenderInfo: defendantInfo + defenderInfo: defendantInfo?.defenderChoice ? { defenderChoice: defendantInfo?.defenderChoice, defenderName: diff --git a/apps/judicial-system/message-handler/project.json b/apps/judicial-system/message-handler/project.json index dc8a464e068b..b13fb708dc37 100644 --- a/apps/judicial-system/message-handler/project.json +++ b/apps/judicial-system/message-handler/project.json @@ -4,6 +4,7 @@ "sourceRoot": "apps/judicial-system/message-handler/src", "projectType": "application", "prefix": "judicial-system-message-handler", + "tags": ["scope:judicial-system-api"], "targets": { "build": { "executor": "./tools/executors/node:build", @@ -35,12 +36,7 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "apps/judicial-system/message-handler/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -48,8 +44,7 @@ "{workspaceRoot}/coverage/apps/judicial-system/message-handler" ], "options": { - "jestConfig": "apps/judicial-system/message-handler/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/judicial-system/message-handler/jest.config.ts" } }, "dev-services": { @@ -59,7 +54,8 @@ "cwd": "apps/judicial-system/message-handler" } }, - "docker-express": {} - }, - "tags": ["scope:judicial-system-api"] + "docker-express": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-express`" + } + } } diff --git a/apps/judicial-system/robot-api/project.json b/apps/judicial-system/robot-api/project.json index 9bb351549797..181727e4a47e 100644 --- a/apps/judicial-system/robot-api/project.json +++ b/apps/judicial-system/robot-api/project.json @@ -4,6 +4,7 @@ "sourceRoot": "apps/judicial-system/robot-api/src", "projectType": "application", "prefix": "judicial-system-robot-api", + "tags": ["scope:judicial-system-api"], "generators": {}, "targets": { "build": { @@ -30,18 +31,12 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "apps/judicial-system/robot-api/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "apps/judicial-system/robot-api/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/judicial-system/robot-api/jest.config.ts" } }, "codegen/backend-schema": { @@ -51,7 +46,8 @@ }, "outputs": ["{projectRoot}/src/openapi.yaml"] }, - "docker-express": {} - }, - "tags": ["scope:judicial-system-api"] + "docker-express": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-express`" + } + } } diff --git a/apps/judicial-system/scheduler/project.json b/apps/judicial-system/scheduler/project.json index 8be9fd1a4290..c2c0f79a8b2c 100644 --- a/apps/judicial-system/scheduler/project.json +++ b/apps/judicial-system/scheduler/project.json @@ -4,6 +4,7 @@ "sourceRoot": "apps/judicial-system/scheduler/src", "projectType": "application", "prefix": "judicial-system-scheduler", + "tags": ["scope:judicial-system-api"], "targets": { "build": { "executor": "./tools/executors/node:build", @@ -29,22 +30,17 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "apps/judicial-system/scheduler/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/apps/judicial-system/scheduler"], "options": { - "jestConfig": "apps/judicial-system/scheduler/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/judicial-system/scheduler/jest.config.ts" } }, - "docker-express": {} - }, - "tags": ["scope:judicial-system-api"] + "docker-express": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-express`" + } + } } diff --git a/apps/judicial-system/web/dist/.nx-results b/apps/judicial-system/web/dist/.nx-results deleted file mode 100644 index 28d835fc8ce5..000000000000 --- a/apps/judicial-system/web/dist/.nx-results +++ /dev/null @@ -1,6 +0,0 @@ -{ - "command": "serve", - "results": { - "judicial-system-web": false - } -} diff --git a/apps/judicial-system/web/infra/judicial-system-web.ts b/apps/judicial-system/web/infra/judicial-system-web.ts index 4f2266e9c030..fa924baca658 100644 --- a/apps/judicial-system/web/infra/judicial-system-web.ts +++ b/apps/judicial-system/web/infra/judicial-system-web.ts @@ -1,3 +1,4 @@ +// eslint-disable-next-line @nx/enforce-module-boundaries import { ref, service, ServiceBuilder } from '../../../../infra/src/dsl/dsl' export const serviceSetup = (services: { diff --git a/apps/judicial-system/web/project.json b/apps/judicial-system/web/project.json index c8b9d9bb851e..7a3444ddac11 100644 --- a/apps/judicial-system/web/project.json +++ b/apps/judicial-system/web/project.json @@ -3,6 +3,7 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "apps/judicial-system/web", "projectType": "application", + "tags": ["scope:judicial-system-web"], "generators": {}, "targets": { "build": { @@ -30,7 +31,8 @@ "maxWorkers": 2, "assets": [], "compiler": "tsc", - "target": "node" + "target": "node", + "webpackConfig": "apps/judicial-system/web/webpack.config.js" }, "configurations": { "development": {}, @@ -84,16 +86,12 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["apps/judicial-system/web/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "apps/judicial-system/web/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/judicial-system/web/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/apps/judicial-system/web"] }, @@ -103,13 +101,14 @@ "command": "graphql-codegen --config apps/judicial-system/web/codegen.yml" } }, - "docker-next": {}, + "docker-next": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-next`" + }, "extract-strings": { "executor": "nx:run-commands", "options": { "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'apps/judicial-system/web/{messages/**/*,**/*.strings}.{js,ts,tsx}'" } } - }, - "tags": ["scope:judicial-system-web"] + } } diff --git a/apps/judicial-system/web/src/components/CourtArrangements/CourtArrangements.tsx b/apps/judicial-system/web/src/components/CourtArrangements/CourtArrangements.tsx index 13717ed01a05..713b7f0f548f 100644 --- a/apps/judicial-system/web/src/components/CourtArrangements/CourtArrangements.tsx +++ b/apps/judicial-system/web/src/components/CourtArrangements/CourtArrangements.tsx @@ -41,15 +41,14 @@ export const useCourtArrangements = ( const { setAndSendCaseToServer } = useCase() const [original, setOriginal] = useState<[DateLogKey, DateLog | undefined | null]>() - const [courtDate, setCourtDate] = useState() + const [courtDate, setCourtDate] = useState({}) const [courtDateHasChanged, setCourtDateHasChanged] = useState(false) useEffect(() => { if ( - original && - original[0] === dateKey && - original[1]?.date === workingCase[dateKey]?.date && - original[1]?.location === workingCase[dateKey]?.location + original?.[0] === dateKey && + original?.[1]?.date === workingCase[dateKey]?.date && + original?.[1]?.location === workingCase[dateKey]?.location ) { // Do not reset the court date if it has not changed return @@ -57,48 +56,40 @@ export const useCourtArrangements = ( setOriginal([dateKey, workingCase[dateKey]]) - if (workingCase[dateKey]) { - setCourtDate(workingCase[dateKey]) - } + setCourtDate({ + date: workingCase[dateKey]?.date, + location: workingCase[dateKey]?.location, + }) }, [dateKey, original, workingCase]) const handleCourtDateChange = ( date: Date | undefined | null, valid = true, ) => { - if (!date) { - setCourtDate(null) - } else if (date && valid) { - const oldDate = workingCase[dateKey] - if ( - oldDate?.date && - compareAsc(date, new Date(oldDate.date)) !== 0 && - hasSentNotification( - NotificationType.COURT_DATE, - workingCase.notifications, - ).hasSent - ) { - setCourtDateHasChanged(true) - } - - setCourtDate((previous) => - previous - ? { ...previous, date: formatDateForServer(date) } - : { date: formatDateForServer(date) }, + if (date && valid) { + const courtDateHasChanged = Boolean( + original?.[1]?.date && + compareAsc(date, new Date(original[1].date)) !== 0 && + hasSentNotification( + NotificationType.COURT_DATE, + workingCase.notifications, + ).hasSent, ) + + setCourtDateHasChanged(courtDateHasChanged) } + + setCourtDate((previous) => ({ + ...previous, + date: date ? formatDateForServer(date) : null, + })) } const handleCourtRoomChange = (courtRoom?: string | null) => { - if (!courtRoom) { - setCourtDate((prev) => ({ ...prev, location: null })) - } else { - setCourtDate((previous) => - previous - ? { ...previous, location: courtRoom } - : { location: courtRoom }, - ) - } + setCourtDate((previous) => ({ + ...previous, + location: courtRoom ? courtRoom : null, + })) } const sendCourtDateToServer = (otherUpdates: UpdateCase[] = []) => { @@ -141,6 +132,12 @@ export const CourtArrangements: FC = (props) => { } = props const { formatMessage } = useIntl() + const [courtRoom, setCourtRoom] = useState(courtDate?.location ?? '') + + useEffect(() => { + setCourtRoom(courtDate?.location ?? '') + }, [courtDate?.location]) + const renderCourtArrangements = () => ( <> @@ -159,9 +156,10 @@ export const CourtArrangements: FC = (props) => { name="courtroom" label={formatMessage(strings.courtRoomLabel)} autoComplete="off" - value={courtDate?.location || ''} + value={courtRoom} placeholder="Skráðu inn dómsal" onChange={(evt) => { + setCourtRoom(evt.target.value) handleCourtRoomChange(evt.target.value) }} disabled={courtRoomDisabled} diff --git a/apps/judicial-system/web/src/components/InfoCard/DefendantInfo/DefendantInfo.strings.ts b/apps/judicial-system/web/src/components/InfoCard/DefendantInfo/DefendantInfo.strings.ts index bc3339042cb3..7b2b9fbb4d4e 100644 --- a/apps/judicial-system/web/src/components/InfoCard/DefendantInfo/DefendantInfo.strings.ts +++ b/apps/judicial-system/web/src/components/InfoCard/DefendantInfo/DefendantInfo.strings.ts @@ -28,4 +28,10 @@ export const strings = defineMessages({ defaultMessage: 'Dómur birtur {date}', description: 'Notað til að birta dagsetningu þegar dómur var birtur.', }, + noDefenderAssigned: { + id: 'judicial.system.core:info_card.defendant_info.no_defender_assigned', + defaultMessage: 'Ekki skráður', + description: + 'Notað til að láta vita að enginn verjandi er skráður í ákæru.', + }, }) diff --git a/apps/judicial-system/web/src/components/InfoCard/DefendantInfo/DefendantInfo.tsx b/apps/judicial-system/web/src/components/InfoCard/DefendantInfo/DefendantInfo.tsx index dc5dde3698fc..0160615ba84e 100644 --- a/apps/judicial-system/web/src/components/InfoCard/DefendantInfo/DefendantInfo.tsx +++ b/apps/judicial-system/web/src/components/InfoCard/DefendantInfo/DefendantInfo.tsx @@ -86,10 +86,11 @@ export const DefendantInfo: FC = (props) => { )} - {defendant.defenderName && displayDefenderInfo && ( + {displayDefenderInfo && ( {`${formatMessage(strings.defender)}: ${ - defendant.defenderName + defendant.defenderName ?? + formatMessage(strings.noDefenderAssigned) }`} {defendant.defenderEmail && ( <> diff --git a/apps/judicial-system/web/src/components/UserProvider/currentUser.graphql b/apps/judicial-system/web/src/components/UserProvider/currentUser.graphql index f373ac43d623..ec9a54b1ef48 100644 --- a/apps/judicial-system/web/src/components/UserProvider/currentUser.graphql +++ b/apps/judicial-system/web/src/components/UserProvider/currentUser.graphql @@ -13,12 +13,10 @@ query CurrentUser { canConfirmIndictment institution { id - created - modified - name type + name + defaultCourtId policeCaseNumberPrefix - active } } } diff --git a/apps/judicial-system/web/src/environments/environment.ts b/apps/judicial-system/web/src/environments/environment.ts deleted file mode 100644 index 53f69e76d4c9..000000000000 --- a/apps/judicial-system/web/src/environments/environment.ts +++ /dev/null @@ -1,9 +0,0 @@ -const devConfig = { - production: false, -} - -const prodConfig = { - production: true, -} - -export default process.env.NODE_ENV === 'production' ? prodConfig : devConfig diff --git a/apps/judicial-system/web/src/routes/Admin/Users/Users.tsx b/apps/judicial-system/web/src/routes/Admin/Users/Users.tsx index 23e078ebeea5..65c9bcc883b9 100644 --- a/apps/judicial-system/web/src/routes/Admin/Users/Users.tsx +++ b/apps/judicial-system/web/src/routes/Admin/Users/Users.tsx @@ -74,6 +74,8 @@ export const Users = () => { return 'Aðstoðarmaður dómara' case UserRole.PRISON_SYSTEM_STAFF: return 'Starfsmaður' + case UserRole.PUBLIC_PROSECUTOR_STAFF: + return 'Skrifstofa' default: return 'Óþekkt' } diff --git a/apps/judicial-system/web/src/routes/Court/Indictments/Conclusion/Conclusion.tsx b/apps/judicial-system/web/src/routes/Court/Indictments/Conclusion/Conclusion.tsx index a11b33af4780..657689a9345c 100644 --- a/apps/judicial-system/web/src/routes/Court/Indictments/Conclusion/Conclusion.tsx +++ b/apps/judicial-system/web/src/routes/Court/Indictments/Conclusion/Conclusion.tsx @@ -379,7 +379,7 @@ const Conclusion: FC = () => { diff --git a/apps/judicial-system/web/src/routes/Court/Indictments/Subpoena/Subpoena.tsx b/apps/judicial-system/web/src/routes/Court/Indictments/Subpoena/Subpoena.tsx index ff90d0cc0e45..61ad34b01190 100644 --- a/apps/judicial-system/web/src/routes/Court/Indictments/Subpoena/Subpoena.tsx +++ b/apps/judicial-system/web/src/routes/Court/Indictments/Subpoena/Subpoena.tsx @@ -100,11 +100,7 @@ const Subpoena: FC = () => { ], ) - const stepIsValid = isSubpoenaStepValid( - workingCase, - courtDate?.date, - courtDate?.location, - ) + const stepIsValid = isSubpoenaStepValid(workingCase, courtDate) return ( { { [[] as CaseFile[], [] as CaseFile[]], ) + const getRulingDecisionTagColor = ( + indictmentRulingDecision: CaseIndictmentRulingDecision, + ): TagVariant => { + switch (indictmentRulingDecision) { + case CaseIndictmentRulingDecision.FINE: + return 'mint' + case CaseIndictmentRulingDecision.CANCELLATION: + return 'rose' + case CaseIndictmentRulingDecision.DISMISSAL: + return 'blue' + case CaseIndictmentRulingDecision.RULING: + default: + return 'darkerBlue' + } + } + return ( { onNavigationTo={handleNavigationTo} > + - {formatMessage(strings.title)} + + {formatMessage(strings.title)} + + {workingCase.indictmentRulingDecision && ( + + + {formatMessage(strings.indictmentRulingDecisionTagText, { + indictmentRulingDecision: + workingCase.indictmentRulingDecision, + })} + + + )} + {formatMessage(core.caseNumber, { diff --git a/apps/judicial-system/web/src/routes/Court/InvestigationCase/HearingArrangements/HearingArrangements.tsx b/apps/judicial-system/web/src/routes/Court/InvestigationCase/HearingArrangements/HearingArrangements.tsx index 16e353b44b3c..913df319cd19 100644 --- a/apps/judicial-system/web/src/routes/Court/InvestigationCase/HearingArrangements/HearingArrangements.tsx +++ b/apps/judicial-system/web/src/routes/Court/InvestigationCase/HearingArrangements/HearingArrangements.tsx @@ -56,7 +56,10 @@ const HearingArrangements = () => { const initialize = useCallback(() => { if (!workingCase.arraignmentDate && workingCase.requestedCourtDate) { - handleCourtDateChange(new Date(workingCase.requestedCourtDate)) + setWorkingCase((theCase) => ({ + ...theCase, + arraignmentDate: { date: theCase.requestedCourtDate }, + })) } setAndSendCaseToServer( @@ -70,12 +73,7 @@ const HearingArrangements = () => { workingCase, setWorkingCase, ) - }, [ - handleCourtDateChange, - setAndSendCaseToServer, - setWorkingCase, - workingCase, - ]) + }, [setAndSendCaseToServer, setWorkingCase, workingCase]) useOnceOn(isCaseUpToDate, initialize) @@ -110,7 +108,7 @@ const HearingArrangements = () => { const stepIsValid = isCourtHearingArrangementsStepValidIC( workingCase, - courtDate?.date, + courtDate, ) const isCorrectingRuling = workingCase.notifications?.some( @@ -304,7 +302,7 @@ const HearingArrangements = () => { diff --git a/apps/judicial-system/web/src/routes/Court/RestrictionCase/CourtRecord/CourtRecord.tsx b/apps/judicial-system/web/src/routes/Court/RestrictionCase/CourtRecord/CourtRecord.tsx index e784bfaf65f6..319d59117d77 100644 --- a/apps/judicial-system/web/src/routes/Court/RestrictionCase/CourtRecord/CourtRecord.tsx +++ b/apps/judicial-system/web/src/routes/Court/RestrictionCase/CourtRecord/CourtRecord.tsx @@ -490,19 +490,18 @@ export const CourtRecord: FC = () => { maxDate={new Date()} selectedDate={workingCase.courtEndTime} onChange={(date: Date | undefined, valid: boolean) => { - setAndSendCaseToServer( - [ - { - courtEndTime: - date && valid - ? formatDateForServer(date) - : undefined, - force: true, - }, - ], - workingCase, - setWorkingCase, - ) + if (date && valid) { + setAndSendCaseToServer( + [ + { + courtEndTime: formatDateForServer(date), + force: true, + }, + ], + workingCase, + setWorkingCase, + ) + } }} blueBox={false} required diff --git a/apps/judicial-system/web/src/routes/Court/RestrictionCase/HearingArrangements/HearingArrangements.tsx b/apps/judicial-system/web/src/routes/Court/RestrictionCase/HearingArrangements/HearingArrangements.tsx index 2b5466d5263e..f76f4d5002e6 100644 --- a/apps/judicial-system/web/src/routes/Court/RestrictionCase/HearingArrangements/HearingArrangements.tsx +++ b/apps/judicial-system/web/src/routes/Court/RestrictionCase/HearingArrangements/HearingArrangements.tsx @@ -60,7 +60,10 @@ export const HearingArrangements = () => { const initialize = useCallback(() => { if (!workingCase.arraignmentDate?.date && workingCase.requestedCourtDate) { - handleCourtDateChange(new Date(workingCase.requestedCourtDate)) + setWorkingCase((theCase) => ({ + ...theCase, + arraignmentDate: { date: theCase.requestedCourtDate }, + })) } setAndSendCaseToServer( @@ -89,12 +92,7 @@ export const HearingArrangements = () => { workingCase, setWorkingCase, ) - }, [ - handleCourtDateChange, - setAndSendCaseToServer, - setWorkingCase, - workingCase, - ]) + }, [setAndSendCaseToServer, setWorkingCase, workingCase]) useOnceOn(isCaseUpToDate, initialize) @@ -129,7 +127,7 @@ export const HearingArrangements = () => { const stepIsValid = isCourtHearingArrangemenstStepValidRC( workingCase, - courtDate?.date, + courtDate, ) const isCorrectingRuling = workingCase.notifications?.some( @@ -173,7 +171,7 @@ export const HearingArrangements = () => { diff --git a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Processing/Processing.tsx b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Processing/Processing.tsx index 9e247a8b2417..d28259f0399a 100644 --- a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Processing/Processing.tsx +++ b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Processing/Processing.tsx @@ -16,6 +16,7 @@ import { PageLayout, ProsecutorCaseInfo, SectionHeading, + UserContext, } from '@island.is/judicial-system-web/src/components' import RequiredStar from '@island.is/judicial-system-web/src/components/RequiredStar/RequiredStar' import { @@ -27,6 +28,7 @@ import { import { useCase, useDefendants, + useOnceOn, } from '@island.is/judicial-system-web/src/utils/hooks' import { isProcessingStepValidIndictments } from '@island.is/judicial-system-web/src/utils/validate' @@ -35,14 +37,38 @@ import { strings } from './processing.strings' import * as styles from './Processing.css' const Processing: FC = () => { - const { workingCase, setWorkingCase, isLoadingWorkingCase, caseNotFound } = - useContext(FormContext) - const { transitionCase } = useCase() + const { user } = useContext(UserContext) + const { + workingCase, + setWorkingCase, + isLoadingWorkingCase, + caseNotFound, + isCaseUpToDate, + refreshCase, + } = useContext(FormContext) + const { updateCase, transitionCase } = useCase() const { formatMessage } = useIntl() const { updateDefendant, updateDefendantState } = useDefendants() const router = useRouter() const isTrafficViolationCaseCheck = isTrafficViolationCase(workingCase) + const initialize = useCallback(async () => { + if (!workingCase.court) { + await updateCase(workingCase.id, { + courtId: user?.institution?.defaultCourtId, + }) + refreshCase() + } + }, [ + refreshCase, + updateCase, + user?.institution?.defaultCourtId, + workingCase.court, + workingCase.id, + ]) + + useOnceOn(isCaseUpToDate, initialize) + const handleNavigationTo = useCallback( async (destination: string) => { if (workingCase.state === CaseState.NEW) { diff --git a/apps/judicial-system/web/src/routes/Shared/Cases/useFilter.spec.tsx b/apps/judicial-system/web/src/routes/Shared/Cases/useFilter.spec.tsx index 17a2f0fcae9f..2b1f8b3d554a 100644 --- a/apps/judicial-system/web/src/routes/Shared/Cases/useFilter.spec.tsx +++ b/apps/judicial-system/web/src/routes/Shared/Cases/useFilter.spec.tsx @@ -38,8 +38,8 @@ describe('useFilter - filterOptionsForUser', () => { { value: 'INVESTIGATION', label: 'INVESTIGATION' }, ]), ) - expect(result.length).toBe(3) - expect(result).toEqual( + expect(result.length).toBe(2) + expect(result).not.toEqual( expect.arrayContaining([{ value: 'INDICTMENT', label: 'INDICTMENT' }]), ) }) diff --git a/apps/judicial-system/web/src/routes/Shared/Cases/useFilter.tsx b/apps/judicial-system/web/src/routes/Shared/Cases/useFilter.tsx index c62e9c41ef3d..fca58a3fee8c 100644 --- a/apps/judicial-system/web/src/routes/Shared/Cases/useFilter.tsx +++ b/apps/judicial-system/web/src/routes/Shared/Cases/useFilter.tsx @@ -83,7 +83,7 @@ export const filterOptionsForUser = ( user?.role === UserRole.PROSECUTOR_REPRESENTATIVE || user?.role === UserRole.DISTRICT_COURT_ASSISTANT ) { - return option.value !== 'INVESTIGATION' + return option.value !== 'INVESTIGATION' && option.value !== 'INDICTMENT' } return true diff --git a/apps/judicial-system/web/src/utils/validate.ts b/apps/judicial-system/web/src/utils/validate.ts index db4d20081612..2b1a7b353b0a 100644 --- a/apps/judicial-system/web/src/utils/validate.ts +++ b/apps/judicial-system/web/src/utils/validate.ts @@ -10,6 +10,7 @@ import { CaseFileCategory, CaseIndictmentRulingDecision, CaseType, + DateLog, DefenderChoice, IndictmentDecision, SessionArrangements, @@ -333,18 +334,23 @@ export const isReceptionAndAssignmentStepValid = ( export const isCourtHearingArrangemenstStepValidRC = ( workingCase: Case, - courtDate?: string | null, + arraignmentDate?: DateLog, ): boolean => { return validate([ [workingCase.defenderEmail, ['email-format']], [workingCase.defenderPhoneNumber, ['phonenumber']], - [courtDate ?? workingCase.arraignmentDate?.date, ['empty', 'date-format']], + [ + arraignmentDate + ? arraignmentDate.date + : workingCase.arraignmentDate?.date, + ['empty', 'date-format'], + ], ]).isValid } export const isCourtHearingArrangementsStepValidIC = ( workingCase: Case, - courtDate?: string | null, + arraignmentDate?: DateLog, ): boolean => { return Boolean( workingCase.sessionArrangements && @@ -352,7 +358,9 @@ export const isCourtHearingArrangementsStepValidIC = ( [workingCase.defenderEmail, ['email-format']], [workingCase.defenderPhoneNumber, ['phonenumber']], [ - courtDate ?? workingCase.arraignmentDate?.date, + arraignmentDate + ? arraignmentDate.date + : workingCase.arraignmentDate?.date, ['empty', 'date-format'], ], ]).isValid, @@ -414,16 +422,22 @@ export const isCourtRecordStepValidIC = (workingCase: Case): boolean => { export const isSubpoenaStepValid = ( workingCase: Case, - courtDate?: string | null, - courtRoom?: string | null, + arraignmentDate?: DateLog, ): boolean => { return ( validate([ [ - courtDate ?? workingCase.arraignmentDate?.date, + arraignmentDate + ? arraignmentDate.date + : workingCase.arraignmentDate?.date, ['empty', 'date-format'], ], - [courtRoom ?? workingCase.arraignmentDate?.location, ['empty']], + [ + arraignmentDate + ? arraignmentDate.location + : workingCase.arraignmentDate?.location, + ['empty'], + ], ]).isValid && Boolean( workingCase.defendants?.every((defendant) => defendant.subpoenaType), diff --git a/apps/judicial-system/web/webpack.config.js b/apps/judicial-system/web/webpack.config.js new file mode 100644 index 000000000000..95e68d080f5b --- /dev/null +++ b/apps/judicial-system/web/webpack.config.js @@ -0,0 +1,8 @@ +const { composePlugins, withNx } = require('@nx/webpack') + +// Nx plugins for webpack. +module.exports = composePlugins(withNx(), (config) => { + // Note: This was added by an Nx migration. Webpack builds are required to have a corresponding Webpack config file. + // See: https://nx.dev/recipes/webpack/webpack-config-setup + return config +}) diff --git a/apps/judicial-system/xrd-api/infra/judicial-system-xrd-api.ts b/apps/judicial-system/xrd-api/infra/judicial-system-xrd-api.ts index a900e97ce01d..6b46830e7467 100644 --- a/apps/judicial-system/xrd-api/infra/judicial-system-xrd-api.ts +++ b/apps/judicial-system/xrd-api/infra/judicial-system-xrd-api.ts @@ -15,6 +15,7 @@ export const serviceSetup = (services: { .secrets({ ERROR_EVENT_URL: '/k8s/judicial-system/ERROR_EVENT_URL', BACKEND_ACCESS_TOKEN: '/k8s/judicial-system/BACKEND_ACCESS_TOKEN', + LAWYERS_ICELAND_API_KEY: '/k8s/judicial-system/LAWYERS_ICELAND_API_KEY', }) .liveness('/liveness') .readiness('/liveness') diff --git a/apps/judicial-system/xrd-api/project.json b/apps/judicial-system/xrd-api/project.json index d90da44c0833..41cbc49d8d61 100644 --- a/apps/judicial-system/xrd-api/project.json +++ b/apps/judicial-system/xrd-api/project.json @@ -4,6 +4,7 @@ "sourceRoot": "apps/judicial-system/xrd-api/src", "projectType": "application", "prefix": "judicial-system-xrd-api", + "tags": ["scope:judicial-system-api"], "generators": {}, "targets": { "build": { @@ -30,18 +31,12 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "apps/judicial-system/xrd-api/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "apps/judicial-system/xrd-api/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/judicial-system/xrd-api/jest.config.ts" } }, "codegen/backend-schema": { @@ -51,7 +46,8 @@ }, "outputs": ["{projectRoot}/src/openapi.yaml"] }, - "docker-express": {} - }, - "tags": ["scope:judicial-system-api"] + "docker-express": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-express`" + } + } } diff --git a/apps/judicial-system/xrd-api/src/app/app.controller.ts b/apps/judicial-system/xrd-api/src/app/app.controller.ts index 1ff678f29646..1d6669745a8e 100644 --- a/apps/judicial-system/xrd-api/src/app/app.controller.ts +++ b/apps/judicial-system/xrd-api/src/app/app.controller.ts @@ -1,19 +1,29 @@ -import { Body, Controller, Inject, Post, UseInterceptors } from '@nestjs/common' -import { ApiCreatedResponse } from '@nestjs/swagger' +import { + Body, + Controller, + Inject, + InternalServerErrorException, + Post, + UseInterceptors, +} from '@nestjs/common' +import { Get } from '@nestjs/common' +import { ApiCreatedResponse, ApiResponse } from '@nestjs/swagger' import type { Logger } from '@island.is/logging' import { LOGGER_PROVIDER } from '@island.is/logging' +import { LawyersService, LawyerType } from '@island.is/judicial-system/lawyers' + import { CreateCaseDto } from './app.dto' import { EventInterceptor } from './app.interceptor' -import { Case } from './app.model' +import { Case, Defender } from './app.model' import { AppService } from './app.service' - @Controller('api/v1') export class AppController { constructor( private readonly appService: AppService, @Inject(LOGGER_PROVIDER) private readonly logger: Logger, + private readonly lawyersService: LawyersService, ) {} @UseInterceptors(EventInterceptor) @@ -28,4 +38,25 @@ export class AppController { return createdCase }) } + + @Get('defenders') + @ApiResponse({ status: 500, description: 'Failed to retrieve defenders' }) + async getLawyers(): Promise { + try { + this.logger.debug('Retrieving litigators from lawyer registry') + + const lawyers = await this.lawyersService.getLawyers( + LawyerType.LITIGATORS, + ) + + return lawyers.map((lawyer) => ({ + nationalId: lawyer.SSN, + name: lawyer.Name, + practice: lawyer.Practice, + })) + } catch (error) { + this.logger.error('Failed to retrieve lawyers', error) + throw new InternalServerErrorException('Failed to retrieve lawyers') + } + } } diff --git a/apps/judicial-system/xrd-api/src/app/app.model.ts b/apps/judicial-system/xrd-api/src/app/app.model.ts index ff512cf6ff0b..e781aa7653aa 100644 --- a/apps/judicial-system/xrd-api/src/app/app.model.ts +++ b/apps/judicial-system/xrd-api/src/app/app.model.ts @@ -4,3 +4,14 @@ export class Case { @ApiProperty() id!: string } + +export class Defender { + @ApiProperty({ type: String }) + nationalId!: string + + @ApiProperty({ type: String }) + name!: string + + @ApiProperty({ type: String }) + practice!: string +} diff --git a/apps/judicial-system/xrd-api/src/app/app.module.ts b/apps/judicial-system/xrd-api/src/app/app.module.ts index 9ebdfe08242e..5ac2ad5f9f45 100644 --- a/apps/judicial-system/xrd-api/src/app/app.module.ts +++ b/apps/judicial-system/xrd-api/src/app/app.module.ts @@ -7,6 +7,10 @@ import { AuditTrailModule, auditTrailModuleConfig, } from '@island.is/judicial-system/audit-trail' +import { + LawyersModule, + lawyersModuleConfig, +} from '@island.is/judicial-system/lawyers' import appModuleConfig from './app.config' import { AppController } from './app.controller' @@ -15,10 +19,11 @@ import { AppService } from './app.service' @Module({ imports: [ AuditTrailModule, + LawyersModule, ProblemModule.forRoot({ logAllErrors: true }), ConfigModule.forRoot({ isGlobal: true, - load: [appModuleConfig, auditTrailModuleConfig], + load: [appModuleConfig, auditTrailModuleConfig, lawyersModuleConfig], }), ], controllers: [AppController], diff --git a/apps/judicial-system/xrd-api/src/app/test/createTestingAppModule.ts b/apps/judicial-system/xrd-api/src/app/test/createTestingAppModule.ts index 2d7b6b8c57e6..ddcd8201e1a3 100644 --- a/apps/judicial-system/xrd-api/src/app/test/createTestingAppModule.ts +++ b/apps/judicial-system/xrd-api/src/app/test/createTestingAppModule.ts @@ -7,6 +7,10 @@ import { auditTrailModuleConfig, AuditTrailService, } from '@island.is/judicial-system/audit-trail' +import { + lawyersModuleConfig, + LawyersService, +} from '@island.is/judicial-system/lawyers' import appConfigModule from '../app.config' import { AppController } from '../app.controller' @@ -17,7 +21,7 @@ export const createTestingAppModule = async () => { imports: [ ConfigModule.forRoot({ isGlobal: true, - load: [auditTrailModuleConfig, appConfigModule], + load: [auditTrailModuleConfig, appConfigModule, lawyersModuleConfig], }), ], controllers: [AppController], @@ -32,6 +36,7 @@ export const createTestingAppModule = async () => { }, AuditTrailService, AppService, + LawyersService, ], }).compile() diff --git a/apps/native/app/project.json b/apps/native/app/project.json index 0b71ea2ed6d3..337b98afd2fe 100644 --- a/apps/native/app/project.json +++ b/apps/native/app/project.json @@ -3,6 +3,7 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "apps/native/app/src", "projectType": "application", + "tags": ["scope:js"], "generators": {}, "targets": { "serve": { @@ -27,10 +28,7 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["apps/native/app/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "codegen/frontend-client": { "executor": "nx:run-commands", @@ -39,7 +37,8 @@ "command": "graphql-codegen --config apps/native/app/codegen.yml" } }, - "docker-native": {} - }, - "tags": ["scope:js"] + "docker-native": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-native`" + } + } } diff --git a/apps/native/app/src/lib/passkeys/helpers.ts b/apps/native/app/src/lib/passkeys/helpers.ts index 1c9006808dca..6d7e9fb919b5 100644 --- a/apps/native/app/src/lib/passkeys/helpers.ts +++ b/apps/native/app/src/lib/passkeys/helpers.ts @@ -125,13 +125,13 @@ export const addPasskeyAsLoginHint = ( } if (url.includes('/minarsidur')) { - return `${origin}/minarsidur/login?login_hint=${authenticationResponse}&target_link_uri=${encodeURIComponent( + return `${origin}/minarsidur/login?login_hint=passkey:${authenticationResponse}&target_link_uri=${encodeURIComponent( url, )}` } if (url.includes('/umsoknir')) { - return `${origin}/umsoknir/login?login_hint=${authenticationResponse}&target_link_uri=${encodeURIComponent( + return `${origin}/umsoknir/login?login_hint=passkey:${authenticationResponse}&target_link_uri=${encodeURIComponent( url, )}` } diff --git a/apps/native/app/src/screens/login/login.tsx b/apps/native/app/src/screens/login/login.tsx index 7296507e4661..93f3dcd5ad48 100644 --- a/apps/native/app/src/screens/login/login.tsx +++ b/apps/native/app/src/screens/login/login.tsx @@ -16,7 +16,7 @@ import { import { NavigationFunctionComponent } from 'react-native-navigation' import styled from 'styled-components/native' import logo from '../../assets/logo/logo-64w.png' -import { openBrowser } from '../../lib/rn-island' +import { useBrowser } from '../../lib/useBrowser' import { useAuthStore } from '../../stores/auth-store' import { preferencesStore } from '../../stores/preferences-store' import { nextOnboardingStep } from '../../utils/onboarding' @@ -68,6 +68,7 @@ function getChromeVersion(): Promise { export const LoginScreen: NavigationFunctionComponent = ({ componentId }) => { const authStore = useAuthStore() + const { openBrowser } = useBrowser() const intl = useIntl() const [isLoggingIn, setIsLoggingIn] = useState(false) const [authState, setAuthState] = useState<{ diff --git a/apps/native/app/src/ui/lib/alert/alert.tsx b/apps/native/app/src/ui/lib/alert/alert.tsx index f2e9c67c3a88..6efaf7302b97 100644 --- a/apps/native/app/src/ui/lib/alert/alert.tsx +++ b/apps/native/app/src/ui/lib/alert/alert.tsx @@ -24,8 +24,11 @@ interface AlertProps { title?: string message?: string style?: any + onClose?(): void + onClosed?(): void + visible?: boolean hideIcon?: boolean sharedAnimatedValue?: any @@ -171,7 +174,7 @@ export function Alert({ const variant = variantStyles[type] useEffect(() => { - if (typeof hidden !== undefined) { + if (typeof hidden !== 'undefined') { LayoutAnimation.configureNext( LayoutAnimation.Presets.easeInEaseOut, () => { diff --git a/apps/portals/admin/project.json b/apps/portals/admin/project.json index c32e6496aa17..d7fc9572a5f0 100644 --- a/apps/portals/admin/project.json +++ b/apps/portals/admin/project.json @@ -3,6 +3,7 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "apps/portals/admin/src", "projectType": "application", + "tags": ["scope:portals-admin"], "targets": { "build": { "executor": "@nx/webpack:webpack", @@ -69,18 +70,13 @@ ] }, "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["apps/portals/admin/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/apps/portals/admin"], "options": { - "jestConfig": "apps/portals/admin/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/portals/admin/jest.config.ts" } }, "extract-strings": { @@ -103,7 +99,8 @@ "parallel": true } }, - "docker-static": {} - }, - "tags": ["scope:portals-admin"] + "docker-static": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-static`" + } + } } diff --git a/apps/reference-backend/project.json b/apps/reference-backend/project.json index c7ab16abc044..771d5abb6d70 100644 --- a/apps/reference-backend/project.json +++ b/apps/reference-backend/project.json @@ -4,6 +4,7 @@ "sourceRoot": "apps/reference-backend/src", "projectType": "application", "prefix": "reference-backend", + "tags": ["scope:nest"], "generators": {}, "targets": { "build": { @@ -47,20 +48,18 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["apps/reference-backend/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "apps/reference-backend/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/reference-backend/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/apps/reference-backend"] }, - "docker-express": {}, + "docker-express": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-express`" + }, "dev-services": { "executor": "nx:run-commands", "options": { @@ -89,6 +88,5 @@ "cwd": "apps/reference-backend" } } - }, - "tags": ["scope:nest"] + } } diff --git a/apps/reference-next-app/project.json b/apps/reference-next-app/project.json index fc3ca5bb693b..3d09e3335af9 100644 --- a/apps/reference-next-app/project.json +++ b/apps/reference-next-app/project.json @@ -3,6 +3,7 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "apps/reference-next-app", "projectType": "application", + "tags": ["scope:react-next"], "generators": {}, "targets": { "build": { @@ -30,7 +31,8 @@ "maxWorkers": 2, "assets": [], "compiler": "tsc", - "target": "node" + "target": "node", + "webpackConfig": "apps/reference-next-app/webpack.config.js" }, "configurations": { "development": {}, @@ -84,16 +86,12 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["apps/reference-next-app/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "apps/reference-next-app/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/reference-next-app/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/apps/reference-next-app"] }, @@ -103,6 +101,5 @@ "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'apps/reference-next-app/{screens,pages,components}/*.{js,ts,tsx}'" } } - }, - "tags": ["scope:react-next"] + } } diff --git a/apps/reference-next-app/webpack.config.js b/apps/reference-next-app/webpack.config.js new file mode 100644 index 000000000000..95e68d080f5b --- /dev/null +++ b/apps/reference-next-app/webpack.config.js @@ -0,0 +1,8 @@ +const { composePlugins, withNx } = require('@nx/webpack') + +// Nx plugins for webpack. +module.exports = composePlugins(withNx(), (config) => { + // Note: This was added by an Nx migration. Webpack builds are required to have a corresponding Webpack config file. + // See: https://nx.dev/recipes/webpack/webpack-config-setup + return config +}) diff --git a/apps/service-portal/project.json b/apps/service-portal/project.json index 4c13c185e56e..bcd4102b5192 100644 --- a/apps/service-portal/project.json +++ b/apps/service-portal/project.json @@ -3,6 +3,7 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "apps/service-portal/src", "projectType": "application", + "tags": ["scope:portals-mypages"], "generators": {}, "targets": { "build": { @@ -76,16 +77,12 @@ ] }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["apps/service-portal/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "apps/service-portal/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/service-portal/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/apps/service-portal"] }, @@ -115,7 +112,8 @@ "parallel": true } }, - "docker-static": {} - }, - "tags": ["scope:portals-mypages"] + "docker-static": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-static`" + } + } } diff --git a/apps/service-portal/src/components/Notifications/NotificationButton.tsx b/apps/service-portal/src/components/Notifications/NotificationButton.tsx index 82583f47e539..0657c6a1bb5b 100644 --- a/apps/service-portal/src/components/Notifications/NotificationButton.tsx +++ b/apps/service-portal/src/components/Notifications/NotificationButton.tsx @@ -72,7 +72,11 @@ const NotificationButton = ({ : setMenuState('notifications') }} ref={ref} - aria-label={formatMessage(m.notifications)} + aria-label={ + showBadge + ? formatMessage(m.notificationsUnread) + : formatMessage(m.notifications) + } /> {data?.userNotificationsOverview?.data.length ? ( { diff --git a/apps/services/auth/ids-api/src/app/delegations/delegations.controller.ts b/apps/services/auth/ids-api/src/app/delegations/delegations.controller.ts index 3cf848839ce6..0bf8035e24c5 100644 --- a/apps/services/auth/ids-api/src/app/delegations/delegations.controller.ts +++ b/apps/services/auth/ids-api/src/app/delegations/delegations.controller.ts @@ -28,7 +28,7 @@ import { Scopes, ScopesGuard, } from '@island.is/auth-nest-tools' -import { AuthDelegationType } from 'delegation' +import { AuthDelegationType } from '@island.is/shared/types' @UseGuards(IdsUserGuard, ScopesGuard) @ApiTags('delegations') diff --git a/apps/services/auth/ids-api/src/app/passkeys/passkeys.controller.ts b/apps/services/auth/ids-api/src/app/passkeys/passkeys.controller.ts index 8e7cba136263..26f6c1139ed3 100644 --- a/apps/services/auth/ids-api/src/app/passkeys/passkeys.controller.ts +++ b/apps/services/auth/ids-api/src/app/passkeys/passkeys.controller.ts @@ -8,11 +8,6 @@ import { import { ApiCreatedResponse, ApiTags } from '@nestjs/swagger' import { PasskeysCoreService } from '@island.is/auth-api-lib' -import { Documentation } from '@island.is/nest/swagger' -import { - AuthenticationOptions, - AuthenticationResult, -} from './dto/authenticationOptions.dto' import { IdsAuthGuard, Scopes, ScopesGuard } from '@island.is/auth-nest-tools' import { Audit } from '@island.is/nest/audit' import { @@ -20,7 +15,12 @@ import { FeatureFlagGuard, Features, } from '@island.is/nest/feature-flags' -import { AuthScope } from '@island.is/auth/scopes' +import { Documentation } from '@island.is/nest/swagger' + +import { + AuthenticationOptions, + AuthenticationResult, +} from './dto/authenticationOptions.dto' const namespace = '@island.is/auth/ids-api/passkeys' @@ -31,7 +31,7 @@ const namespace = '@island.is/auth/ids-api/passkeys' }) @UseGuards(IdsAuthGuard, ScopesGuard, FeatureFlagGuard) @Audit({ namespace }) -@Scopes(AuthScope.passkeys) +@Scopes('@identityserver.api/authentication') export class PasskeysController { constructor(private readonly passkeysCoreService: PasskeysCoreService) {} diff --git a/apps/services/auth/personal-representative-public/project.json b/apps/services/auth/personal-representative-public/project.json index ff533ed63e5e..f231990cf128 100644 --- a/apps/services/auth/personal-representative-public/project.json +++ b/apps/services/auth/personal-representative-public/project.json @@ -4,6 +4,7 @@ "sourceRoot": "apps/services/auth/personal-representative-public/src", "projectType": "application", "prefix": "personal-representative-public", + "tags": ["scope:auth-api"], "targets": { "build": { "executor": "./tools/executors/node:build", @@ -31,12 +32,7 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "apps/services/auth/personal-representative-public/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -45,7 +41,6 @@ ], "options": { "jestConfig": "apps/services/auth/personal-representative-public/jest.config.ts", - "passWithNoTests": true, "runInBand": true } }, @@ -56,7 +51,8 @@ }, "outputs": ["{projectRoot}/src/openapi.yaml"] }, - "docker-express": {} - }, - "tags": ["scope:auth-api"] + "docker-express": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-express`" + } + } } diff --git a/apps/services/auth/personal-representative/project.json b/apps/services/auth/personal-representative/project.json index b6290c47f700..68935d3234d2 100644 --- a/apps/services/auth/personal-representative/project.json +++ b/apps/services/auth/personal-representative/project.json @@ -4,6 +4,7 @@ "sourceRoot": "apps/services/auth/personal-representative/src", "projectType": "application", "prefix": "personal-representative", + "tags": ["scope:auth-api"], "targets": { "build": { "executor": "./tools/executors/node:build", @@ -29,12 +30,7 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "apps/services/auth/personal-representative/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -43,7 +39,6 @@ ], "options": { "jestConfig": "apps/services/auth/personal-representative/jest.config.ts", - "passWithNoTests": true, "runInBand": true } }, @@ -54,7 +49,8 @@ }, "outputs": ["{projectRoot}/src/openapi.yaml"] }, - "docker-express": {} - }, - "tags": ["scope:auth-api"] + "docker-express": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-express`" + } + } } diff --git a/apps/services/auth/public-api/project.json b/apps/services/auth/public-api/project.json index 7afa437c0ee5..378d0e8c161c 100644 --- a/apps/services/auth/public-api/project.json +++ b/apps/services/auth/public-api/project.json @@ -4,6 +4,7 @@ "sourceRoot": "apps/services/auth/public-api/src", "projectType": "application", "prefix": "services-auth-public-api", + "tags": ["scope:auth-api"], "targets": { "build": { "executor": "./tools/executors/node:build", @@ -29,19 +30,13 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "apps/services/auth/public-api/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/apps/services/auth/public-api"], "options": { "jestConfig": "apps/services/auth/public-api/jest.config.ts", - "passWithNoTests": true, "runInBand": true } }, @@ -52,7 +47,8 @@ }, "outputs": ["{projectRoot}/src/openapi.yaml"] }, - "docker-express": {} - }, - "tags": ["scope:auth-api"] + "docker-express": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-express`" + } + } } diff --git a/apps/services/contentful-entry-tagger/project.json b/apps/services/contentful-entry-tagger/project.json index 1cb36c36b7bd..29a65f68aa19 100644 --- a/apps/services/contentful-entry-tagger/project.json +++ b/apps/services/contentful-entry-tagger/project.json @@ -4,6 +4,7 @@ "sourceRoot": "apps/services/contentful-entry-tagger/src", "projectType": "application", "prefix": "services-contentful-entry-tagger", + "tags": ["scope:nest"], "targets": { "build": { "executor": "./tools/executors/node:build", @@ -29,12 +30,7 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "apps/services/contentful-entry-tagger/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -42,11 +38,11 @@ "{workspaceRoot}/coverage/apps/services/contentful-entry-tagger" ], "options": { - "jestConfig": "apps/services/contentful-entry-tagger/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/services/contentful-entry-tagger/jest.config.ts" } }, - "docker-express": {} - }, - "tags": ["scope:nest"] + "docker-express": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-express`" + } + } } diff --git a/apps/services/documents/project.json b/apps/services/documents/project.json index e341cc382f25..dbaa504cc65e 100644 --- a/apps/services/documents/project.json +++ b/apps/services/documents/project.json @@ -4,6 +4,7 @@ "sourceRoot": "apps/services/documents/src", "projectType": "application", "prefix": "services-documents", + "tags": ["scope:nest"], "generators": {}, "targets": { "build": { @@ -48,16 +49,12 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["apps/services/documents/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "apps/services/documents/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/services/documents/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/apps/services/documents"] }, @@ -89,7 +86,8 @@ "cwd": "apps/services/documents" } }, - "docker-express": {} - }, - "tags": ["scope:nest"] + "docker-express": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-express`" + } + } } diff --git a/apps/services/endorsements/api/project.json b/apps/services/endorsements/api/project.json index 4923ce4401d9..bc645e6bc495 100644 --- a/apps/services/endorsements/api/project.json +++ b/apps/services/endorsements/api/project.json @@ -4,6 +4,7 @@ "sourceRoot": "apps/services/endorsements/api/src", "projectType": "application", "prefix": "services-endorsements-api", + "tags": ["scope:nest"], "targets": { "build": { "executor": "./tools/executors/node:build", @@ -50,20 +51,14 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "apps/services/endorsements/api/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/apps/services/endorsements/api"], "options": { "jestConfig": "apps/services/endorsements/api/jest.config.ts", - "runInBand": true, - "passWithNoTests": true + "runInBand": true } }, "dev-services": { @@ -130,8 +125,9 @@ "cwd": "apps/services/endorsements/api" } }, - "docker-express": {}, + "docker-express": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-express`" + }, "service-endorsement-system-api": {} - }, - "tags": ["scope:nest"] + } } diff --git a/apps/services/endorsements/api/test/globalSetup.ts b/apps/services/endorsements/api/test/globalSetup.ts index 52b9d2aa692c..aee8f3f4c1c7 100644 --- a/apps/services/endorsements/api/test/globalSetup.ts +++ b/apps/services/endorsements/api/test/globalSetup.ts @@ -8,8 +8,10 @@ import { startPostgres } from '@island.is/testing/containers' export default async () => { await startPostgres() - execSync('yarn nx run services-endorsements-api:migrate --env test') execSync( - 'yarn nx run services-endorsements-api:seed --env test --seed 20210505212921-e2e-tests.js', + 'cross-env NODE_ENV=test yarn nx run services-endorsements-api:migrate', + ) + execSync( + 'cross-env NODE_ENV=test yarn nx run services-endorsements-api:seed --seed 20210505212921-e2e-tests.js', ) } diff --git a/apps/services/endorsements/api/test/globalTeardown.ts b/apps/services/endorsements/api/test/globalTeardown.ts index d86479b27ca9..720dffde054c 100644 --- a/apps/services/endorsements/api/test/globalTeardown.ts +++ b/apps/services/endorsements/api/test/globalTeardown.ts @@ -8,7 +8,7 @@ import { stopPostgres } from '@island.is/testing/containers' export default async () => { execSync( - 'yarn nx run services-endorsements-api:seed/undo --env test --seed 20210505212921-e2e-tests.js', + 'cross-env NODE_ENV=test yarn nx run services-endorsements-api:seed/undo --seed 20210505212921-e2e-tests.js', ) await stopPostgres() } diff --git a/apps/services/license-api/project.json b/apps/services/license-api/project.json index 29ebccb8e985..fc1c8929e7cd 100644 --- a/apps/services/license-api/project.json +++ b/apps/services/license-api/project.json @@ -4,6 +4,7 @@ "sourceRoot": "apps/services/license-api/src", "projectType": "application", "prefix": "license-api", + "tags": ["scope:nest"], "generators": {}, "targets": { "build": { @@ -37,16 +38,12 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["apps/services/license-api/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "apps/services/license-api/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/services/license-api/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/apps/services/license-api"] }, @@ -71,7 +68,8 @@ "parallel": true } }, - "docker-express": {} - }, - "tags": ["scope:nest"] + "docker-express": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-express`" + } + } } diff --git a/apps/services/regulations-admin-backend/project.json b/apps/services/regulations-admin-backend/project.json index 088b85acf931..c16cbe8dd104 100644 --- a/apps/services/regulations-admin-backend/project.json +++ b/apps/services/regulations-admin-backend/project.json @@ -4,6 +4,7 @@ "sourceRoot": "apps/services/regulations-admin-backend/src", "projectType": "application", "prefix": "regulations-admin-backend", + "tags": ["scope:nest"], "targets": { "build": { "executor": "@anatine/esbuildnx:build", @@ -51,12 +52,7 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "apps/services/regulations-admin-backend/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -64,8 +60,7 @@ "{workspaceRoot}/coverage/apps/services/regulations-admin-backend" ], "options": { - "jestConfig": "apps/services/regulations-admin-backend/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/services/regulations-admin-backend/jest.config.ts" } }, "dev-services": { @@ -110,7 +105,9 @@ "cwd": "apps/services/regulations-admin-backend" } }, - "docker-express": {}, + "docker-express": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-express`" + }, "extract-strings": { "executor": "nx:run-commands", "options": { @@ -135,6 +132,5 @@ "parallel": true } } - }, - "tags": ["scope:nest"] + } } diff --git a/apps/services/regulations-admin-backend/src/app/modules/draft_regulation/draft_regulation.controller.ts b/apps/services/regulations-admin-backend/src/app/modules/draft_regulation/draft_regulation.controller.ts index c3ad814e9263..5212b052e3a8 100644 --- a/apps/services/regulations-admin-backend/src/app/modules/draft_regulation/draft_regulation.controller.ts +++ b/apps/services/regulations-admin-backend/src/app/modules/draft_regulation/draft_regulation.controller.ts @@ -120,7 +120,7 @@ export class DraftRegulationController { }) async getAll( @CurrentUser() user: User, - @Param('page') page: number, + @Query('page') page: number, ): Promise { // managers can see all, creators can only see their own const canManage = user.scope.includes( diff --git a/apps/services/regulations-admin-backend/src/app/modules/draft_regulation/draft_regulation.model.ts b/apps/services/regulations-admin-backend/src/app/modules/draft_regulation/draft_regulation.model.ts index 5427674e0f6d..eb5a74c0f94d 100644 --- a/apps/services/regulations-admin-backend/src/app/modules/draft_regulation/draft_regulation.model.ts +++ b/apps/services/regulations-admin-backend/src/app/modules/draft_regulation/draft_regulation.model.ts @@ -1,4 +1,12 @@ -import { Column, DataType, Model, Table, HasMany } from 'sequelize-typescript' +import { + Column, + DataType, + Model, + Table, + HasMany, + CreatedAt, + UpdatedAt, +} from 'sequelize-typescript' import { RegulationType, @@ -95,6 +103,14 @@ export class DraftRegulationModel extends Model { @ApiProperty() signature_date?: ISODate + @CreatedAt + @ApiProperty() + created!: Date + + @UpdatedAt + @ApiProperty() + modified!: Date + @Column({ type: DataType.STRING, }) diff --git a/apps/services/regulations-admin-backend/src/app/modules/draft_regulation/draft_regulation.service.ts b/apps/services/regulations-admin-backend/src/app/modules/draft_regulation/draft_regulation.service.ts index 08d466c70598..a92b649e388f 100644 --- a/apps/services/regulations-admin-backend/src/app/modules/draft_regulation/draft_regulation.service.ts +++ b/apps/services/regulations-admin-backend/src/app/modules/draft_regulation/draft_regulation.service.ts @@ -9,7 +9,7 @@ import { CreateDraftRegulationDto, UpdateDraftRegulationDto } from './dto' import { DraftRegulationModel } from './draft_regulation.model' import { DraftRegulationChangeModel } from '../draft_regulation_change' import { DraftRegulationCancelModel } from '../draft_regulation_cancel' -import { Op } from 'sequelize' +import { Op, Sequelize } from 'sequelize' import { DraftRegulationCancelService } from '../draft_regulation_cancel/draft_regulation_cancel.service' import { DraftRegulationChangeService } from '../draft_regulation_change/draft_regulation_change.service' import { DraftAuthorService } from '../draft_author/draft_author.service' @@ -77,8 +77,12 @@ export class DraftRegulationService { offset: (page - 1) * count, order: [ ['drafting_status', 'ASC'], - ['fast_track', 'DESC'], + [ + Sequelize.literal('CASE WHEN fast_track IS TRUE THEN 1 ELSE 0 END'), + 'DESC', + ], ['ideal_publish_date', 'ASC'], + ['modified', 'DESC'], ['created', 'DESC'], ], }) diff --git a/apps/services/search-indexer/project.json b/apps/services/search-indexer/project.json index 6015cf679e59..948ddfd445c0 100644 --- a/apps/services/search-indexer/project.json +++ b/apps/services/search-indexer/project.json @@ -4,6 +4,7 @@ "sourceRoot": "apps/services/search-indexer/src", "projectType": "application", "prefix": "services-search-indexer", + "tags": ["scope:nest"], "generators": {}, "targets": { "build": { @@ -61,22 +62,17 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "apps/services/search-indexer/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "apps/services/search-indexer/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/services/search-indexer/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/apps/services/search-indexer"] }, - "docker-express": {} - }, - "tags": ["scope:nest"] + "docker-express": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-express`" + } + } } diff --git a/apps/services/search-indexer/src/migrate/lib/elastic.ts b/apps/services/search-indexer/src/migrate/lib/elastic.ts index f835489d1158..d3c3de11b128 100644 --- a/apps/services/search-indexer/src/migrate/lib/elastic.ts +++ b/apps/services/search-indexer/src/migrate/lib/elastic.ts @@ -18,7 +18,7 @@ import { MetricsService, } from '@island.is/content-search-metrics' import { AwsEsPackage } from './aws' -import { SearchResponse } from 'elastic' +import { SearchResponse } from '@island.is/shared/types' const esService = new ElasticService() diff --git a/apps/services/sessions/project.json b/apps/services/sessions/project.json index a994baf4df67..363a8c8706ce 100644 --- a/apps/services/sessions/project.json +++ b/apps/services/sessions/project.json @@ -3,6 +3,7 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "apps/services/sessions/src", "projectType": "application", + "tags": ["scope:nest"], "targets": { "build": { "executor": "./tools/executors/node:build", @@ -31,6 +32,7 @@ }, "configurations": { "production": { + "outputPath": "dist/apps/services/sessions", "optimization": true, "extractLicenses": true, "inspect": false @@ -51,11 +53,7 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["apps/services/sessions/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -123,7 +121,8 @@ "cwd": "apps/services/sessions" } }, - "docker-express": {} - }, - "tags": ["scope:nest"] + "docker-express": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-express`" + } + } } diff --git a/apps/services/university-gateway/project.json b/apps/services/university-gateway/project.json index 86d47cc7c067..3b5d58a41b84 100644 --- a/apps/services/university-gateway/project.json +++ b/apps/services/university-gateway/project.json @@ -1,8 +1,10 @@ { "name": "services-university-gateway", + "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "apps/services/university-gateway/src", "projectType": "application", "prefix": "services-university-gateway", + "tags": ["scope:nest"], "generators": {}, "targets": { "build": { @@ -52,12 +54,7 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "apps/services/university-gateway/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "worker": { "executor": "@nx/js:node", @@ -108,7 +105,9 @@ "cwd": "apps/services/university-gateway" } }, - "docker-express": {}, + "docker-express": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-express`" + }, "dev-init": { "executor": "nx:run-commands", "options": { @@ -131,10 +130,8 @@ "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/apps/services/university-gateway"], "options": { - "jestConfig": "apps/services/university-gateway/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/services/university-gateway/jest.config.ts" } } - }, - "tags": ["scope:nest"] + } } diff --git a/apps/services/user-notification/project.json b/apps/services/user-notification/project.json index 733fc0f40d44..0dac2fb896a8 100644 --- a/apps/services/user-notification/project.json +++ b/apps/services/user-notification/project.json @@ -4,6 +4,7 @@ "sourceRoot": "apps/services/user-notification/src", "projectType": "application", "prefix": "services-user-notification", + "tags": ["scope:nest"], "targets": { "extract-strings": { "executor": "nx:run-commands", @@ -77,19 +78,13 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "apps/services/user-notification/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/apps/services/user-notification"], "options": { - "jestConfig": "apps/services/user-notification/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/services/user-notification/jest.config.ts" } }, "dev-services": { @@ -137,7 +132,8 @@ "parallel": true } }, - "docker-express": {} - }, - "tags": ["scope:nest"] + "docker-express": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-express`" + } + } } diff --git a/apps/services/user-notification/src/app/modules/notifications/messageProcessor.service.ts b/apps/services/user-notification/src/app/modules/notifications/messageProcessor.service.ts index f8a0d6604f25..6433fd08972f 100644 --- a/apps/services/user-notification/src/app/modules/notifications/messageProcessor.service.ts +++ b/apps/services/user-notification/src/app/modules/notifications/messageProcessor.service.ts @@ -18,7 +18,7 @@ export class MessageProcessorService { message.templateId, locale, ) - const notification = this.notificationsService.formatArguments( + const notification = await this.notificationsService.formatArguments( message.args, // We need to pass the template as a new object to avoid tempering with // the template object from the memory cache. @@ -26,6 +26,8 @@ export class MessageProcessorService { { ...template, }, + message.senderId, + locale, ) return { title: notification.title, diff --git a/apps/services/user-notification/src/app/modules/notifications/notifications.service.ts b/apps/services/user-notification/src/app/modules/notifications/notifications.service.ts index 5fb33237ccd1..7a7be722db15 100644 --- a/apps/services/user-notification/src/app/modules/notifications/notifications.service.ts +++ b/apps/services/user-notification/src/app/modules/notifications/notifications.service.ts @@ -42,7 +42,7 @@ const ALLOWED_REPLACE_PROPS: Array = [ ] type SenderOrganization = { - title: string | undefined + title: string } @Injectable() @@ -91,33 +91,12 @@ export class NotificationsService { template = await this.getTemplate(templateId, locale) } - // check for organization argument to fetch translated organization title - const organizationArg = notification.args.find( - (arg) => arg.key === 'organization', - ) - - // if senderId is set and args contains organization, fetch organizationtitle from senderId - if (notification.senderId && organizationArg) { - try { - const sender = await this.getSenderOrganizationTitle( - notification.senderId, - locale, - ) - if (sender?.title) { - organizationArg.value = sender.title - } - } catch (error) { - this.logger.error(error.message, { - senderId: notification.senderId, - locale, - }) - } - } - // Format the template with arguments from the notification - const formattedTemplate = this.formatArguments( + const formattedTemplate = await this.formatArguments( notification.args, template, + notification.senderId, + locale, ) // Map to RenderedNotificationDto @@ -213,7 +192,29 @@ export class NotificationsService { /** * Replaces the placeholders in the template with the values provided in the request body */ - formatArguments(args: ArgumentDto[], template: HnippTemplate): HnippTemplate { + async formatArguments( + args: ArgumentDto[], + template: HnippTemplate, + senderId?: string, + locale?: Locale, + ): Promise { + // Fetch and update organization name if needed + if (senderId && args.some((arg) => arg.key === 'organization')) { + try { + const sender = await this.getSenderOrganizationTitle(senderId, locale) + if (sender?.title) { + args = args.map((arg) => + arg.key === 'organization' ? { ...arg, value: sender.title } : arg, + ) + } + } catch (error) { + this.logger.error('Error fetching sender organization title:', { + senderId, + locale, + }) + } + } + // Deep clone the template to avoid modifying the original const formattedTemplate = JSON.parse(JSON.stringify(template)) diff --git a/apps/services/user-notification/src/app/modules/notifications/notificationsWorker/notificationsWorker.service.ts b/apps/services/user-notification/src/app/modules/notifications/notificationsWorker/notificationsWorker.service.ts index 67e9ca46c7bd..fbf514a4ba2b 100644 --- a/apps/services/user-notification/src/app/modules/notifications/notificationsWorker/notificationsWorker.service.ts +++ b/apps/services/user-notification/src/app/modules/notifications/notificationsWorker/notificationsWorker.service.ts @@ -260,13 +260,15 @@ export class NotificationsWorkerService implements OnApplicationBootstrap { const isEnglish = profile.locale === 'en' - const formattedTemplate = this.notificationsService.formatArguments( + const formattedTemplate = await this.notificationsService.formatArguments( message.args, // We need to shallow copy the template here so that the // in-memory cache is not modified. { ...template, }, + message?.senderId, + profile.locale as Locale, ) try { diff --git a/apps/services/user-notification/src/app/modules/notifications/tests/notifications.service.spec.ts b/apps/services/user-notification/src/app/modules/notifications/tests/notifications.service.spec.ts index 8384087e7b3d..8820d8ddd2cb 100644 --- a/apps/services/user-notification/src/app/modules/notifications/tests/notifications.service.spec.ts +++ b/apps/services/user-notification/src/app/modules/notifications/tests/notifications.service.spec.ts @@ -138,12 +138,12 @@ describe('NotificationsService', () => { expect(counts).toBe(false) }) - it('should replace template {{placeholders}} with args', () => { + it('should replace template {{placeholders}} with args', async () => { mockCreateHnippNotificationDto.args = [ { key: 'arg1', value: 'hello' }, { key: 'arg2', value: 'world' }, ] - const template = service.formatArguments( + const template = await service.formatArguments( mockCreateHnippNotificationDto.args, mockHnippTemplate, ) diff --git a/apps/services/user-profile/infra/service-portal-api.ts b/apps/services/user-profile/infra/service-portal-api.ts index d996908099bb..cba03ff550cd 100644 --- a/apps/services/user-profile/infra/service-portal-api.ts +++ b/apps/services/user-profile/infra/service-portal-api.ts @@ -96,4 +96,5 @@ export const serviceSetup = (): ServiceBuilder => 'islandis', 'user-notification', 'identity-server', + 'application-system', ) diff --git a/apps/services/user-profile/project.json b/apps/services/user-profile/project.json index e60101613a3b..32f31cf51a8d 100644 --- a/apps/services/user-profile/project.json +++ b/apps/services/user-profile/project.json @@ -4,6 +4,7 @@ "sourceRoot": "apps/services/user-profile/src", "projectType": "application", "prefix": "services-user-profile", + "tags": ["scope:nest"], "generators": {}, "targets": { "build": { @@ -53,16 +54,12 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["apps/services/user-profile/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { "jestConfig": "apps/services/user-profile/jest.config.ts", - "passWithNoTests": true, "runInBand": true }, "outputs": ["{workspaceRoot}/coverage/apps/services/user-profile"] @@ -123,8 +120,9 @@ "parallel": true } }, - "docker-express": {}, + "docker-express": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-express`" + }, "service-service-portal-api": {} - }, - "tags": ["scope:nest"] + } } diff --git a/apps/services/xroad-collector/project.json b/apps/services/xroad-collector/project.json index a946ff6f4d48..4ef3b91c9a0d 100644 --- a/apps/services/xroad-collector/project.json +++ b/apps/services/xroad-collector/project.json @@ -4,6 +4,7 @@ "sourceRoot": "apps/services/xroad-collector/src", "projectType": "application", "prefix": "services-xroad-collector", + "tags": ["scope:nest"], "generators": {}, "targets": { "build": { @@ -31,22 +32,17 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "apps/services/xroad-collector/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "apps/services/xroad-collector/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/services/xroad-collector/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/apps/services/xroad-collector"] }, - "docker-express": {} - }, - "tags": ["scope:nest"] + "docker-express": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-express`" + } + } } diff --git a/apps/skilavottord/web/.eslintrc.json b/apps/skilavottord/web/.eslintrc.json index bf282605197b..050e58a985b6 100644 --- a/apps/skilavottord/web/.eslintrc.json +++ b/apps/skilavottord/web/.eslintrc.json @@ -7,16 +7,28 @@ { "enforceBuildableLibDependency": true, "allowCircularSelfDependency": true, - "allow": [], + "allow": ["../../../infra/src/dsl"], "depConstraints": [ - { "sourceTag": "*", "onlyDependOnLibsWithTags": ["*"] } + { + "sourceTag": "*", + "onlyDependOnLibsWithTags": ["*"] + } ] } ] }, "overrides": [ - { "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], "rules": {} }, - { "files": ["*.ts", "*.tsx"], "rules": {} }, - { "files": ["*.js", "*.jsx"], "rules": {} } + { + "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], + "rules": {} + }, + { + "files": ["*.ts", "*.tsx"], + "rules": {} + }, + { + "files": ["*.js", "*.jsx"], + "rules": {} + } ] } diff --git a/apps/skilavottord/web/project.json b/apps/skilavottord/web/project.json index 5349519115ab..0610771504d8 100644 --- a/apps/skilavottord/web/project.json +++ b/apps/skilavottord/web/project.json @@ -3,6 +3,7 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "apps/skilavottord/web", "projectType": "application", + "tags": ["scope:react-next"], "generators": {}, "targets": { "build": { @@ -30,7 +31,8 @@ "maxWorkers": 2, "assets": [], "compiler": "tsc", - "target": "node" + "target": "node", + "webpackConfig": "apps/skilavottord/web/webpack.config.js" }, "configurations": { "development": {}, @@ -94,16 +96,12 @@ ] }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["apps/skilavottord/web/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "apps/skilavottord/web/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/skilavottord/web/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/apps/skilavottord/web"] }, @@ -134,7 +132,8 @@ "parallel": true } }, - "docker-next": {} - }, - "tags": ["scope:react-next"] + "docker-next": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-next`" + } + } } diff --git a/apps/skilavottord/web/webpack.config.js b/apps/skilavottord/web/webpack.config.js new file mode 100644 index 000000000000..95e68d080f5b --- /dev/null +++ b/apps/skilavottord/web/webpack.config.js @@ -0,0 +1,8 @@ +const { composePlugins, withNx } = require('@nx/webpack') + +// Nx plugins for webpack. +module.exports = composePlugins(withNx(), (config) => { + // Note: This was added by an Nx migration. Webpack builds are required to have a corresponding Webpack config file. + // See: https://nx.dev/recipes/webpack/webpack-config-setup + return config +}) diff --git a/apps/skilavottord/ws/project.json b/apps/skilavottord/ws/project.json index 883dda568c25..ac406527df90 100644 --- a/apps/skilavottord/ws/project.json +++ b/apps/skilavottord/ws/project.json @@ -4,6 +4,7 @@ "sourceRoot": "apps/skilavottord/ws/src", "projectType": "application", "prefix": "skilavottord-ws", + "tags": ["scope:nest"], "generators": {}, "targets": { "build": { @@ -54,16 +55,12 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["apps/skilavottord/ws/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "apps/skilavottord/ws/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/skilavottord/ws/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/apps/skilavottord/ws"] }, @@ -122,7 +119,8 @@ "parallel": true } }, - "docker-express": {} - }, - "tags": ["scope:nest"] + "docker-express": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-express`" + } + } } diff --git a/apps/system-e2e/README.md b/apps/system-e2e/README.md index c783109ae982..85a838908fd4 100644 --- a/apps/system-e2e/README.md +++ b/apps/system-e2e/README.md @@ -193,9 +193,11 @@ You will need a few things to set up your test so it can run with mountebank. Now that you are set up. You need to run a couple of commands. +- Navigate to `/infra` - In your terminal run `yarn cli render-local-env --service=service-portal --service=api` . - This would show you commands how to start the mocking for `service-portal` and `api`. Replace with the services you want to test. - In the output you will see a docker output it will look something like this: `docker run -it --rm -p ...` copy that line and run in a new terminal window. Now your Mountebank impostor should be running. +- Open a new terminal tab within the island.is root. - Now start your services, but make sure your services ports have been replaced by the ports provided by Mountebank. In this examples case that would be `XROAD_BASE_PATH=http://localhost:9388 yarn start api` - Run the test with Playwright and you should see your mocked data replace the API's data. diff --git a/apps/system-e2e/project.json b/apps/system-e2e/project.json index 68ce559f8ab5..d06954dea03f 100644 --- a/apps/system-e2e/project.json +++ b/apps/system-e2e/project.json @@ -4,6 +4,7 @@ "sourceRoot": "apps/system-e2e/src", "projectType": "application", "prefix": "system-e2e", + "tags": ["scope:e2e"], "generators": {}, "targets": { "build": { @@ -13,7 +14,6 @@ "esbuild --bundle $(find apps/system-e2e -name '*.ts' -not -path '*/node_modules/*') --outdir=dist/apps/system-e2e --tsconfig=apps/system-e2e/tsconfig.json --platform=node $(jq -r '.dependencies|keys[]|(\"--external:\"+.)' apps/system-e2e/package.json | xargs) --external:@nestjs/microservices --external:@nestjs/websockets --external:fsevents --external:class-transformer --external:canvas", "cp apps/system-e2e/package.json dist/apps/system-e2e/" ], - "outputPath": "dist/apps/system-e2e", "parallel": false }, "configurations": { @@ -22,10 +22,7 @@ "outputs": ["{workspaceRoot}/dist/apps/system-e2e"] }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["apps/system-e2e/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "smoke": { "executor": "nx:run-commands", @@ -39,7 +36,8 @@ "command": "yarn playwright test apps/system-e2e/src/tests -c apps/system-e2e/src" } }, - "docker-playwright": {} - }, - "tags": ["scope:e2e"] + "docker-playwright": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-playwright`" + } + } } diff --git a/apps/system-e2e/src/support/wire-mocks.ts b/apps/system-e2e/src/support/wire-mocks.ts index 6cbf29229b11..53a7f94fd854 100644 --- a/apps/system-e2e/src/support/wire-mocks.ts +++ b/apps/system-e2e/src/support/wire-mocks.ts @@ -25,6 +25,7 @@ import { ServiceDefinitionForEnv, ValueSource, } from '../../../../infra/src/dsl/types/input-types' +// eslint-disable-next-line @nx/enforce-module-boundaries import { Envs } from '../../../../infra/src/environments' import { env, TestEnvironment } from './urls' diff --git a/apps/system-e2e/src/tests/islandis/service-portal/acceptance/setup-xroad.mocks.ts b/apps/system-e2e/src/tests/islandis/service-portal/acceptance/setup-xroad.mocks.ts index dc6e5ca3561b..7fd2acb732f3 100644 --- a/apps/system-e2e/src/tests/islandis/service-portal/acceptance/setup-xroad.mocks.ts +++ b/apps/system-e2e/src/tests/islandis/service-portal/acceptance/setup-xroad.mocks.ts @@ -14,11 +14,11 @@ export const setupXroadMocks = async () => { /** Xroad mocks */ await Promise.all([ - loadAssetsXroadMocks(), - loadHealthInsuranceXroadMocks(), - loadSocialInsuranceXroadMocks(), - loadLicensesXroadMocks(), - loadOccupationalLicensesXroadMocks(), + loadAssetsXroadMocks().catch((error) => ({ error })), + loadHealthInsuranceXroadMocks().catch((error) => ({ error })), + loadSocialInsuranceXroadMocks().catch((error) => ({ error })), + loadLicensesXroadMocks().catch((error) => ({ error })), + loadOccupationalLicensesXroadMocks().catch((error) => ({ error })), ]) const { envs } = getEnvVariables(Base.getEnv(), 'system-e2e', env) diff --git a/apps/tools/contentful-role-permissions/project.json b/apps/tools/contentful-role-permissions/project.json index 3f944588089a..145fb164d7c6 100644 --- a/apps/tools/contentful-role-permissions/project.json +++ b/apps/tools/contentful-role-permissions/project.json @@ -3,6 +3,7 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "apps/tools/contentful-role-permissions", "projectType": "application", + "tags": ["scope:react-next"], "targets": { "build": { "executor": "@nx/next:build", @@ -48,19 +49,11 @@ "{workspaceRoot}/coverage/apps/tools/contentful-role-permissions" ], "options": { - "jestConfig": "apps/tools/contentful-role-permissions/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/tools/contentful-role-permissions/jest.config.ts" } }, "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "apps/tools/contentful-role-permissions/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" } - }, - "tags": ["scope:react-next"] + } } diff --git a/apps/web/.eslintrc.json b/apps/web/.eslintrc.json index b2e4c7bacb36..b0b7131a6c3a 100644 --- a/apps/web/.eslintrc.json +++ b/apps/web/.eslintrc.json @@ -7,9 +7,12 @@ { "enforceBuildableLibDependency": true, "allowCircularSelfDependency": true, - "allow": [], + "allow": ["../../../infra/src/dsl"], "depConstraints": [ - { "sourceTag": "*", "onlyDependOnLibsWithTags": ["*"] } + { + "sourceTag": "*", + "onlyDependOnLibsWithTags": ["*"] + } ] } ], @@ -36,8 +39,17 @@ }, "plugins": ["simple-import-sort"], "overrides": [ - { "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], "rules": {} }, - { "files": ["*.ts", "*.tsx"], "rules": {} }, - { "files": ["*.js", "*.jsx"], "rules": {} } + { + "files": ["*.ts", "*.tsx", "*.js", "*.jsx"], + "rules": {} + }, + { + "files": ["*.ts", "*.tsx"], + "rules": {} + }, + { + "files": ["*.js", "*.jsx"], + "rules": {} + } ] } diff --git a/apps/web/components/Charts/ChartsCard/ChartsCard.tsx b/apps/web/components/Charts/ChartsCard/ChartsCard.tsx index 11cf99e96727..a465c3d79df2 100644 --- a/apps/web/components/Charts/ChartsCard/ChartsCard.tsx +++ b/apps/web/components/Charts/ChartsCard/ChartsCard.tsx @@ -98,7 +98,7 @@ export const ChartsCard: React.FC< {/* // eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore make web strict */} +// @ts-expect-error make web strict */} {graphTitle} {graphDescription && ( diff --git a/apps/web/components/ChatPanel/WatsonChatPanel/utils.ts b/apps/web/components/ChatPanel/WatsonChatPanel/utils.ts index 1bad5ece14f0..c92633b2310e 100644 --- a/apps/web/components/ChatPanel/WatsonChatPanel/utils.ts +++ b/apps/web/components/ChatPanel/WatsonChatPanel/utils.ts @@ -1,4 +1,4 @@ -import { Locale } from 'locale' +import { Locale } from '@island.is/shared/types' import { uuid } from 'uuidv4' import { ApolloClient, NormalizedCacheObject } from '@apollo/client' diff --git a/apps/web/components/GenericList/GenericList.tsx b/apps/web/components/GenericList/GenericList.tsx index 45d9abcf284b..8c1bb39fab5b 100644 --- a/apps/web/components/GenericList/GenericList.tsx +++ b/apps/web/components/GenericList/GenericList.tsx @@ -1,6 +1,5 @@ import { useEffect, useMemo, useRef, useState } from 'react' import { useDebounce } from 'react-use' -import { Locale } from 'locale' import flatten from 'lodash/flatten' import { useRouter } from 'next/router' import { parseAsInteger, parseAsJson, useQueryState } from 'next-usequerystate' @@ -24,6 +23,7 @@ import { Text, } from '@island.is/island-ui/core' import { theme } from '@island.is/island-ui/theme' +import { Locale } from '@island.is/shared/types' import { GenericListItem, GenericListItemResponse, diff --git a/apps/web/components/OfficialJournalOfIceland/OJOISearchGridView.tsx b/apps/web/components/OfficialJournalOfIceland/OJOISearchGridView.tsx index 0fa637d3df6d..f4c669f98144 100644 --- a/apps/web/components/OfficialJournalOfIceland/OJOISearchGridView.tsx +++ b/apps/web/components/OfficialJournalOfIceland/OJOISearchGridView.tsx @@ -1,4 +1,4 @@ -import { Locale } from 'locale' +import { Locale } from '@island.is/shared/types' import { Stack } from '@island.is/island-ui/core' import { OfficialJournalOfIcelandAdvertsResponse } from '@island.is/web/graphql/schema' diff --git a/apps/web/components/OfficialJournalOfIceland/OJOISearchListView.tsx b/apps/web/components/OfficialJournalOfIceland/OJOISearchListView.tsx index 745ba0ba57e5..958503d1b716 100644 --- a/apps/web/components/OfficialJournalOfIceland/OJOISearchListView.tsx +++ b/apps/web/components/OfficialJournalOfIceland/OJOISearchListView.tsx @@ -1,6 +1,6 @@ import format from 'date-fns/format' import is from 'date-fns/locale/is' -import { Locale } from 'locale' +import { Locale } from '@island.is/shared/types' import { LinkV2, Table as T, Text } from '@island.is/island-ui/core' import { OfficialJournalOfIcelandAdvertsResponse } from '@island.is/web/graphql/schema' diff --git a/apps/web/components/Organization/Slice/OverviewLinks/OverviewLinks.tsx b/apps/web/components/Organization/Slice/OverviewLinks/OverviewLinks.tsx index de6ba56319f7..8b1a4604f4e3 100644 --- a/apps/web/components/Organization/Slice/OverviewLinks/OverviewLinks.tsx +++ b/apps/web/components/Organization/Slice/OverviewLinks/OverviewLinks.tsx @@ -62,9 +62,9 @@ export const OverviewLinksSlice: React.FC< paddingLeft={leftImage ? undefined : [0, 0, 0, 0, 6]} paddingRight={leftImage ? [10, 0, 0, 0, 6] : [10, 0]} > - {/** + {/** // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict */} + // @ts-expect-error make web strict */} > = ({ slice }) => { const { activeLocale } = useI18n() + const { width } = useWindowSize() + const [isMobile, setIsMobile] = useState(false) + + useEffect(() => { + setIsMobile(width < theme.breakpoints.lg) + }, [width]) const leftId = 'sliceLeftTitle-' + slice.id const rightId = 'sliceRightTitle-' + slice.id @@ -41,6 +49,18 @@ export const TwoColumnTextSlice: React.FC< sliceLabelIds.push(rightId) } + const rightTitleIsSkipped = + slice.rightTitle === '' || + slice.rightTitle === undefined || + slice.onlyUseOneTitle + + const leftTitleExist = slice.leftTitle !== '' + + const leftLinkNotExist = !slice.leftLink?.url + + const verticalAlignContentInMobile = + rightTitleIsSkipped && leftTitleExist && leftLinkNotExist && isMobile + const ariaLabelledBy = sliceLabelIds.join(' ') return ( @@ -53,20 +73,25 @@ export const TwoColumnTextSlice: React.FC< {slice.dividerOnTop && } - + {slice.leftTitle && ( {slice.leftTitle} )} - - {slice.rightTitle && ( - - {slice.rightTitle} - - )} - + {!slice.onlyUseOneTitle && ( + + {slice.rightTitle && ( + + {slice.rightTitle} + + )} + + )} @@ -83,42 +108,57 @@ export const TwoColumnTextSlice: React.FC< activeLocale, )} {slice.leftLink && slice.leftLink.url && ( - - - + + + + + )} - - {slice.rightTitle && ( + + {!slice.onlyUseOneTitle && slice.rightTitle && ( {slice.rightTitle} )} - {webRichText( - slice.rightContent as SliceType[], - undefined, - activeLocale, - )} + + {webRichText( + slice.rightContent as SliceType[], + undefined, + activeLocale, + )} + {slice.rightLink && slice.rightLink.url && ( - - - + + + + + )} diff --git a/apps/web/components/Organization/Wrapper/config.ts b/apps/web/components/Organization/Wrapper/config.ts index 79fa63cc10d4..29dd6a701809 100644 --- a/apps/web/components/Organization/Wrapper/config.ts +++ b/apps/web/components/Organization/Wrapper/config.ts @@ -1,4 +1,4 @@ -import { Locale } from 'locale' +import { Locale } from '@island.is/shared/types' import { LiveChatIncChatPanelProps, diff --git a/apps/web/components/ServiceWeb/config.ts b/apps/web/components/ServiceWeb/config.ts index 1043be9f8f88..a766a5aa3902 100644 --- a/apps/web/components/ServiceWeb/config.ts +++ b/apps/web/components/ServiceWeb/config.ts @@ -1,4 +1,4 @@ -import { Locale } from 'locale' +import { Locale } from '@island.is/shared/types' import { WatsonChatPanelProps } from '@island.is/web/components' diff --git a/apps/web/components/SideMenu/SideMenu.tsx b/apps/web/components/SideMenu/SideMenu.tsx index e90d023a41fb..a068cd957796 100644 --- a/apps/web/components/SideMenu/SideMenu.tsx +++ b/apps/web/components/SideMenu/SideMenu.tsx @@ -1,26 +1,26 @@ import React, { - useState, - useRef, - useEffect, useCallback, useContext, + useEffect, + useRef, + useState, } from 'react' import FocusLock from 'react-focus-lock' import { RemoveScroll } from 'react-remove-scroll' import { useKey, useWindowSize } from 'react-use' import cn from 'classnames' import { - Text, - Icon, - Hidden, - Link, + Box, Button, + FocusableBox, + GridColumn, GridContainer, GridRow, - GridColumn, - Box, - FocusableBox, + Hidden, + Icon, + Link, Logo, + Text, } from '@island.is/island-ui/core' import { theme } from '@island.is/island-ui/theme' import { MenuTabsContext } from '@island.is/web/context/MenuTabsContext/MenuTabsContext' @@ -214,7 +214,7 @@ export const SideMenu = ({ role="presentation" > (tabRefs.current[index] = el)} + ref={(el) => (tabRefs.current[index] = el) as any} component="button" className={styles.tabButton} role="tab" diff --git a/apps/web/components/SignLanguageButton/SignLanguageButton.tsx b/apps/web/components/SignLanguageButton/SignLanguageButton.tsx index 4ef659c7bd03..60f9b79ec0df 100644 --- a/apps/web/components/SignLanguageButton/SignLanguageButton.tsx +++ b/apps/web/components/SignLanguageButton/SignLanguageButton.tsx @@ -1,10 +1,10 @@ import { ReactNode, useMemo, useState } from 'react' -import type { Locale } from 'locale' import { useQuery } from '@apollo/client' import { EmbeddedVideo } from '@island.is/island-ui/contentful' import { Box, Hidden, Icon, Text } from '@island.is/island-ui/core' import { Modal } from '@island.is/react/components' +import type { Locale } from '@island.is/shared/types' import { Query, QueryGetNamespaceArgs } from '@island.is/web/graphql/schema' import { useNamespace } from '@island.is/web/hooks' import { useI18n } from '@island.is/web/i18n' diff --git a/apps/web/components/connected/vehicles/PublicVehicleSearch.tsx b/apps/web/components/connected/vehicles/PublicVehicleSearch.tsx index ddde3c4e6851..0484ee1685a6 100644 --- a/apps/web/components/connected/vehicles/PublicVehicleSearch.tsx +++ b/apps/web/components/connected/vehicles/PublicVehicleSearch.tsx @@ -61,7 +61,7 @@ const PublicVehicleSearch = ({ slice }: PublicVehicleSearchProps) => { const vehicleInformation = data?.getPublicVehicleSearch const vehicleWasNotFound = - vehicleInformation === null || typeof vehicleInformation === undefined + vehicleInformation === null || typeof vehicleInformation === 'undefined' const handleSearch = (value: string) => { const updatedQuery = { ...router.query } diff --git a/apps/web/i18n/withLocale.tsx b/apps/web/i18n/withLocale.tsx index 30817f2e8b84..9cdd2ad81535 100644 --- a/apps/web/i18n/withLocale.tsx +++ b/apps/web/i18n/withLocale.tsx @@ -13,8 +13,6 @@ import I18n, { isLocale } from './I18n' export const getLocaleFromPath = (path = ''): Locale => { const maybeLocale = path.split('/').find(Boolean) - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict return isLocale(maybeLocale) ? maybeLocale : defaultLanguage } @@ -39,13 +37,11 @@ export const withLocale = }) => ( {/** - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict */} + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-expect-error make web strict */} ) - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict NewComponent.getProps = async (ctx) => { const newContext = { ...ctx, @@ -64,7 +60,7 @@ export const withLocale = } } // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict return NewComponent } diff --git a/apps/web/layouts/main.tsx b/apps/web/layouts/main.tsx index 4a3dda2ee68b..a420f400076a 100644 --- a/apps/web/layouts/main.tsx +++ b/apps/web/layouts/main.tsx @@ -70,7 +70,7 @@ const { publicRuntimeConfig = {} } = getConfig() ?? {} const IS_MOCK = process.env.NODE_ENV !== 'production' && process.env.API_MOCKS === 'true' // eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore make web strict +// @ts-expect-error make web strict const absoluteUrl = (req, setLocalhost) => { let protocol = 'https:' let host = req @@ -110,10 +110,10 @@ export interface LayoutProps { languageToggleQueryParams?: Record> footerVersion?: 'default' | 'organization' // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict respOrigin // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict megaMenuData children?: React.ReactNode } @@ -132,7 +132,7 @@ if ( }) } // eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore make web strict +// @ts-expect-error make web strict const Layout: Screen = ({ showSearchInHeader = true, wrapContent = true, @@ -188,7 +188,7 @@ const Layout: Screen = ({ useEffect(() => { setAlertBanners( // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict [ { bannerId: `alert-${stringHash( @@ -338,50 +338,50 @@ const Layout: Screen = ({ {alertBanners.map((banner) => ( { // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict if (banner.dismissedForDays !== 0) { // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict Cookies.set(banner.bannerId, 'hide', { // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict expires: banner.dismissedForDays, }) } @@ -401,7 +401,7 @@ const Layout: Screen = ({ {showHeader && (
= ({ url('/fonts/ibm-plex-sans-v7-latin-300.woff2') format('woff2'), url('/fonts/ibm-plex-sans-v7-latin-300.woff') format('woff'); } + @font-face { font-family: 'IBM Plex Sans'; font-style: normal; @@ -472,6 +473,7 @@ const Layout: Screen = ({ url('/fonts/ibm-plex-sans-v7-latin-regular.woff2') format('woff2'), url('/fonts/ibm-plex-sans-v7-latin-regular.woff') format('woff'); } + @font-face { font-family: 'IBM Plex Sans'; font-style: italic; @@ -481,6 +483,7 @@ const Layout: Screen = ({ url('/fonts/ibm-plex-sans-v7-latin-italic.woff2') format('woff2'), url('/fonts/ibm-plex-sans-v7-latin-italic.woff') format('woff'); } + @font-face { font-family: 'IBM Plex Sans'; font-style: normal; @@ -490,6 +493,7 @@ const Layout: Screen = ({ url('/fonts/ibm-plex-sans-v7-latin-500.woff2') format('woff2'), url('/fonts/ibm-plex-sans-v7-latin-500.woff') format('woff'); } + @font-face { font-family: 'IBM Plex Sans'; font-style: normal; @@ -505,7 +509,7 @@ const Layout: Screen = ({ ) } // eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore make web strict +// @ts-expect-error make web strict Layout.getProps = async ({ apolloClient, locale, req }) => { const lang = locale ?? 'is' // Defaulting to is when locale is undefined @@ -544,7 +548,7 @@ Layout.getProps = async ({ apolloClient, locale, req }) => { .then((res) => { // map data here to reduce data processing in component // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict return JSON.parse(res.data.getNamespace.fields) }), apolloClient @@ -567,7 +571,7 @@ Layout.getProps = async ({ apolloClient, locale, req }) => { const alertBannerId = `alert-${stringHash(JSON.stringify(alertBanner))}` // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict const [asideTopLinksData, asideBottomLinksData] = megaMenuData.menus const mapLinks = (item: Menu) => @@ -600,13 +604,13 @@ Layout.getProps = async ({ apolloClient, locale, req }) => { footerMiddleMenu: [], } // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict const footerMenu = footerMenuData.menus.reduce((menus, menu, idx) => { if (IS_MOCK) { const key = Object.keys(menus)[idx] if (key) { // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict menus[key] = mapLinks(menu as Menu) } return menus @@ -616,31 +620,31 @@ Layout.getProps = async ({ apolloClient, locale, req }) => { // Footer lower case '6vTuiadpCKOBhAlSjYY8td': // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict menus.footerLowerMenu = mapLinks(menu as Menu) break // Footer middle case '7hSbSQm5F5EBc0KxPTFVAS': // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict menus.footerMiddleMenu = mapLinks(menu as Menu) break // Footer tags case '6oGQDyWos4xcKX9BdMHd5R': // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict menus.footerTagsMenu = mapLinks(menu as Menu) break // Footer upper case '62Zh6hUc3bi0JwNRnqV8Nm': // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict menus.footerUpperInfo = mapLinks(menu as Menu) break // Footer upper contact case '5yUCZ4U6aZ8rZ9Jigme7GI': // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict menus.footerUpperContact = mapLinks(menu as Menu) break default: @@ -656,7 +660,7 @@ Layout.getProps = async ({ apolloClient, locale, req }) => { ...alertBanner, showAlertBanner: // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict alertBanner.showAlertBanner && (!req?.headers.cookie || req.headers.cookie?.indexOf(alertBannerId) === -1), @@ -699,9 +703,9 @@ export const withMainLayout = ( }) => { return ( - {/** + {/** // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict */} + // @ts-expect-error make web strict */} ) diff --git a/apps/web/pages/api/rss/index.ts b/apps/web/pages/api/rss/index.ts index b0da0b25b52f..2eca8c803770 100644 --- a/apps/web/pages/api/rss/index.ts +++ b/apps/web/pages/api/rss/index.ts @@ -1,16 +1,17 @@ import type { NextApiRequest, NextApiResponse } from 'next' -import type { Locale } from 'locale' + +import { defaultLanguage } from '@island.is/shared/constants' +import type { Locale } from '@island.is/shared/types' +import { FRONTPAGE_NEWS_TAG_ID } from '@island.is/web/constants' +import initApollo from '@island.is/web/graphql/client' import { ContentLanguage, GetNewsQuery, QueryGetNewsArgs, } from '@island.is/web/graphql/schema' -import { GET_NEWS_QUERY } from '@island.is/web/screens/queries' -import initApollo from '@island.is/web/graphql/client' -import { FRONTPAGE_NEWS_TAG_ID } from '@island.is/web/constants' -import { isLocale } from '@island.is/web/i18n/I18n' -import { defaultLanguage } from '@island.is/shared/constants' import { linkResolver } from '@island.is/web/hooks' +import { isLocale } from '@island.is/web/i18n/I18n' +import { GET_NEWS_QUERY } from '@island.is/web/screens/queries' const extractTagsFromQuery = (query: NextApiRequest['query']) => { if (typeof query?.tags === 'string') { diff --git a/apps/web/project.json b/apps/web/project.json index bed60aa33f7f..a1a12fdb04f5 100644 --- a/apps/web/project.json +++ b/apps/web/project.json @@ -3,6 +3,7 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "apps/web", "projectType": "application", + "tags": ["scope:react-next"], "generators": {}, "targets": { "build": { @@ -51,7 +52,8 @@ "maxWorkers": 2, "assets": [], "compiler": "tsc", - "target": "node" + "target": "node", + "webpackConfig": "apps/web/webpack.config.js" }, "configurations": { "development": {}, @@ -90,16 +92,12 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["apps/web/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "apps/web/jest.config.ts", - "passWithNoTests": true + "jestConfig": "apps/web/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/apps/web"] }, @@ -138,7 +136,8 @@ "parallel": true } }, - "docker-next": {} - }, - "tags": ["scope:react-next"] + "docker-next": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-next`" + } + } } diff --git a/apps/web/screens/Adgerdir/Article.tsx b/apps/web/screens/Adgerdir/Article.tsx index ef172a3fb801..7ed5c8ae8f8b 100644 --- a/apps/web/screens/Adgerdir/Article.tsx +++ b/apps/web/screens/Adgerdir/Article.tsx @@ -56,21 +56,21 @@ const AdgerdirArticle: Screen = ({ const portalRef = useRef() const [mounted, setMounted] = useState(false) // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict const n = useNamespace(namespace) const { activeLocale } = useI18n() const { linkResolver } = useLinkResolver() useEffect(() => { // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict portalRef.current = document.querySelector('#__next') setMounted(true) }, []) const { items: pagesItems } = pages // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict const { items: tagsItems } = tags const processEntry = article?.processEntry @@ -141,9 +141,9 @@ const AdgerdirArticle: Screen = ({ {processEntry?.processLink && ( - {/** + {/** // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore */} + // @ts-expect-error expecting error */} )} @@ -163,12 +163,12 @@ const AdgerdirArticle: Screen = ({ printHidden > {/** - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict */} + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-expect-error make web strict */} , // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict portalRef.current, )} @@ -180,10 +180,10 @@ const AdgerdirArticle: Screen = ({ tags={tagsItems} items={pagesItems} // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict namespace={namespace} // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict currentArticle={article} showAll /> diff --git a/apps/web/screens/AnchorPage/AnchorPage.tsx b/apps/web/screens/AnchorPage/AnchorPage.tsx index cc88a9c19301..3540f5719746 100644 --- a/apps/web/screens/AnchorPage/AnchorPage.tsx +++ b/apps/web/screens/AnchorPage/AnchorPage.tsx @@ -37,7 +37,7 @@ import { useNamespace, usePlausiblePageview } from '@island.is/web/hooks' import useContentfulId from '@island.is/web/hooks/useContentfulId' import { useLinkResolver } from '@island.is/web/hooks/useLinkResolver' import { useRouter } from 'next/router' -import { Locale } from 'locale' +import { Locale } from '@island.is/shared/types' import { useLocalLinkTypeResolver } from '@island.is/web/hooks/useLocalLinkTypeResolver' import { webRichText } from '@island.is/web/utils/richText' import { useI18n } from '@island.is/web/i18n' diff --git a/apps/web/screens/AnchorPage/config.ts b/apps/web/screens/AnchorPage/config.ts index 6c12d73814d8..bf0260ff1006 100644 --- a/apps/web/screens/AnchorPage/config.ts +++ b/apps/web/screens/AnchorPage/config.ts @@ -1,5 +1,5 @@ import { WatsonChatPanelProps } from '@island.is/web/components' -import { Locale } from 'locale' +import { Locale } from '@island.is/shared/types' export const watsonConfig: Record = { is: { diff --git a/apps/web/screens/Article/Article.tsx b/apps/web/screens/Article/Article.tsx index 9bcea28a36f7..18ae19782f75 100644 --- a/apps/web/screens/Article/Article.tsx +++ b/apps/web/screens/Article/Article.tsx @@ -66,7 +66,7 @@ import { getOrganizationLink } from '@island.is/web/utils/organization' type Article = GetSingleArticleQuery['getSingleArticle'] // eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore make web strict +// @ts-expect-error make web strict type SubArticle = GetSingleArticleQuery['getSingleArticle']['subArticles'][0] const getThemeConfig = (article: Article) => { @@ -134,7 +134,7 @@ const createArticleNavigation = ( } } // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict return nav } @@ -224,7 +224,7 @@ const ArticleNavigation: FC< } isMenuDialog={isMenuDialog} // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict renderLink={(link, { typename, slug }) => { return ( > = ({ locale={activeLocale} linkProps={{ // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict href: getOrganizationLink(article.organization[0], activeLocale), }} imgContainerDisplay={['block', 'block', 'none', 'block']} @@ -336,15 +337,15 @@ const ArticleScreen: Screen = ({ const [isVisible, setIsVisible] = useState(true) useEffect(() => { // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict portalRef.current = document.querySelector('#__next') // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict processEntryRef.current = document.querySelector('#processRef') setMounted(true) }, []) // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict const n = useNamespace(namespace) const { query, asPath } = useRouter() const { linkResolver } = useLinkResolver() @@ -368,7 +369,7 @@ const ArticleScreen: Screen = ({ const elementPosition = processEntryRef && processEntryRef.current ? // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict processEntryRef?.current.getBoundingClientRect().bottom + (px - currPos.y) : 0 @@ -378,7 +379,7 @@ const ArticleScreen: Screen = ({ }, [setIsVisible], // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict null, false, 150, @@ -457,7 +458,7 @@ const ArticleScreen: Screen = ({ {webRichText( // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict (subArticle ?? article).body as SliceType[], { renderComponent: { @@ -490,12 +491,12 @@ const ArticleScreen: Screen = ({ > {/** // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict */} + // @ts-expect-error make web strict */} {processEntry?.processLink && } { // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict article.organization.length > 0 && ( = ({ > ({ title: responsibleParty.title, @@ -530,13 +531,13 @@ const ArticleScreen: Screen = ({ }), )} // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict relatedInstitution={article.relatedOrganization.map( (relatedOrganization) => ({ title: relatedOrganization.title, label: n('relatedOrganization'), // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict href: getOrganizationLink(relatedOrganization, activeLocale), }), )} @@ -549,18 +550,18 @@ const ArticleScreen: Screen = ({ { // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict (article.relatedArticles.length > 0 || // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict article.relatedContent.length > 0) && ( ) @@ -605,7 +606,7 @@ const ArticleScreen: Screen = ({ {!inStepperView && ( { return ( @@ -688,7 +689,7 @@ const ArticleScreen: Screen = ({ {!inStepperView && ( @@ -696,11 +697,11 @@ const ArticleScreen: Screen = ({ {(subArticle ? subArticle.signLanguageVideo?.url : // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict article.signLanguageVideo?.url) && ( = ({ { // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict (subArticle ?? article).title } @@ -749,7 +750,7 @@ const ArticleScreen: Screen = ({ > {/** // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict */} + // @ts-expect-error make web strict */} )} @@ -759,7 +760,7 @@ const ArticleScreen: Screen = ({ = ({ {/** // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict */} + // @ts-expect-error make web strict */} , // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict portalRef.current, )} = ({ const expanded = hashArray.includes(groupSlug) return ( -
(itemsRef.current[index] = el)}> +
(itemsRef.current[index] = el) as any}> = { is: { diff --git a/apps/web/screens/LifeEventPage/LifeEventPage.tsx b/apps/web/screens/LifeEventPage/LifeEventPage.tsx index b3a7f4f343c4..aa10671c4e2a 100644 --- a/apps/web/screens/LifeEventPage/LifeEventPage.tsx +++ b/apps/web/screens/LifeEventPage/LifeEventPage.tsx @@ -1,5 +1,5 @@ import React, { useMemo, useRef } from 'react' -import { Locale } from 'locale' +import { Locale } from '@island.is/shared/types' import NextLink from 'next/link' import { useRouter } from 'next/router' import { parseAsBoolean } from 'next-usequerystate' diff --git a/apps/web/screens/LifeEventPage/config.ts b/apps/web/screens/LifeEventPage/config.ts index d51fd8440584..ded35343be97 100644 --- a/apps/web/screens/LifeEventPage/config.ts +++ b/apps/web/screens/LifeEventPage/config.ts @@ -1,4 +1,4 @@ -import { Locale } from 'locale' +import { Locale } from '@island.is/shared/types' import { WatsonChatPanelProps } from '@island.is/web/components' import { setupOneScreenWatsonChatBot } from '@island.is/web/utils/webChat' diff --git a/apps/web/screens/News.tsx b/apps/web/screens/News.tsx index 336e2afc03b6..9c3f6e5352c1 100644 --- a/apps/web/screens/News.tsx +++ b/apps/web/screens/News.tsx @@ -74,7 +74,7 @@ interface NewsListProps { const spacing: ResponsiveSpace = [3, 3, 4] const spacingMini: ResponsiveSpace = [0, 0, 4] // eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore make web strict +// @ts-expect-error make web strict const NewsListNew: Screen = ({ newsItem, newsList, @@ -90,7 +90,7 @@ const NewsListNew: Screen = ({ const { linkResolver } = useLinkResolver() const { format, getMonthByIndex } = useDateUtils() // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict const n = useNamespace(namespace) useContentfulId(newsItem?.id) @@ -153,7 +153,7 @@ const NewsListNew: Screen = ({ }, ] // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict const breadCrumbTags: BreadCrumbItem | BreadCrumbItem[] = newsItem ?.genericTags?.length ? newsItem.genericTags @@ -200,7 +200,7 @@ const NewsListNew: Screen = ({ title={navTitle} items={navItems} // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict renderLink={(link, { href }) => { return ( @@ -228,9 +228,9 @@ const NewsListNew: Screen = ({ return ( <> - {/** + {/** // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict */} + // @ts-expect-error make web strict */} = ({ title={navTitleMobile} items={navItems} // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict renderLink={(link, { href }) => { return ( @@ -324,7 +324,7 @@ const NewsListNew: Screen = ({ {!newsItem && ( @@ -354,11 +354,9 @@ const NewsListNew: Screen = ({ { if (!isNaN(i)) return i } // eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore make web strict +// @ts-expect-error make web strict NewsListNew.getProps = async ({ apolloClient, locale, query }) => { const slug = query.slug as string // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict const year = getIntParam(query.y) // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict const month = year && getIntParam(query.m) // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict const selectedPage = getIntParam(query.page) ?? 1 const tag = (query.tag as string) ?? FRONTPAGE_NEWS_TAG_ID @@ -483,19 +481,19 @@ NewsListNew.getProps = async ({ apolloClient, locale, query }) => { .then((variables) => { // map data here to reduce data processing in component // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict return JSON.parse(variables.data.getNamespace.fields) }), ]) // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict const newsItem = getSingleNewsResult?.data?.getSingleNews ?? null // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict const newsList = getNewsResults?.data?.getNews?.items ?? [] // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict const total = getNewsResults?.data?.getNews?.total ?? 0 const selectedYear = newsItem?.date @@ -514,7 +512,7 @@ NewsListNew.getProps = async ({ apolloClient, locale, query }) => { return { // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict + // @ts-expect-error make web strict newsList: newsList.map((item) => ({ ...item, genericTags: item?.genericTags?.filter(filterOutFrontpageTag) ?? [], diff --git a/apps/web/screens/OfficialJournalOfIceland/OJOIAdvert.tsx b/apps/web/screens/OfficialJournalOfIceland/OJOIAdvert.tsx index 7f9e8368dd97..92fcc0abc82c 100644 --- a/apps/web/screens/OfficialJournalOfIceland/OJOIAdvert.tsx +++ b/apps/web/screens/OfficialJournalOfIceland/OJOIAdvert.tsx @@ -1,5 +1,5 @@ import { useIntl } from 'react-intl' -import { Locale } from 'locale' +import { Locale } from '@island.is/shared/types' import { Box, Button, Link, Stack, Text } from '@island.is/island-ui/core' import { diff --git a/apps/web/screens/OfficialJournalOfIceland/OJOICategories.tsx b/apps/web/screens/OfficialJournalOfIceland/OJOICategories.tsx index c16f0c636756..b03b4338998e 100644 --- a/apps/web/screens/OfficialJournalOfIceland/OJOICategories.tsx +++ b/apps/web/screens/OfficialJournalOfIceland/OJOICategories.tsx @@ -1,6 +1,6 @@ import { useCallback, useEffect, useMemo, useState } from 'react' import { useIntl } from 'react-intl' -import { Locale } from 'locale' +import { Locale } from '@island.is/shared/types' import debounce from 'lodash/debounce' import { useRouter } from 'next/router' diff --git a/apps/web/screens/OfficialJournalOfIceland/OJOIHome.tsx b/apps/web/screens/OfficialJournalOfIceland/OJOIHome.tsx index 40554df056a1..2cb2b12905fd 100644 --- a/apps/web/screens/OfficialJournalOfIceland/OJOIHome.tsx +++ b/apps/web/screens/OfficialJournalOfIceland/OJOIHome.tsx @@ -1,5 +1,5 @@ import { useIntl } from 'react-intl' -import { Locale } from 'locale' +import { Locale } from '@island.is/shared/types' import NextLink from 'next/link' import { diff --git a/apps/web/screens/OfficialJournalOfIceland/OJOISearch.tsx b/apps/web/screens/OfficialJournalOfIceland/OJOISearch.tsx index 27806fbd951e..5d248425a3a7 100644 --- a/apps/web/screens/OfficialJournalOfIceland/OJOISearch.tsx +++ b/apps/web/screens/OfficialJournalOfIceland/OJOISearch.tsx @@ -1,6 +1,6 @@ import { useEffect, useMemo, useState } from 'react' import { useIntl } from 'react-intl' -import { Locale } from 'locale' +import { Locale } from '@island.is/shared/types' import debounce from 'lodash/debounce' import { useRouter } from 'next/router' import { useLazyQuery } from '@apollo/client' diff --git a/apps/web/screens/Organization/OrganizationEvents/OrganizationEventArticle.tsx b/apps/web/screens/Organization/OrganizationEvents/OrganizationEventArticle.tsx index cc2e96f132e7..84b1073b9929 100644 --- a/apps/web/screens/Organization/OrganizationEvents/OrganizationEventArticle.tsx +++ b/apps/web/screens/Organization/OrganizationEvents/OrganizationEventArticle.tsx @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react' import cn from 'classnames' -import type { Locale } from 'locale' +import type { Locale } from '@island.is/shared/types' import { useRouter } from 'next/router' import { EmbeddedVideo, Image } from '@island.is/island-ui/contentful' diff --git a/apps/web/screens/Organization/OrganizationEvents/OrganizationEventList.tsx b/apps/web/screens/Organization/OrganizationEvents/OrganizationEventList.tsx index dce1f9201998..8c8addf1eaa1 100644 --- a/apps/web/screens/Organization/OrganizationEvents/OrganizationEventList.tsx +++ b/apps/web/screens/Organization/OrganizationEvents/OrganizationEventList.tsx @@ -1,4 +1,4 @@ -import type { Locale } from 'locale' +import type { Locale } from '@island.is/shared/types' import { useRouter } from 'next/router' import { diff --git a/apps/web/screens/Organization/OrganizationNews/OrganizationNewsArticle.tsx b/apps/web/screens/Organization/OrganizationNews/OrganizationNewsArticle.tsx index 2d94426eff92..61472a70d0f5 100644 --- a/apps/web/screens/Organization/OrganizationNews/OrganizationNewsArticle.tsx +++ b/apps/web/screens/Organization/OrganizationNews/OrganizationNewsArticle.tsx @@ -28,7 +28,7 @@ import { useNamespace } from '@island.is/web/hooks' import { useLinkResolver } from '@island.is/web/hooks' import { CustomNextError } from '@island.is/web/units/errors' import { useLocalLinkTypeResolver } from '@island.is/web/hooks/useLocalLinkTypeResolver' -import { Locale } from 'locale' +import { Locale } from '@island.is/shared/types' interface OrganizationNewsArticleProps { newsItem: GetSingleNewsItemQuery['getSingleNews'] diff --git a/apps/web/screens/Organization/OrganizationNews/OrganizationNewsList.tsx b/apps/web/screens/Organization/OrganizationNews/OrganizationNewsList.tsx index 1e1feca458a9..6a2b713c9716 100644 --- a/apps/web/screens/Organization/OrganizationNews/OrganizationNewsList.tsx +++ b/apps/web/screens/Organization/OrganizationNews/OrganizationNewsList.tsx @@ -27,7 +27,7 @@ import { useDateUtils } from '@island.is/web/i18n/useDateUtils' import { LayoutProps, withMainLayout } from '@island.is/web/layouts/main' import type { Screen } from '@island.is/web/types' import { CustomNextError } from '@island.is/web/units/errors' -import { Locale } from 'locale' +import { Locale } from '@island.is/shared/types' import capitalize from 'lodash/capitalize' import { useRouter } from 'next/router' import { diff --git a/apps/web/screens/Organization/SubPage.tsx b/apps/web/screens/Organization/SubPage.tsx index 7c50c19691e7..5e34391352df 100644 --- a/apps/web/screens/Organization/SubPage.tsx +++ b/apps/web/screens/Organization/SubPage.tsx @@ -1,4 +1,4 @@ -import { Locale } from 'locale' +import { Locale } from '@island.is/shared/types' import { useRouter } from 'next/router' import { ParsedUrlQuery } from 'querystring' diff --git a/apps/web/screens/Project/Project.tsx b/apps/web/screens/Project/Project.tsx index 01dff72bc059..4b4e1394da62 100644 --- a/apps/web/screens/Project/Project.tsx +++ b/apps/web/screens/Project/Project.tsx @@ -1,5 +1,5 @@ import { useEffect, useMemo, useState } from 'react' -import { Locale } from 'locale' +import { Locale } from '@island.is/shared/types' import { useRouter } from 'next/router' import slugify from '@sindresorhus/slugify' diff --git a/apps/web/screens/Project/ProjectNewsArticle.tsx b/apps/web/screens/Project/ProjectNewsArticle.tsx index 1d3e9850da33..6af11e7946b2 100644 --- a/apps/web/screens/Project/ProjectNewsArticle.tsx +++ b/apps/web/screens/Project/ProjectNewsArticle.tsx @@ -22,7 +22,7 @@ import { useNamespace } from '@island.is/web/hooks' import { useLinkResolver } from '../../hooks/useLinkResolver' import { CustomNextError } from '../../units/errors' import { useLocalLinkTypeResolver } from '@island.is/web/hooks/useLocalLinkTypeResolver' -import { Locale } from 'locale' +import { Locale } from '@island.is/shared/types' import { ProjectWrapper } from './components/ProjectWrapper' import { GET_PROJECT_PAGE_QUERY } from '../queries/Project' import { getThemeConfig } from './utils' diff --git a/apps/web/screens/Project/ProjectNewsList.tsx b/apps/web/screens/Project/ProjectNewsList.tsx index 39f7eddd0eef..07168ca9a2fe 100644 --- a/apps/web/screens/Project/ProjectNewsList.tsx +++ b/apps/web/screens/Project/ProjectNewsList.tsx @@ -23,7 +23,7 @@ import { useDateUtils } from '@island.is/web/i18n/useDateUtils' import { LayoutProps, withMainLayout } from '@island.is/web/layouts/main' import type { Screen } from '@island.is/web/types' import { CustomNextError } from '@island.is/web/units/errors' -import { Locale } from 'locale' +import { Locale } from '@island.is/shared/types' import capitalize from 'lodash/capitalize' import { useRouter } from 'next/router' import { diff --git a/apps/web/screens/Project/components/ProjectChatPanel/config.ts b/apps/web/screens/Project/components/ProjectChatPanel/config.ts index bdc71689b001..683646c48081 100644 --- a/apps/web/screens/Project/components/ProjectChatPanel/config.ts +++ b/apps/web/screens/Project/components/ProjectChatPanel/config.ts @@ -1,4 +1,4 @@ -import { Locale } from 'locale' +import { Locale } from '@island.is/shared/types' import { LiveChatIncChatPanelProps, diff --git a/apps/web/screens/ServiceWeb/Forms/Forms.tsx b/apps/web/screens/ServiceWeb/Forms/Forms.tsx index b803ddd6c159..ed91df332345 100644 --- a/apps/web/screens/ServiceWeb/Forms/Forms.tsx +++ b/apps/web/screens/ServiceWeb/Forms/Forms.tsx @@ -1,5 +1,5 @@ import { ReactNode, useEffect, useMemo } from 'react' -import { Locale } from 'locale' +import { Locale } from '@island.is/shared/types' import NextLink from 'next/link' import { useMutation } from '@apollo/client' import { BLOCKS, INLINES } from '@contentful/rich-text-types' diff --git a/apps/web/screens/ServiceWeb/Home/Home.tsx b/apps/web/screens/ServiceWeb/Home/Home.tsx index acb7c9d9f269..5fffeee97032 100644 --- a/apps/web/screens/ServiceWeb/Home/Home.tsx +++ b/apps/web/screens/ServiceWeb/Home/Home.tsx @@ -1,4 +1,4 @@ -import { Locale } from 'locale' +import { Locale } from '@island.is/shared/types' import { useRouter } from 'next/router' import { diff --git a/apps/web/screens/ServiceWeb/Search/ServiceSearch.tsx b/apps/web/screens/ServiceWeb/Search/ServiceSearch.tsx index 94e4aa413dd0..3b45f017bb8c 100644 --- a/apps/web/screens/ServiceWeb/Search/ServiceSearch.tsx +++ b/apps/web/screens/ServiceWeb/Search/ServiceSearch.tsx @@ -1,5 +1,5 @@ import { useMemo } from 'react' -import { Locale } from 'locale' +import { Locale } from '@island.is/shared/types' import NextLink from 'next/link' import { useRouter } from 'next/router' diff --git a/apps/web/screens/ServiceWeb/SubPage/SubPage.tsx b/apps/web/screens/ServiceWeb/SubPage/SubPage.tsx index 4b953a98d32c..7c602ca8d74d 100644 --- a/apps/web/screens/ServiceWeb/SubPage/SubPage.tsx +++ b/apps/web/screens/ServiceWeb/SubPage/SubPage.tsx @@ -1,4 +1,4 @@ -import { Locale } from 'locale' +import { Locale } from '@island.is/shared/types' import groupBy from 'lodash/groupBy' import NextLink from 'next/link' import { useRouter } from 'next/router' diff --git a/apps/web/screens/queries/fragments.ts b/apps/web/screens/queries/fragments.ts index 9b5db5057ef4..2c5b155a939d 100644 --- a/apps/web/screens/queries/fragments.ts +++ b/apps/web/screens/queries/fragments.ts @@ -420,6 +420,7 @@ export const slices = gql` url } dividerOnTop + onlyUseOneTitle } fragment MultipleStatisticsFields on MultipleStatistics { diff --git a/apps/web/utils/organization.ts b/apps/web/utils/organization.ts index be9cbb93ff83..93b1a54d24c2 100644 --- a/apps/web/utils/organization.ts +++ b/apps/web/utils/organization.ts @@ -1,4 +1,4 @@ -import { Locale } from 'locale' +import { Locale } from '@island.is/shared/types' import { OrganizationPage, OrganizationTheme } from '../graphql/schema' import { linkResolver, pathIsRoute } from '../hooks' diff --git a/apps/web/webpack.config.js b/apps/web/webpack.config.js new file mode 100644 index 000000000000..95e68d080f5b --- /dev/null +++ b/apps/web/webpack.config.js @@ -0,0 +1,8 @@ +const { composePlugins, withNx } = require('@nx/webpack') + +// Nx plugins for webpack. +module.exports = composePlugins(withNx(), (config) => { + // Note: This was added by an Nx migration. Webpack builds are required to have a corresponding Webpack config file. + // See: https://nx.dev/recipes/webpack/webpack-config-setup + return config +}) diff --git a/charts/islandis/values.dev.yaml b/charts/islandis/values.dev.yaml index e9b409b9899b..c37074a33485 100644 --- a/charts/islandis/values.dev.yaml +++ b/charts/islandis/values.dev.yaml @@ -373,7 +373,7 @@ api: XROAD_NATIONAL_REGISTRY_TIMEOUT: '20000' XROAD_OFFICIAL_JOURNAL_APPLICATION_PATH: 'IS-DEV/GOV/10014/DMR-Protected/official-journal-application' XROAD_OFFICIAL_JOURNAL_PATH: 'IS-DEV/GOV/10014/DMR-Protected/official-journal' - XROAD_PASSPORT_LICENSE_PATH: 'IS-DEV/GOV/10001/SKRA-Protected/Forskraning-V1' + XROAD_PASSPORT_LICENSE_PATH: 'IS-DEV/GOV/10001/SKRA-Cloud-Protected/Forskraning-V1' XROAD_PAYMENT_ADDITION_CALLBACK_URL: '/' XROAD_PAYMENT_BASE_CALLBACK_URL: 'XROAD:/IS-DEV/GOV/10000/island-is/application-callback-v2/application-payment/' XROAD_PAYMENT_PROVIDER_ID: 'IS-DEV/GOV/10021/FJS-Public' @@ -610,6 +610,7 @@ application-system-api: REDIS_URL_NODE_01: '["clustercfg.general-redis-cluster-group.5fzau3.euw1.cache.amazonaws.com:6379"]' SERVERSIDE_FEATURES_ON: '' SERVICE_DOCUMENTS_BASEPATH: 'http://web-services-documents.services-documents.svc.cluster.local' + SERVICE_USER_PROFILE_URL: 'http://web-service-portal-api.service-portal.svc.cluster.local' UNIVERSITY_GATEWAY_API_URL: 'http://web-services-university-gateway.services-university-gateway.svc.cluster.local' WORKPOINT_ARBORG_SERVICE_PATH: 'IS-DEV/MUN/10036/Arborg-Protected/tengill-application-v1' XROAD_AGRICULTURAL_UNIVERSITY_OF_ICELAND_PATH: 'IS-DEV/EDU/10056/LBHI-Protected/brautskraning-v1' @@ -646,7 +647,7 @@ application-system-api: XROAD_NATIONAL_REGISTRY_SERVICE_PATH: 'IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1' XROAD_OFFICIAL_JOURNAL_APPLICATION_PATH: 'IS-DEV/GOV/10014/DMR-Protected/official-journal-application' XROAD_OFFICIAL_JOURNAL_PATH: 'IS-DEV/GOV/10014/DMR-Protected/official-journal' - XROAD_PASSPORT_LICENSE_PATH: 'IS-DEV/GOV/10001/SKRA-Protected/Forskraning-V1' + XROAD_PASSPORT_LICENSE_PATH: 'IS-DEV/GOV/10001/SKRA-Cloud-Protected/Forskraning-V1' XROAD_PAYMENT_ADDITION_CALLBACK_URL: '/' XROAD_PAYMENT_BASE_CALLBACK_URL: 'XROAD:/IS-DEV/GOV/10000/island-is/application-callback-v2/application-payment/' XROAD_PAYMENT_PROVIDER_ID: 'IS-DEV/GOV/10021/FJS-Public' @@ -2177,6 +2178,7 @@ service-portal-api: - 'islandis' - 'user-notification' - 'identity-server' + - 'application-system' grantNamespacesEnabled: true healthCheck: liveness: diff --git a/charts/islandis/values.prod.yaml b/charts/islandis/values.prod.yaml index 4cf805359a68..6ccb3917b3bd 100644 --- a/charts/islandis/values.prod.yaml +++ b/charts/islandis/values.prod.yaml @@ -363,7 +363,7 @@ api: XROAD_NATIONAL_REGISTRY_TIMEOUT: '20000' XROAD_OFFICIAL_JOURNAL_APPLICATION_PATH: 'IS/GOV/10014/DMR-Protected/official-journal-application' XROAD_OFFICIAL_JOURNAL_PATH: 'IS/GOV/10014/DMR-Protected/official-journal' - XROAD_PASSPORT_LICENSE_PATH: 'IS/GOV/6503760649/SKRA-Protected/Forskraning-V1' + XROAD_PASSPORT_LICENSE_PATH: 'IS/GOV/6503760649/SKRA-Cloud-Protected/Forskraning-V1' XROAD_PAYMENT_ADDITION_CALLBACK_URL: '/' XROAD_PAYMENT_BASE_CALLBACK_URL: 'XROAD:/IS/GOV/5501692829/island-is/application-callback-v2/application-payment/' XROAD_PAYMENT_PROVIDER_ID: 'IS/GOV/5402697509/FJS-Public' @@ -600,6 +600,7 @@ application-system-api: REDIS_URL_NODE_01: '["clustercfg.general-redis-cluster-group.whakos.euw1.cache.amazonaws.com:6379"]' SERVERSIDE_FEATURES_ON: 'driving-license-use-v1-endpoint-for-v2-comms' SERVICE_DOCUMENTS_BASEPATH: 'http://web-services-documents.services-documents.svc.cluster.local' + SERVICE_USER_PROFILE_URL: 'http://web-service-portal-api.service-portal.svc.cluster.local' UNIVERSITY_GATEWAY_API_URL: 'http://web-services-university-gateway.services-university-gateway.svc.cluster.local' WORKPOINT_ARBORG_SERVICE_PATH: 'IS/MUN/10036/Arborg-Protected/tengill-application-v1' XROAD_AGRICULTURAL_UNIVERSITY_OF_ICELAND_PATH: 'IS/EDU/4112043590/LBHI-Protected/brautskraning-v1' @@ -636,7 +637,7 @@ application-system-api: XROAD_NATIONAL_REGISTRY_SERVICE_PATH: 'IS/GOV/6503760649/SKRA-Protected/Einstaklingar-v1' XROAD_OFFICIAL_JOURNAL_APPLICATION_PATH: 'IS/GOV/10014/DMR-Protected/official-journal-application' XROAD_OFFICIAL_JOURNAL_PATH: 'IS/GOV/10014/DMR-Protected/official-journal' - XROAD_PASSPORT_LICENSE_PATH: 'IS/GOV/6503760649/SKRA-Protected/Forskraning-V1' + XROAD_PASSPORT_LICENSE_PATH: 'IS/GOV/6503760649/SKRA-Cloud-Protected/Forskraning-V1' XROAD_PAYMENT_ADDITION_CALLBACK_URL: '/' XROAD_PAYMENT_BASE_CALLBACK_URL: 'XROAD:/IS/GOV/5501692829/island-is/application-callback-v2/application-payment/' XROAD_PAYMENT_PROVIDER_ID: 'IS/GOV/5402697509/FJS-Public' @@ -2048,6 +2049,7 @@ service-portal-api: - 'islandis' - 'user-notification' - 'identity-server' + - 'application-system' grantNamespacesEnabled: true healthCheck: liveness: diff --git a/charts/islandis/values.staging.yaml b/charts/islandis/values.staging.yaml index 285751840af4..d779344442f4 100644 --- a/charts/islandis/values.staging.yaml +++ b/charts/islandis/values.staging.yaml @@ -373,7 +373,7 @@ api: XROAD_NATIONAL_REGISTRY_TIMEOUT: '20000' XROAD_OFFICIAL_JOURNAL_APPLICATION_PATH: 'IS-DEV/GOV/10014/DMR-Protected/official-journal-application' XROAD_OFFICIAL_JOURNAL_PATH: 'IS-DEV/GOV/10014/DMR-Protected/official-journal' - XROAD_PASSPORT_LICENSE_PATH: 'IS-TEST/GOV/6503760649/SKRA-Protected/Forskraning-V1' + XROAD_PASSPORT_LICENSE_PATH: 'IS-TEST/GOV/6503760649/SKRA-Cloud-Protected/Forskraning-V1' XROAD_PAYMENT_ADDITION_CALLBACK_URL: '/' XROAD_PAYMENT_BASE_CALLBACK_URL: 'XROAD:' XROAD_PAYMENT_PROVIDER_ID: 'IS-TEST/GOV/10021/FJS-DEV-Public' @@ -608,6 +608,7 @@ application-system-api: REDIS_URL_NODE_01: '["clustercfg.general-redis-cluster-group.ab9ckb.euw1.cache.amazonaws.com:6379"]' SERVERSIDE_FEATURES_ON: '' SERVICE_DOCUMENTS_BASEPATH: 'http://web-services-documents.services-documents.svc.cluster.local' + SERVICE_USER_PROFILE_URL: 'http://web-service-portal-api.service-portal.svc.cluster.local' UNIVERSITY_GATEWAY_API_URL: 'http://web-services-university-gateway.services-university-gateway.svc.cluster.local' WORKPOINT_ARBORG_SERVICE_PATH: 'IS-DEV/MUN/10036/Arborg-Protected/tengill-application-v1' XROAD_AGRICULTURAL_UNIVERSITY_OF_ICELAND_PATH: 'IS-DEV/EDU/10056/LBHI-Protected/brautskraning-v1' @@ -644,7 +645,7 @@ application-system-api: XROAD_NATIONAL_REGISTRY_SERVICE_PATH: 'IS-TEST/GOV/6503760649/SKRA-Protected/Einstaklingar-v1' XROAD_OFFICIAL_JOURNAL_APPLICATION_PATH: 'IS-DEV/GOV/10014/DMR-Protected/official-journal-application' XROAD_OFFICIAL_JOURNAL_PATH: 'IS-DEV/GOV/10014/DMR-Protected/official-journal' - XROAD_PASSPORT_LICENSE_PATH: 'IS-TEST/GOV/6503760649/SKRA-Protected/Forskraning-V1' + XROAD_PASSPORT_LICENSE_PATH: 'IS-TEST/GOV/6503760649/SKRA-Cloud-Protected/Forskraning-V1' XROAD_PAYMENT_ADDITION_CALLBACK_URL: '/' XROAD_PAYMENT_BASE_CALLBACK_URL: 'XROAD:' XROAD_PAYMENT_PROVIDER_ID: 'IS-TEST/GOV/10021/FJS-DEV-Public' @@ -1920,6 +1921,7 @@ service-portal-api: - 'islandis' - 'user-notification' - 'identity-server' + - 'application-system' grantNamespacesEnabled: true healthCheck: liveness: diff --git a/charts/judicial-system/values.dev.yaml b/charts/judicial-system/values.dev.yaml index 6034ba18586b..8868b9dfb4a6 100644 --- a/charts/judicial-system/values.dev.yaml +++ b/charts/judicial-system/values.dev.yaml @@ -629,6 +629,7 @@ judicial-system-xrd-api: BACKEND_ACCESS_TOKEN: '/k8s/judicial-system/BACKEND_ACCESS_TOKEN' CONFIGCAT_SDK_KEY: '/k8s/configcat/CONFIGCAT_SDK_KEY' ERROR_EVENT_URL: '/k8s/judicial-system/ERROR_EVENT_URL' + LAWYERS_ICELAND_API_KEY: '/k8s/judicial-system/LAWYERS_ICELAND_API_KEY' securityContext: allowPrivilegeEscalation: false privileged: false diff --git a/charts/judicial-system/values.prod.yaml b/charts/judicial-system/values.prod.yaml index e7e46e11483b..17fd3e77314d 100644 --- a/charts/judicial-system/values.prod.yaml +++ b/charts/judicial-system/values.prod.yaml @@ -629,6 +629,7 @@ judicial-system-xrd-api: BACKEND_ACCESS_TOKEN: '/k8s/judicial-system/BACKEND_ACCESS_TOKEN' CONFIGCAT_SDK_KEY: '/k8s/configcat/CONFIGCAT_SDK_KEY' ERROR_EVENT_URL: '/k8s/judicial-system/ERROR_EVENT_URL' + LAWYERS_ICELAND_API_KEY: '/k8s/judicial-system/LAWYERS_ICELAND_API_KEY' securityContext: allowPrivilegeEscalation: false privileged: false diff --git a/charts/judicial-system/values.staging.yaml b/charts/judicial-system/values.staging.yaml index fc6073f8028c..1ecb3e880222 100644 --- a/charts/judicial-system/values.staging.yaml +++ b/charts/judicial-system/values.staging.yaml @@ -629,6 +629,7 @@ judicial-system-xrd-api: BACKEND_ACCESS_TOKEN: '/k8s/judicial-system/BACKEND_ACCESS_TOKEN' CONFIGCAT_SDK_KEY: '/k8s/configcat/CONFIGCAT_SDK_KEY' ERROR_EVENT_URL: '/k8s/judicial-system/ERROR_EVENT_URL' + LAWYERS_ICELAND_API_KEY: '/k8s/judicial-system/LAWYERS_ICELAND_API_KEY' securityContext: allowPrivilegeEscalation: false privileged: false diff --git a/infra/src/dsl/xroad.ts b/infra/src/dsl/xroad.ts index 57e22fa74fc1..6bc6fc0750ac 100644 --- a/infra/src/dsl/xroad.ts +++ b/infra/src/dsl/xroad.ts @@ -467,9 +467,9 @@ export const NationalRegistryAuthB2C = new XroadConf({ export const Passports = new XroadConf({ env: { XROAD_PASSPORT_LICENSE_PATH: { - dev: 'IS-DEV/GOV/10001/SKRA-Protected/Forskraning-V1', - staging: 'IS-TEST/GOV/6503760649/SKRA-Protected/Forskraning-V1', - prod: 'IS/GOV/6503760649/SKRA-Protected/Forskraning-V1', + dev: 'IS-DEV/GOV/10001/SKRA-Cloud-Protected/Forskraning-V1', + staging: 'IS-TEST/GOV/6503760649/SKRA-Cloud-Protected/Forskraning-V1', + prod: 'IS/GOV/6503760649/SKRA-Cloud-Protected/Forskraning-V1', }, }, }) diff --git a/infra/src/uber-charts/islandis.ts b/infra/src/uber-charts/islandis.ts index 0124521b7447..7c2f09f796c0 100644 --- a/infra/src/uber-charts/islandis.ts +++ b/infra/src/uber-charts/islandis.ts @@ -67,14 +67,16 @@ const skilavottordWs = skilavottordWsSetup() const skilavottordWeb = skilavottordWebSetup({ api: skilavottordWs }) const documentsService = serviceDocumentsSetup() +const servicePortalApi = servicePortalApiSetup() + const appSystemApi = appSystemApiSetup({ documentsService, servicesEndorsementApi: endorsement, skilavottordWs, + servicePortalApi, }) const appSystemApiWorker = appSystemApiWorkerSetup() -const servicePortalApi = servicePortalApiSetup() const adminPortal = adminPortalSetup() const nameRegistryBackend = serviceNameRegistryBackendSetup() diff --git a/libs/air-discount-scheme/consts/project.json b/libs/air-discount-scheme/consts/project.json index 88525679f9b1..a293afb0c423 100644 --- a/libs/air-discount-scheme/consts/project.json +++ b/libs/air-discount-scheme/consts/project.json @@ -3,24 +3,18 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/air-discount-scheme/consts/src", "projectType": "library", + "tags": ["scope:js", "lib:js"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/air-discount-scheme/consts/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/air-discount-scheme/consts/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/air-discount-scheme/consts/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/air-discount-scheme/consts"] } - }, - "tags": ["scope:js", "lib:js"] + } } diff --git a/libs/air-discount-scheme/types/project.json b/libs/air-discount-scheme/types/project.json index c95f36cedd06..6be1e537bd4a 100644 --- a/libs/air-discount-scheme/types/project.json +++ b/libs/air-discount-scheme/types/project.json @@ -3,24 +3,18 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/air-discount-scheme/types/src", "projectType": "library", + "tags": ["lib:js", "scope:js"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/air-discount-scheme/types/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/air-discount-scheme/types/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/air-discount-scheme/types/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/air-discount-scheme/types"] } - }, - "tags": ["lib:js", "scope:js"] + } } diff --git a/libs/api-catalogue/consts/project.json b/libs/api-catalogue/consts/project.json index de3862e27e1d..cf0e467c4936 100644 --- a/libs/api-catalogue/consts/project.json +++ b/libs/api-catalogue/consts/project.json @@ -3,22 +3,18 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api-catalogue/consts/src", "projectType": "library", + "tags": ["scope:js", "lib:js"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/api-catalogue/consts/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/api-catalogue/consts/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api-catalogue/consts/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/api-catalogue/consts"] } - }, - "tags": ["scope:js", "lib:js"] + } } diff --git a/libs/api-catalogue/elastic/project.json b/libs/api-catalogue/elastic/project.json index 11a1c21b8bb3..8b0f14f75548 100644 --- a/libs/api-catalogue/elastic/project.json +++ b/libs/api-catalogue/elastic/project.json @@ -3,22 +3,18 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api-catalogue/elastic/src", "projectType": "library", + "tags": ["lib:nest", "scope:nest"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/api-catalogue/elastic/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/api-catalogue/elastic/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api-catalogue/elastic/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/api-catalogue/elastic"] } - }, - "tags": ["lib:nest", "scope:nest"] + } } diff --git a/libs/api-catalogue/services/project.json b/libs/api-catalogue/services/project.json index 2e01d9d847cc..58488ad30a98 100644 --- a/libs/api-catalogue/services/project.json +++ b/libs/api-catalogue/services/project.json @@ -3,19 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api-catalogue/services/src", "projectType": "library", + "tags": ["lib:nest", "scope:nest"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/api-catalogue/services/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/api-catalogue/services/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api-catalogue/services/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/api-catalogue/services"] }, @@ -30,6 +27,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:nest", "scope:nest"] + } } diff --git a/libs/api-catalogue/types/project.json b/libs/api-catalogue/types/project.json index 7897fb5a5edf..087efb71d910 100644 --- a/libs/api-catalogue/types/project.json +++ b/libs/api-catalogue/types/project.json @@ -3,22 +3,18 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api-catalogue/types/src", "projectType": "library", + "tags": ["scope:js", "lib:js"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/api-catalogue/types/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/api-catalogue/types/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api-catalogue/types/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/api-catalogue/types"] } - }, - "tags": ["scope:js", "lib:js"] + } } diff --git a/libs/api/domains/administration-of-occupational-safety-and-health/project.json b/libs/api/domains/administration-of-occupational-safety-and-health/project.json index ed64a3062668..f36641f228c8 100644 --- a/libs/api/domains/administration-of-occupational-safety-and-health/project.json +++ b/libs/api/domains/administration-of-occupational-safety-and-health/project.json @@ -3,30 +3,17 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/administration-of-occupational-safety-and-health/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/api/domains/administration-of-occupational-safety-and-health/**/*.ts" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/api/domains/administration-of-occupational-safety-and-health/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/api/domains/administration-of-occupational-safety-and-health/jest.config.ts" } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/air-discount-scheme/project.json b/libs/api/domains/air-discount-scheme/project.json index 403659d11adc..a9e0b7ded430 100644 --- a/libs/api/domains/air-discount-scheme/project.json +++ b/libs/api/domains/air-discount-scheme/project.json @@ -3,14 +3,10 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/air-discount-scheme/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/api/domains/air-discount-scheme/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -18,8 +14,7 @@ "{workspaceRoot}/coverage/libs/api/domains/air-discount-scheme" ], "options": { - "jestConfig": "libs/api/domains/air-discount-scheme/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/air-discount-scheme/jest.config.ts" } }, "dev-init": { @@ -44,6 +39,5 @@ "parallel": true } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/aircraft-registry/project.json b/libs/api/domains/aircraft-registry/project.json index 08cbf64c7ca7..ac44848e2377 100644 --- a/libs/api/domains/aircraft-registry/project.json +++ b/libs/api/domains/aircraft-registry/project.json @@ -2,13 +2,10 @@ "name": "api-domains-aircraft-registry", "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/aircraft-registry/src", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/api/domains/aircraft-registry/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -16,10 +13,8 @@ "{workspaceRoot}/coverage/libs/api/domains/aircraft-registry" ], "options": { - "jestConfig": "libs/api/domains/aircraft-registry/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/aircraft-registry/jest.config.ts" } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/api-catalogue/project.json b/libs/api/domains/api-catalogue/project.json index 7afab7574317..125b0ae572d6 100644 --- a/libs/api/domains/api-catalogue/project.json +++ b/libs/api/domains/api-catalogue/project.json @@ -3,24 +3,18 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/api-catalogue/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/api/domains/api-catalogue/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/api/domains/api-catalogue/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/api-catalogue/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/api/domains/api-catalogue"] } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/application/project.json b/libs/api/domains/application/project.json index b216b5d0616f..4873e64e63f5 100644 --- a/libs/api/domains/application/project.json +++ b/libs/api/domains/application/project.json @@ -3,21 +3,17 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/application/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], + "implicitDependencies": ["application-system-api"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/api/domains/application/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/api/domains/application/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/application/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/api/domains/application"] }, @@ -28,7 +24,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "implicitDependencies": ["application-system-api"], - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/assets/project.json b/libs/api/domains/assets/project.json index 635ae3bd9727..fa717317318d 100644 --- a/libs/api/domains/assets/project.json +++ b/libs/api/domains/assets/project.json @@ -3,21 +3,17 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/assets/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/api/domains/assets/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/api/domains/assets"], "options": { - "jestConfig": "libs/api/domains/assets/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/assets/jest.config.ts" } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/auth-admin/project.json b/libs/api/domains/auth-admin/project.json index 1c038ca2e7ad..431b970b765e 100644 --- a/libs/api/domains/auth-admin/project.json +++ b/libs/api/domains/auth-admin/project.json @@ -2,22 +2,17 @@ "name": "api-domains-auth-admin", "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/auth-admin/src", + "tags": ["scope:*", "lib:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/api/domains/auth-admin/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/api/domains/auth-admin"], "options": { - "jestConfig": "libs/api/domains/auth-admin/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/auth-admin/jest.config.ts" } } - }, - "tags": ["scope:*", "lib:api"] + } } diff --git a/libs/api/domains/auth-admin/src/lib/client/dto/create-client.response.ts b/libs/api/domains/auth-admin/src/lib/client/dto/create-client.response.ts index 534acde85f61..f50ba444587b 100644 --- a/libs/api/domains/auth-admin/src/lib/client/dto/create-client.response.ts +++ b/libs/api/domains/auth-admin/src/lib/client/dto/create-client.response.ts @@ -1,5 +1,5 @@ import { Field, ObjectType } from '@nestjs/graphql' -import { Environment } from 'environment' +import { Environment } from '@island.is/shared/types' @ObjectType('AuthAdminCreateClientResponse') export class CreateClientResponse { diff --git a/libs/api/domains/auth-admin/src/lib/client/dto/revoke-secrets.input.ts b/libs/api/domains/auth-admin/src/lib/client/dto/revoke-secrets.input.ts index 9bcf00c2151a..32ec8e06a40a 100644 --- a/libs/api/domains/auth-admin/src/lib/client/dto/revoke-secrets.input.ts +++ b/libs/api/domains/auth-admin/src/lib/client/dto/revoke-secrets.input.ts @@ -1,6 +1,6 @@ import { Field, InputType } from '@nestjs/graphql' -import { Environment } from 'environment' +import { Environment } from '@island.is/shared/types' @InputType('AuthAdminRevokeSecretsInput') export class RevokeSecretsInput { diff --git a/libs/api/domains/auth-admin/src/lib/client/dto/rotate-secret.input.ts b/libs/api/domains/auth-admin/src/lib/client/dto/rotate-secret.input.ts index bdba23fc1098..91abf3a999e8 100644 --- a/libs/api/domains/auth-admin/src/lib/client/dto/rotate-secret.input.ts +++ b/libs/api/domains/auth-admin/src/lib/client/dto/rotate-secret.input.ts @@ -1,6 +1,6 @@ import { Field, InputType } from '@nestjs/graphql' -import { Environment } from 'environment' +import { Environment } from '@island.is/shared/types' @InputType('AuthAdminRotateSecretInput') export class RotateSecretInput { diff --git a/libs/api/domains/auth-admin/src/lib/delegationProvider/dto/delegation-provider.dto.ts b/libs/api/domains/auth-admin/src/lib/delegationProvider/dto/delegation-provider.dto.ts index 94b80b560dba..3ba1743be704 100644 --- a/libs/api/domains/auth-admin/src/lib/delegationProvider/dto/delegation-provider.dto.ts +++ b/libs/api/domains/auth-admin/src/lib/delegationProvider/dto/delegation-provider.dto.ts @@ -1,6 +1,6 @@ import { Field, ID, ObjectType } from '@nestjs/graphql' import { DelegationType } from './DelegationType.dto' -import { Environment } from 'environment' +import { Environment } from '@island.is/shared/types' @ObjectType('AuthAdminDelegationProvider') export class DelegationProvider { diff --git a/libs/api/domains/auth/project.json b/libs/api/domains/auth/project.json index bf07529f4b2f..b9266c7abdca 100644 --- a/libs/api/domains/auth/project.json +++ b/libs/api/domains/auth/project.json @@ -3,21 +3,17 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/auth/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/api/domains/auth/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/api/domains/auth"], "options": { - "jestConfig": "libs/api/domains/auth/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/auth/jest.config.ts" } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/communications/project.json b/libs/api/domains/communications/project.json index 272fd15876ed..0887cd7d3286 100644 --- a/libs/api/domains/communications/project.json +++ b/libs/api/domains/communications/project.json @@ -3,24 +3,18 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/communications/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/api/domains/communications/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/api/domains/communications/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/communications/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/api/domains/communications"] } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/company-registry/project.json b/libs/api/domains/company-registry/project.json index 9db90099f4ef..205bebedf77c 100644 --- a/libs/api/domains/company-registry/project.json +++ b/libs/api/domains/company-registry/project.json @@ -3,24 +3,18 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/company-registry/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/api/domains/company-registry/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/api/domains/company-registry/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/company-registry/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/api/domains/company-registry"] } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/consultation-portal/project.json b/libs/api/domains/consultation-portal/project.json index cf8e90e51192..6e8bd350f4b2 100644 --- a/libs/api/domains/consultation-portal/project.json +++ b/libs/api/domains/consultation-portal/project.json @@ -3,26 +3,20 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/consultation-portal/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/api/domains/consultation-portal/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/api/domains/consultation-portal/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/consultation-portal/jest.config.ts" }, "outputs": [ "{workspaceRoot}/coverage/libs/api/domains/consultation-portal" ] } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/content-search/project.json b/libs/api/domains/content-search/project.json index 7d1af78a95a1..5a428deb04eb 100644 --- a/libs/api/domains/content-search/project.json +++ b/libs/api/domains/content-search/project.json @@ -3,24 +3,18 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/content-search/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/api/domains/content-search/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/api/domains/content-search/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/content-search/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/api/domains/content-search"] } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/criminal-record/project.json b/libs/api/domains/criminal-record/project.json index 384f2f7755f7..bb06b9628e17 100644 --- a/libs/api/domains/criminal-record/project.json +++ b/libs/api/domains/criminal-record/project.json @@ -3,23 +3,17 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/criminal-record/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/api/domains/criminal-record/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/api/domains/criminal-record"], "options": { - "jestConfig": "libs/api/domains/criminal-record/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/criminal-record/jest.config.ts" } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/directorate-of-labour/project.json b/libs/api/domains/directorate-of-labour/project.json index c36ba48450c6..7d8344a92d5e 100644 --- a/libs/api/domains/directorate-of-labour/project.json +++ b/libs/api/domains/directorate-of-labour/project.json @@ -3,26 +3,20 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/directorate-of-labour/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/api/domains/directorate-of-labour/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/api/domains/directorate-of-labour/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/directorate-of-labour/jest.config.ts" }, "outputs": [ "{workspaceRoot}/coverage/libs/api/domains/directorate-of-labour" ] } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/disability-license/project.json b/libs/api/domains/disability-license/project.json index d9d48846adb6..a70afafcfb6c 100644 --- a/libs/api/domains/disability-license/project.json +++ b/libs/api/domains/disability-license/project.json @@ -3,13 +3,10 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/disability-license/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/api/domains/disability-license/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -17,10 +14,8 @@ "{workspaceRoot}/coverage/libs/api/domains/disability-license" ], "options": { - "jestConfig": "libs/api/domains/disability-license/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/disability-license/jest.config.ts" } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/document-provider/project.json b/libs/api/domains/document-provider/project.json index 0d46a634b4a5..0c871b9b6216 100644 --- a/libs/api/domains/document-provider/project.json +++ b/libs/api/domains/document-provider/project.json @@ -3,21 +3,17 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/document-provider/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], + "implicitDependencies": ["services-documents"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/api/domains/document-provider/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/api/domains/document-provider/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/document-provider/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/api/domains/document-provider"] }, @@ -28,7 +24,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "implicitDependencies": ["services-documents"], - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/documents/project.json b/libs/api/domains/documents/project.json index 3223db412d25..54923b311654 100644 --- a/libs/api/domains/documents/project.json +++ b/libs/api/domains/documents/project.json @@ -3,22 +3,18 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/documents/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/api/domains/documents/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/api/domains/documents/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/documents/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/api/domains/documents"] } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/driving-license-book/project.json b/libs/api/domains/driving-license-book/project.json index 518c98d2e782..c076fa51b3b9 100644 --- a/libs/api/domains/driving-license-book/project.json +++ b/libs/api/domains/driving-license-book/project.json @@ -3,26 +3,20 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/driving-license-book/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/api/domains/driving-license-book/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/api/domains/driving-license-book/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/driving-license-book/jest.config.ts" }, "outputs": [ "{workspaceRoot}/coverage/libs/api/domains/driving-license-book" ] } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/driving-license/project.json b/libs/api/domains/driving-license/project.json index cd7e75acd3d0..40ce410f3df3 100644 --- a/libs/api/domains/driving-license/project.json +++ b/libs/api/domains/driving-license/project.json @@ -3,21 +3,16 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/driving-license/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/api/domains/driving-license/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/api/domains/driving-license/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/driving-license/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/api/domains/driving-license"] }, @@ -28,6 +23,5 @@ "parallel": true } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/driving-license/src/lib/drivingLicense.service.ts b/libs/api/domains/driving-license/src/lib/drivingLicense.service.ts index 97093ce252d7..26a3a1af72e1 100644 --- a/libs/api/domains/driving-license/src/lib/drivingLicense.service.ts +++ b/libs/api/domains/driving-license/src/lib/drivingLicense.service.ts @@ -14,6 +14,7 @@ import { ApplicationEligibilityRequirement, QualitySignatureResult, NewBEDrivingLicenseInput, + DrivinglicenseDuplicateValidityStatus, } from './drivingLicense.type' import { CanApplyErrorCodeBFull, @@ -44,6 +45,7 @@ import { import { info } from 'kennitala' import { computeCountryResidence } from '@island.is/residence-history' import { Jurisdiction } from './graphql/models' +import addMonths from 'date-fns/addMonths' const LOGTAG = '[api-domains-driving-license]' @@ -384,6 +386,51 @@ export class DrivingLicenseService { }) } + async canGetNewDuplicate( + token: string, + ): Promise { + const license = await this.drivingLicenseApi.getCurrentLicense({ + token, + }) + + if (license.comments?.some((comment) => comment?.nr == '400')) { + return { + canGetNewDuplicate: false, + meta: '', + } + } + + const inSixMonths = addMonths(new Date(), 6) + + for (const category of license.categories ?? []) { + if (category.expires === null) { + // Technically this will result in the wrong error message + // towards the user, however, contacting the registry + // with the category information should result in the error + // being discovered anyway. We log it here for good measure though. + this.logger.warn(`${LOGTAG} Category has no expiration date`, { + category: category.name, + }) + return { + canGetNewDuplicate: false, + meta: category.name, + } + } + + if (category.expires < inSixMonths) { + return { + canGetNewDuplicate: false, + meta: category.name, + } + } + } + + return { + canGetNewDuplicate: true, + meta: '', + } + } + async drivingLicenseDuplicateSubmission(params: { districtId: number token: string diff --git a/libs/api/domains/driving-license/src/lib/drivingLicense.type.ts b/libs/api/domains/driving-license/src/lib/drivingLicense.type.ts index fdcda87b214e..24a6d5062b98 100644 --- a/libs/api/domains/driving-license/src/lib/drivingLicense.type.ts +++ b/libs/api/domains/driving-license/src/lib/drivingLicense.type.ts @@ -47,6 +47,11 @@ export interface TeachingRightsStatus { hasTeachingRights: boolean } +export interface DrivinglicenseDuplicateValidityStatus { + canGetNewDuplicate: boolean + meta: string +} + export interface StudentQueryInput { nationalId: string } diff --git a/libs/api/domains/education/project.json b/libs/api/domains/education/project.json index 9dc666fd663d..99fbabff1a21 100644 --- a/libs/api/domains/education/project.json +++ b/libs/api/domains/education/project.json @@ -3,22 +3,18 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/education/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/api/domains/education/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/api/domains/education/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/education/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/api/domains/education"] } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/electronic-registration-statistics/project.json b/libs/api/domains/electronic-registration-statistics/project.json index 610549992028..2eef2f4ab771 100644 --- a/libs/api/domains/electronic-registration-statistics/project.json +++ b/libs/api/domains/electronic-registration-statistics/project.json @@ -3,15 +3,10 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/electronic-registration-statistics/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/api/domains/electronic-registration-statistics/**/*.ts" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -19,10 +14,8 @@ "{workspaceRoot}/coverage/libs/api/domains/electronic-registration-statistics" ], "options": { - "jestConfig": "libs/api/domains/electronic-registration-statistics/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/electronic-registration-statistics/jest.config.ts" } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/email-signup/project.json b/libs/api/domains/email-signup/project.json index 770740a5fccc..9093ec33a94c 100644 --- a/libs/api/domains/email-signup/project.json +++ b/libs/api/domains/email-signup/project.json @@ -3,22 +3,17 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/email-signup/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/api/domains/email-signup/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/api/domains/email-signup"], "options": { - "jestConfig": "libs/api/domains/email-signup/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/email-signup/jest.config.ts" } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/endorsement-system/project.json b/libs/api/domains/endorsement-system/project.json index 05a313fe6cb2..7e5bb862c4d4 100644 --- a/libs/api/domains/endorsement-system/project.json +++ b/libs/api/domains/endorsement-system/project.json @@ -3,21 +3,17 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/endorsement-system/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], + "implicitDependencies": ["services-endorsements-api"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/api/domains/endorsement-system/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/api/domains/endorsement-system/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/endorsement-system/jest.config.ts" }, "outputs": [ "{workspaceRoot}/coverage/libs/api/domains/endorsement-system" @@ -50,7 +46,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "implicitDependencies": ["services-endorsements-api"], - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/endorsement-system/src/lib/endorsementSystem.resolver.ts b/libs/api/domains/endorsement-system/src/lib/endorsementSystem.resolver.ts index edfc414f4fd0..acbbcd33b5b0 100644 --- a/libs/api/domains/endorsement-system/src/lib/endorsementSystem.resolver.ts +++ b/libs/api/domains/endorsement-system/src/lib/endorsementSystem.resolver.ts @@ -28,12 +28,17 @@ import { EndorsementPaginationInput } from './dto/endorsementPagination.input' import { OpenListInput } from './dto/openList.input' import { sendPdfEmailResponse } from './dto/sendPdfEmail.response' import { sendPdfEmailInput } from './dto/sendPdfEmail.input' +import { CacheControl, CacheControlOptions } from '@island.is/nest/graphql' +import { CACHE_CONTROL_MAX_AGE } from '@island.is/shared/constants' + +const defaultCache: CacheControlOptions = { maxAge: CACHE_CONTROL_MAX_AGE } @UseGuards(IdsUserGuard) @Resolver(() => EndorsementList) export class EndorsementSystemResolver { constructor(private endorsementSystemService: EndorsementSystemService) {} + @CacheControl({ inheritMaxAge: true }) @ResolveField('ownerName', () => String, { nullable: true }) resolveOwnerName(@Parent() list: EndorsementList): Promise { return this.endorsementSystemService.endorsementListControllerGetOwnerName({ @@ -41,7 +46,7 @@ export class EndorsementSystemResolver { }) } - // GET /endorsement-list/{listId}/endorsement/exists + @CacheControl(defaultCache) @Query(() => ExistsEndorsementResponse) async endorsementSystemGetSingleEndorsement( @Args('input') input: FindEndorsementListInput, @@ -53,7 +58,7 @@ export class EndorsementSystemResolver { ) } - // GET /endorsement-list/{listId}/endorsement + @CacheControl(defaultCache) @Query(() => PaginatedEndorsementResponse, { nullable: true }) async endorsementSystemGetEndorsements( @Args('input') input: PaginatedEndorsementInput, @@ -65,7 +70,6 @@ export class EndorsementSystemResolver { ) } - // POST /endorsement-list/{listId}/endorsement @Mutation(() => Endorsement) async endorsementSystemEndorseList( @Args('input') input: CreateEndorsementInput, @@ -77,7 +81,6 @@ export class EndorsementSystemResolver { ) } - // DELETE /endorsement-list/{listId}/endorsement @Mutation(() => Boolean) async endorsementSystemUnendorseList( @Args('input') input: FindEndorsementListInput, @@ -89,7 +92,7 @@ export class EndorsementSystemResolver { ) } - // GET /endorsement-list ... by tags + @CacheControl(defaultCache) @Query(() => PaginatedEndorsementListResponse) async endorsementSystemFindEndorsementLists( @Args('input') input: PaginatedEndorsementListInput, @@ -101,7 +104,7 @@ export class EndorsementSystemResolver { ) } - // GET /endorsement-list/general-petition-lists + @CacheControl(defaultCache) @Query(() => PaginatedEndorsementListResponse) @BypassAuth() async endorsementSystemGetGeneralPetitionLists( @@ -112,7 +115,7 @@ export class EndorsementSystemResolver { ) } - // GET /endorsement-list/general-petition-list/{listId} + @CacheControl(defaultCache) @Query(() => EndorsementList) @BypassAuth() async endorsementSystemGetGeneralPetitionList( @@ -123,7 +126,7 @@ export class EndorsementSystemResolver { ) } - // GET /endorsement-list/{listId}/endorsement/general-petition + @CacheControl(defaultCache) @Query(() => PaginatedEndorsementResponse, { nullable: true }) @BypassAuth() async endorsementSystemGetGeneralPetitionEndorsements( @@ -134,7 +137,7 @@ export class EndorsementSystemResolver { ) } - // GET /endorsement-list/{listId} + @CacheControl(defaultCache) @Query(() => EndorsementList, { nullable: true }) async endorsementSystemGetSingleEndorsementList( @Args('input') input: FindEndorsementListInput, @@ -146,7 +149,7 @@ export class EndorsementSystemResolver { ) } - // GET /endorsement-list/endorsements + @CacheControl(defaultCache) @Query(() => PaginatedEndorsementResponse) async endorsementSystemUserEndorsements( @CurrentUser() user: User, @@ -158,7 +161,7 @@ export class EndorsementSystemResolver { ) } - // GET /endorsement-list/endorsementLists + @CacheControl(defaultCache) @Query(() => PaginatedEndorsementListResponse) async endorsementSystemUserEndorsementLists( @CurrentUser() user: User, @@ -170,7 +173,6 @@ export class EndorsementSystemResolver { ) } - // POST /endorsement-list @Mutation(() => EndorsementList) async endorsementSystemCreateEndorsementList( @Args('input') input: CreateEndorsementListDto, @@ -197,7 +199,7 @@ export class EndorsementSystemResolver { user, ) } - // PUT /endorsement-list/{listId}/close + @Mutation(() => EndorsementList) async endorsementSystemCloseEndorsementList( @Args('input') input: FindEndorsementListInput, @@ -209,7 +211,6 @@ export class EndorsementSystemResolver { ) } - // PUT /endorsement-list/{listId}/open @Mutation(() => EndorsementList) async endorsementSystemOpenEndorsementList( @Args('input') input: OpenListInput, @@ -221,7 +222,6 @@ export class EndorsementSystemResolver { ) } - // PUT /endorsement-list/{listId}/lock @Mutation(() => EndorsementList) async endorsementSystemLockEndorsementList( @Args('input') input: FindEndorsementListInput, @@ -233,7 +233,6 @@ export class EndorsementSystemResolver { ) } - // PUT /endorsement-list/{listId}/unlock @Mutation(() => EndorsementList) async endorsementSystemUnlockEndorsementList( @Args('input') input: FindEndorsementListInput, diff --git a/libs/api/domains/energy-funds/project.json b/libs/api/domains/energy-funds/project.json index 1ad7f07697de..80d279ac40ee 100644 --- a/libs/api/domains/energy-funds/project.json +++ b/libs/api/domains/energy-funds/project.json @@ -3,28 +3,17 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/energy-funds/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/api/domains/energy-funds/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/api/domains/energy-funds/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/api/domains/energy-funds/jest.config.ts" } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/file-upload/project.json b/libs/api/domains/file-upload/project.json index 53832b472721..91bd798ef32b 100644 --- a/libs/api/domains/file-upload/project.json +++ b/libs/api/domains/file-upload/project.json @@ -3,24 +3,18 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/file-upload/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/api/domains/file-upload/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/api/domains/file-upload/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/file-upload/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/api/domains/file-upload"] } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/finance/project.json b/libs/api/domains/finance/project.json index ef56da0dc288..2e7545bfa17d 100644 --- a/libs/api/domains/finance/project.json +++ b/libs/api/domains/finance/project.json @@ -3,21 +3,17 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/finance/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/api/domains/finance/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/api/domains/finance"], "options": { - "jestConfig": "libs/api/domains/finance/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/finance/jest.config.ts" } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/financial-statements-inao/project.json b/libs/api/domains/financial-statements-inao/project.json index 5c836f89ff36..26fc4d08c9b4 100644 --- a/libs/api/domains/financial-statements-inao/project.json +++ b/libs/api/domains/financial-statements-inao/project.json @@ -3,14 +3,10 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/financial-statements-inao/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/api/domains/financial-statements-inao/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -18,10 +14,8 @@ "{workspaceRoot}/coverage/libs/api/domains/financial-statements-inao" ], "options": { - "jestConfig": "libs/api/domains/financial-statements-inao/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/financial-statements-inao/jest.config.ts" } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/fishing-license/project.json b/libs/api/domains/fishing-license/project.json index 088eb13052e1..6202ecb9c929 100644 --- a/libs/api/domains/fishing-license/project.json +++ b/libs/api/domains/fishing-license/project.json @@ -3,23 +3,17 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/fishing-license/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/api/domains/fishing-license/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/api/domains/fishing-license"], "options": { - "jestConfig": "libs/api/domains/fishing-license/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/fishing-license/jest.config.ts" } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/fiskistofa/project.json b/libs/api/domains/fiskistofa/project.json index 35608db86887..df72ffcd9569 100644 --- a/libs/api/domains/fiskistofa/project.json +++ b/libs/api/domains/fiskistofa/project.json @@ -3,22 +3,17 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/fiskistofa/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/api/domains/fiskistofa/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/api/domains/fiskistofa"], "options": { - "jestConfig": "libs/api/domains/fiskistofa/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/fiskistofa/jest.config.ts" } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/health-insurance/project.json b/libs/api/domains/health-insurance/project.json index 0565174bd28c..74d0039d46f7 100644 --- a/libs/api/domains/health-insurance/project.json +++ b/libs/api/domains/health-insurance/project.json @@ -3,24 +3,18 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/health-insurance/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/api/domains/health-insurance/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/api/domains/health-insurance/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/health-insurance/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/api/domains/health-insurance"] } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/hms-loans/project.json b/libs/api/domains/hms-loans/project.json index eef9306cbfa9..faeb71d11d01 100644 --- a/libs/api/domains/hms-loans/project.json +++ b/libs/api/domains/hms-loans/project.json @@ -3,28 +3,17 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/hms-loans/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/api/domains/hms-loans/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/api/domains/hms-loans/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/api/domains/hms-loans/jest.config.ts" } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/housing-benefit-calculator/project.json b/libs/api/domains/housing-benefit-calculator/project.json index c58b824c08b7..b162f38b30cc 100644 --- a/libs/api/domains/housing-benefit-calculator/project.json +++ b/libs/api/domains/housing-benefit-calculator/project.json @@ -3,30 +3,17 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/housing-benefit-calculator/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/api/domains/housing-benefit-calculator/**/*.ts" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/api/domains/housing-benefit-calculator/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/api/domains/housing-benefit-calculator/jest.config.ts" } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/housing-benefits/project.json b/libs/api/domains/housing-benefits/project.json index eae708dec1ba..d660820dc22a 100644 --- a/libs/api/domains/housing-benefits/project.json +++ b/libs/api/domains/housing-benefits/project.json @@ -3,28 +3,17 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/housing-benefits/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/api/domains/housing-benefits/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/api/domains/housing-benefits/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/api/domains/housing-benefits/jest.config.ts" } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/icelandic-government-institution-vacancies/project.json b/libs/api/domains/icelandic-government-institution-vacancies/project.json index 70d0ecd6a54b..7c38f13df05b 100644 --- a/libs/api/domains/icelandic-government-institution-vacancies/project.json +++ b/libs/api/domains/icelandic-government-institution-vacancies/project.json @@ -2,15 +2,10 @@ "name": "api-domains-icelandic-government-institution-vacancies", "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/icelandic-government-institution-vacancies/src", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/api/domains/icelandic-government-institution-vacancies/**/*.ts" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -18,10 +13,8 @@ "{workspaceRoot}/coverage/libs/api/domains/icelandic-government-institution-vacancies" ], "options": { - "jestConfig": "libs/api/domains/icelandic-government-institution-vacancies/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/icelandic-government-institution-vacancies/jest.config.ts" } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/icelandic-names-registry/project.json b/libs/api/domains/icelandic-names-registry/project.json index 68e920917fbe..f64e291e9ba6 100644 --- a/libs/api/domains/icelandic-names-registry/project.json +++ b/libs/api/domains/icelandic-names-registry/project.json @@ -3,26 +3,20 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/icelandic-names-registry/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/api/domains/icelandic-names-registry/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/api/domains/icelandic-names-registry/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/icelandic-names-registry/jest.config.ts" }, "outputs": [ "{workspaceRoot}/coverage/libs/api/domains/icelandic-names-registry" ] } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/identity/project.json b/libs/api/domains/identity/project.json index 2cadeab6ba6c..fdf3f6a5a9b3 100644 --- a/libs/api/domains/identity/project.json +++ b/libs/api/domains/identity/project.json @@ -3,21 +3,17 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/identity/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/api/domains/identity/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/api/domains/identity"], "options": { - "jestConfig": "libs/api/domains/identity/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/identity/jest.config.ts" } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/intellectual-properties/project.json b/libs/api/domains/intellectual-properties/project.json index bf2ad69f52f1..92aa2c3a0215 100644 --- a/libs/api/domains/intellectual-properties/project.json +++ b/libs/api/domains/intellectual-properties/project.json @@ -3,28 +3,17 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/intellectual-properties/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/api/domains/intellectual-properties/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/api/domains/intellectual-properties/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/api/domains/intellectual-properties/jest.config.ts" } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/license-service/project.json b/libs/api/domains/license-service/project.json index 116c24b0c864..c884416947a6 100644 --- a/libs/api/domains/license-service/project.json +++ b/libs/api/domains/license-service/project.json @@ -3,23 +3,17 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/license-service/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/api/domains/license-service/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/api/domains/license-service"], "options": { - "jestConfig": "libs/api/domains/license-service/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/license-service/jest.config.ts" } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/license-service/src/lib/licenceService.type.ts b/libs/api/domains/license-service/src/lib/licenceService.type.ts index 0884b4da25dc..57bf8380bf35 100644 --- a/libs/api/domains/license-service/src/lib/licenceService.type.ts +++ b/libs/api/domains/license-service/src/lib/licenceService.type.ts @@ -19,15 +19,18 @@ export enum GenericLicenseType { * */ export enum GenericLicenseOrganizationSlug { DriversLicense = 'rikislogreglustjori', + // eslint-disable-next-line @typescript-eslint/no-duplicate-enum-values FirearmLicense = 'rikislogreglustjori', HuntingLicense = 'umhverfisstofnun', AdrLicense = 'vinnueftirlitid', + // eslint-disable-next-line @typescript-eslint/no-duplicate-enum-values MachineLicense = 'vinnueftirlitid', DisabilityLicense = 'tryggingastofnun', PCard = 'syslumenn', EHIC = 'sjukratryggingar-islands', Passport = 'thjodskra-islands', } + export type GenericLicenseTypeType = keyof typeof GenericLicenseType export enum GenericLicenseProviderId { diff --git a/libs/api/domains/license-service/src/lib/utils/translations.ts b/libs/api/domains/license-service/src/lib/utils/translations.ts index 92771b4c504f..e359d4aeec6e 100644 --- a/libs/api/domains/license-service/src/lib/utils/translations.ts +++ b/libs/api/domains/license-service/src/lib/utils/translations.ts @@ -1,4 +1,4 @@ -import { Locale } from 'locale' +import { Locale } from '@island.is/shared/types' import { LicenseLabelsObject } from '../licenceService.type' export const getLabel = ( diff --git a/libs/api/domains/mortgage-certificate/project.json b/libs/api/domains/mortgage-certificate/project.json index 529800e439c0..c7b755003caa 100644 --- a/libs/api/domains/mortgage-certificate/project.json +++ b/libs/api/domains/mortgage-certificate/project.json @@ -3,14 +3,10 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/mortgage-certificate/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/api/domains/mortgage-certificate/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -18,10 +14,8 @@ "{workspaceRoot}/coverage/libs/api/domains/mortgage-certificate" ], "options": { - "jestConfig": "libs/api/domains/mortgage-certificate/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/mortgage-certificate/jest.config.ts" } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/municipalities-financial-aid/project.json b/libs/api/domains/municipalities-financial-aid/project.json index 7cbc25bb9868..9b20b7b173e1 100644 --- a/libs/api/domains/municipalities-financial-aid/project.json +++ b/libs/api/domains/municipalities-financial-aid/project.json @@ -3,26 +3,20 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/municipalities-financial-aid/src ", "projectType": "library", + "tags": ["lib:api", "scope:api"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/api/domains/municipalities-financial-aid/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/api/domains/municipalities-financial-aid/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/municipalities-financial-aid/jest.config.ts" }, "outputs": [ "{workspaceRoot}/coverage/libs/api/domains/municipalities-financial-aid" ] } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/national-registry-x-road/project.json b/libs/api/domains/national-registry-x-road/project.json index 9710d1b3e90d..636409bb3cbc 100644 --- a/libs/api/domains/national-registry-x-road/project.json +++ b/libs/api/domains/national-registry-x-road/project.json @@ -3,26 +3,20 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/national-registry-x-road/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/api/domains/national-registry-x-road/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/api/domains/national-registry-x-road/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/national-registry-x-road/jest.config.ts" }, "outputs": [ "{workspaceRoot}/coverage/libs/api/domains/national-registry-x-road" ] } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/national-registry/project.json b/libs/api/domains/national-registry/project.json index 0a2a4ef1e56e..0b9bf27f75e6 100644 --- a/libs/api/domains/national-registry/project.json +++ b/libs/api/domains/national-registry/project.json @@ -3,24 +3,18 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/national-registry/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/api/domains/national-registry/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/api/domains/national-registry/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/national-registry/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/api/domains/national-registry"] } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/notifications/project.json b/libs/api/domains/notifications/project.json index ab5abca5262c..c0b11b5ba9a3 100644 --- a/libs/api/domains/notifications/project.json +++ b/libs/api/domains/notifications/project.json @@ -3,23 +3,17 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/notifications/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/api/domains/notifications/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/api/domains/notifications"], "options": { - "jestConfig": "libs/api/domains/notifications/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/notifications/jest.config.ts" } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/occupational-licenses-v2/project.json b/libs/api/domains/occupational-licenses-v2/project.json index 70e01785570f..3bfffe4b5da1 100644 --- a/libs/api/domains/occupational-licenses-v2/project.json +++ b/libs/api/domains/occupational-licenses-v2/project.json @@ -3,30 +3,17 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/occupational-licenses-v2/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/api/domains/occupational-licenses-v2/**/*.ts" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/api/domains/occupational-licenses-v2/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/api/domains/occupational-licenses-v2/jest.config.ts" } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/occupational-licenses-v2/src/lib/models/license.model.ts b/libs/api/domains/occupational-licenses-v2/src/lib/models/license.model.ts index 64182ec7c821..71749367beab 100644 --- a/libs/api/domains/occupational-licenses-v2/src/lib/models/license.model.ts +++ b/libs/api/domains/occupational-licenses-v2/src/lib/models/license.model.ts @@ -8,12 +8,12 @@ export class License { @Field() licenseId!: string - @Field() - licenseNumber!: string - @Field(() => LicenseType) type!: LicenseType + @Field({ nullable: true }) + licenseNumber?: string + @Field({ nullable: true }) legalEntityId?: string diff --git a/libs/api/domains/occupational-licenses-v2/src/lib/models/licenseResult.model.ts b/libs/api/domains/occupational-licenses-v2/src/lib/models/licenseResult.model.ts index bc0de30473cb..dc0118dbdd31 100644 --- a/libs/api/domains/occupational-licenses-v2/src/lib/models/licenseResult.model.ts +++ b/libs/api/domains/occupational-licenses-v2/src/lib/models/licenseResult.model.ts @@ -6,7 +6,7 @@ export const LicenseResult = createUnionType({ name: 'OccupationalLicensesV2LicenseResult', types: () => [License, LicenseError] as const, resolveType(value) { - if (value.licenseNumber) { + if (value.licenseId) { return License } diff --git a/libs/api/domains/occupational-licenses-v2/src/lib/occupationalLicensesV2.service.ts b/libs/api/domains/occupational-licenses-v2/src/lib/occupationalLicensesV2.service.ts index 0a8cfbf4eea4..b8a2ff125267 100644 --- a/libs/api/domains/occupational-licenses-v2/src/lib/occupationalLicensesV2.service.ts +++ b/libs/api/domains/occupational-licenses-v2/src/lib/occupationalLicensesV2.service.ts @@ -69,7 +69,6 @@ export class OccupationalLicensesV2Service { } return { licenseId: addLicenseTypePrefix(l.id, 'DistrictCommissioners'), - licenseNumber: l.id, type: LicenseType.DISTRICT_COMMISSIONERS, issuer: l.issuerId, issuerTitle: l.issuerTitle, @@ -110,7 +109,6 @@ export class OccupationalLicensesV2Service { ), type: LicenseType.DISTRICT_COMMISSIONERS, licenseHolderName: license.holderName, - licenseNumber: license.licenseInfo.id, issuer: license.licenseInfo.issuerId, profession: license.licenseInfo.title, dateOfBirth: info(user.nationalId).birthday, @@ -283,7 +281,6 @@ export class OccupationalLicensesV2Service { const issuer: OrganizationSlugType = 'haskoli-islands' return { licenseId: addLicenseTypePrefix(data.id, 'Education'), - licenseNumber: data.id, type: LicenseType.EDUCATION, issuer, issuerTitle: data.issuer, diff --git a/libs/api/domains/occupational-licenses/project.json b/libs/api/domains/occupational-licenses/project.json index 698b64c61d6f..981213fd6033 100644 --- a/libs/api/domains/occupational-licenses/project.json +++ b/libs/api/domains/occupational-licenses/project.json @@ -3,26 +3,20 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/occupational-licenses/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "generators": {}, "targets": { "lint": { - "executor": "@nrwl/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/api/domains/occupational-licenses/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/api/domains/occupational-licenses/jest.config.js", - "passWithNoTests": true + "jestConfig": "libs/api/domains/occupational-licenses/jest.config.js" }, "outputs": [ "{workspaceRoot}/coverage/libs/api/domains/occupational-licenses" ] } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/occupational-licenses/src/index.ts b/libs/api/domains/occupational-licenses/src/index.ts index cd12025a62a8..d2aeb99c34ba 100644 --- a/libs/api/domains/occupational-licenses/src/index.ts +++ b/libs/api/domains/occupational-licenses/src/index.ts @@ -1 +1 @@ -export { OccupationalLicensesModule } from './lib/occupationalLicenses.module' +export * from './lib/occupationalLicenses.module' diff --git a/libs/api/domains/official-journal-of-iceland-application/project.json b/libs/api/domains/official-journal-of-iceland-application/project.json index dad94bc6e8de..ca61d0bb4080 100644 --- a/libs/api/domains/official-journal-of-iceland-application/project.json +++ b/libs/api/domains/official-journal-of-iceland-application/project.json @@ -3,30 +3,17 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/official-journal-of-iceland-application/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/api/domains/official-journal-of-iceland-application/**/*.ts" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/api/domains/official-journal-of-iceland-application/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/api/domains/official-journal-of-iceland-application/jest.config.ts" } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/official-journal-of-iceland/project.json b/libs/api/domains/official-journal-of-iceland/project.json index 11c9e5dcc1b8..db4480df1e75 100644 --- a/libs/api/domains/official-journal-of-iceland/project.json +++ b/libs/api/domains/official-journal-of-iceland/project.json @@ -3,30 +3,17 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/official-journal-of-iceland/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/api/domains/official-journal-of-iceland/**/*.ts" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/api/domains/official-journal-of-iceland/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/api/domains/official-journal-of-iceland/jest.config.ts" } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/passport/project.json b/libs/api/domains/passport/project.json index 5ef496715737..504ecaf5251e 100644 --- a/libs/api/domains/passport/project.json +++ b/libs/api/domains/passport/project.json @@ -3,22 +3,17 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/passport/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/api/domains/passport/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/api/domains/passport"], "options": { - "jestConfig": "libs/api/domains/passport/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/passport/jest.config.ts" } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/payment-schedule/project.json b/libs/api/domains/payment-schedule/project.json index 43f07e460b96..9ee32b25ecd9 100644 --- a/libs/api/domains/payment-schedule/project.json +++ b/libs/api/domains/payment-schedule/project.json @@ -3,23 +3,17 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/payment-schedule/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/api/domains/payment-schedule/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/api/domains/payment-schedule"], "options": { - "jestConfig": "libs/api/domains/payment-schedule/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/payment-schedule/jest.config.ts" } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/payment/project.json b/libs/api/domains/payment/project.json index 94d69696d4cd..81ed364d9e7c 100644 --- a/libs/api/domains/payment/project.json +++ b/libs/api/domains/payment/project.json @@ -3,22 +3,18 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/payment/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/api/domains/payment/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/api/domains/payment/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/payment/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/api/domains/payment"] } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/regulations-admin/project.json b/libs/api/domains/regulations-admin/project.json index 5c4fd7743792..1509417aca3a 100644 --- a/libs/api/domains/regulations-admin/project.json +++ b/libs/api/domains/regulations-admin/project.json @@ -3,22 +3,18 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/regulations-admin/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/api/domains/regulations-admin/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/api/domains/regulations-admin/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/regulations-admin/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/api/domains/regulations-admin"] } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/regulations/project.json b/libs/api/domains/regulations/project.json index 2f6862c900b2..f6a9b1b5d736 100644 --- a/libs/api/domains/regulations/project.json +++ b/libs/api/domains/regulations/project.json @@ -3,24 +3,18 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/regulations/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/api/domains/regulations/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/api/domains/regulations/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/regulations/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/api/domains/regulations"] } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/rights-portal/project.json b/libs/api/domains/rights-portal/project.json index 5c806c7ef662..bcd33a3fa34a 100644 --- a/libs/api/domains/rights-portal/project.json +++ b/libs/api/domains/rights-portal/project.json @@ -3,22 +3,17 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/rights-portal/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/api/domains/rights-portal/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/api/domains/rights-portal"], "options": { - "jestConfig": "libs/api/domains/rights-portal/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/rights-portal/jest.config.ts" } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/sessions/project.json b/libs/api/domains/sessions/project.json index 1217a24a9474..523331597da5 100644 --- a/libs/api/domains/sessions/project.json +++ b/libs/api/domains/sessions/project.json @@ -2,22 +2,17 @@ "name": "api-domains-sessions", "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/sessions/src", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/api/domains/sessions/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/api/domains/sessions"], "options": { - "jestConfig": "libs/api/domains/sessions/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/sessions/jest.config.ts" } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/ship-registry/project.json b/libs/api/domains/ship-registry/project.json index 81f4238a2681..48eb20d03a02 100644 --- a/libs/api/domains/ship-registry/project.json +++ b/libs/api/domains/ship-registry/project.json @@ -3,28 +3,17 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/ship-registry/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/api/domains/ship-registry/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/api/domains/ship-registry/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/api/domains/ship-registry/jest.config.ts" } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/signature-collection/project.json b/libs/api/domains/signature-collection/project.json index cbf3ecb1d0d5..390bd5084421 100644 --- a/libs/api/domains/signature-collection/project.json +++ b/libs/api/domains/signature-collection/project.json @@ -3,28 +3,17 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/signature-collection/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/api/domains/signature-collection/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/api/domains/signature-collection/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/api/domains/signature-collection/jest.config.ts" } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/social-insurance/project.json b/libs/api/domains/social-insurance/project.json index d4897c5d57f1..e4aab7b7d923 100644 --- a/libs/api/domains/social-insurance/project.json +++ b/libs/api/domains/social-insurance/project.json @@ -3,28 +3,17 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/social-insurance/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/api/domains/social-insurance/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/api/domains/social-insurance/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/api/domains/social-insurance/jest.config.ts" } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/statistics/project.json b/libs/api/domains/statistics/project.json index f02da19cf2f7..00904c33ae19 100644 --- a/libs/api/domains/statistics/project.json +++ b/libs/api/domains/statistics/project.json @@ -3,28 +3,17 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/statistics/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/api/domains/statistics/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/api/domains/statistics/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/api/domains/statistics/jest.config.ts" } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/syslumenn/project.json b/libs/api/domains/syslumenn/project.json index 8cd509accf09..a8edb493d71b 100644 --- a/libs/api/domains/syslumenn/project.json +++ b/libs/api/domains/syslumenn/project.json @@ -3,22 +3,18 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/syslumenn/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/api/domains/syslumenn/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/api/domains/syslumenn/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/syslumenn/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/api/domains/syslumenn"] } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/transport-authority/project.json b/libs/api/domains/transport-authority/project.json index 141679176dd4..9d83d117ab5c 100644 --- a/libs/api/domains/transport-authority/project.json +++ b/libs/api/domains/transport-authority/project.json @@ -3,13 +3,10 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/transport-authority/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/api/domains/transport-authority/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -17,10 +14,8 @@ "{workspaceRoot}/coverage/libs/api/domains/transport-authority" ], "options": { - "jestConfig": "libs/api/domains/transport-authority/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/transport-authority/jest.config.ts" } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/university-careers/project.json b/libs/api/domains/university-careers/project.json index 0b4b0604f897..ff62e071d91a 100644 --- a/libs/api/domains/university-careers/project.json +++ b/libs/api/domains/university-careers/project.json @@ -3,28 +3,17 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/university-careers/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/api/domains/university-careers/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/api/domains/university-careers/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/api/domains/university-careers/jest.config.ts" } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/university-careers/src/lib/models/studentTrackHistory.model.ts b/libs/api/domains/university-careers/src/lib/models/studentTrackHistory.model.ts index 93bd4968b8b8..873ba949f75d 100644 --- a/libs/api/domains/university-careers/src/lib/models/studentTrackHistory.model.ts +++ b/libs/api/domains/university-careers/src/lib/models/studentTrackHistory.model.ts @@ -1,8 +1,12 @@ import { Field, ObjectType } from '@nestjs/graphql' -import { StudentTrackTranscriptResult } from './studentTrackTranscriptResult.model' +import { StudentTrackTranscriptError } from './studentTrackTranscriptError.model' +import { StudentTrackTranscript } from './studentTrackTranscript.model' @ObjectType('UniversityCareersStudentTrackHistory') export class StudentTrackHistory { - @Field(() => [StudentTrackTranscriptResult]) - trackResults!: Array + @Field(() => [StudentTrackTranscript]) + transcripts!: Array + + @Field(() => [StudentTrackTranscriptError], { nullable: true }) + errors?: Array } diff --git a/libs/api/domains/university-careers/src/lib/models/studentTrackTranscriptError.model.ts b/libs/api/domains/university-careers/src/lib/models/studentTrackTranscriptError.model.ts index af510322bee3..54f1505ac608 100644 --- a/libs/api/domains/university-careers/src/lib/models/studentTrackTranscriptError.model.ts +++ b/libs/api/domains/university-careers/src/lib/models/studentTrackTranscriptError.model.ts @@ -1,10 +1,10 @@ -import { UniversityId } from '@island.is/clients/university-careers' import { Field, ObjectType } from '@nestjs/graphql' +import { Institution } from './institution.model' @ObjectType('UniversityCareersStudentTrackTranscriptError') export class StudentTrackTranscriptError { - @Field(() => UniversityId) - university!: UniversityId + @Field(() => Institution) + institution!: Institution @Field({ nullable: true, description: 'The error, raw' }) error?: string diff --git a/libs/api/domains/university-careers/src/lib/models/studentTrackTranscriptResult.model.ts b/libs/api/domains/university-careers/src/lib/models/studentTrackTranscriptResult.model.ts deleted file mode 100644 index f61f35f82895..000000000000 --- a/libs/api/domains/university-careers/src/lib/models/studentTrackTranscriptResult.model.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { createUnionType } from '@nestjs/graphql' -import { StudentTrackTranscript } from './studentTrackTranscript.model' -import { StudentTrackTranscriptError } from './studentTrackTranscriptError.model' - -export const StudentTrackTranscriptResult = createUnionType({ - name: 'UniversityCareersStudentTrackTranscriptResult', - types: () => [StudentTrackTranscript, StudentTrackTranscriptError] as const, - resolveType(value) { - if (value.error) { - return StudentTrackTranscriptError - } - if (value.trackNumber) { - return StudentTrackTranscript - } - - return null - }, -}) diff --git a/libs/api/domains/university-careers/src/lib/resolvers/index.ts b/libs/api/domains/university-careers/src/lib/resolvers/index.ts new file mode 100644 index 000000000000..4845702cb12c --- /dev/null +++ b/libs/api/domains/university-careers/src/lib/resolvers/index.ts @@ -0,0 +1,3 @@ +export { InstitutionResolver } from './institution.resolver' +export { StudentTrackResolver } from './studentTrack.resolver' +export { TrackHistoryResolver } from './trackHistory.resolver' diff --git a/libs/api/domains/university-careers/src/lib/resolvers/institution.resolver.ts b/libs/api/domains/university-careers/src/lib/resolvers/institution.resolver.ts new file mode 100644 index 000000000000..428c31f1574c --- /dev/null +++ b/libs/api/domains/university-careers/src/lib/resolvers/institution.resolver.ts @@ -0,0 +1,56 @@ +import { Parent, ResolveField, Resolver } from '@nestjs/graphql' +import { Inject, UseGuards } from '@nestjs/common' +import { Audit } from '@island.is/nest/audit' +import { IdsUserGuard, Scopes, ScopesGuard } from '@island.is/auth-nest-tools' +import { ApiScope } from '@island.is/auth/scopes' +import { Institution } from '../models/institution.model' +import { Loader } from '@island.is/nest/dataloader' +import { + type OrganizationLogoByReferenceIdDataLoader, + OrganizationLogoByReferenceIdLoader, + type OrganizationTitleByReferenceIdDataLoader, + OrganizationTitleByReferenceIdLoader, +} from '@island.is/cms' +import { UniversityContentfulReferenceIds } from '../universityCareers.types' +import { type Logger, LOGGER_PROVIDER } from '@island.is/logging' + +@UseGuards(IdsUserGuard, ScopesGuard) +@Scopes(ApiScope.internal) +@Resolver(() => Institution) +@Audit({ namespace: '@island.is/api/university-careers' }) +export class InstitutionResolver { + constructor(@Inject(LOGGER_PROVIDER) private readonly logger: Logger) {} + + @ResolveField('displayName', () => String, { + nullable: true, + }) + async resolveProviderName( + @Parent() license: Institution, + @Loader(OrganizationTitleByReferenceIdLoader) + organizationTitleLoader: OrganizationTitleByReferenceIdDataLoader, + ): Promise { + if (!license.id) { + return + } + const refId = UniversityContentfulReferenceIds[license.id] + const name = await organizationTitleLoader.load(refId) + return name ?? undefined + } + + @ResolveField('logoUrl', () => String, { + nullable: true, + }) + async resolveLogoUrl( + @Parent() license: Institution, + @Loader(OrganizationLogoByReferenceIdLoader) + organizationLogoLoader: OrganizationLogoByReferenceIdDataLoader, + ): Promise { + if (!license.id) { + return + } + const refId = UniversityContentfulReferenceIds[license.id] + const logo = await organizationLogoLoader.load(refId) + + return logo ?? undefined + } +} diff --git a/libs/api/domains/university-careers/src/lib/universityCareers.resolver.ts b/libs/api/domains/university-careers/src/lib/resolvers/studentTrack.resolver.ts similarity index 62% rename from libs/api/domains/university-careers/src/lib/universityCareers.resolver.ts rename to libs/api/domains/university-careers/src/lib/resolvers/studentTrack.resolver.ts index 497d0e39d122..ef004f64ca74 100644 --- a/libs/api/domains/university-careers/src/lib/universityCareers.resolver.ts +++ b/libs/api/domains/university-careers/src/lib/resolvers/studentTrack.resolver.ts @@ -1,4 +1,4 @@ -import { Args, Query, Resolver } from '@nestjs/graphql' +import { Args, Query, ResolveField, Resolver } from '@nestjs/graphql' import { Inject, UseGuards } from '@nestjs/common' import { Audit } from '@island.is/nest/audit' import { @@ -11,19 +11,17 @@ import type { User } from '@island.is/auth-nest-tools' import { ApiScope } from '@island.is/auth/scopes' import { DownloadServiceConfig } from '@island.is/nest/config' import type { ConfigType } from '@island.is/nest/config' -import { StudentInfoByUniversityInput } from './dto/studentInfoByUniversity.input' +import { StudentTrack } from '../models/studentTrack.model' +import { UniversityCareersService } from '../universityCareers.service' +import { type Logger, LOGGER_PROVIDER } from '@island.is/logging' +import { StudentInfoByUniversityInput } from '../dto/studentInfoByUniversity.input' import { Locale } from '@island.is/shared/types' -import { StudentTrack } from './models/studentTrack.model' -import { LOGGER_PROVIDER, type Logger } from '@island.is/logging' -import { StudentInfoInput } from './dto/studentInfo.input' -import { UniversityCareersService } from './universityCareers.service' -import { StudentTrackHistory } from './models/studentTrackHistory.model' @UseGuards(IdsUserGuard, ScopesGuard) @Scopes(ApiScope.internal) -@Resolver(() => StudentTrackHistory) +@Resolver(() => StudentTrack) @Audit({ namespace: '@island.is/api/university-careers' }) -export class UniversityCareersResolver { +export class StudentTrackResolver { constructor( private service: UniversityCareersService, @Inject(DownloadServiceConfig.KEY) @@ -33,20 +31,6 @@ export class UniversityCareersResolver { @Inject(LOGGER_PROVIDER) private readonly logger: Logger, ) {} - @Query(() => StudentTrackHistory, { - name: 'universityCareersStudentTrackHistory', - }) - @Audit() - async studentTrackHistory( - @CurrentUser() user: User, - @Args('input') input: StudentInfoInput, - ): Promise { - return await this.service.getStudentTrackHistory( - user, - input.locale as Locale, - ) - } - @Query(() => StudentTrack, { name: 'universityCareersStudentTrack', nullable: true, diff --git a/libs/api/domains/university-careers/src/lib/resolvers/trackHistory.resolver.ts b/libs/api/domains/university-careers/src/lib/resolvers/trackHistory.resolver.ts new file mode 100644 index 000000000000..8bab07328145 --- /dev/null +++ b/libs/api/domains/university-careers/src/lib/resolvers/trackHistory.resolver.ts @@ -0,0 +1,34 @@ +import { Args, Query, Resolver } from '@nestjs/graphql' +import { UseGuards } from '@nestjs/common' +import { Audit } from '@island.is/nest/audit' +import { + CurrentUser, + IdsUserGuard, + Scopes, + ScopesGuard, +} from '@island.is/auth-nest-tools' +import type { User } from '@island.is/auth-nest-tools' +import { ApiScope } from '@island.is/auth/scopes' +import { StudentTrackHistory } from '../models/studentTrackHistory.model' +import { UniversityCareersService } from '../universityCareers.service' +import { StudentInfoInput } from '../dto/studentInfo.input' +import { Locale } from '@island.is/shared/types' + +@UseGuards(IdsUserGuard, ScopesGuard) +@Scopes(ApiScope.internal) +@Resolver(() => StudentTrackHistory) +@Audit({ namespace: '@island.is/api/university-careers' }) +export class TrackHistoryResolver { + constructor(private service: UniversityCareersService) {} + + @Query(() => StudentTrackHistory, { + name: 'universityCareersStudentTrackHistory', + }) + @Audit() + async studentTrackHistory( + @CurrentUser() user: User, + @Args('input') input: StudentInfoInput, + ): Promise { + return this.service.getStudentTrackHistory(user, input.locale as Locale) + } +} diff --git a/libs/api/domains/university-careers/src/lib/universityCareers.module.ts b/libs/api/domains/university-careers/src/lib/universityCareers.module.ts index d0a656140b96..f38a031cb2f2 100644 --- a/libs/api/domains/university-careers/src/lib/universityCareers.module.ts +++ b/libs/api/domains/university-careers/src/lib/universityCareers.module.ts @@ -1,12 +1,21 @@ import { Module } from '@nestjs/common' import { UniversityCareersClientModule } from '@island.is/clients/university-careers' -import { UniversityCareersResolver } from './universityCareers.resolver' import { CmsModule } from '@island.is/cms' import { UniversityCareersService } from './universityCareers.service' import { FeatureFlagModule } from '@island.is/nest/feature-flags' +import { + InstitutionResolver, + StudentTrackResolver, + TrackHistoryResolver, +} from './resolvers' @Module({ - providers: [UniversityCareersResolver, UniversityCareersService], + providers: [ + InstitutionResolver, + StudentTrackResolver, + TrackHistoryResolver, + UniversityCareersService, + ], imports: [UniversityCareersClientModule, CmsModule, FeatureFlagModule], }) export class UniversityCareersModule {} diff --git a/libs/api/domains/university-careers/src/lib/universityCareers.service.ts b/libs/api/domains/university-careers/src/lib/universityCareers.service.ts index f96a643c88b6..7d7dcd386dbe 100644 --- a/libs/api/domains/university-careers/src/lib/universityCareers.service.ts +++ b/libs/api/domains/university-careers/src/lib/universityCareers.service.ts @@ -5,7 +5,6 @@ import { UniversityCareersClientService, UniversityId, } from '@island.is/clients/university-careers' -import { CmsContentfulService } from '@island.is/cms' import { LOGGER_PROVIDER, type Logger } from '@island.is/logging' import { FeatureFlagService, Features } from '@island.is/nest/feature-flags' import { Locale } from '@island.is/shared/types' @@ -16,8 +15,6 @@ import { StudentTrack } from './models/studentTrack.model' import { StudentTrackHistory } from './models/studentTrackHistory.model' import { StudentTrackTranscript } from './models/studentTrackTranscript.model' import { StudentTrackTranscriptError } from './models/studentTrackTranscriptError.model' -import { StudentTrackTranscriptResult } from './models/studentTrackTranscriptResult.model' -import { UniversityContentfulReferenceIds } from './universityCareers.types' import { UniversityIdMap } from '@island.is/clients/university-careers' const LOG_CATEGORY = 'university-careers-api' @@ -33,72 +30,35 @@ const FEATURE_FLAGS: Record, Features> = { export class UniversityCareersService { constructor( private universityCareers: UniversityCareersClientService, - private readonly cmsContentfulService: CmsContentfulService, private readonly featureFlagService: FeatureFlagService, @Inject(LOGGER_PROVIDER) private readonly logger: Logger, ) {} - private getContentfulOrganizations = async (locale: Locale) => { - const universityIds = Object.values(UniversityId) - const referenceIds = universityIds.map( - (id) => UniversityContentfulReferenceIds[id], - ) - - //Get all organizations now -> fewer contentful calls - return this.cmsContentfulService.getOrganizations({ - lang: locale, - referenceIdentifiers: referenceIds, - }) - } - async getStudentTrackHistory( user: User, locale: Locale, ): Promise { - let normalizedResults: Array = [] - - const organizations = await this.getContentfulOrganizations(locale) - //parallel execution - await Promise.all( - Object.values(UniversityId).map(async (uni) => { - const org = organizations.items.find( - (o) => - o.referenceIdentifier === UniversityContentfulReferenceIds[uni], - ) - if (!org) { - this.logger.warning('Invalid institution for student track history', { - university: uni, - }) - normalizedResults.push({ - university: uni, - error: JSON.stringify(new Error('Invalid institution')), - }) - return - } + const promises = Object.values(UniversityId).map(async (uni) => { + return this.getStudentTrackHistoryByUniversity(user, uni, locale) + }) - const data = await this.getStudentTrackHistoryByUniversity( - user, - uni, - locale, - org.title, - org.logo?.url, - ) + const transcripts: Array = [] + const errors: Array = [] - if (!data) { - this.logger.debug('No data found') - return - } - - if (Array.isArray(data)) { - normalizedResults = normalizedResults.concat(data) + for (const resultArray of await Promise.allSettled(promises)) { + if (resultArray.status === 'fulfilled' && resultArray.value) { + const result = resultArray.value + if (Array.isArray(result)) { + transcripts.push(...result) } else { - normalizedResults.push(data) + errors.push(result) } - }), - ) + } + } return { - trackResults: normalizedResults, + transcripts, + errors, } } @@ -106,8 +66,6 @@ export class UniversityCareersService { user: User, university: UniversityId, locale: Locale, - institutionTitle?: string, - institutionLogoUrl?: string, ): Promise< Array | StudentTrackTranscriptError | null > { @@ -126,7 +84,18 @@ export class UniversityCareersService { await this.universityCareers .getStudentTrackHistory(user, university, locale) .catch((e: Error | FetchError) => { - return { university, error: JSON.stringify(e) } + this.logger.warn('Student track history fetch failed', { + university, + locale, + error: e, + }) + return { + institution: { + id: university, + shortId: UniversityIdMap[university], + }, + error: JSON.stringify(e), + } }) if (Array.isArray(data)) { @@ -135,8 +104,6 @@ export class UniversityCareersService { mapToStudent(d, { id: university, shortId: UniversityIdMap[university], - displayName: institutionTitle ?? '', - logoUrl: institutionLogoUrl, }), ) .filter(isDefined) @@ -159,24 +126,17 @@ export class UniversityCareersService { ) if (!data?.transcript) { - this.logger.debug('No transcript data found', { + this.logger.info('No transcript data found', { category: LOG_CATEGORY, university, }) return null } - const organization = - await this.cmsContentfulService.getOrganizationByReferenceId( - UniversityContentfulReferenceIds[university], - locale, - ) return ( mapToStudentTrackModel(data, { id: university, shortId: UniversityIdMap[university], - displayName: organization.title, - logoUrl: organization.logo?.url, }) ?? null ) } diff --git a/libs/api/domains/university-careers/src/lib/universityCareers.types.ts b/libs/api/domains/university-careers/src/lib/universityCareers.types.ts index e22ad4710401..335f81939654 100644 --- a/libs/api/domains/university-careers/src/lib/universityCareers.types.ts +++ b/libs/api/domains/university-careers/src/lib/universityCareers.types.ts @@ -6,7 +6,7 @@ import { export interface InstitutionProps { id: UniversityId shortId: UniversityIdShort - displayName: string + displayName?: string logoUrl?: string } diff --git a/libs/api/domains/university-gateway/project.json b/libs/api/domains/university-gateway/project.json index 2b80e063fcd2..76f93f197821 100644 --- a/libs/api/domains/university-gateway/project.json +++ b/libs/api/domains/university-gateway/project.json @@ -3,28 +3,17 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/university-gateway/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/api/domains/university-gateway/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/api/domains/university-gateway/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/api/domains/university-gateway/jest.config.ts" } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/user-profile/project.json b/libs/api/domains/user-profile/project.json index 398c3d035bb6..dd3dfb197959 100644 --- a/libs/api/domains/user-profile/project.json +++ b/libs/api/domains/user-profile/project.json @@ -3,24 +3,18 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/user-profile/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/api/domains/user-profile/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/api/domains/user-profile/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/user-profile/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/api/domains/user-profile"] } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/user-profile/src/lib/userProfile.model.ts b/libs/api/domains/user-profile/src/lib/userProfile.model.ts index 534499fc5091..af6cbf0ed353 100644 --- a/libs/api/domains/user-profile/src/lib/userProfile.model.ts +++ b/libs/api/domains/user-profile/src/lib/userProfile.model.ts @@ -46,7 +46,7 @@ export class UserProfile { @Field(() => Boolean, { nullable: true, deprecationReason: - 'Deprecated due to new field "EmailNotification" from UserProfile V2', + 'Deprecated due to new field EmailNotification from UserProfile V2', }) canNudge?: boolean diff --git a/libs/api/domains/vehicles/project.json b/libs/api/domains/vehicles/project.json index bc40abf9b945..12892a54a5b4 100644 --- a/libs/api/domains/vehicles/project.json +++ b/libs/api/domains/vehicles/project.json @@ -3,21 +3,17 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/vehicles/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/api/domains/vehicles/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/api/domains/vehicles"], "options": { - "jestConfig": "libs/api/domains/vehicles/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/vehicles/jest.config.ts" } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/domains/watson-assistant-chat/project.json b/libs/api/domains/watson-assistant-chat/project.json index 326b23ceeb83..4e76c2c3e178 100644 --- a/libs/api/domains/watson-assistant-chat/project.json +++ b/libs/api/domains/watson-assistant-chat/project.json @@ -3,13 +3,10 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/watson-assistant-chat/src", "projectType": "library", + "tags": ["scope:api", "lib:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/api/domains/watson-assistant-chat/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -17,10 +14,8 @@ "{workspaceRoot}/coverage/libs/api/domains/watson-assistant-chat" ], "options": { - "jestConfig": "libs/api/domains/watson-assistant-chat/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/watson-assistant-chat/jest.config.ts" } } - }, - "tags": ["scope:api", "lib:api"] + } } diff --git a/libs/api/domains/work-machines/project.json b/libs/api/domains/work-machines/project.json index bd03e27b133c..72d10c6ae447 100644 --- a/libs/api/domains/work-machines/project.json +++ b/libs/api/domains/work-machines/project.json @@ -3,21 +3,17 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/domains/work-machines/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/api/domains/work-machines/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/api/domains/work-machines"], "options": { - "jestConfig": "libs/api/domains/work-machines/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/domains/work-machines/jest.config.ts" } } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/api/mocks/project.json b/libs/api/mocks/project.json index 1458647bf1bc..1d6925048fac 100644 --- a/libs/api/mocks/project.json +++ b/libs/api/mocks/project.json @@ -3,19 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/mocks/src", "projectType": "library", + "tags": ["lib:dom", "scope:dom"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/api/mocks/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/api/mocks/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/api/mocks/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/api/mocks"] }, @@ -28,6 +25,5 @@ ] } } - }, - "tags": ["lib:dom", "scope:dom"] + } } diff --git a/libs/api/schema/project.json b/libs/api/schema/project.json index d806a87976de..079cbf3d4c63 100644 --- a/libs/api/schema/project.json +++ b/libs/api/schema/project.json @@ -3,13 +3,11 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/api/schema/src", "projectType": "library", + "tags": ["lib:dom", "scope:dom"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/api/schema/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "codegen/frontend-client": { "executor": "nx:run-commands", @@ -17,6 +15,5 @@ "command": "graphql-codegen --config libs/api/schema/codegen.yml" } } - }, - "tags": ["lib:dom", "scope:dom"] + } } diff --git a/libs/application/api/core/project.json b/libs/application/api/core/project.json index 19970fa92c5f..bd397920046b 100644 --- a/libs/application/api/core/project.json +++ b/libs/application/api/core/project.json @@ -3,21 +3,17 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/api/core/src", "projectType": "library", + "tags": ["lib:application-system-api", "scope:application-system-api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/application/api/core/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/application/api/core"], "options": { - "jestConfig": "libs/application/api/core/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/api/core/jest.config.ts" } } - }, - "tags": ["lib:application-system-api", "scope:application-system-api"] + } } diff --git a/libs/application/api/files/project.json b/libs/application/api/files/project.json index 9fb3b5b8d47d..8f3d74ee9ffc 100644 --- a/libs/application/api/files/project.json +++ b/libs/application/api/files/project.json @@ -2,22 +2,17 @@ "name": "application-api-files", "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/api/files/src", + "tags": ["scope:application-system-api", "lib:application-system-api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/application/api/files/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/application/api/files"], "options": { - "jestConfig": "libs/application/api/files/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/api/files/jest.config.ts" } } - }, - "tags": ["scope:application-system-api", "lib:application-system-api"] + } } diff --git a/libs/application/api/history/project.json b/libs/application/api/history/project.json index c42f8446a1bd..1e3792069608 100644 --- a/libs/application/api/history/project.json +++ b/libs/application/api/history/project.json @@ -2,22 +2,17 @@ "name": "application-api-history", "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/api/history/src", + "tags": ["scope:application-system-api", "lib:application-system-api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/application/api/history/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/application/api/history"], "options": { - "jestConfig": "libs/application/api/history/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/api/history/jest.config.ts" } } - }, - "tags": ["scope:application-system-api", "lib:application-system-api"] + } } diff --git a/libs/application/api/history/src/lib/dto/history.dto.ts b/libs/application/api/history/src/lib/dto/history.dto.ts index 3a8aa678eacc..53d2545a03c0 100644 --- a/libs/application/api/history/src/lib/dto/history.dto.ts +++ b/libs/application/api/history/src/lib/dto/history.dto.ts @@ -2,7 +2,7 @@ import { IsDate, IsString } from 'class-validator' import { ApiProperty } from '@nestjs/swagger' import { Expose } from 'class-transformer' import { FormatMessage } from '@island.is/application/types' -import { StaticText } from 'static-text' +import { StaticText } from '@island.is/shared/types' export class HistoryResponseDto { @ApiProperty() diff --git a/libs/application/api/payment/project.json b/libs/application/api/payment/project.json index d2cf1d00409a..015e34ca0d54 100644 --- a/libs/application/api/payment/project.json +++ b/libs/application/api/payment/project.json @@ -2,22 +2,17 @@ "name": "application-api-payment", "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/api/payment/src", + "tags": ["lib:application-system-api", "scope:application-system-api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/application/api/payment/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/application/api/payment"], "options": { - "jestConfig": "libs/application/api/payment/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/api/payment/jest.config.ts" } } - }, - "tags": ["lib:application-system-api", "scope:application-system-api"] + } } diff --git a/libs/application/core/project.json b/libs/application/core/project.json index dc0b607f9a70..31f74ed0f9d9 100644 --- a/libs/application/core/project.json +++ b/libs/application/core/project.json @@ -3,19 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/core/src", "projectType": "library", + "tags": ["lib:application-system", "scope:application-system"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/application/core/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/application/core/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/core/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/application/core"] }, @@ -25,6 +22,5 @@ "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/application/core/src/**/*.{js,ts,tsx}'" } } - }, - "tags": ["lib:application-system", "scope:application-system"] + } } diff --git a/libs/application/core/src/lib/conditionUtils.spec.ts b/libs/application/core/src/lib/conditionUtils.spec.ts index ce6a84e65fc8..0eee417536dc 100644 --- a/libs/application/core/src/lib/conditionUtils.spec.ts +++ b/libs/application/core/src/lib/conditionUtils.spec.ts @@ -9,7 +9,7 @@ import { import { buildTextField } from '../lib/fieldBuilders' import { shouldShowFormItem } from './conditionUtils' import { buildSection, buildSubSection } from './formBuilders' -import { User } from 'user' +import { User } from '@island.is/shared/types' import { createOpenIDUser } from '@island.is/testing/fixtures' const createRandomUser = (): User => { diff --git a/libs/application/core/src/lib/conditionUtils.ts b/libs/application/core/src/lib/conditionUtils.ts index 4bbe313dd7c5..f8b26d4c0440 100644 --- a/libs/application/core/src/lib/conditionUtils.ts +++ b/libs/application/core/src/lib/conditionUtils.ts @@ -9,7 +9,7 @@ import { StaticCheck, } from '@island.is/application/types' import { getValueViaPath } from './formUtils' -import { User } from 'user' +import { User } from '@island.is/shared/types' function applyStaticConditionalCheck( formValue: FormValue, diff --git a/libs/application/core/src/lib/formUtils.ts b/libs/application/core/src/lib/formUtils.ts index 8cb2dc769b4c..6055233140ce 100644 --- a/libs/application/core/src/lib/formUtils.ts +++ b/libs/application/core/src/lib/formUtils.ts @@ -25,7 +25,7 @@ import { StaticTextObject, SubSection, } from '@island.is/application/types' -import { User } from 'user' +import { User } from '@island.is/shared/types' const containsArray = (obj: RecordObject) => { let contains = false @@ -131,6 +131,7 @@ export function getSectionsInForm( }) return sections } + export function getSubSectionsInSection( section: Section, answers: FormValue, @@ -281,7 +282,7 @@ export function formatAndParseAsHTML( text: FormText, application: Application, formatMessage: MessageFormatter, -): React.ReactElement[] { +) { return HtmlParser(formatText(text, application, formatMessage)) } diff --git a/libs/application/core/src/lib/messages.ts b/libs/application/core/src/lib/messages.ts index be1ce94b56cf..16bfbfbaaba1 100644 --- a/libs/application/core/src/lib/messages.ts +++ b/libs/application/core/src/lib/messages.ts @@ -501,6 +501,23 @@ export const coreErrorMessages = defineMessages({ description: 'Error message summary when a user already has icelandic citizenship', }, + drivingLicenseDuplicateEntryValidationErrorTitle: { + id: 'application.system:core.fetch.data.drivingLicenseDuplicateEntryValidationError', + defaultMessage: 'Ökuskírteini hæfir ekki umsókn um samrit', + description: 'Driving License duplicate entry validation error', + }, + drivingLicenseDuplicateEntryValidationSign400Error: { + id: 'application.system:core.fetch.data.drivingLicenseDuplicateEntryValidationSign400Error', + defaultMessage: 'Ógild tákntala, 400, fannst á ökuskírteini', + description: + 'Driving License duplicate entry validation error for sign (is: tákntala)', + }, + drivingLicenseDuplicateEntryValidationExpiredCategoryLicenseError: { + id: 'application.system:core.fetch.data.drivingLicenseDuplicateEntryValidationExpiredLicenseError', + defaultMessage: + 'Flokkur "{categoryName}" á ökukírteini er útrunninn eða rennur út innan 6 mánaða', + description: 'Driving License duplicate entry validation error', + }, drivingLicenseNoTeachingRightsTitle: { id: 'application.system:core.fetch.data.drivingLicenseNoTeachingRightsTitle', defaultMessage: 'Þú hefur ekki ökukennararéttindi í ökuskírteinaskrá.', diff --git a/libs/application/graphql/project.json b/libs/application/graphql/project.json index f3e4859b18cd..97520cf7c28d 100644 --- a/libs/application/graphql/project.json +++ b/libs/application/graphql/project.json @@ -3,22 +3,18 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/graphql/src", "projectType": "library", + "tags": ["lib:application-system", "scope:application-system"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/application/graphql/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/application/graphql/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/graphql/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/application/graphql"] } - }, - "tags": ["lib:application-system", "scope:application-system"] + } } diff --git a/libs/application/template-api-modules/project.json b/libs/application/template-api-modules/project.json index 5f7769c1bb65..1a1199c4df16 100644 --- a/libs/application/template-api-modules/project.json +++ b/libs/application/template-api-modules/project.json @@ -3,21 +3,17 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/template-api-modules/src", "projectType": "library", + "tags": ["lib:application-system-api", "scope:application-system-api"], + "implicitDependencies": ["services-endorsements-api"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/template-api-modules/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/application/template-api-modules/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/template-api-modules/jest.config.ts" }, "outputs": [ "{workspaceRoot}/coverage/libs/application/template-api-modules" @@ -34,7 +30,5 @@ "{projectRoot}/src/lib/modules/templates/general-petition/gen/fetch" ] } - }, - "implicitDependencies": ["services-endorsements-api"], - "tags": ["lib:application-system-api", "scope:application-system-api"] + } } diff --git a/libs/application/template-api-modules/src/lib/modules/shared/api/user-profile/user-profile.module.ts b/libs/application/template-api-modules/src/lib/modules/shared/api/user-profile/user-profile.module.ts index e27c2c9ae8be..cbb9557c9cb3 100644 --- a/libs/application/template-api-modules/src/lib/modules/shared/api/user-profile/user-profile.module.ts +++ b/libs/application/template-api-modules/src/lib/modules/shared/api/user-profile/user-profile.module.ts @@ -1,8 +1,7 @@ import { DynamicModule } from '@nestjs/common' import { BaseTemplateAPIModuleConfig } from '../../../../types' import { UserProfileService } from './user-profile.service' - -import { Configuration, UserProfileApi } from '@island.is/clients/user-profile' +import { Configuration, V2UsersApi } from '@island.is/clients/user-profile' import { IslykillApiModule } from '@island.is/clients/islykill' export class UserProfileModule { static register(config: BaseTemplateAPIModuleConfig): DynamicModule { @@ -18,9 +17,9 @@ export class UserProfileModule { providers: [ UserProfileService, { - provide: UserProfileApi, + provide: V2UsersApi, useFactory: () => - new UserProfileApi( + new V2UsersApi( new Configuration({ fetchApi: fetch, basePath: config.userProfile.serviceBasePath, diff --git a/libs/application/template-api-modules/src/lib/modules/shared/api/user-profile/user-profile.service.ts b/libs/application/template-api-modules/src/lib/modules/shared/api/user-profile/user-profile.service.ts index 360ed29e8dc5..2ea872a220fc 100644 --- a/libs/application/template-api-modules/src/lib/modules/shared/api/user-profile/user-profile.service.ts +++ b/libs/application/template-api-modules/src/lib/modules/shared/api/user-profile/user-profile.service.ts @@ -1,7 +1,10 @@ import { Injectable } from '@nestjs/common' -import { Auth, AuthMiddleware } from '@island.is/auth-nest-tools' +import { Auth, AuthMiddleware, User } from '@island.is/auth-nest-tools' import { IslyklarApi } from '@island.is/clients/islykill' -import { UserProfileApi } from '@island.is/clients/user-profile' +import { + UserProfileControllerFindUserProfileClientTypeEnum, + V2UsersApi, +} from '@island.is/clients/user-profile' import { isRunningOnEnvironment } from '@island.is/shared/utils' import { BaseTemplateAPIModuleConfig, @@ -13,8 +16,7 @@ import { UserProfile, UserProfileParameters, } from '@island.is/application/types' -import { TemplateApiError } from '@island.is/nest/problem' -import { coreErrorMessages, getSlugFromType } from '@island.is/application/core' +import { getSlugFromType } from '@island.is/application/core' import { IdsClientConfig } from '@island.is/nest/config' import { Inject } from '@nestjs/common' import { ConfigService, ConfigType } from '@nestjs/config' @@ -25,7 +27,7 @@ export const MAX_OUT_OF_DATE_MONTHS = 6 @Injectable() export class UserProfileService extends BaseTemplateApiService { constructor( - private readonly userProfileApi: UserProfileApi, + private readonly userProfileApi: V2UsersApi, private readonly islyklarApi: IslyklarApi, @Inject(IdsClientConfig.KEY) private idsClientConfig: ConfigType, @@ -35,60 +37,50 @@ export class UserProfileService extends BaseTemplateApiService { super('UserProfile') } - userProfileApiWithAuth(auth: Auth): UserProfileApi { + userProfileApiWithAuth(auth: Auth): V2UsersApi { return this.userProfileApi.withMiddleware(new AuthMiddleware(auth)) } async userProfile({ - application, auth, - params, }: TemplateApiModuleActionProps): Promise { - // Temporary solution while we still run the old user profile service. - return this.islyklarApi - .islyklarGet({ ssn: auth.nationalId }) - - .then((results) => { - if (params?.validateBankInformation && !results?.bankInfo) { - // If individual does not have a valid bank account, then we fail this check - throw new TemplateApiError( - { - title: coreErrorMessages.noBankAccountError, - summary: coreErrorMessages.noBankAccountError, - }, - 400, - ) - } - - if (params?.validateEmail && !results?.email) { - throw new TemplateApiError( - { - title: coreErrorMessages.noEmailFound, - summary: { - ...coreErrorMessages.noEmailFoundDescription, - values: { link: this.getIDSLink(application) }, - }, - }, - 500, - ) - } - - return { - mobilePhoneNumber: results?.mobile, - email: results?.email, - bankInfo: results?.bankInfo, - } + const { mobilePhoneNumber, email } = await this.userProfileApiWithAuth(auth) + .userProfileControllerFindUserProfile({ + xParamNationalId: auth.nationalId, + clientType: + UserProfileControllerFindUserProfileClientTypeEnum.FirstParty, }) .catch((error) => { if (isRunningOnEnvironment('local')) { return { email: 'mockEmail@island.is', mobilePhoneNumber: '9999999', - bankInfo: '0000-11-222222', } } - if (params?.catchMock) { - return {} + throw error + }) + /// Temporary dependency on íslykill for bank info retrieval via FJS API. + /// A refactor is planned to integrate bank info directly from FJS API to eliminate íslykill dependency. + const bankInfo = await this.getBankInfoFromIslykill(auth) + + return { + mobilePhoneNumber: mobilePhoneNumber ?? undefined, + email: email ?? undefined, + bankInfo, + } + } + + private async getBankInfoFromIslykill( + auth: User, + ): Promise { + return this.islyklarApi + .islyklarGet({ ssn: auth.nationalId }) + .then((results) => { + return results?.bankInfo + }) + .catch((error) => { + if (isRunningOnEnvironment('local')) { + return '0000-11-222222' } throw error }) diff --git a/libs/application/template-api-modules/src/lib/modules/templates/driving-license-duplicate/driving-license-duplicate.service.ts b/libs/application/template-api-modules/src/lib/modules/templates/driving-license-duplicate/driving-license-duplicate.service.ts index fdf9c65e7d99..533911cf0891 100644 --- a/libs/application/template-api-modules/src/lib/modules/templates/driving-license-duplicate/driving-license-duplicate.service.ts +++ b/libs/application/template-api-modules/src/lib/modules/templates/driving-license-duplicate/driving-license-duplicate.service.ts @@ -8,6 +8,8 @@ import { ApplicationTypes } from '@island.is/application/types' import type { Logger } from '@island.is/logging' import { LOGGER_PROVIDER } from '@island.is/logging' import { BaseTemplateApiService } from '../../base-template-api.service' +import { TemplateApiError } from '@island.is/nest/problem' +import { coreErrorMessages } from '@island.is/application/core' @Injectable() export class DrivingLicenseDuplicateService extends BaseTemplateApiService { @@ -19,6 +21,35 @@ export class DrivingLicenseDuplicateService extends BaseTemplateApiService { super(ApplicationTypes.DRIVING_LICENSE_DUPLICATE) } + async canGetNewDuplicate({ auth }: TemplateApiModuleActionProps) { + const can = await this.drivingLicenseService.canGetNewDuplicate( + auth.authorization, + ) + if (!can.canGetNewDuplicate) { + let summary = + coreErrorMessages.drivingLicenseDuplicateEntryValidationSign400Error + if (can.meta) { + summary = + coreErrorMessages.drivingLicenseDuplicateEntryValidationExpiredCategoryLicenseError + } + throw new TemplateApiError( + { + title: + coreErrorMessages.drivingLicenseDuplicateEntryValidationErrorTitle, + description: '', + summary: { + ...summary, + values: { + categoryName: can.meta, + }, + }, + defaultMessage: '', + }, + 400, + ) + } + } + async submitApplication({ application, auth, diff --git a/libs/application/template-api-modules/src/lib/modules/templates/operating-license/types/application.ts b/libs/application/template-api-modules/src/lib/modules/templates/operating-license/types/application.ts index 81a96ae595c0..6d25173be147 100644 --- a/libs/application/template-api-modules/src/lib/modules/templates/operating-license/types/application.ts +++ b/libs/application/template-api-modules/src/lib/modules/templates/operating-license/types/application.ts @@ -27,7 +27,9 @@ export type Operation = { export enum CATEGORIES { RESTURANT_TWO = 'Flokkur II', RESTURANT_THREE = 'Flokkur III', + // eslint-disable-next-line @typescript-eslint/no-duplicate-enum-values HOTEL = 'Flokkur II', + // eslint-disable-next-line @typescript-eslint/no-duplicate-enum-values HOTEL_FOOD = 'Flokkur III', HOTEL_ALCOHOL = 'Flokkur IV', } diff --git a/libs/application/template-loader/project.json b/libs/application/template-loader/project.json index dbed7bc4ff84..129d378dd31e 100644 --- a/libs/application/template-loader/project.json +++ b/libs/application/template-loader/project.json @@ -3,24 +3,18 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/template-loader/src", "projectType": "library", + "tags": ["scope:application-system", "lib:application-system"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/template-loader/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/application/template-loader/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/template-loader/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/application/template-loader"] } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/accident-notification/project.json b/libs/application/templates/accident-notification/project.json index eee449cb2952..a5357c794c8d 100644 --- a/libs/application/templates/accident-notification/project.json +++ b/libs/application/templates/accident-notification/project.json @@ -3,21 +3,16 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/accident-notification/src", "projectType": "library", + "tags": ["scope:application-system", "lib:application-system"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/templates/accident-notification/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/application/templates/accident-notification/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/accident-notification/jest.config.ts" }, "outputs": [ "{workspaceRoot}/coverage/libs/application/templates/accident-notification" @@ -29,6 +24,5 @@ "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/application/templates/accident-notification/src/lib/messages/*.ts'" } } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/alcohol-tax-redemption/project.json b/libs/application/templates/alcohol-tax-redemption/project.json index fe4d32c00d4e..b2bfe47cdc53 100644 --- a/libs/application/templates/alcohol-tax-redemption/project.json +++ b/libs/application/templates/alcohol-tax-redemption/project.json @@ -3,15 +3,10 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/alcohol-tax-redemption/src", "projectType": "library", + "tags": ["scope:application-system", "lib:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/application/templates/alcohol-tax-redemption/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -19,8 +14,7 @@ "{workspaceRoot}/coverage/libs/application/templates/alcohol-tax-redemption" ], "options": { - "jestConfig": "libs/application/templates/alcohol-tax-redemption/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/alcohol-tax-redemption/jest.config.ts" } }, "extract-strings": { @@ -29,6 +23,5 @@ "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/application/templates/alcohol-tax-redemption/src/lib/messages/*.ts'" } } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/announcement-of-death/project.json b/libs/application/templates/announcement-of-death/project.json index ad09313baeda..d0211e136b40 100644 --- a/libs/application/templates/announcement-of-death/project.json +++ b/libs/application/templates/announcement-of-death/project.json @@ -3,15 +3,11 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/announcement-of-death/src", "projectType": "library", + "tags": ["scope:application-system", "lib:application-system"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/templates/announcement-of-death/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "extract-strings": { "executor": "nx:run-commands", @@ -25,6 +21,5 @@ "command": "graphql-codegen --config libs/application/templates/announcement-of-death/codegen.yml" } } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/aosh/change-machine-supervisor/project.json b/libs/application/templates/aosh/change-machine-supervisor/project.json index 99b4f0a6132c..fbe2220ab85b 100644 --- a/libs/application/templates/aosh/change-machine-supervisor/project.json +++ b/libs/application/templates/aosh/change-machine-supervisor/project.json @@ -6,13 +6,7 @@ "tags": ["scope:application-system", "lib:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/application/templates/aosh/change-machine-supervisor/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "extract-strings": { "executor": "nx:run-commands", @@ -24,14 +18,7 @@ "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/application/templates/aosh/change-machine-supervisor/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/application/templates/aosh/change-machine-supervisor/jest.config.ts" } } } diff --git a/libs/application/templates/aosh/deregister-machine/project.json b/libs/application/templates/aosh/deregister-machine/project.json index 9003e54ae85e..d73ff901099b 100644 --- a/libs/application/templates/aosh/deregister-machine/project.json +++ b/libs/application/templates/aosh/deregister-machine/project.json @@ -6,13 +6,7 @@ "tags": ["scope:application-system", "lib:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/application/templates/aosh/deregister-machine/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "extract-strings": { "executor": "nx:run-commands", @@ -24,14 +18,7 @@ "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/application/templates/aosh/deregister-machine/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/application/templates/aosh/deregister-machine/jest.config.ts" } } } diff --git a/libs/application/templates/aosh/request-for-inspection/project.json b/libs/application/templates/aosh/request-for-inspection/project.json index 0c1baf5254bd..5a684a9920d1 100644 --- a/libs/application/templates/aosh/request-for-inspection/project.json +++ b/libs/application/templates/aosh/request-for-inspection/project.json @@ -6,13 +6,7 @@ "tags": ["scope:application-system", "lib:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/application/templates/aosh/request-for-inspection/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "extract-strings": { "executor": "nx:run-commands", @@ -24,14 +18,7 @@ "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/application/templates/aosh/request-for-inspection/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/application/templates/aosh/request-for-inspection/jest.config.ts" } } } diff --git a/libs/application/templates/aosh/street-registration/project.json b/libs/application/templates/aosh/street-registration/project.json index adb2b0daaf10..000b0bf68aba 100644 --- a/libs/application/templates/aosh/street-registration/project.json +++ b/libs/application/templates/aosh/street-registration/project.json @@ -6,13 +6,7 @@ "tags": ["scope:application-system", "lib:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/application/templates/aosh/street-registration/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "extract-strings": { "executor": "nx:run-commands", @@ -24,14 +18,7 @@ "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/application/templates/aosh/street-registration/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/application/templates/aosh/street-registration/jest.config.ts" } } } diff --git a/libs/application/templates/aosh/transfer-of-machine-ownership/project.json b/libs/application/templates/aosh/transfer-of-machine-ownership/project.json index d0cf007a2f16..4a6df3adb9eb 100644 --- a/libs/application/templates/aosh/transfer-of-machine-ownership/project.json +++ b/libs/application/templates/aosh/transfer-of-machine-ownership/project.json @@ -6,13 +6,7 @@ "tags": ["scope:application-system", "lib:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/application/templates/aosh/transfer-of-machine-ownership/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "extract-strings": { "executor": "nx:run-commands", @@ -24,14 +18,7 @@ "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/application/templates/aosh/transfer-of-machine-ownership/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/application/templates/aosh/transfer-of-machine-ownership/jest.config.ts" } } } diff --git a/libs/application/templates/car-recycling/project.json b/libs/application/templates/car-recycling/project.json index fae6c1348865..3c5d909fbbfb 100644 --- a/libs/application/templates/car-recycling/project.json +++ b/libs/application/templates/car-recycling/project.json @@ -3,21 +3,16 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/car-recycling/src", "projectType": "library", + "tags": ["lib:application-system", "scope:application-system"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/templates/car-recycling/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/application/templates/car-recycling/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/car-recycling/jest.config.ts" }, "outputs": [ "{workspaceRoot}/coverage/libs/application/templates/car-recycling" @@ -29,6 +24,5 @@ "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract libs/application/templates/car-recycling/src/lib/messages.ts" } } - }, - "tags": ["lib:application-system", "scope:application-system"] + } } diff --git a/libs/application/templates/complaints-to-althingi-ombudsman/project.json b/libs/application/templates/complaints-to-althingi-ombudsman/project.json index a4e003c7cd1f..bb537cbfcd36 100644 --- a/libs/application/templates/complaints-to-althingi-ombudsman/project.json +++ b/libs/application/templates/complaints-to-althingi-ombudsman/project.json @@ -3,15 +3,11 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/complaints-to-althingi-ombudsman/src", "projectType": "library", + "tags": ["scope:application-system", "lib:application-system"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/templates/complaints-to-althingi-ombudsman/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "extract-strings": { "executor": "nx:run-commands", @@ -19,6 +15,5 @@ "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/application/templates/complaints-to-althingi-ombudsman/src/lib/messages/*.ts'" } } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/criminal-record/project.json b/libs/application/templates/criminal-record/project.json index 2030eb57ba30..6586e1e093be 100644 --- a/libs/application/templates/criminal-record/project.json +++ b/libs/application/templates/criminal-record/project.json @@ -3,15 +3,11 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/criminal-record/src", "projectType": "library", + "tags": ["scope:application-system", "lib:application-system"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/templates/criminal-record/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -19,8 +15,7 @@ "{workspaceRoot}/coverage/libs/application/templates/criminal-record" ], "options": { - "jestConfig": "libs/application/templates/criminal-record/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/criminal-record/jest.config.ts" } }, "extract-strings": { @@ -29,6 +24,5 @@ "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/application/templates/criminal-record/src/**/*.{js,ts,tsx}'" } } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/data-protection-complaint/project.json b/libs/application/templates/data-protection-complaint/project.json index 9e1745420225..ef15c1b383be 100644 --- a/libs/application/templates/data-protection-complaint/project.json +++ b/libs/application/templates/data-protection-complaint/project.json @@ -3,15 +3,11 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/data-protection-complaint/src", "projectType": "library", + "tags": ["scope:application-system", "lib:application-system"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/templates/data-protection-complaint/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "extract-strings": { "executor": "nx:run-commands", @@ -22,13 +18,11 @@ "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/application/templates/data-protection-complaint/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/data-protection-complaint/jest.config.ts" }, "outputs": [ "{workspaceRoot}/coverage/libs/application/templates/data-protection-complaint" ] } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/directorate-of-immigration/citizenship/project.json b/libs/application/templates/directorate-of-immigration/citizenship/project.json index 1f738d25b117..c9fe45d6ad0d 100644 --- a/libs/application/templates/directorate-of-immigration/citizenship/project.json +++ b/libs/application/templates/directorate-of-immigration/citizenship/project.json @@ -6,13 +6,7 @@ "tags": ["scope:application-system", "lib:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/application/templates/directorate-of-immigration/citizenship/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -20,8 +14,7 @@ "{workspaceRoot}/coverage/libs/application/templates/directorate-of-immigration/citizenship" ], "options": { - "jestConfig": "libs/application/templates/directorate-of-immigration/citizenship/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/directorate-of-immigration/citizenship/jest.config.ts" } }, "extract-strings": { diff --git a/libs/application/templates/document-provider-onboarding/project.json b/libs/application/templates/document-provider-onboarding/project.json index ec6e7de56b9a..4506a9cae545 100644 --- a/libs/application/templates/document-provider-onboarding/project.json +++ b/libs/application/templates/document-provider-onboarding/project.json @@ -3,21 +3,16 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/document-provider-onboarding/src", "projectType": "library", + "tags": ["scope:application-system", "lib:application-system"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/templates/document-provider-onboarding/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/application/templates/document-provider-onboarding/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/document-provider-onboarding/jest.config.ts" }, "outputs": [ "{workspaceRoot}/coverage/libs/application/templates/document-provider-onboarding" @@ -29,6 +24,5 @@ "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract libs/application/templates/document-provider-onboarding/src/forms/messages.ts" } } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/driving-assessment-approval/project.json b/libs/application/templates/driving-assessment-approval/project.json index ec93a01ffaa0..3c8b484fab87 100644 --- a/libs/application/templates/driving-assessment-approval/project.json +++ b/libs/application/templates/driving-assessment-approval/project.json @@ -3,15 +3,11 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/driving-assessment-approval/src", "projectType": "library", + "tags": ["scope:application-system", "lib:application-system"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/templates/driving-assessment-approval/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "extract-strings": { "executor": "nx:run-commands", @@ -25,6 +21,5 @@ "command": "graphql-codegen --config libs/application/templates/driving-assessment-approval/codegen.yml" } } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/driving-instructor-registrations/project.json b/libs/application/templates/driving-instructor-registrations/project.json index af2e489f27b5..92278dcea558 100644 --- a/libs/application/templates/driving-instructor-registrations/project.json +++ b/libs/application/templates/driving-instructor-registrations/project.json @@ -3,15 +3,11 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/driving-instructor-registrations/src", "projectType": "library", + "tags": ["scope:application-system", "lib:application-system"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/templates/driving-instructor-registrations/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "extract-strings": { "executor": "nx:run-commands", @@ -25,6 +21,5 @@ "command": "graphql-codegen --config libs/application/templates/driving-instructor-registrations/codegen.yml" } } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/driving-learners-permit/project.json b/libs/application/templates/driving-learners-permit/project.json index a6821e1d4ab9..f9eac2b1e6e1 100644 --- a/libs/application/templates/driving-learners-permit/project.json +++ b/libs/application/templates/driving-learners-permit/project.json @@ -3,22 +3,17 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/driving-learners-permit/src", "projectType": "library", - "generators": {}, "schematics": {}, + "tags": ["scope:application-system", "lib:application-system"], + "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/templates/driving-learners-permit/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/application/templates/driving-learners-permit/jest.config.js", - "passWithNoTests": true + "jestConfig": "libs/application/templates/driving-learners-permit/jest.config.js" }, "outputs": [ "{workspaceRoot}/coverage/libs/application/templates/driving-learners-permit" @@ -36,6 +31,5 @@ "command": "graphql-codegen --config libs/application/templates/driving-learners-permit/codegen.yml" } } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/driving-license-book-update-instructor/project.json b/libs/application/templates/driving-license-book-update-instructor/project.json index 33509f56f514..3afa983d957f 100644 --- a/libs/application/templates/driving-license-book-update-instructor/project.json +++ b/libs/application/templates/driving-license-book-update-instructor/project.json @@ -6,13 +6,7 @@ "tags": ["scope:application-system", "lib:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/application/templates/driving-license-book-update-instructor/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "extract-strings": { "executor": "nx:run-commands", @@ -26,8 +20,7 @@ "{workspaceRoot}/coverage/libs/application/templates/driving-license-book-update-instructor" ], "options": { - "jestConfig": "libs/application/templates/driving-license-book-update-instructor/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/driving-license-book-update-instructor/jest.config.ts" } } } diff --git a/libs/application/templates/driving-license-duplicate/project.json b/libs/application/templates/driving-license-duplicate/project.json index 5413c20c810b..e13cce4f91fb 100644 --- a/libs/application/templates/driving-license-duplicate/project.json +++ b/libs/application/templates/driving-license-duplicate/project.json @@ -3,15 +3,11 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/driving-license-duplicate/src", "projectType": "library", + "tags": ["scope:application-system", "lib:application-system"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/templates/driving-license-duplicate/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "extract-strings": { "executor": "nx:run-commands", @@ -25,6 +21,5 @@ "command": "graphql-codegen --config libs/application/templates/driving-license-duplicate/codegen.yml" } } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/driving-license-duplicate/src/dataProviders/index.ts b/libs/application/templates/driving-license-duplicate/src/dataProviders/index.ts index 750644930ce7..f39af419ccca 100644 --- a/libs/application/templates/driving-license-duplicate/src/dataProviders/index.ts +++ b/libs/application/templates/driving-license-duplicate/src/dataProviders/index.ts @@ -1,6 +1,7 @@ import { InstitutionNationalIds, PaymentCatalogApi, + defineTemplateApi, } from '@island.is/application/types' export const SyslumadurPaymentCatalogApi = PaymentCatalogApi.configure({ @@ -9,3 +10,8 @@ export const SyslumadurPaymentCatalogApi = PaymentCatalogApi.configure({ }, externalDataId: 'payment', }) + +export const DuplicateEligibilityApi = defineTemplateApi({ + action: 'canGetNewDuplicate', + shouldPersistToExternalData: false, +}) diff --git a/libs/application/templates/driving-license-duplicate/src/forms/applicationSections/sectionDataProviders.ts b/libs/application/templates/driving-license-duplicate/src/forms/applicationSections/sectionDataProviders.ts index 3af2a23b5156..cf8ca65b1327 100644 --- a/libs/application/templates/driving-license-duplicate/src/forms/applicationSections/sectionDataProviders.ts +++ b/libs/application/templates/driving-license-duplicate/src/forms/applicationSections/sectionDataProviders.ts @@ -11,7 +11,10 @@ import { QualitySignatureApi, UserProfileApi, } from '@island.is/application/types' -import { SyslumadurPaymentCatalogApi } from '../../dataProviders' +import { + DuplicateEligibilityApi, + SyslumadurPaymentCatalogApi, +} from '../../dataProviders' export const sectionDataProviders = buildExternalDataProvider({ id: 'approveExternalData', @@ -35,6 +38,11 @@ export const sectionDataProviders = buildExternalDataProvider({ title: '', subTitle: '', }), + buildDataProviderItem({ + provider: DuplicateEligibilityApi, + title: '', + subTitle: '', + }), buildDataProviderItem({ provider: UserProfileApi, title: m.dataCollectionUserProfileTitle, diff --git a/libs/application/templates/driving-license-duplicate/src/lib/drivingLicenseDuplicateTemplate.ts b/libs/application/templates/driving-license-duplicate/src/lib/drivingLicenseDuplicateTemplate.ts index 1ed9a75ee568..81e4b7bde2c1 100644 --- a/libs/application/templates/driving-license-duplicate/src/lib/drivingLicenseDuplicateTemplate.ts +++ b/libs/application/templates/driving-license-duplicate/src/lib/drivingLicenseDuplicateTemplate.ts @@ -25,7 +25,10 @@ import { DrivingLicenseDuplicateFeatureFlags, getApplicationFeatureFlags, } from './getApplicationFeatureFlags' -import { SyslumadurPaymentCatalogApi } from '../dataProviders' +import { + DuplicateEligibilityApi, + SyslumadurPaymentCatalogApi, +} from '../dataProviders' import { coreHistoryMessages, getValueViaPath, @@ -121,6 +124,7 @@ const DrivingLicenseDuplicateTemplate: ApplicationTemplate< QualitySignatureApi, QualityPhotoApi, UserProfileApi, + DuplicateEligibilityApi, ], write: 'all', delete: true, diff --git a/libs/application/templates/driving-license/project.json b/libs/application/templates/driving-license/project.json index 34772869d507..32bb6a4779fb 100644 --- a/libs/application/templates/driving-license/project.json +++ b/libs/application/templates/driving-license/project.json @@ -3,21 +3,16 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/driving-license/src", "projectType": "library", + "tags": ["lib:application-system", "scope:application-system"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/templates/driving-license/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/application/templates/driving-license/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/driving-license/jest.config.ts" }, "outputs": [ "{workspaceRoot}/coverage/libs/application/templates/driving-license" @@ -35,6 +30,5 @@ "command": "graphql-codegen --config libs/application/templates/driving-license/codegen.yml" } } - }, - "tags": ["lib:application-system", "scope:application-system"] + } } diff --git a/libs/application/templates/driving-license/src/forms/draft/subSectionTempInfo.ts b/libs/application/templates/driving-license/src/forms/draft/subSectionTempInfo.ts index 2f6d3e0cd46a..e64c150fb89d 100644 --- a/libs/application/templates/driving-license/src/forms/draft/subSectionTempInfo.ts +++ b/libs/application/templates/driving-license/src/forms/draft/subSectionTempInfo.ts @@ -102,7 +102,7 @@ export const subSectionTempInfo = buildSubSection({ }) => { return (data as TeacherV4[]).map(({ name, nationalId }) => ({ value: nationalId, - label: name, + label: `${name} (${nationalId.substring(0, 6)})`, })) }, }), diff --git a/libs/application/templates/driving-school-confirmation/project.json b/libs/application/templates/driving-school-confirmation/project.json index ba4ccfcdb65d..dc2626453435 100644 --- a/libs/application/templates/driving-school-confirmation/project.json +++ b/libs/application/templates/driving-school-confirmation/project.json @@ -3,15 +3,11 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/driving-school-confirmation/src", "projectType": "library", + "tags": ["scope:application-system", "lib:application-system"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/templates/driving-school-confirmation/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "extract-strings": { "executor": "nx:run-commands", @@ -25,6 +21,5 @@ "command": "graphql-codegen --config libs/application/templates/driving-school-confirmation/codegen.yml" } } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/energy-funds/project.json b/libs/application/templates/energy-funds/project.json index 28e66a3b9685..28b854c0f301 100644 --- a/libs/application/templates/energy-funds/project.json +++ b/libs/application/templates/energy-funds/project.json @@ -6,13 +6,7 @@ "tags": ["scope:application-system", "lib:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/application/templates/energy-funds/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -20,8 +14,7 @@ "{workspaceRoot}/coverage/libs/application/templates/energy-funds" ], "options": { - "jestConfig": "libs/application/templates/energy-funds/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/energy-funds/jest.config.ts" } }, "extract-strings": { diff --git a/libs/application/templates/estate/project.json b/libs/application/templates/estate/project.json index 9484ad525bfb..272640bf9260 100644 --- a/libs/application/templates/estate/project.json +++ b/libs/application/templates/estate/project.json @@ -3,21 +3,16 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/estate/src", "projectType": "library", + "tags": ["lib:application-system", "scope:application-system"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/templates/estate/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/application/templates/estate/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/estate/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/application/templates/estate"] }, @@ -27,6 +22,5 @@ "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract libs/application/templates/estate/src/lib/messages.ts" } } - }, - "tags": ["lib:application-system", "scope:application-system"] + } } diff --git a/libs/application/templates/european-health-insurance-card/project.json b/libs/application/templates/european-health-insurance-card/project.json index 288a6b21a913..f5b6f762b7c2 100644 --- a/libs/application/templates/european-health-insurance-card/project.json +++ b/libs/application/templates/european-health-insurance-card/project.json @@ -6,13 +6,7 @@ "tags": ["lib:application-system", "scope:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/application/templates/european-health-insurance-card/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -20,8 +14,7 @@ "{workspaceRoot}/coverage/libs/application/templates/european-health-insurance-card" ], "options": { - "jestConfig": "libs/application/templates/european-health-insurance-card/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/european-health-insurance-card/jest.config.ts" } }, "extract-strings": { diff --git a/libs/application/templates/example-payment/project.json b/libs/application/templates/example-payment/project.json index 9c9189e58c56..c34e367463fd 100644 --- a/libs/application/templates/example-payment/project.json +++ b/libs/application/templates/example-payment/project.json @@ -3,14 +3,10 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/example-payment/src", "projectType": "library", + "tags": ["scope:application-system", "lib:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/templates/example-payment/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -34,6 +30,5 @@ "command": "graphql-codegen --config libs/application/templates/example-payment/codegen.yml" } } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/family-matters/children-residence-change-v2/project.json b/libs/application/templates/family-matters/children-residence-change-v2/project.json index 74842e5134ec..7c9412f68b86 100644 --- a/libs/application/templates/family-matters/children-residence-change-v2/project.json +++ b/libs/application/templates/family-matters/children-residence-change-v2/project.json @@ -3,15 +3,11 @@ "$schema": "../../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/family-matters/children-residence-change-v2/src", "projectType": "library", + "tags": ["scope:application-system", "lib:application-system"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/templates/family-matters/children-residence-change-v2/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "extract-strings": { "executor": "nx:run-commands", @@ -19,6 +15,5 @@ "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/application/templates/family-matters/children-residence-change-v2/src/**/*.{js,ts,tsx}'" } } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/family-matters/children-residence-change/project.json b/libs/application/templates/family-matters/children-residence-change/project.json index da8bdcfc65d6..b0c7c454aa8b 100644 --- a/libs/application/templates/family-matters/children-residence-change/project.json +++ b/libs/application/templates/family-matters/children-residence-change/project.json @@ -3,15 +3,11 @@ "$schema": "../../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/family-matters/children-residence-change/src", "projectType": "library", + "tags": ["scope:application-system", "lib:application-system"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/templates/family-matters/children-residence-change/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "extract-strings": { "executor": "nx:run-commands", @@ -19,6 +15,5 @@ "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/application/templates/family-matters/children-residence-change/src/**/*.{js,ts,tsx}'" } } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/family-matters/core/project.json b/libs/application/templates/family-matters/core/project.json index ab2d642d9183..4dc18c2e8532 100644 --- a/libs/application/templates/family-matters/core/project.json +++ b/libs/application/templates/family-matters/core/project.json @@ -3,16 +3,11 @@ "$schema": "../../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/family-matters/core/src", "projectType": "library", + "tags": ["scope:application-system", "lib:application-system"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/templates/family-matters/core/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/financial-aid/project.json b/libs/application/templates/financial-aid/project.json index 37c526b5df6a..603ff31cd204 100644 --- a/libs/application/templates/financial-aid/project.json +++ b/libs/application/templates/financial-aid/project.json @@ -3,15 +3,11 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/financial-aid/src", "projectType": "library", + "tags": ["scope:application-system", "lib:application-system"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/templates/financial-aid/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -19,7 +15,8 @@ "{workspaceRoot}/coverage/libs/application/templates/financial-aid" ], "options": { - "jestConfig": "libs/application/templates/financial-aid/jest.config.ts" + "jestConfig": "libs/application/templates/financial-aid/jest.config.ts", + "passWithNoTests": false } }, "extract-strings": { @@ -28,6 +25,5 @@ "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/application/templates/financial-aid/src/**/*.{js,ts,tsx}'" } } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/financial-aid/src/fields/Summary/SummaryForm.tsx b/libs/application/templates/financial-aid/src/fields/Summary/SummaryForm.tsx index 8c49372f363e..79fc7ad25c72 100644 --- a/libs/application/templates/financial-aid/src/fields/Summary/SummaryForm.tsx +++ b/libs/application/templates/financial-aid/src/fields/Summary/SummaryForm.tsx @@ -62,7 +62,7 @@ const SummaryForm = ({ application, goToScreen }: FAFieldBaseProps) => { childrenFiles: UploadFile[], income: ApproveOptions, ) => { - if (childrenFiles.length > 0) { + if (childrenFiles?.length > 0) { return Routes.CHILDRENFILES } if (income === ApproveOptions.Yes) { diff --git a/libs/application/templates/financial-statements-inao/project.json b/libs/application/templates/financial-statements-inao/project.json index f4c37b5ba63c..9b4c8a106a3e 100644 --- a/libs/application/templates/financial-statements-inao/project.json +++ b/libs/application/templates/financial-statements-inao/project.json @@ -3,15 +3,11 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/financial-statements-inao/src", "projectType": "library", + "tags": ["scope:application-system", "lib:application-system"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/templates/financial-statements-inao/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "extract-strings": { "executor": "nx:run-commands", @@ -25,6 +21,5 @@ "command": "graphql-codegen --config libs/application/templates/financial-statements-inao/codegen.yml" } } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/funding-government-projects/project.json b/libs/application/templates/funding-government-projects/project.json index d35b357ba76b..3f0db0b55034 100644 --- a/libs/application/templates/funding-government-projects/project.json +++ b/libs/application/templates/funding-government-projects/project.json @@ -3,14 +3,10 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/funding-government-projects/src", "projectType": "library", + "tags": ["scope:application-system", "lib:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/templates/funding-government-projects/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -18,8 +14,7 @@ "{workspaceRoot}/coverage/libs/application/templates/funding-government-projects" ], "options": { - "jestConfig": "libs/application/templates/funding-government-projects/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/funding-government-projects/jest.config.ts" } }, "extract-strings": { @@ -28,6 +23,5 @@ "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/application/templates/funding-government-projects/src/**/*.{js,ts,tsx}'" } } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/general-fishing-license/project.json b/libs/application/templates/general-fishing-license/project.json index 4289c364debd..359667d0a7ea 100644 --- a/libs/application/templates/general-fishing-license/project.json +++ b/libs/application/templates/general-fishing-license/project.json @@ -3,15 +3,11 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/general-fishing-license/src", "projectType": "library", + "tags": ["scope:application-system", "lib:application-system"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/templates/general-fishing-license/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "extract-strings": { "executor": "nx:run-commands", @@ -25,6 +21,5 @@ "command": "graphql-codegen --config libs/application/templates/general-fishing-license/codegen.yml" } } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/general-petition/project.json b/libs/application/templates/general-petition/project.json index 364872cf6d16..96818bf2d2bf 100644 --- a/libs/application/templates/general-petition/project.json +++ b/libs/application/templates/general-petition/project.json @@ -3,21 +3,16 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/general-petition/src", "projectType": "library", + "tags": ["scope:application-system", "lib:application-system"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/templates/general-petition/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/application/templates/general-petition/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/general-petition/jest.config.ts" }, "outputs": [ "{workspaceRoot}/coverage/libs/application/templates/general-petition" @@ -61,6 +56,5 @@ }, "outputs": ["{projectRoot}/src/types/schema.ts"] } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/grindavik-housing-buyout/project.json b/libs/application/templates/grindavik-housing-buyout/project.json index 4c737925870f..f4f79a527cc4 100644 --- a/libs/application/templates/grindavik-housing-buyout/project.json +++ b/libs/application/templates/grindavik-housing-buyout/project.json @@ -6,26 +6,13 @@ "tags": ["lib:application-system", "scope:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/application/templates/grindavik-housing-buyout/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/application/templates/grindavik-housing-buyout/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/application/templates/grindavik-housing-buyout/jest.config.ts" } }, "extract-strings": { diff --git a/libs/application/templates/health-insurance-declaration/project.json b/libs/application/templates/health-insurance-declaration/project.json index e3f7c3fb7a27..5e20e9293c51 100644 --- a/libs/application/templates/health-insurance-declaration/project.json +++ b/libs/application/templates/health-insurance-declaration/project.json @@ -6,26 +6,13 @@ "tags": ["scope:application-system", "lib:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/application/templates/health-insurance-declaration/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/application/templates/health-insurance-declaration/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/application/templates/health-insurance-declaration/jest.config.ts" } }, "extract-strings": { diff --git a/libs/application/templates/health-insurance/project.json b/libs/application/templates/health-insurance/project.json index 1a4fb8040df7..c5b6337c69fe 100644 --- a/libs/application/templates/health-insurance/project.json +++ b/libs/application/templates/health-insurance/project.json @@ -3,21 +3,16 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/health-insurance/src", "projectType": "library", + "tags": ["scope:application-system", "lib:application-system"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/templates/health-insurance/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/application/templates/health-insurance/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/health-insurance/jest.config.ts" }, "outputs": [ "{workspaceRoot}/coverage/libs/application/templates/health-insurance" @@ -29,6 +24,5 @@ "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract libs/application/templates/health-insurance/src/forms/messages.ts" } } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/healthcare-license-certificate/project.json b/libs/application/templates/healthcare-license-certificate/project.json index 7aa9b641e0d3..851e6aaeb51c 100644 --- a/libs/application/templates/healthcare-license-certificate/project.json +++ b/libs/application/templates/healthcare-license-certificate/project.json @@ -6,26 +6,13 @@ "tags": ["scope:application-system", "lib:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/application/templates/healthcare-license-certificate/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/application/templates/healthcare-license-certificate/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/application/templates/healthcare-license-certificate/jest.config.ts" } }, "extract-strings": { diff --git a/libs/application/templates/healthcare-work-permit/src/forms/HealthcareWorkPermitForm/personalSection.ts b/libs/application/templates/healthcare-work-permit/src/forms/HealthcareWorkPermitForm/personalSection.ts index 7f342bafa92c..cf5defab7521 100644 --- a/libs/application/templates/healthcare-work-permit/src/forms/HealthcareWorkPermitForm/personalSection.ts +++ b/libs/application/templates/healthcare-work-permit/src/forms/HealthcareWorkPermitForm/personalSection.ts @@ -1,4 +1,5 @@ import { + buildAlertMessageField, buildDescriptionField, buildMultiField, buildPhoneField, @@ -61,6 +62,19 @@ export const PersonalSection = buildSection({ defaultValue: (application: Application) => application.externalData?.nationalRegistry?.data?.citizenship.name, }), + buildAlertMessageField({ + id: 'userInformation.alert', + title: '', + alertType: 'info', + message: personal.labels.userInformation.alertMessage, + links: [ + { + title: personal.labels.userInformation.alertMessageLinkTitle, + url: personal.labels.userInformation.alertMessageLink, + isExternal: false, + }, + ], + }), buildTextField({ id: 'userInformation.email', title: personal.labels.userInformation.email, diff --git a/libs/application/templates/healthcare-work-permit/src/lib/messages/personal.ts b/libs/application/templates/healthcare-work-permit/src/lib/messages/personal.ts index 06a53f3825e4..203f617ea9c8 100644 --- a/libs/application/templates/healthcare-work-permit/src/lib/messages/personal.ts +++ b/libs/application/templates/healthcare-work-permit/src/lib/messages/personal.ts @@ -50,6 +50,22 @@ export const personal = { defaultMessage: 'Símanúmer', description: 'User information phone number label', }, + alertMessage: { + id: 'hwp.application:personal.labels.userInformation.alertMessage#markdown', + defaultMessage: + 'Ef netfang og símanúmer er ekki rétt hér að neðan þá verður að breyta þeim upplýsingum á {mínum síðum}. Þú þarft svo að koma aftur í þennan glugga og uppfæra upplýsingar hér neðst á síðunni.', + description: 'User information alert message', + }, + alertMessageLink: { + id: 'hwp.application:personal.labels.userInformation.alertMessageLink', + defaultMessage: '/minarsidur', + description: 'Link for mínar síður', + }, + alertMessageLinkTitle: { + id: 'hwp.application:personal.labels.userInformation.alertMessageLinkTitle', + defaultMessage: 'Fara á mínar síður', + description: 'title for mínar síður link', + }, }), }, } diff --git a/libs/application/templates/home-support/project.json b/libs/application/templates/home-support/project.json index e455a49e9bd3..78cc887a1eac 100644 --- a/libs/application/templates/home-support/project.json +++ b/libs/application/templates/home-support/project.json @@ -6,26 +6,13 @@ "tags": ["lib:application-system", "scope:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/application/templates/home-support/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/application/templates/home-support/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/application/templates/home-support/jest.config.ts" } }, "extract-strings": { diff --git a/libs/application/templates/inheritance-report/project.json b/libs/application/templates/inheritance-report/project.json index 2919144a7aa5..f633c59606d7 100644 --- a/libs/application/templates/inheritance-report/project.json +++ b/libs/application/templates/inheritance-report/project.json @@ -3,21 +3,16 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/inheritance-report/src", "projectType": "library", + "tags": ["lib:application-system", "scope:application-system"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/templates/inheritance-report/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/application/templates/inheritance-report/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/inheritance-report/jest.config.ts" }, "outputs": [ "{workspaceRoot}/coverage/libs/application/templates/inheritance-report" @@ -29,6 +24,5 @@ "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract libs/application/templates/inheritance-report/src/lib/messages.ts" } } - }, - "tags": ["lib:application-system", "scope:application-system"] + } } diff --git a/libs/application/templates/institution-collaboration/project.json b/libs/application/templates/institution-collaboration/project.json index fc9a3b67b6ef..46e76f4b365f 100644 --- a/libs/application/templates/institution-collaboration/project.json +++ b/libs/application/templates/institution-collaboration/project.json @@ -3,21 +3,16 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/institution-collaboration/src", "projectType": "library", + "tags": ["scope:application-system", "lib:application-system"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/templates/institution-collaboration/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/application/templates/institution-collaboration/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/institution-collaboration/jest.config.ts" } }, "extract-strings": { @@ -26,6 +21,5 @@ "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract libs/application/templates/institution-collaboration/src/lib/messages.ts" } } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/login-service/project.json b/libs/application/templates/login-service/project.json index 2cfb78fae826..d614fe623074 100644 --- a/libs/application/templates/login-service/project.json +++ b/libs/application/templates/login-service/project.json @@ -3,14 +3,10 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/login-service/src", "projectType": "library", + "tags": ["scope:application-system", "lib:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/templates/login-service/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -18,8 +14,7 @@ "{workspaceRoot}/coverage/libs/application/templates/login-service" ], "options": { - "jestConfig": "libs/application/templates/login-service/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/login-service/jest.config.ts" } }, "extract-strings": { @@ -28,6 +23,5 @@ "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/application/templates/login-service/src/**/*.{js,ts,tsx}'" } } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/marriage-conditions/project.json b/libs/application/templates/marriage-conditions/project.json index 9f54467e8a3a..fb7f10a3c432 100644 --- a/libs/application/templates/marriage-conditions/project.json +++ b/libs/application/templates/marriage-conditions/project.json @@ -3,14 +3,10 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/marriage-conditions/src", "projectType": "library", + "tags": ["scope:application-system", "lib:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/templates/marriage-conditions/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "extract-strings": { "executor": "nx:run-commands", @@ -27,13 +23,11 @@ "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/application/templates/marriage-conditions/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/marriage-conditions/jest.config.ts" }, "outputs": [ "{workspaceRoot}/coverage/libs/application/templates/marriage-conditions" ] } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/mortgage-certificate/project.json b/libs/application/templates/mortgage-certificate/project.json index c2a628607f0e..b3a39084b14b 100644 --- a/libs/application/templates/mortgage-certificate/project.json +++ b/libs/application/templates/mortgage-certificate/project.json @@ -3,14 +3,10 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/mortgage-certificate/src", "projectType": "library", + "tags": ["scope:application-system", "lib:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/templates/mortgage-certificate/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -18,8 +14,7 @@ "{workspaceRoot}/coverage/libs/application/templates/mortgage-certificate" ], "options": { - "jestConfig": "libs/application/templates/mortgage-certificate/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/mortgage-certificate/jest.config.ts" } }, "extract-strings": { @@ -28,6 +23,5 @@ "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/application/templates/mortgage-certificate/src/**/*.{js,ts,tsx}'" } } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/no-debt-certificate/project.json b/libs/application/templates/no-debt-certificate/project.json index 9812e47e9394..e06e239ba1bf 100644 --- a/libs/application/templates/no-debt-certificate/project.json +++ b/libs/application/templates/no-debt-certificate/project.json @@ -3,14 +3,10 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/no-debt-certificate/src", "projectType": "library", + "tags": ["scope:application-system", "lib:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/templates/no-debt-certificate/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -18,8 +14,7 @@ "{workspaceRoot}/coverage/libs/application/templates/no-debt-certificate" ], "options": { - "jestConfig": "libs/application/templates/no-debt-certificate/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/no-debt-certificate/jest.config.ts" } }, "extract-strings": { @@ -28,6 +23,5 @@ "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/application/templates/no-debt-certificate/src/**/*.{js,ts,tsx}'" } } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/official-journal-of-iceland/project.json b/libs/application/templates/official-journal-of-iceland/project.json index 28de4bef761a..3c958b4f9fd1 100644 --- a/libs/application/templates/official-journal-of-iceland/project.json +++ b/libs/application/templates/official-journal-of-iceland/project.json @@ -6,26 +6,13 @@ "tags": ["scope:application-system", "lib:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/application/templates/official-journal-of-iceland/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/application/templates/official-journal-of-iceland/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/application/templates/official-journal-of-iceland/jest.config.ts" } }, "extract-strings": { diff --git a/libs/application/templates/operating-license/project.json b/libs/application/templates/operating-license/project.json index c8f48ea70db1..a78d435da274 100644 --- a/libs/application/templates/operating-license/project.json +++ b/libs/application/templates/operating-license/project.json @@ -3,14 +3,10 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/operating-license/src", "projectType": "library", + "tags": ["scope:application-system", "lib:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/templates/operating-license/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "extract-strings": { "executor": "nx:run-commands", @@ -24,6 +20,5 @@ "command": "graphql-codegen --config libs/application/templates/operating-license/codegen.yml" } } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/p-sign/project.json b/libs/application/templates/p-sign/project.json index 2b1d2fea5b67..1495c78e9da4 100644 --- a/libs/application/templates/p-sign/project.json +++ b/libs/application/templates/p-sign/project.json @@ -3,15 +3,11 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/p-sign/src", "projectType": "library", + "tags": ["scope:application-system", "lib:application-system"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/templates/p-sign/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "extract-strings": { "executor": "nx:run-commands", @@ -25,6 +21,5 @@ "command": "graphql-codegen --config libs/application/templates/p-sign/codegen.yml" } } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/parental-leave/project.json b/libs/application/templates/parental-leave/project.json index 2471b6b936ba..044a47388c11 100644 --- a/libs/application/templates/parental-leave/project.json +++ b/libs/application/templates/parental-leave/project.json @@ -3,21 +3,16 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/parental-leave/src", "projectType": "library", + "tags": ["lib:application-system", "scope:application-system"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/templates/parental-leave/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/application/templates/parental-leave/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/parental-leave/jest.config.ts" }, "outputs": [ "{workspaceRoot}/coverage/libs/application/templates/parental-leave" @@ -35,6 +30,5 @@ "command": "graphql-codegen --config libs/application/templates/parental-leave/codegen.yml" } } - }, - "tags": ["lib:application-system", "scope:application-system"] + } } diff --git a/libs/application/templates/passport-annulment/project.json b/libs/application/templates/passport-annulment/project.json index 2a6c7bb7d69a..e1c74a7cd2d2 100644 --- a/libs/application/templates/passport-annulment/project.json +++ b/libs/application/templates/passport-annulment/project.json @@ -3,21 +3,16 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/passport-annulment/src", "projectType": "library", + "tags": ["scope:application-system", "lib:application-system"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/templates/passport-annulment/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/application/templates/passport-annulment/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/passport-annulment/jest.config.ts" }, "outputs": [ "{workspaceRoot}/coverage/libs/application/templates/passport-annulment" @@ -29,6 +24,5 @@ "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/application/templates/passport-annulment/src/**/*.{js,ts,tsx}'" } } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/passport/project.json b/libs/application/templates/passport/project.json index b184038fe085..6ab70f7af1e6 100644 --- a/libs/application/templates/passport/project.json +++ b/libs/application/templates/passport/project.json @@ -3,21 +3,16 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/passport/src", "projectType": "library", + "tags": ["scope:application-system", "lib:application-system"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/templates/passport/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/application/templates/passport/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/passport/jest.config.ts" }, "outputs": [ "{workspaceRoot}/coverage/libs/application/templates/passport" @@ -29,6 +24,5 @@ "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/application/templates/passport/src/**/*.{js,ts,tsx}'" } } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/public-debt-payment-plan/project.json b/libs/application/templates/public-debt-payment-plan/project.json index 0437083f6b50..fddf6b4416c3 100644 --- a/libs/application/templates/public-debt-payment-plan/project.json +++ b/libs/application/templates/public-debt-payment-plan/project.json @@ -3,14 +3,10 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/public-debt-payment-plan/src", "projectType": "library", + "tags": ["scope:application-system", "lib:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/templates/public-debt-payment-plan/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -18,8 +14,7 @@ "{workspaceRoot}/coverage/libs/application/templates/public-debt-payment-plan" ], "options": { - "jestConfig": "libs/application/templates/public-debt-payment-plan/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/public-debt-payment-plan/jest.config.ts" } }, "extract-strings": { @@ -28,6 +23,5 @@ "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/application/templates/public-debt-payment-plan/src/**/*.{js,ts,tsx}'" } } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/public-debt-payment-plan/src/lib/PublicDebtPaymentPlanTemplate.ts b/libs/application/templates/public-debt-payment-plan/src/lib/PublicDebtPaymentPlanTemplate.ts index 83f0bbd6b57a..9f15b375b8d0 100644 --- a/libs/application/templates/public-debt-payment-plan/src/lib/PublicDebtPaymentPlanTemplate.ts +++ b/libs/application/templates/public-debt-payment-plan/src/lib/PublicDebtPaymentPlanTemplate.ts @@ -18,7 +18,7 @@ import { import { PaymentPlanPrerequisitesApi } from '../dataProviders' import { PublicDebtPaymentPlanSchema } from './dataSchema' import { application, conclusion } from './messages' -import { AuthDelegationType } from 'delegation' +import { AuthDelegationType } from '@island.is/shared/types' const States = { draft: 'draft', diff --git a/libs/application/templates/reference-template/project.json b/libs/application/templates/reference-template/project.json index 8132ee123a86..6f0b662c30b0 100644 --- a/libs/application/templates/reference-template/project.json +++ b/libs/application/templates/reference-template/project.json @@ -3,21 +3,16 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/reference-template/src", "projectType": "library", + "tags": ["scope:application-system", "lib:application-system"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/templates/reference-template/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/application/templates/reference-template/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/reference-template/jest.config.ts" }, "outputs": [ "{workspaceRoot}/coverage/libs/application/templates/reference-template" @@ -29,6 +24,5 @@ "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract libs/application/templates/reference-template/src/lib/messages.ts" } } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/signature-collection/presidential-list-creation/project.json b/libs/application/templates/signature-collection/presidential-list-creation/project.json index 37c363721338..039fd2e1d4a7 100644 --- a/libs/application/templates/signature-collection/presidential-list-creation/project.json +++ b/libs/application/templates/signature-collection/presidential-list-creation/project.json @@ -6,13 +6,7 @@ "tags": ["scope:application-system", "lib:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/application/templates/signature-collection/presidential-list-creation/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -20,8 +14,7 @@ "{workspaceRoot}/coverage/libs/application/templates/signature-collection/presidential-list-creation" ], "options": { - "jestConfig": "libs/application/templates/signature-collection/presidential-list-creation/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/signature-collection/presidential-list-creation/jest.config.ts" } }, "extract-strings": { diff --git a/libs/application/templates/signature-collection/presidential-list-creation/src/fields/ListCreated/index.tsx b/libs/application/templates/signature-collection/presidential-list-creation/src/fields/ListCreated/index.tsx index ada0ea963fc0..410d3152a37d 100644 --- a/libs/application/templates/signature-collection/presidential-list-creation/src/fields/ListCreated/index.tsx +++ b/libs/application/templates/signature-collection/presidential-list-creation/src/fields/ListCreated/index.tsx @@ -2,6 +2,7 @@ import { Box, Text } from '@island.is/island-ui/core' import { useLocale } from '@island.is/localization' import { CopyLink } from '@island.is/application/ui-components' import { m } from '../../lib/messages' +// eslint-disable-next-line @nx/enforce-module-boundaries import Illustration from '../../../../assets/Illustration' import { FieldBaseProps } from '@island.is/application/types' import { FC } from 'react' diff --git a/libs/application/templates/signature-collection/presidential-list-signing/project.json b/libs/application/templates/signature-collection/presidential-list-signing/project.json index 2accdb99264d..50e6ec830b66 100644 --- a/libs/application/templates/signature-collection/presidential-list-signing/project.json +++ b/libs/application/templates/signature-collection/presidential-list-signing/project.json @@ -6,13 +6,7 @@ "tags": ["scope:application-system", "lib:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/application/templates/signature-collection/presidential-list-signing/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -20,8 +14,7 @@ "{workspaceRoot}/coverage/libs/application/templates/signature-collection/presidential-list-signing" ], "options": { - "jestConfig": "libs/application/templates/signature-collection/presidential-list-signing/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/signature-collection/presidential-list-signing/jest.config.ts" } }, "extract-strings": { diff --git a/libs/application/templates/signature-collection/presidential-list-signing/src/fields/ListSigned/index.tsx b/libs/application/templates/signature-collection/presidential-list-signing/src/fields/ListSigned/index.tsx index 9cd8806d80a0..d0df1b07b7c3 100644 --- a/libs/application/templates/signature-collection/presidential-list-signing/src/fields/ListSigned/index.tsx +++ b/libs/application/templates/signature-collection/presidential-list-signing/src/fields/ListSigned/index.tsx @@ -1,4 +1,5 @@ import { Box } from '@island.is/island-ui/core' +// eslint-disable-next-line @nx/enforce-module-boundaries import Illustration from '../../../../assets/Illustration' export const ListSigned = () => { diff --git a/libs/application/templates/social-insurance-administration/additional-support-for-the-elderly/project.json b/libs/application/templates/social-insurance-administration/additional-support-for-the-elderly/project.json index c7a37cd65c4b..11dca36cc392 100644 --- a/libs/application/templates/social-insurance-administration/additional-support-for-the-elderly/project.json +++ b/libs/application/templates/social-insurance-administration/additional-support-for-the-elderly/project.json @@ -3,15 +3,10 @@ "$schema": "../../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/social-insurance-administration/additional-support-for-the-elderly/src", "projectType": "library", + "tags": ["scope:application-system", "lib:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/application/templates/social-insurance-administration/additional-support-for-the-elderly/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -19,8 +14,7 @@ "{workspaceRoot}/coverage/libs/application/templates/social-insurance-administration/additional-support-for-the-elderly" ], "options": { - "jestConfig": "libs/application/templates/social-insurance-administration/additional-support-for-the-elderly/jest.config.js", - "passWithNoTests": true + "jestConfig": "libs/application/templates/social-insurance-administration/additional-support-for-the-elderly/jest.config.js" } }, "extract-strings": { @@ -29,6 +23,5 @@ "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/application/templates/social-insurance-administration/additional-support-for-the-elderly/src/lib/messages.ts'" } } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/social-insurance-administration/core/project.json b/libs/application/templates/social-insurance-administration/core/project.json index 479240de038c..047578e9d1ba 100644 --- a/libs/application/templates/social-insurance-administration/core/project.json +++ b/libs/application/templates/social-insurance-administration/core/project.json @@ -3,15 +3,11 @@ "$schema": "../../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/social-insurance-administration/core/src", "projectType": "library", + "tags": ["scope:application-system", "lib:application-system"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/templates/social-insurance-administration/core/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -19,8 +15,7 @@ "{workspaceRoot}/coverage/libs/application/templates/social-insurance-administration/core" ], "options": { - "jestConfig": "libs/application/templates/social-insurance-administration/core/jest.config.js", - "passWithNoTests": true + "jestConfig": "libs/application/templates/social-insurance-administration/core/jest.config.js" } }, "extract-strings": { @@ -29,6 +24,5 @@ "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/application/templates/social-insurance-administration/core/src/lib/messages.ts'" } } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/social-insurance-administration/household-supplement/project.json b/libs/application/templates/social-insurance-administration/household-supplement/project.json index 58dc27579880..b2629c90f6be 100644 --- a/libs/application/templates/social-insurance-administration/household-supplement/project.json +++ b/libs/application/templates/social-insurance-administration/household-supplement/project.json @@ -3,15 +3,10 @@ "$schema": "../../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/social-insurance-administration/household-supplement/src", "projectType": "library", + "tags": ["scope:application-system", "lib:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/application/templates/social-insurance-administration/household-supplement/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -19,8 +14,7 @@ "{workspaceRoot}/coverage/libs/application/templates/social-insurance-administration/household-supplement" ], "options": { - "jestConfig": "libs/application/templates/social-insurance-administration/household-supplement/jest.config.js", - "passWithNoTests": true + "jestConfig": "libs/application/templates/social-insurance-administration/household-supplement/jest.config.js" } }, "extract-strings": { @@ -29,6 +23,5 @@ "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/application/templates/social-insurance-administration/household-supplement/src/lib/messages.ts'" } } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/social-insurance-administration/old-age-pension/project.json b/libs/application/templates/social-insurance-administration/old-age-pension/project.json index c446b2976da5..7140a7b7f9d7 100644 --- a/libs/application/templates/social-insurance-administration/old-age-pension/project.json +++ b/libs/application/templates/social-insurance-administration/old-age-pension/project.json @@ -3,15 +3,10 @@ "$schema": "../../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/social-insurance-administration/old-age-pension/src", "projectType": "library", + "tags": ["scope:application-system", "lib:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/application/templates/social-insurance-administration/old-age-pension/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -19,8 +14,7 @@ "{workspaceRoot}/coverage/libs/application/templates/social-insurance-administration/old-age-pension" ], "options": { - "jestConfig": "libs/application/templates/social-insurance-administration/old-age-pension/jest.config.js", - "passWithNoTests": true + "jestConfig": "libs/application/templates/social-insurance-administration/old-age-pension/jest.config.js" } }, "extract-strings": { @@ -29,6 +23,5 @@ "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/application/templates/social-insurance-administration/old-age-pension/src/lib/messages.ts'" } } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/social-insurance-administration/pension-supplement/project.json b/libs/application/templates/social-insurance-administration/pension-supplement/project.json index 5db5e7168a87..2657207006ec 100644 --- a/libs/application/templates/social-insurance-administration/pension-supplement/project.json +++ b/libs/application/templates/social-insurance-administration/pension-supplement/project.json @@ -3,15 +3,10 @@ "$schema": "../../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/templates/social-insurance-administration/pension-supplement/src", "projectType": "library", + "tags": ["scope:application-system", "lib:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/application/templates/social-insurance-administration/pension-supplement/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -19,8 +14,7 @@ "{workspaceRoot}/coverage/libs/application/templates/social-insurance-administration/pension-supplement" ], "options": { - "jestConfig": "libs/application/templates/social-insurance-administration/pension-supplement/jest.config.js", - "passWithNoTests": true + "jestConfig": "libs/application/templates/social-insurance-administration/pension-supplement/jest.config.js" } }, "extract-strings": { @@ -29,6 +23,5 @@ "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/application/templates/social-insurance-administration/pension-supplement/src/lib/messages.ts'" } } - }, - "tags": ["scope:application-system", "lib:application-system"] + } } diff --git a/libs/application/templates/transport-authority/anonymity-in-vehicle-registry/project.json b/libs/application/templates/transport-authority/anonymity-in-vehicle-registry/project.json index 0d8684a0b356..9571b65771db 100644 --- a/libs/application/templates/transport-authority/anonymity-in-vehicle-registry/project.json +++ b/libs/application/templates/transport-authority/anonymity-in-vehicle-registry/project.json @@ -6,13 +6,7 @@ "tags": ["scope:application-system", "lib:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/application/templates/transport-authority/anonymity-in-vehicle-registry/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -20,8 +14,7 @@ "{workspaceRoot}/coverage/libs/application/templates/transport-authority/anonymity-in-vehicle-registry" ], "options": { - "jestConfig": "libs/application/templates/transport-authority/anonymity-in-vehicle-registry/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/transport-authority/anonymity-in-vehicle-registry/jest.config.ts" } }, "extract-strings": { diff --git a/libs/application/templates/transport-authority/change-co-owner-of-vehicle/project.json b/libs/application/templates/transport-authority/change-co-owner-of-vehicle/project.json index df6f8ab27b3f..e9a5dcd54737 100644 --- a/libs/application/templates/transport-authority/change-co-owner-of-vehicle/project.json +++ b/libs/application/templates/transport-authority/change-co-owner-of-vehicle/project.json @@ -6,13 +6,7 @@ "tags": ["scope:application-system", "lib:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/application/templates/transport-authority/change-co-owner-of-vehicle/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -20,8 +14,7 @@ "{workspaceRoot}/coverage/libs/application/templates/transport-authority/change-co-owner-of-vehicle" ], "options": { - "jestConfig": "libs/application/templates/transport-authority/change-co-owner-of-vehicle/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/transport-authority/change-co-owner-of-vehicle/jest.config.ts" } }, "extract-strings": { diff --git a/libs/application/templates/transport-authority/change-operator-of-vehicle/project.json b/libs/application/templates/transport-authority/change-operator-of-vehicle/project.json index a4a1fe61b75c..d210313081fd 100644 --- a/libs/application/templates/transport-authority/change-operator-of-vehicle/project.json +++ b/libs/application/templates/transport-authority/change-operator-of-vehicle/project.json @@ -6,13 +6,7 @@ "tags": ["scope:application-system", "lib:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/application/templates/transport-authority/change-operator-of-vehicle/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -20,8 +14,7 @@ "{workspaceRoot}/coverage/libs/application/templates/transport-authority/change-operator-of-vehicle" ], "options": { - "jestConfig": "libs/application/templates/transport-authority/change-operator-of-vehicle/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/transport-authority/change-operator-of-vehicle/jest.config.ts" } }, "extract-strings": { diff --git a/libs/application/templates/transport-authority/digital-tachograph-company-card/project.json b/libs/application/templates/transport-authority/digital-tachograph-company-card/project.json index ce02f928d17d..a9f056e6f518 100644 --- a/libs/application/templates/transport-authority/digital-tachograph-company-card/project.json +++ b/libs/application/templates/transport-authority/digital-tachograph-company-card/project.json @@ -6,13 +6,7 @@ "tags": ["scope:application-system", "lib:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/application/templates/transport-authority/digital-tachograph-company-card/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -20,8 +14,7 @@ "{workspaceRoot}/coverage/libs/application/templates/transport-authority/digital-tachograph-company-card" ], "options": { - "jestConfig": "libs/application/templates/transport-authority/digital-tachograph-company-card/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/transport-authority/digital-tachograph-company-card/jest.config.ts" } }, "extract-strings": { diff --git a/libs/application/templates/transport-authority/digital-tachograph-drivers-card/project.json b/libs/application/templates/transport-authority/digital-tachograph-drivers-card/project.json index 17b00039fc30..d52b54865e17 100644 --- a/libs/application/templates/transport-authority/digital-tachograph-drivers-card/project.json +++ b/libs/application/templates/transport-authority/digital-tachograph-drivers-card/project.json @@ -6,13 +6,7 @@ "tags": ["scope:application-system", "lib:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/application/templates/transport-authority/digital-tachograph-drivers-card/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -20,8 +14,7 @@ "{workspaceRoot}/coverage/libs/application/templates/transport-authority/digital-tachograph-drivers-card" ], "options": { - "jestConfig": "libs/application/templates/transport-authority/digital-tachograph-drivers-card/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/transport-authority/digital-tachograph-drivers-card/jest.config.ts" } }, "extract-strings": { diff --git a/libs/application/templates/transport-authority/digital-tachograph-workshop-card/project.json b/libs/application/templates/transport-authority/digital-tachograph-workshop-card/project.json index 14b9294bec89..ce5aaa06e185 100644 --- a/libs/application/templates/transport-authority/digital-tachograph-workshop-card/project.json +++ b/libs/application/templates/transport-authority/digital-tachograph-workshop-card/project.json @@ -6,13 +6,7 @@ "tags": ["scope:application-system", "lib:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/application/templates/transport-authority/digital-tachograph-workshop-card/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -20,8 +14,7 @@ "{workspaceRoot}/coverage/libs/application/templates/transport-authority/digital-tachograph-workshop-card" ], "options": { - "jestConfig": "libs/application/templates/transport-authority/digital-tachograph-workshop-card/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/transport-authority/digital-tachograph-workshop-card/jest.config.ts" } }, "extract-strings": { diff --git a/libs/application/templates/transport-authority/license-plate-renewal/project.json b/libs/application/templates/transport-authority/license-plate-renewal/project.json index a49a8b42d44f..110238fa8df2 100644 --- a/libs/application/templates/transport-authority/license-plate-renewal/project.json +++ b/libs/application/templates/transport-authority/license-plate-renewal/project.json @@ -6,13 +6,7 @@ "tags": ["scope:application-system", "lib:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/application/templates/transport-authority/license-plate-renewal/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -20,8 +14,7 @@ "{workspaceRoot}/coverage/libs/application/templates/transport-authority/license-plate-renewal" ], "options": { - "jestConfig": "libs/application/templates/transport-authority/license-plate-renewal/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/transport-authority/license-plate-renewal/jest.config.ts" } }, "extract-strings": { diff --git a/libs/application/templates/transport-authority/order-vehicle-license-plate/project.json b/libs/application/templates/transport-authority/order-vehicle-license-plate/project.json index 73143e09a53d..dd53d61f609b 100644 --- a/libs/application/templates/transport-authority/order-vehicle-license-plate/project.json +++ b/libs/application/templates/transport-authority/order-vehicle-license-plate/project.json @@ -6,13 +6,7 @@ "tags": ["scope:application-system", "lib:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/application/templates/transport-authority/order-vehicle-license-plate/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -20,8 +14,7 @@ "{workspaceRoot}/coverage/libs/application/templates/transport-authority/order-vehicle-license-plate" ], "options": { - "jestConfig": "libs/application/templates/transport-authority/order-vehicle-license-plate/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/transport-authority/order-vehicle-license-plate/jest.config.ts" } }, "extract-strings": { diff --git a/libs/application/templates/transport-authority/order-vehicle-registration-certificate/project.json b/libs/application/templates/transport-authority/order-vehicle-registration-certificate/project.json index 0145135a3eef..c6761279f7c6 100644 --- a/libs/application/templates/transport-authority/order-vehicle-registration-certificate/project.json +++ b/libs/application/templates/transport-authority/order-vehicle-registration-certificate/project.json @@ -6,13 +6,7 @@ "tags": ["scope:application-system", "lib:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/application/templates/transport-authority/order-vehicle-registration-certificate/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -20,8 +14,7 @@ "{workspaceRoot}/coverage/libs/application/templates/transport-authority/order-vehicle-registration-certificate" ], "options": { - "jestConfig": "libs/application/templates/transport-authority/order-vehicle-registration-certificate/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/transport-authority/order-vehicle-registration-certificate/jest.config.ts" } }, "extract-strings": { diff --git a/libs/application/templates/transport-authority/transfer-of-vehicle-ownership/project.json b/libs/application/templates/transport-authority/transfer-of-vehicle-ownership/project.json index 8b29ecb9ca28..2e66f3d76d6e 100644 --- a/libs/application/templates/transport-authority/transfer-of-vehicle-ownership/project.json +++ b/libs/application/templates/transport-authority/transfer-of-vehicle-ownership/project.json @@ -6,13 +6,7 @@ "tags": ["scope:application-system", "lib:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/application/templates/transport-authority/transfer-of-vehicle-ownership/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -20,8 +14,7 @@ "{workspaceRoot}/coverage/libs/application/templates/transport-authority/transfer-of-vehicle-ownership" ], "options": { - "jestConfig": "libs/application/templates/transport-authority/transfer-of-vehicle-ownership/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/transport-authority/transfer-of-vehicle-ownership/jest.config.ts" } }, "extract-strings": { diff --git a/libs/application/templates/university/project.json b/libs/application/templates/university/project.json index 7baacb3a552a..1ef0bf25e7b6 100644 --- a/libs/application/templates/university/project.json +++ b/libs/application/templates/university/project.json @@ -6,13 +6,7 @@ "tags": ["scope:application-system", "lib:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/application/templates/university/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -20,8 +14,7 @@ "{workspaceRoot}/coverage/libs/application/templates/university" ], "options": { - "jestConfig": "libs/application/templates/university/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/templates/university/jest.config.ts" } }, "extract-strings": { diff --git a/libs/application/testing/project.json b/libs/application/testing/project.json index 2fac9be1f060..37c02aa29580 100644 --- a/libs/application/testing/project.json +++ b/libs/application/testing/project.json @@ -6,18 +6,13 @@ "tags": ["lib:application-system", "scope:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/application/testing/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/application/testing"], "options": { - "jestConfig": "libs/application/testing/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/testing/jest.config.ts" } } } diff --git a/libs/application/types/project.json b/libs/application/types/project.json index c6f2c7c1ee0e..615224e19d0c 100644 --- a/libs/application/types/project.json +++ b/libs/application/types/project.json @@ -3,21 +3,17 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/types/src", "projectType": "library", + "tags": ["lib:js", "scope:application-system", "TODO:splitUp"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/application/types/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/application/types"], "options": { - "jestConfig": "libs/application/types/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/types/jest.config.ts" } } - }, - "tags": ["lib:js", "scope:application-system", "TODO:splitUp"] + } } diff --git a/libs/application/types/src/lib/Condition.ts b/libs/application/types/src/lib/Condition.ts index ddce5ba17b63..6deb44e11833 100644 --- a/libs/application/types/src/lib/Condition.ts +++ b/libs/application/types/src/lib/Condition.ts @@ -1,5 +1,5 @@ import { FormValue, ExternalData } from './Application' -import { User } from 'user' +import { User } from '@island.is/shared/types' export enum Comparators { EQUALS = 'eq', diff --git a/libs/application/types/src/lib/Fields.ts b/libs/application/types/src/lib/Fields.ts index 46deea2d2b0f..0571cf036565 100644 --- a/libs/application/types/src/lib/Fields.ts +++ b/libs/application/types/src/lib/Fields.ts @@ -60,6 +60,16 @@ export type TableRepeaterFields = | 'radio' | 'checkbox' | 'date' + | 'nationalIdWithName' + +type RepeaterOption = { label: StaticText; value: string; tooltip?: StaticText } + +type TableRepeaterOptions = + | RepeaterOption[] + | (( + application: Application, + activeField: Record, + ) => RepeaterOption[] | []) export type TableRepeaterItem = { component: TableRepeaterFields @@ -69,15 +79,21 @@ export type TableRepeaterItem = { displayInTable?: boolean label?: StaticText placeholder?: StaticText - options?: { label: StaticText; value: string }[] + options?: TableRepeaterOptions backgroundColor?: 'blue' | 'white' - width?: 'half' | 'full' + width?: 'half' | 'full' | 'third' required?: boolean condition?: ( application: Application, activeField?: Record, ) => boolean dataTestId?: string + readonly?: + | boolean + | (( + application: Application, + activeField?: Record, + ) => boolean) } & ( | { component: 'input' @@ -88,6 +104,7 @@ export type TableRepeaterItem = { rows?: number maxLength?: number currency?: boolean + suffix?: string } | { component: 'date' @@ -102,8 +119,8 @@ export type TableRepeaterItem = { | { component: 'select' label: StaticText - options: { label: StaticText; value: string }[] isSearchable?: boolean + isMulti?: boolean } | { component: 'radio' @@ -113,6 +130,9 @@ export type TableRepeaterItem = { component: 'checkbox' large?: boolean } + | { + component: 'nationalIdWithName' + } ) export type AlertMessageLink = { diff --git a/libs/application/types/src/lib/InstitutionNationalIds.ts b/libs/application/types/src/lib/InstitutionNationalIds.ts index 4bab4fda5e32..aca8d0a2b257 100644 --- a/libs/application/types/src/lib/InstitutionNationalIds.ts +++ b/libs/application/types/src/lib/InstitutionNationalIds.ts @@ -4,6 +4,7 @@ export enum InstitutionNationalIds { TRYGGINGASTOFNUN = '5012130120', FISKISTOFA = '6608922069', FJARMALA_EFNAHAGSRADUNEYTID = '5501692829', + // eslint-disable-next-line @typescript-eslint/no-duplicate-enum-values FJARSYSLA_RIKISINS = '5501692829', INNHEIMTUMADUR = '5402696029', PERSONUVERND = '5608002820', @@ -11,6 +12,7 @@ export enum InstitutionNationalIds { RIKISLOGREGLUSTJORI = '5306972079', SAMBAND_SVEITARFELAGA = '5502694739', SJUKRATRYGGINGAR_ISLANDS = '4804080550', + // eslint-disable-next-line @typescript-eslint/no-duplicate-enum-values STAFRAENT_ISLAND = '5501692829', UMBODSMADUR_ALTHINGIS = '5605882089', VINNUMALASTOFNUN = '7005942039', diff --git a/libs/application/ui-components/project.json b/libs/application/ui-components/project.json index 1eca71d9678e..7bc02d37c245 100644 --- a/libs/application/ui-components/project.json +++ b/libs/application/ui-components/project.json @@ -3,21 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/ui-components/src", "projectType": "library", + "tags": ["lib:application-system", "scope:application-system"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/application/ui-components/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/application/ui-components/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/ui-components/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/application/ui-components"] }, @@ -28,6 +23,5 @@ "command": "graphql-codegen --config libs/application/ui-components/codegen.yml" } } - }, - "tags": ["lib:application-system", "scope:application-system"] + } } diff --git a/libs/application/ui-components/src/components/NationalIdWithName/NationalIdWithName.tsx b/libs/application/ui-components/src/components/NationalIdWithName/NationalIdWithName.tsx index cc08d2e40652..d232bc7ef1fd 100644 --- a/libs/application/ui-components/src/components/NationalIdWithName/NationalIdWithName.tsx +++ b/libs/application/ui-components/src/components/NationalIdWithName/NationalIdWithName.tsx @@ -50,7 +50,7 @@ export const NationalIdWithName: FC< }) => { const fieldId = customId.length > 0 ? customId : id const nameField = `${fieldId}.name` - const nationaIdField = `${fieldId}.nationalId` + const nationalIdField = `${fieldId}.nationalId` const { formatMessage } = useLocale() const { @@ -81,13 +81,13 @@ export const NationalIdWithName: FC< { minAge: minAgePerson }, ) } else if (!errorMessage) { - nationalIdFieldErrors = getErrorViaPath(errors, nationaIdField) + nationalIdFieldErrors = getErrorViaPath(errors, nationalIdField) } // get default values const defaultNationalId = nationalIdDefaultValue ? nationalIdDefaultValue - : getValueViaPath(application.answers, nationaIdField, '') + : getValueViaPath(application.answers, nationalIdField, '') const defaultName = nameDefaultValue ? nameDefaultValue : getValueViaPath(application.answers, nameField, '') @@ -123,7 +123,7 @@ export const NationalIdWithName: FC< = ({ @@ -85,6 +88,9 @@ export const TableRepeaterFormField: FC = ({ const staticData = getStaticTableData?.(application) const canAddItem = maxRows ? savedFields.length < maxRows : true + // check for components that might need some custom value mapping + const customMappedValues = handleCustomMappedValues(tableItems, values) + const handleSaveItem = async (index: number) => { const isValid = await methods.trigger(`${data.id}[${index}]`, { shouldFocus: true, @@ -216,7 +222,12 @@ export const TableRepeaterFormField: FC = ({ {tableRows.map((item, idx) => ( - {formatTableValue(item, values[index])} + {formatTableValue( + item, + customMappedValues.length + ? customMappedValues[index] + : values[index], + )} ))} @@ -241,19 +252,49 @@ export const TableRepeaterFormField: FC = ({ options, width = 'full', condition, + readonly = false, ...props } = item const isHalfColumn = component !== 'radio' && width === 'half' - const span = isHalfColumn ? '1/2' : '1/1' + const isThirdColumn = + component !== 'radio' && width === 'third' + const span = isHalfColumn + ? '1/2' + : isThirdColumn + ? '1/3' + : '1/1' const Component = componentMapper[component] const id = `${data.id}[${activeIndex}].${itemId}` const activeValues = activeIndex >= 0 && values ? values[activeIndex] : undefined - const translatedOptions = options?.map((option) => ({ - ...option, - label: formatText(option.label, application, formatMessage), - })) + let translatedOptions: any = [] + if (typeof options === 'function') { + translatedOptions = options(application, activeValues) + } else { + translatedOptions = options?.map((option) => ({ + ...option, + label: formatText( + option.label, + application, + formatMessage, + ), + ...(option.tooltip && { + tooltip: formatText( + option.tooltip, + application, + formatMessage, + ), + }), + })) + } + + let Readonly: boolean | undefined + if (typeof readonly === 'function') { + Readonly = readonly(application, activeValues) + } else { + Readonly = readonly + } if (condition && !condition(application, activeValues)) { return null @@ -284,12 +325,14 @@ export const TableRepeaterFormField: FC = ({ split={width === 'half' ? '1/2' : '1/1'} error={getFieldError(itemId)} control={methods.control} + readOnly={Readonly} backgroundColor={backgroundColor} onChange={() => { if (error) { methods.clearErrors(id) } }} + application={application} {...props} /> diff --git a/libs/application/ui-fields/src/lib/TableRepeaterFormField/utils.ts b/libs/application/ui-fields/src/lib/TableRepeaterFormField/utils.ts new file mode 100644 index 000000000000..fd1962a41f14 --- /dev/null +++ b/libs/application/ui-fields/src/lib/TableRepeaterFormField/utils.ts @@ -0,0 +1,42 @@ +import { TableRepeaterItem } from '@island.is/application/types' + +type Item = { + id: string +} & TableRepeaterItem + +export type Value = { [key: string]: T } + +export const handleCustomMappedValues = ( + tableItems: Array, + values: Array>, +) => { + // Iterate over tableItems and handle items with nationalIdWithName component + return tableItems.reduce((acc, item) => { + if (item.component === 'nationalIdWithName') { + return handleNationalIdWithNameItem(item, values) + } + return acc + }, [] as Array>) +} + +const handleNationalIdWithNameItem = ( + item: Item, + values: Array>, +) => { + if (!values?.length) { + return [] + } + + // nationalIdWithName is a special case where the value is an object + // with a nested object inside it. This function will extract the nested + // object and merge it with the rest of the values. + const newValues = values.map((value) => { + if (typeof value[item.id] === 'object' && value[item.id] !== null) { + const { [item.id]: nestedObject, ...rest } = value + return { ...nestedObject, ...rest } + } + return value + }) + + return newValues +} diff --git a/libs/application/ui-forms/project.json b/libs/application/ui-forms/project.json index e5d97ba68182..224ef4618328 100644 --- a/libs/application/ui-forms/project.json +++ b/libs/application/ui-forms/project.json @@ -3,20 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/ui-forms/src", "projectType": "library", + "tags": ["lib:application-system", "scope:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/application/ui-forms/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/application/ui-forms"], "options": { - "jestConfig": "libs/application/ui-forms/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/ui-forms/jest.config.ts" } }, "extract-strings": { @@ -25,6 +21,5 @@ "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/application/ui-forms/src/**/*.{js,ts,tsx}'" } } - }, - "tags": ["lib:application-system", "scope:application-system"] + } } diff --git a/libs/application/ui-shell/project.json b/libs/application/ui-shell/project.json index 436c1c3b4bf5..29581b352d12 100644 --- a/libs/application/ui-shell/project.json +++ b/libs/application/ui-shell/project.json @@ -3,19 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/ui-shell/src", "projectType": "library", + "tags": ["scope:application-system-web", "lib:application-system-web"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/application/ui-shell/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/application/ui-shell/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/application/ui-shell/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/application/ui-shell"] }, @@ -25,6 +22,5 @@ "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/application/ui-shell/src/{lib,components}/**/*.{js,ts,tsx}'" } } - }, - "tags": ["scope:application-system-web", "lib:application-system-web"] + } } diff --git a/libs/application/ui-shell/src/reducer/ReducerTypes.ts b/libs/application/ui-shell/src/reducer/ReducerTypes.ts index 8c876abdacd4..5d404b6808c0 100644 --- a/libs/application/ui-shell/src/reducer/ReducerTypes.ts +++ b/libs/application/ui-shell/src/reducer/ReducerTypes.ts @@ -5,7 +5,7 @@ import { Section, } from '@island.is/application/types' import { FormScreen } from '../types' -import { User } from 'user' +import { User } from '@island.is/shared/types' export interface ApplicationUIState { application: Application diff --git a/libs/application/ui-shell/src/reducer/reducerUtils.ts b/libs/application/ui-shell/src/reducer/reducerUtils.ts index 299f5f077831..da1e0cae9270 100644 --- a/libs/application/ui-shell/src/reducer/reducerUtils.ts +++ b/libs/application/ui-shell/src/reducer/reducerUtils.ts @@ -33,7 +33,7 @@ import { RepeaterScreen, } from '../types' import { answerIsMissing } from '../utils' -import { User } from 'user' +import { User } from '@island.is/shared/types' export const screenRequiresAnswer = (screen: FormScreen) => { if (!screen.isNavigable) { diff --git a/libs/application/utils/project.json b/libs/application/utils/project.json index 106667fa8c89..f0cee55e967e 100644 --- a/libs/application/utils/project.json +++ b/libs/application/utils/project.json @@ -3,28 +3,17 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/application/utils/src", "projectType": "library", + "tags": ["lib:application-system", "scope:application-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/application/utils/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/application/utils/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/application/utils/jest.config.ts" } } - }, - "tags": ["lib:application-system", "scope:application-system"] + } } diff --git a/libs/auth-api-lib/project.json b/libs/auth-api-lib/project.json index 225b8b795fdc..d36515573d4e 100644 --- a/libs/auth-api-lib/project.json +++ b/libs/auth-api-lib/project.json @@ -3,22 +3,18 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/auth-api-lib/src", "projectType": "library", + "tags": ["lib:auth-api", "scope:auth-api"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/auth-api-lib/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/auth-api-lib/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/auth-api-lib/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/auth-api-lib"] } - }, - "tags": ["lib:auth-api", "scope:auth-api"] + } } diff --git a/libs/auth-api-lib/src/lib/clients/clients.service.ts b/libs/auth-api-lib/src/lib/clients/clients.service.ts index 08373dbddeab..5671ae04e200 100644 --- a/libs/auth-api-lib/src/lib/clients/clients.service.ts +++ b/libs/auth-api-lib/src/lib/clients/clients.service.ts @@ -29,7 +29,10 @@ import { ClientSecretDTO } from './dto/client-secret.dto' import { ClientsTranslationService } from './clients-translation.service' import { BulkCreateOptions, DestroyOptions } from 'sequelize' import { ClientDelegationType } from './models/client-delegation-type.model' -import { AuthDelegationProvider, AuthDelegationType } from 'delegation' +import { + AuthDelegationProvider, + AuthDelegationType, +} from '@island.is/shared/types' import { DelegationTypeModel } from '../delegations/models/delegation-type.model' @Injectable() diff --git a/libs/auth-api-lib/src/lib/delegations/dto/delegation-index.dto.ts b/libs/auth-api-lib/src/lib/delegations/dto/delegation-index.dto.ts index 6aa3a29f5b17..c0da33c52460 100644 --- a/libs/auth-api-lib/src/lib/delegations/dto/delegation-index.dto.ts +++ b/libs/auth-api-lib/src/lib/delegations/dto/delegation-index.dto.ts @@ -1,6 +1,9 @@ import { IsDateString, IsNumber, IsOptional, IsString } from 'class-validator' import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger' -import { AuthDelegationProvider, AuthDelegationType } from 'delegation' +import { + AuthDelegationProvider, + AuthDelegationType, +} from '@island.is/shared/types' import { PageInfoDto } from '@island.is/nest/pagination' export class DelegationRecordDTO { diff --git a/libs/auth-api-lib/src/lib/resources/admin/admin-scope.service.ts b/libs/auth-api-lib/src/lib/resources/admin/admin-scope.service.ts index 4d1a0b16c2b4..ced3382eb852 100644 --- a/libs/auth-api-lib/src/lib/resources/admin/admin-scope.service.ts +++ b/libs/auth-api-lib/src/lib/resources/admin/admin-scope.service.ts @@ -25,7 +25,7 @@ import { TranslatedValueDto } from '../../translation/dto/translated-value.dto' import { TranslationService } from '../../translation/translation.service' import { User } from '@island.is/auth-nest-tools' import { AdminPortalScope } from '@island.is/auth/scopes' -import { AuthDelegationType } from 'delegation' +import { AuthDelegationType } from '@island.is/shared/types' import { ApiScopeDelegationType } from '../models/api-scope-delegation-type.model' /** diff --git a/libs/auth-nest-tools/project.json b/libs/auth-nest-tools/project.json index 0a4e6cf05bc1..536ecf4a1471 100644 --- a/libs/auth-nest-tools/project.json +++ b/libs/auth-nest-tools/project.json @@ -3,22 +3,18 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/auth-nest-tools/src", "projectType": "library", + "tags": ["lib:nest", "scope:nest"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/auth-nest-tools/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/auth-nest-tools/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/auth-nest-tools/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/auth-nest-tools"] } - }, - "tags": ["lib:nest", "scope:nest"] + } } diff --git a/libs/auth/react/project.json b/libs/auth/react/project.json index 53b268ca56e9..51a8e03a6a39 100644 --- a/libs/auth/react/project.json +++ b/libs/auth/react/project.json @@ -3,21 +3,17 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/auth/react/src", "projectType": "library", + "tags": ["lib:react-spa", "scope:react-spa"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/auth/react/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/auth/react"], "options": { - "jestConfig": "libs/auth/react/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/auth/react/jest.config.ts" } } - }, - "tags": ["lib:react-spa", "scope:react-spa"] + } } diff --git a/libs/auth/scopes/project.json b/libs/auth/scopes/project.json index 74bb2e2a7482..67c60b4ac32b 100644 --- a/libs/auth/scopes/project.json +++ b/libs/auth/scopes/project.json @@ -3,21 +3,17 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/auth/scopes/src", "projectType": "library", + "tags": ["lib:js", "scope:js"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/auth/scopes/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/auth/scopes"], "options": { - "jestConfig": "libs/auth/scopes/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/auth/scopes/jest.config.ts" } } - }, - "tags": ["lib:js", "scope:js"] + } } diff --git a/libs/auth/shared/project.json b/libs/auth/shared/project.json index 581db28f01d7..4b27a9c1e363 100644 --- a/libs/auth/shared/project.json +++ b/libs/auth/shared/project.json @@ -2,6 +2,7 @@ "name": "auth-shared", "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/auth/shared/src", + "tags": ["lib:js", "scope:js"], "targets": { "build": { "executor": "@nrwl/js:tsc", @@ -14,20 +15,14 @@ } }, "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/auth/shared/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/auth/shared"], "options": { - "jestConfig": "libs/auth/shared/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/auth/shared/jest.config.ts" } } - }, - "tags": ["lib:js", "scope:js"] + } } diff --git a/libs/cache/project.json b/libs/cache/project.json index 6015efdc38dd..349bca7bcc9c 100644 --- a/libs/cache/project.json +++ b/libs/cache/project.json @@ -3,22 +3,18 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/cache/src", "projectType": "library", + "tags": ["lib:node", "scope:node"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/cache/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/cache/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/cache/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/cache"] } - }, - "tags": ["lib:node", "scope:node"] + } } diff --git a/libs/clients/administration-of-occupational-safety-and-health/project.json b/libs/clients/administration-of-occupational-safety-and-health/project.json index 5855eb92d02a..edc8fae66ac5 100644 --- a/libs/clients/administration-of-occupational-safety-and-health/project.json +++ b/libs/clients/administration-of-occupational-safety-and-health/project.json @@ -3,28 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/administration-of-occupational-safety-and-health/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/clients/administration-of-occupational-safety-and-health/**/*.ts" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/clients/administration-of-occupational-safety-and-health/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/clients/administration-of-occupational-safety-and-health/jest.config.ts" } }, "update-openapi-document": { @@ -44,6 +32,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/adr-and-machine-license/project.json b/libs/clients/adr-and-machine-license/project.json index 08d60fb21af6..9685a55c1227 100644 --- a/libs/clients/adr-and-machine-license/project.json +++ b/libs/clients/adr-and-machine-license/project.json @@ -3,14 +3,10 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/adr-and-machine-license/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/clients/adr-and-machine-license/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "update-openapi-document": { "executor": "nx:run-commands", @@ -30,8 +26,7 @@ "{workspaceRoot}/coverage/libs/clients/adr-and-machine-license" ], "options": { - "jestConfig": "libs/clients/adr-and-machine-license/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/adr-and-machine-license/jest.config.ts" } }, "codegen/backend-client": { @@ -41,6 +36,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/air-discount-scheme/project.json b/libs/clients/air-discount-scheme/project.json index 80f55fbe5272..5db0a7365420 100644 --- a/libs/clients/air-discount-scheme/project.json +++ b/libs/clients/air-discount-scheme/project.json @@ -3,21 +3,17 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/air-discount-scheme/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], + "implicitDependencies": ["air-discount-scheme-backend"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/clients/air-discount-scheme/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/air-discount-scheme"], "options": { - "jestConfig": "libs/clients/air-discount-scheme/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/air-discount-scheme/jest.config.ts" } }, "codegen/backend-client": { @@ -27,7 +23,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "implicitDependencies": ["air-discount-scheme-backend"], - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/aircraft-registry/project.json b/libs/clients/aircraft-registry/project.json index 189811a3d2dc..26e991ee76bd 100644 --- a/libs/clients/aircraft-registry/project.json +++ b/libs/clients/aircraft-registry/project.json @@ -2,20 +2,16 @@ "name": "aircraft-registry", "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/aircraft-registry/src", + "tags": ["scope:client", "lib:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/clients/aircraft-registry/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/aircraft-registry"], "options": { - "jestConfig": "libs/clients/aircraft-registry/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/aircraft-registry/jest.config.ts" } }, "update-openapi-document": { @@ -37,6 +33,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["scope:client", "lib:client"] + } } diff --git a/libs/clients/althingi-ombudsman/project.json b/libs/clients/althingi-ombudsman/project.json index bdee5b0841bb..ab8e22c510f5 100644 --- a/libs/clients/althingi-ombudsman/project.json +++ b/libs/clients/althingi-ombudsman/project.json @@ -3,13 +3,10 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/althingi-ombudsman/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/clients/althingi-ombudsman/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "codegen/backend-client": { "executor": "nx:run-commands", @@ -22,16 +19,8 @@ "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/clients/althingi-ombudsman/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/clients/althingi-ombudsman/jest.config.ts" } } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/assets/project.json b/libs/clients/assets/project.json index 43a200db24ee..f1f53725708f 100644 --- a/libs/clients/assets/project.json +++ b/libs/clients/assets/project.json @@ -3,19 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/assets/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/clients/assets/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/assets"], "options": { - "jestConfig": "libs/clients/assets/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/assets/jest.config.ts" } }, "codegen/backend-client": { @@ -25,6 +22,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/auth/admin-api/project.json b/libs/clients/auth/admin-api/project.json index b477be164210..a67ab8d1fe62 100644 --- a/libs/clients/auth/admin-api/project.json +++ b/libs/clients/auth/admin-api/project.json @@ -3,20 +3,17 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/auth/admin-api/src", "projectType": "library", + "tags": ["scope:client", "lib:client"], + "implicitDependencies": ["services-auth-admin-api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/clients/auth/admin-api/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/auth/admin-api"], "options": { - "jestConfig": "libs/clients/auth/admin-api/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/auth/admin-api/jest.config.ts" } }, "codegen/backend-client": { @@ -26,7 +23,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "implicitDependencies": ["services-auth-admin-api"], - "tags": ["scope:client", "lib:client"] + } } diff --git a/libs/clients/auth/delegation-api/project.json b/libs/clients/auth/delegation-api/project.json index 451600d454a5..25398b782ecd 100644 --- a/libs/clients/auth/delegation-api/project.json +++ b/libs/clients/auth/delegation-api/project.json @@ -2,20 +2,17 @@ "name": "clients-auth-delegation-api", "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/auth/delegation-api/src", + "tags": ["lib:client", "scope:client"], + "implicitDependencies": ["services-auth-delegation-api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/clients/auth/delegation-api/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/auth/delegation-api"], "options": { - "jestConfig": "libs/clients/auth/delegation-api/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/auth/delegation-api/jest.config.ts" } }, "codegen/backend-client": { @@ -25,7 +22,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "implicitDependencies": ["services-auth-delegation-api"], - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/auth/ids-api/project.json b/libs/clients/auth/ids-api/project.json index 8fb45760196a..66ab587fd813 100644 --- a/libs/clients/auth/ids-api/project.json +++ b/libs/clients/auth/ids-api/project.json @@ -2,20 +2,16 @@ "name": "clients-auth-ids-api", "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/auth/ids-api/src", + "tags": ["scope:client", "lib:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/clients/auth/ids-api/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/auth/ids-api"], "options": { - "jestConfig": "libs/clients/auth/ids-api/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/auth/ids-api/jest.config.ts" } }, "codegen/backend-client": { @@ -31,6 +27,5 @@ "{projectRoot}/src/clientConfig.yaml" ] } - }, - "tags": ["scope:client", "lib:client"] + } } diff --git a/libs/clients/auth/public-api/project.json b/libs/clients/auth/public-api/project.json index 473d5a459438..86362de3e076 100644 --- a/libs/clients/auth/public-api/project.json +++ b/libs/clients/auth/public-api/project.json @@ -3,21 +3,17 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/auth/public-api/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], + "implicitDependencies": ["services-auth-public-api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/clients/auth/public-api/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/auth/public-api"], "options": { - "jestConfig": "libs/clients/auth/public-api/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/auth/public-api/jest.config.ts" } }, "codegen/backend-client": { @@ -27,7 +23,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "implicitDependencies": ["services-auth-public-api"], - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/car-recycling/project.json b/libs/clients/car-recycling/project.json index a7a49ccadb65..5f8f8e89967e 100644 --- a/libs/clients/car-recycling/project.json +++ b/libs/clients/car-recycling/project.json @@ -3,20 +3,18 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/car-recycling/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], + "implicitDependencies": ["skilavottord-ws"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/clients/car-recycling/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/car-recycling"], "options": { - "jestConfig": "libs/clients/car-recycling/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/car-recycling/jest.config.ts" } }, "codegen/backend-client": { @@ -30,7 +28,5 @@ ], "outputs": ["{projectRoot}/gen", "{projectRoot}/**/*.generated.ts"] } - }, - "implicitDependencies": ["skilavottord-ws"], - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/charge-fjs-v2/project.json b/libs/clients/charge-fjs-v2/project.json index 60633a107a21..ef305b6c4dce 100644 --- a/libs/clients/charge-fjs-v2/project.json +++ b/libs/clients/charge-fjs-v2/project.json @@ -3,19 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/charge-fjs-v2/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/clients/charge-fjs-v2/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/charge-fjs-v2"], "options": { - "jestConfig": "libs/clients/charge-fjs-v2/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/charge-fjs-v2/jest.config.ts" } }, "update-openapi-document": { @@ -37,6 +34,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/consultation-portal/project.json b/libs/clients/consultation-portal/project.json index ee4c3590f42f..c004a6071eab 100644 --- a/libs/clients/consultation-portal/project.json +++ b/libs/clients/consultation-portal/project.json @@ -3,21 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/consultation-portal/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/clients/consultation-portal/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/consultation-portal"], "options": { - "jestConfig": "libs/clients/consultation-portal/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/consultation-portal/jest.config.ts" } }, "codegen/backend-client": { @@ -27,6 +22,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/criminal-record/project.json b/libs/clients/criminal-record/project.json index 85e4f2900e70..45acafa01d47 100644 --- a/libs/clients/criminal-record/project.json +++ b/libs/clients/criminal-record/project.json @@ -3,21 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/criminal-record/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/clients/criminal-record/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/criminal-record"], "options": { - "jestConfig": "libs/clients/criminal-record/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/criminal-record/jest.config.ts" } }, "update-openapi-document": { @@ -39,6 +34,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/data-protection-complaint/project.json b/libs/clients/data-protection-complaint/project.json index e004c387ccd6..3582c1a27423 100644 --- a/libs/clients/data-protection-complaint/project.json +++ b/libs/clients/data-protection-complaint/project.json @@ -3,14 +3,10 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/data-protection-complaint/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/clients/data-protection-complaint/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "codegen/backend-client": { "executor": "nx:run-commands", @@ -25,10 +21,8 @@ "{workspaceRoot}/coverage/libs/clients/data-protection-complaint" ], "options": { - "jestConfig": "libs/clients/data-protection-complaint/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/data-protection-complaint/jest.config.ts" } } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/directorate-of-immigration/project.json b/libs/clients/directorate-of-immigration/project.json index 5bee6212fe49..8bec05a207ab 100644 --- a/libs/clients/directorate-of-immigration/project.json +++ b/libs/clients/directorate-of-immigration/project.json @@ -3,26 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/directorate-of-immigration/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/clients/directorate-of-immigration/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/clients/directorate-of-immigration/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/clients/directorate-of-immigration/jest.config.ts" } }, "update-openapi-document": { @@ -45,6 +35,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/disability-license/project.json b/libs/clients/disability-license/project.json index ff2c2bd3f595..05dbe4c66b27 100644 --- a/libs/clients/disability-license/project.json +++ b/libs/clients/disability-license/project.json @@ -3,20 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/disability-license/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/clients/disability-license/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/disability-license"], "options": { - "jestConfig": "libs/clients/disability-license/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/disability-license/jest.config.ts" } }, "codegen/backend-client": { @@ -26,6 +22,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/district-commissioners-licenses/project.json b/libs/clients/district-commissioners-licenses/project.json index 6d4ad14cc08c..80104150f66e 100644 --- a/libs/clients/district-commissioners-licenses/project.json +++ b/libs/clients/district-commissioners-licenses/project.json @@ -3,28 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/district-commissioners-licenses/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/clients/district-commissioners-licenses/**/*.ts" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/clients/district-commissioners-licenses/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/clients/district-commissioners-licenses/jest.config.ts" } }, "update-openapi-document": { @@ -45,6 +33,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/document-provider/project.json b/libs/clients/document-provider/project.json index 0a30371fb0ce..6437677694e8 100644 --- a/libs/clients/document-provider/project.json +++ b/libs/clients/document-provider/project.json @@ -3,21 +3,17 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/document-provider/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], + "implicitDependencies": ["services-documents"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/clients/document-provider/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/document-provider"], "options": { - "jestConfig": "libs/clients/document-provider/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/document-provider/jest.config.ts" } }, "codegen/backend-client": { @@ -27,7 +23,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "implicitDependencies": ["services-documents"], - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/documents-v2/project.json b/libs/clients/documents-v2/project.json index fbdb41abe0f3..559ec0061420 100644 --- a/libs/clients/documents-v2/project.json +++ b/libs/clients/documents-v2/project.json @@ -3,19 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/documents-v2/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/clients/documents-v2/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/documents-v2"], "options": { - "jestConfig": "libs/clients/documents-v2/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/documents-v2/jest.config.ts" } }, "update-openapi-document": { @@ -36,6 +33,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/documents-v2/src/lib/documentsClientV2.service.ts b/libs/clients/documents-v2/src/lib/documentsClientV2.service.ts index f3ad890bf8cd..4381e3457c89 100644 --- a/libs/clients/documents-v2/src/lib/documentsClientV2.service.ts +++ b/libs/clients/documents-v2/src/lib/documentsClientV2.service.ts @@ -46,6 +46,7 @@ export class DocumentsClientV2Service { const inputObject = sanitizeObject({ ...input, kennitala: input.nationalId, + page: input.page ?? 1, senderKennitala: input.senderNationalId && input.senderNationalId.length > 0 ? input.senderNationalId.join() diff --git a/libs/clients/documents-v2/src/lib/dto/document.dto.ts b/libs/clients/documents-v2/src/lib/dto/document.dto.ts index 1a014daf9ac9..3b99498f011d 100644 --- a/libs/clients/documents-v2/src/lib/dto/document.dto.ts +++ b/libs/clients/documents-v2/src/lib/dto/document.dto.ts @@ -1,6 +1,13 @@ import sanitizeHtml from 'sanitize-html' import { DocumentDTO } from '../..' +const customDocument = { + senderName: 'Ríkisskattstjóri', + senderNatReg: '5402696029', + subjectContains: 'Niðurstaða álagningar', + url: 'https://thjonustusidur.rsk.is/alagningarsedill', +} + export type FileType = 'pdf' | 'html' | 'url' export type DocumentDto = { @@ -23,7 +30,16 @@ export const mapToDocument = (document: DocumentDTO): DocumentDto | null => { content = document.content } else if (document.url) { fileType = 'url' - content = document.url + + // Handling edge case for documents that can't be presented due to requiring authentication through rsk.is + if ( + document.senderKennitala === customDocument.senderNatReg && + document?.subject?.includes(customDocument.subjectContains) + ) { + content = customDocument.url + } else { + content = document.url + } } else if (document.htmlContent) { fileType = 'html' diff --git a/libs/clients/documents/project.json b/libs/clients/documents/project.json index a8fa825e1505..376320883ed2 100644 --- a/libs/clients/documents/project.json +++ b/libs/clients/documents/project.json @@ -3,21 +3,17 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/documents/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/clients/documents/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/documents"], "options": { - "jestConfig": "libs/clients/documents/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/documents/jest.config.ts" } } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/driving-license-book/project.json b/libs/clients/driving-license-book/project.json index 3bec3c3a30ca..c89648d9ce0d 100644 --- a/libs/clients/driving-license-book/project.json +++ b/libs/clients/driving-license-book/project.json @@ -3,21 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/driving-license-book/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/clients/driving-license-book/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/driving-license-book"], "options": { - "jestConfig": "libs/clients/driving-license-book/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/driving-license-book/jest.config.ts" } }, "update-openapi-document": { @@ -41,6 +36,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/driving-license/project.json b/libs/clients/driving-license/project.json index 9b60428d13f5..11f92a4910d7 100644 --- a/libs/clients/driving-license/project.json +++ b/libs/clients/driving-license/project.json @@ -3,21 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/driving-license/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/clients/driving-license/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/driving-license"], "options": { - "jestConfig": "libs/clients/driving-license/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/driving-license/jest.config.ts" } }, "update-openapi-document": { @@ -55,6 +50,5 @@ "parallel": false } } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/driving-license/src/lib/drivingLicenseApi.types.ts b/libs/clients/driving-license/src/lib/drivingLicenseApi.types.ts index 1ec0c0be52ed..fa097fa8a40f 100644 --- a/libs/clients/driving-license/src/lib/drivingLicenseApi.types.ts +++ b/libs/clients/driving-license/src/lib/drivingLicenseApi.types.ts @@ -38,6 +38,7 @@ export interface DriversLicense { disqualification?: Disqualification | null birthCountry?: string | null publishPlaceName?: string | null + comments?: LicenseComments[] | null } export interface RemarkCode { diff --git a/libs/clients/driving-license/src/v4/clientConfig.json b/libs/clients/driving-license/src/v4/clientConfig.json index 082d23865387..13f9da7c22ba 100644 --- a/libs/clients/driving-license/src/v4/clientConfig.json +++ b/libs/clients/driving-license/src/v4/clientConfig.json @@ -3,10 +3,172 @@ "info": { "title": "RLS driver licence Rest API", "description": "RESTFul services for driver licences. Programmed in ASP.NET Core 3 API ", - "contact": { "name": "TMD", "email": "tmd@tmd.is" }, + "contact": { + "name": "TMD", + "email": "tmd@tmd.is" + }, "version": "4.0" }, "paths": { + "/api/applications/v4/applyfor/be": { + "post": { + "tags": ["Application"], + "summary": "Apply for BE category", + "parameters": [ + { + "name": "api-version", + "in": "header", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + }, + { + "name": "api-version", + "in": "query", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + } + ], + "requestBody": { + "description": "Application model", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/PostApplicationForBEModel" + } + } + } + }, + "responses": { + "200": { + "description": "Success", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/ApplicationForCategoryDto" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/ApplicationForCategoryDto" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/ApplicationForCategoryDto" + } + } + } + }, + "400": { + "description": "Bad Request", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + } + } + } + } + } + }, + "/api/applications/v4/testfinished/{applicationId}": { + "post": { + "tags": ["Application"], + "summary": "Confirm application as done, test finished", + "parameters": [ + { + "name": "applicationId", + "in": "path", + "description": "RLS application id", + "required": true, + "schema": { + "type": "string" + } + }, + { + "name": "api-version", + "in": "header", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + }, + { + "name": "api-version", + "in": "query", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + } + ], + "responses": { + "200": { + "description": "Success", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/ApplicationFinishedDto" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/ApplicationFinishedDto" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/ApplicationFinishedDto" + } + } + } + }, + "400": { + "description": "Bad Request", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + } + } + } + } + } + }, "/api/codetables/deprivations": { "get": { "tags": ["Codetables"], @@ -17,14 +179,20 @@ "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -34,19 +202,25 @@ "text/plain": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/TegSviptingaDto" } + "items": { + "$ref": "#/components/schemas/TegSviptingaDto" + } } }, "application/json": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/TegSviptingaDto" } + "items": { + "$ref": "#/components/schemas/TegSviptingaDto" + } } }, "text/json": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/TegSviptingaDto" } + "items": { + "$ref": "#/components/schemas/TegSviptingaDto" + } } } } @@ -64,14 +238,138 @@ "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } + }, + { + "name": "api-version", + "in": "query", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + } + ], + "responses": { + "200": { + "description": "Success", + "content": { + "text/plain": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/TegundRettindaDto" + } + } + }, + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/TegundRettindaDto" + } + } + }, + "text/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/TegundRettindaDto" + } + } + } + } + } + } + } + }, + "/api/codetables/remarks": { + "get": { + "tags": ["Codetables"], + "summary": "Get types of remarks", + "parameters": [ + { + "name": "api-version", + "in": "header", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + }, + { + "name": "api-version", + "in": "query", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + } + ], + "responses": { + "200": { + "description": "Success", + "content": { + "text/plain": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/TegundAthugasemdaDto" + } + } + }, + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/TegundAthugasemdaDto" + } + } + }, + "text/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/TegundAthugasemdaDto" + } + } + } + } + } + } + } + }, + "/api/codetables/districts": { + "get": { + "tags": ["Codetables"], + "summary": "Get for all districts", + "parameters": [ + { + "name": "api-version", + "in": "header", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -80,20 +378,497 @@ "content": { "text/plain": { "schema": { - "type": "array", - "items": { "$ref": "#/components/schemas/TegundRettindaDto" } + "type": "array", + "items": { + "$ref": "#/components/schemas/EmbaettiDto" + } + } + }, + "application/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/EmbaettiDto" + } + } + }, + "text/json": { + "schema": { + "type": "array", + "items": { + "$ref": "#/components/schemas/EmbaettiDto" + } + } + } + } + } + } + } + }, + "/api/imagecontroller/{SSN}/hasqualityphoto": { + "get": { + "tags": ["Image"], + "summary": "Check if person has quality marked photo", + "parameters": [ + { + "name": "SSN", + "in": "path", + "description": "Person social security number", + "required": true, + "schema": { + "type": "string" + } + }, + { + "name": "api-version", + "in": "header", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + }, + { + "name": "api-version", + "in": "query", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + } + ], + "responses": { + "200": { + "description": "Success", + "content": { + "text/plain": { + "schema": { + "type": "integer", + "format": "int32" + } + }, + "application/json": { + "schema": { + "type": "integer", + "format": "int32" + } + }, + "text/json": { + "schema": { + "type": "integer", + "format": "int32" + } + } + } + } + } + } + }, + "/api/imagecontroller/{SSN}/hasqualitysignature": { + "get": { + "tags": ["Image"], + "summary": "Check if person has quality marked photo", + "parameters": [ + { + "name": "SSN", + "in": "path", + "description": "Person social security number", + "required": true, + "schema": { + "type": "string" + } + }, + { + "name": "api-version", + "in": "header", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + }, + { + "name": "api-version", + "in": "query", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + } + ], + "responses": { + "200": { + "description": "Success", + "content": { + "text/plain": { + "schema": { + "type": "integer", + "format": "int32" + } + }, + "application/json": { + "schema": { + "type": "integer", + "format": "int32" + } + }, + "text/json": { + "schema": { + "type": "integer", + "format": "int32" + } + } + } + } + } + } + }, + "/api/imagecontroller/{SSN}/getqualityphoto": { + "get": { + "tags": ["Image"], + "summary": "Get quality marked photo for person", + "parameters": [ + { + "name": "SSN", + "in": "path", + "description": "Person id number", + "required": true, + "schema": { + "type": "string" + } + }, + { + "name": "api-version", + "in": "header", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + }, + { + "name": "api-version", + "in": "query", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + } + ], + "responses": { + "200": { + "description": "Success", + "content": { + "text/plain": { + "schema": { + "type": "string", + "format": "byte" + } + }, + "application/json": { + "schema": { + "type": "string", + "format": "byte" + } + }, + "text/json": { + "schema": { + "type": "string", + "format": "byte" + } + } + } + }, + "204": { + "description": "No Content" + } + } + } + }, + "/api/imagecontroller/{SSN}/getqualitysignature": { + "get": { + "tags": ["Image"], + "summary": "Get quality marked photo for person", + "parameters": [ + { + "name": "SSN", + "in": "path", + "description": "Person social security number", + "required": true, + "schema": { + "type": "string" + } + }, + { + "name": "api-version", + "in": "header", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + }, + { + "name": "api-version", + "in": "query", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + } + ], + "responses": { + "200": { + "description": "Success", + "content": { + "text/plain": { + "schema": { + "type": "string", + "format": "byte" + } + }, + "application/json": { + "schema": { + "type": "string", + "format": "byte" + } + }, + "text/json": { + "schema": { + "type": "string", + "format": "byte" + } + } + } + }, + "204": { + "description": "No Content" + } + } + } + }, + "/api/imagecontroller/{SSN}/fromnationalregistry": { + "get": { + "tags": ["Image"], + "summary": "Get for all images from thjodskra", + "parameters": [ + { + "name": "SSN", + "in": "path", + "description": "Person social serial number", + "required": true, + "schema": { + "type": "string" + } + }, + { + "name": "api-version", + "in": "header", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + }, + { + "name": "api-version", + "in": "query", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + } + ], + "responses": { + "200": { + "description": "Success", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/ImagesFromThjodskraDto" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/ImagesFromThjodskraDto" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/ImagesFromThjodskraDto" + } + } + } + } + } + } + }, + "/api/licenseservice/v4/{SSN}/islicensevalid": { + "get": { + "tags": ["LicenseService"], + "summary": "Check if ssn has a valid license", + "parameters": [ + { + "name": "SSN", + "in": "path", + "description": "Person's social security number", + "required": true, + "schema": { + "type": "string" + } + }, + { + "name": "api-version", + "in": "header", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + }, + { + "name": "api-version", + "in": "query", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + } + ], + "responses": { + "200": { + "description": "Success", + "content": { + "text/plain": { + "schema": { + "type": "boolean" + } + }, + "application/json": { + "schema": { + "type": "boolean" + } + }, + "text/json": { + "schema": { + "type": "boolean" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + } + } + } + } + } + }, + "/api/licenseservice/v4/{SSN}/getlicense": { + "get": { + "tags": ["LicenseService"], + "summary": "Get person license by person social security number", + "parameters": [ + { + "name": "SSN", + "in": "path", + "description": "Person's social security number", + "required": true, + "schema": { + "type": "string" + } + }, + { + "name": "api-version", + "in": "header", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + }, + { + "name": "api-version", + "in": "query", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + } + ], + "responses": { + "200": { + "description": "Success", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/DriverLicenseDto" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/DriverLicenseDto" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/DriverLicenseDto" + } + } + } + }, + "404": { + "description": "Not Found", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" } }, "application/json": { "schema": { - "type": "array", - "items": { "$ref": "#/components/schemas/TegundRettindaDto" } + "$ref": "#/components/schemas/ProblemDetails" } }, "text/json": { "schema": { - "type": "array", - "items": { "$ref": "#/components/schemas/TegundRettindaDto" } + "$ref": "#/components/schemas/ProblemDetails" } } } @@ -101,24 +876,40 @@ } } }, - "/api/codetables/remarks": { + "/api/licenseservice/v4/{id}": { "get": { - "tags": ["Codetables"], - "summary": "Get types of remarks", + "tags": ["LicenseService"], + "summary": "Get person license by license id", "parameters": [ + { + "name": "id", + "in": "path", + "description": "", + "required": true, + "schema": { + "type": "integer", + "format": "int32" + } + }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -127,73 +918,37 @@ "content": { "text/plain": { "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/TegundAthugasemdaDto" - } + "$ref": "#/components/schemas/DriverLicenseDto" } }, "application/json": { "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/TegundAthugasemdaDto" - } + "$ref": "#/components/schemas/DriverLicenseDto" } }, "text/json": { "schema": { - "type": "array", - "items": { - "$ref": "#/components/schemas/TegundAthugasemdaDto" - } + "$ref": "#/components/schemas/DriverLicenseDto" } } } - } - } - } - }, - "/api/codetables/districts": { - "get": { - "tags": ["Codetables"], - "summary": "Get for all districts", - "parameters": [ - { - "name": "api-version", - "in": "header", - "description": "The requested API version", - "required": true, - "schema": { "type": "string", "default": "4.0" } }, - { - "name": "api-version", - "in": "query", - "description": "The requested API version", - "required": true, - "schema": { "type": "string", "default": "4.0" } - } - ], - "responses": { - "200": { - "description": "Success", + "404": { + "description": "Not Found", "content": { "text/plain": { "schema": { - "type": "array", - "items": { "$ref": "#/components/schemas/EmbaettiDto" } + "$ref": "#/components/schemas/ProblemDetails" } }, "application/json": { "schema": { - "type": "array", - "items": { "$ref": "#/components/schemas/EmbaettiDto" } + "$ref": "#/components/schemas/ProblemDetails" } }, "text/json": { "schema": { - "type": "array", - "items": { "$ref": "#/components/schemas/EmbaettiDto" } + "$ref": "#/components/schemas/ProblemDetails" } } } @@ -212,21 +967,29 @@ "in": "path", "description": "Person social security number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -234,13 +997,19 @@ "description": "Success", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/DriverLicenseDto" } + "schema": { + "$ref": "#/components/schemas/DriverLicenseDto" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/DriverLicenseDto" } + "schema": { + "$ref": "#/components/schemas/DriverLicenseDto" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/DriverLicenseDto" } + "schema": { + "$ref": "#/components/schemas/DriverLicenseDto" + } } } }, @@ -248,13 +1017,19 @@ "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } } } } @@ -269,36 +1044,52 @@ "in": "path", "description": "Person social security number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { - "204": { "description": "No Content" }, + "204": { + "description": "No Content" + }, "400": { "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } } } } @@ -315,28 +1106,38 @@ "in": "path", "description": "Person social security number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "category", "in": "path", "description": "Category to check for (B, C, and so on)", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -373,28 +1174,38 @@ "in": "path", "description": "Category in license", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "requestBody": { "description": "Model of application", "content": { "application/json": { - "schema": { "$ref": "#/components/schemas/PostNewFinalLicense" } + "schema": { + "$ref": "#/components/schemas/PostNewFinalLicense" + } } } }, @@ -403,13 +1214,22 @@ "description": "Success", "content": { "text/plain": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "application/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "text/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } } } }, @@ -417,13 +1237,19 @@ "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } } } } @@ -440,21 +1266,29 @@ "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "requestBody": { "description": "Model of application", "content": { "application/json": { - "schema": { "$ref": "#/components/schemas/PostNewCollaborative" } + "schema": { + "$ref": "#/components/schemas/PostNewCollaborative" + } } } }, @@ -463,13 +1297,22 @@ "description": "Created", "content": { "text/plain": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "application/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "text/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } } } }, @@ -477,13 +1320,19 @@ "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } } } } @@ -500,21 +1349,29 @@ "in": "path", "description": "Person social security number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -522,13 +1379,19 @@ "description": "Success", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/DeprivationDto" } + "schema": { + "$ref": "#/components/schemas/DeprivationDto" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/DeprivationDto" } + "schema": { + "$ref": "#/components/schemas/DeprivationDto" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/DeprivationDto" } + "schema": { + "$ref": "#/components/schemas/DeprivationDto" + } } } } @@ -545,21 +1408,109 @@ "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } + }, + { + "name": "api-version", + "in": "query", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + } + ], + "requestBody": { + "description": "Model of application", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/PostTemporaryLicense" + } + } + } + }, + "responses": { + "201": { + "description": "Created", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/NewTemporaryLicsenseDto" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/NewTemporaryLicsenseDto" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/NewTemporaryLicsenseDto" + } + } + } + }, + "400": { + "description": "Bad Request", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/NewTemporaryLicsenseDto" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/NewTemporaryLicsenseDto" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/NewTemporaryLicsenseDto" + } + } + } + } + } + } + }, + "/api/drivinglicense/v4/applications/new/temporarywithhealthdeclaration": { + "post": { + "tags": ["Okuskirteini"], + "summary": "Apply for drivers license for a category", + "parameters": [ + { + "name": "api-version", + "in": "header", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "requestBody": { "description": "Model of application", "content": { "application/json": { - "schema": { "$ref": "#/components/schemas/PostTemporaryLicense" } + "schema": { + "$ref": "#/components/schemas/PostTemporaryLicenseWithHealthDeclaration" + } } } }, @@ -618,14 +1569,20 @@ "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "requestBody": { @@ -692,21 +1649,29 @@ "in": "path", "description": "Person social security number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -714,13 +1679,19 @@ "description": "Success", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/PenaltyPointsDto" } + "schema": { + "$ref": "#/components/schemas/PenaltyPointsDto" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/PenaltyPointsDto" } + "schema": { + "$ref": "#/components/schemas/PenaltyPointsDto" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/PenaltyPointsDto" } + "schema": { + "$ref": "#/components/schemas/PenaltyPointsDto" + } } } } @@ -737,21 +1708,29 @@ "in": "path", "description": "Person social security number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -788,13 +1767,19 @@ "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } } } } @@ -811,21 +1796,29 @@ "in": "path", "description": "Person social security number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -833,13 +1826,22 @@ "description": "Success", "content": { "text/plain": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "application/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "text/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } } } } @@ -857,21 +1859,29 @@ "in": "path", "description": "Person social security number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -908,21 +1918,29 @@ "in": "path", "description": "Person social security number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -930,13 +1948,22 @@ "description": "Success", "content": { "text/plain": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "application/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "text/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } } } } @@ -953,21 +1980,29 @@ "in": "path", "description": "Person social security number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -975,13 +2010,22 @@ "description": "Success", "content": { "text/plain": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "application/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "text/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } } } } @@ -998,21 +2042,29 @@ "in": "path", "description": "Person id number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -1020,15 +2072,28 @@ "description": "Success", "content": { "text/plain": { - "schema": { "type": "string", "format": "byte" } + "schema": { + "type": "string", + "format": "byte" + } }, "application/json": { - "schema": { "type": "string", "format": "byte" } + "schema": { + "type": "string", + "format": "byte" + } }, - "text/json": { "schema": { "type": "string", "format": "byte" } } + "text/json": { + "schema": { + "type": "string", + "format": "byte" + } + } } }, - "204": { "description": "No Content" } + "204": { + "description": "No Content" + } } } }, @@ -1042,21 +2107,29 @@ "in": "path", "description": "Person social security number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -1064,15 +2137,28 @@ "description": "Success", "content": { "text/plain": { - "schema": { "type": "string", "format": "byte" } + "schema": { + "type": "string", + "format": "byte" + } }, "application/json": { - "schema": { "type": "string", "format": "byte" } + "schema": { + "type": "string", + "format": "byte" + } }, - "text/json": { "schema": { "type": "string", "format": "byte" } } + "text/json": { + "schema": { + "type": "string", + "format": "byte" + } + } } }, - "204": { "description": "No Content" } + "204": { + "description": "No Content" + } } } }, @@ -1086,21 +2172,29 @@ "in": "path", "description": "Person social security number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -1137,14 +2231,20 @@ "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "requestBody": { @@ -1158,18 +2258,26 @@ } }, "responses": { - "204": { "description": "No Content" }, + "204": { + "description": "No Content" + }, "400": { "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } } } } @@ -1186,21 +2294,29 @@ "in": "path", "description": "Person social security number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -1228,13 +2344,19 @@ "description": "Not Found", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } } } } @@ -1251,14 +2373,20 @@ "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -1268,19 +2396,25 @@ "text/plain": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/InstructorDto" } + "items": { + "$ref": "#/components/schemas/InstructorDto" + } } }, "application/json": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/InstructorDto" } + "items": { + "$ref": "#/components/schemas/InstructorDto" + } } }, "text/json": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/InstructorDto" } + "items": { + "$ref": "#/components/schemas/InstructorDto" + } } } } @@ -1298,21 +2432,29 @@ "in": "path", "description": "Driver license number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -1320,13 +2462,19 @@ "description": "Success", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/LicenseStatusDto" } + "schema": { + "$ref": "#/components/schemas/LicenseStatusDto" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/LicenseStatusDto" } + "schema": { + "$ref": "#/components/schemas/LicenseStatusDto" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/LicenseStatusDto" } + "schema": { + "$ref": "#/components/schemas/LicenseStatusDto" + } } } } @@ -1343,35 +2491,48 @@ "in": "path", "description": "Person social security number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "category", "in": "path", "description": "Category to check, optional, default B", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "drivinglicenseid", "in": "path", "description": "License id, optional, default persons newest license", "required": true, - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -1379,13 +2540,19 @@ "description": "Success", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/CategoryValidDto" } + "schema": { + "$ref": "#/components/schemas/CategoryValidDto" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/CategoryValidDto" } + "schema": { + "$ref": "#/components/schemas/CategoryValidDto" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/CategoryValidDto" } + "schema": { + "$ref": "#/components/schemas/CategoryValidDto" + } } } } @@ -1402,28 +2569,38 @@ "in": "path", "description": "Person social security number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "categoryid", "in": "path", "description": "License category", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -1460,28 +2637,38 @@ "in": "path", "description": "Social security number of applicant", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "requestBody": { "description": "Model with information about the practice permit", "content": { "application/json": { - "schema": { "$ref": "#/components/schemas/PostPracticePermit" } + "schema": { + "$ref": "#/components/schemas/PostPracticePermit" + } } } }, @@ -1490,13 +2677,19 @@ "description": "Success", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } } } }, @@ -1504,13 +2697,19 @@ "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } } } } @@ -1527,28 +2726,38 @@ "in": "path", "description": "Person's social security number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "requestBody": { "description": "Model with information about the practice permit", "content": { "application/json": { - "schema": { "$ref": "#/components/schemas/PostPracticePermit" } + "schema": { + "$ref": "#/components/schemas/PostPracticePermit" + } } } }, @@ -1557,13 +2766,19 @@ "description": "Success", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } } } }, @@ -1571,13 +2786,19 @@ "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } } } } @@ -1594,28 +2815,38 @@ "in": "path", "description": "", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "requestBody": { "description": "Model with information about the person", "content": { "application/json": { - "schema": { "$ref": "#/components/schemas/PostRenewal65AndOver" } + "schema": { + "$ref": "#/components/schemas/PostRenewal65AndOver" + } } } }, @@ -1624,13 +2855,19 @@ "description": "Success", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/Renewal65AndOver" } + "schema": { + "$ref": "#/components/schemas/Renewal65AndOver" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/Renewal65AndOver" } + "schema": { + "$ref": "#/components/schemas/Renewal65AndOver" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/Renewal65AndOver" } + "schema": { + "$ref": "#/components/schemas/Renewal65AndOver" + } } } }, @@ -1638,13 +2875,19 @@ "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/Renewal65AndOver" } + "schema": { + "$ref": "#/components/schemas/Renewal65AndOver" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/Renewal65AndOver" } + "schema": { + "$ref": "#/components/schemas/Renewal65AndOver" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/Renewal65AndOver" } + "schema": { + "$ref": "#/components/schemas/Renewal65AndOver" + } } } } @@ -1661,28 +2904,42 @@ "in": "path", "description": "Year from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 2022 } + "schema": { + "type": "integer", + "format": "int32", + "default": 2022 + } }, { "name": "monthfrom", "in": "path", "description": "Month from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 1 } + "schema": { + "type": "integer", + "format": "int32", + "default": 1 + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -1728,28 +2985,42 @@ "in": "path", "description": "Year from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 2022 } + "schema": { + "type": "integer", + "format": "int32", + "default": 2022 + } }, { "name": "monthfrom", "in": "path", "description": "Month from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 1 } + "schema": { + "type": "integer", + "format": "int32", + "default": 1 + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -1795,28 +3066,42 @@ "in": "path", "description": "Year from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 2022 } + "schema": { + "type": "integer", + "format": "int32", + "default": 2022 + } }, { "name": "monthfrom", "in": "path", "description": "Month from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 1 } + "schema": { + "type": "integer", + "format": "int32", + "default": 1 + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -1862,28 +3147,42 @@ "in": "path", "description": "Year from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 2022 } + "schema": { + "type": "integer", + "format": "int32", + "default": 2022 + } }, { "name": "monthfrom", "in": "path", "description": "Month from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 1 } + "schema": { + "type": "integer", + "format": "int32", + "default": 1 + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -1929,28 +3228,42 @@ "in": "path", "description": "Year from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 2022 } + "schema": { + "type": "integer", + "format": "int32", + "default": 2022 + } }, { "name": "monthfrom", "in": "path", "description": "Month from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 1 } + "schema": { + "type": "integer", + "format": "int32", + "default": 1 + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -1996,28 +3309,42 @@ "in": "path", "description": "Year from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 2022 } + "schema": { + "type": "integer", + "format": "int32", + "default": 2022 + } }, { "name": "monthfrom", "in": "path", "description": "Month from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 1 } + "schema": { + "type": "integer", + "format": "int32", + "default": 1 + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -2063,28 +3390,39 @@ "in": "path", "description": "Person's social security number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "licenseid", "in": "path", "description": "License id", "required": true, - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "4.0" } + "schema": { + "type": "string", + "default": "4.0" + } } ], "responses": { @@ -2094,43 +3432,176 @@ "text/plain": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/MedferdDto" } + "items": { + "$ref": "#/components/schemas/MedferdDto" + } } }, "application/json": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/MedferdDto" } + "items": { + "$ref": "#/components/schemas/MedferdDto" + } } }, "text/json": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/MedferdDto" } + "items": { + "$ref": "#/components/schemas/MedferdDto" + } + } + } + } + }, + "400": { + "description": "Bad Request", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + } + } + } + } + } + }, + "/api/drivinglicense/v4/{SSN}/drivingschool3finished/{licenseId}": { + "post": { + "tags": ["Okuskirteini"], + "summary": "Update person license, has finished driving school 3", + "parameters": [ + { + "name": "SSN", + "in": "path", + "description": "Person social security number", + "required": true, + "schema": { + "type": "string" + } + }, + { + "name": "licenseId", + "in": "path", + "description": "Person license id", + "required": true, + "schema": { + "type": "integer", + "format": "int32" + } + }, + { + "name": "api-version", + "in": "header", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + }, + { + "name": "api-version", + "in": "query", + "description": "The requested API version", + "required": true, + "schema": { + "type": "string", + "default": "4.0" + } + } + ], + "responses": { + "204": { + "description": "No Content" + }, + "400": { + "description": "Bad Request", + "content": { + "text/plain": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "application/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } + }, + "text/json": { + "schema": { + "$ref": "#/components/schemas/ProblemDetails" } } } + } + } + } + } + }, + "components": { + "schemas": { + "ApplicationFinishedDto": { + "type": "object", + "properties": { + "licenseId": { + "type": "integer", + "description": "New license id", + "format": "int32", + "nullable": true + }, + "result": { + "type": "integer", + "description": "Result", + "format": "int32" + }, + "errorCode": { + "type": "string", + "description": "Error code if any", + "nullable": true + } + }, + "additionalProperties": false, + "description": "Dto for application finished" + }, + "ApplicationForCategoryDto": { + "type": "object", + "properties": { + "category": { + "type": "string", + "description": "Category applied for", + "nullable": true }, - "400": { - "description": "Bad Request", - "content": { - "text/plain": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } - }, - "application/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } - }, - "text/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } - } - } + "result": { + "type": "boolean", + "description": "Can person apply for full license" + }, + "errorCode": { + "type": "string", + "description": "Error code if can not apply", + "nullable": true + }, + "customMessage": { + "type": "string", + "description": "Custom message", + "nullable": true } - } - } - } - }, - "components": { - "schemas": { + }, + "additionalProperties": false, + "description": "Data transfer object for category application" + }, "CategoryDto": { "type": "object", "properties": { @@ -2250,12 +3721,20 @@ "DriverLicenseDto": { "type": "object", "properties": { - "id": { "type": "integer", "description": "Id", "format": "int32" }, + "id": { + "type": "integer", + "description": "Id", + "format": "int32" + }, "temporaryLicense": { "type": "boolean", "description": "Is this license marked as temporary" }, - "name": { "type": "string", "description": "Name", "nullable": true }, + "name": { + "type": "string", + "description": "Name", + "nullable": true + }, "socialSecurityNumber": { "type": "string", "description": "Persond id number", @@ -2294,13 +3773,17 @@ }, "categories": { "type": "array", - "items": { "$ref": "#/components/schemas/CategoryDto" }, + "items": { + "$ref": "#/components/schemas/CategoryDto" + }, "description": "Category list", "nullable": true }, "comments": { "type": "array", - "items": { "$ref": "#/components/schemas/LicenseCommentsDto" }, + "items": { + "$ref": "#/components/schemas/LicenseCommentsDto" + }, "description": "Remark list", "nullable": true }, @@ -2316,9 +3799,15 @@ "format": "int32", "nullable": true }, - "photo": { "$ref": "#/components/schemas/ImageDto" }, - "signature": { "$ref": "#/components/schemas/ImageDto" }, - "deprivation": { "$ref": "#/components/schemas/DeprivationDto" } + "photo": { + "$ref": "#/components/schemas/ImageDto" + }, + "signature": { + "$ref": "#/components/schemas/ImageDto" + }, + "deprivation": { + "$ref": "#/components/schemas/DeprivationDto" + } }, "additionalProperties": false, "description": "Licence entity" @@ -2326,8 +3815,16 @@ "DriverLicenseWithoutImagesDto": { "type": "object", "properties": { - "id": { "type": "integer", "description": "Id", "format": "int32" }, - "name": { "type": "string", "description": "Name", "nullable": true }, + "id": { + "type": "integer", + "description": "Id", + "format": "int32" + }, + "name": { + "type": "string", + "description": "Name", + "nullable": true + }, "socialSecurityNumber": { "type": "string", "description": "Persond id number", @@ -2366,7 +3863,9 @@ }, "categories": { "type": "array", - "items": { "$ref": "#/components/schemas/CategoryDto" }, + "items": { + "$ref": "#/components/schemas/CategoryDto" + }, "description": "Category list", "nullable": true }, @@ -2377,11 +3876,15 @@ }, "comments": { "type": "array", - "items": { "$ref": "#/components/schemas/LicenseCommentsDto" }, + "items": { + "$ref": "#/components/schemas/LicenseCommentsDto" + }, "description": "Remark list", "nullable": true }, - "deprivation": { "$ref": "#/components/schemas/DeprivationDto" } + "deprivation": { + "$ref": "#/components/schemas/DeprivationDto" + } }, "additionalProperties": false, "description": "Licence entity" @@ -2509,6 +4012,11 @@ "type": "string", "description": "Origin of creation", "nullable": true + }, + "districtId": { + "type": "integer", + "description": "District id", + "format": "int32" } }, "additionalProperties": false, @@ -2552,6 +4060,63 @@ "additionalProperties": false, "description": "Data transfer object for if person has finished driving school 3" }, + "HealthDeclarationModel": { + "type": "object", + "properties": { + "isDisabled": { + "type": "boolean", + "description": "Is person disabled", + "nullable": true + }, + "hasDiabetes": { + "type": "boolean", + "description": "Has person diabetes", + "nullable": true + }, + "hasEpilepsy": { + "type": "boolean", + "description": "Has person Epilepsy", + "nullable": true + }, + "isAlcoholic": { + "type": "boolean", + "description": "Is person alcoholic", + "nullable": true + }, + "hasHeartDisease": { + "type": "boolean", + "description": "Does person have a heart disease", + "nullable": true + }, + "hasMentalIllness": { + "type": "boolean", + "description": "Has person mental illness", + "nullable": true + }, + "hasOtherDiseases": { + "type": "boolean", + "description": "Has person other diseases", + "nullable": true + }, + "usesMedicalDrugs": { + "type": "boolean", + "description": "Does person use medical drugs", + "nullable": true + }, + "usesContactGlasses": { + "type": "boolean", + "description": "Does person use contact glasses", + "nullable": true + }, + "hasReducedPeripheralVision": { + "type": "boolean", + "description": "Does person have reduced peripheral vision", + "nullable": true + } + }, + "additionalProperties": false, + "description": "Health declaration when applying for driver's license" + }, "ImageDto": { "type": "object", "properties": { @@ -2595,6 +4160,53 @@ "additionalProperties": false, "description": "Entity for picture" }, + "ImageFromThjodskraDto": { + "type": "object", + "properties": { + "content": { + "type": "string", + "description": "Image content", + "nullable": true + }, + "contentLength": { + "type": "integer", + "description": "Content length", + "format": "int32" + }, + "contentDocumentType": { + "type": "string", + "description": "Content document type", + "nullable": true + }, + "created": { + "type": "string", + "description": "Created", + "format": "date-time" + }, + "biometricId": { + "type": "string", + "description": "BiometricId", + "nullable": true + } + }, + "additionalProperties": false, + "description": "Image with info from thjodskra" + }, + "ImagesFromThjodskraDto": { + "type": "object", + "properties": { + "images": { + "type": "array", + "items": { + "$ref": "#/components/schemas/ImageFromThjodskraDto" + }, + "description": "Array of all images from thjodskra", + "nullable": true + } + }, + "additionalProperties": false, + "description": "All images from thjodskra dto" + }, "InstructorDto": { "type": "object", "properties": { @@ -2603,7 +4215,11 @@ "description": "Social security number", "nullable": true }, - "name": { "type": "string", "description": "Name", "nullable": true }, + "name": { + "type": "string", + "description": "Name", + "nullable": true + }, "driverLicenseId": { "type": "integer", "description": "Instructors license id", @@ -2818,6 +4434,38 @@ "additionalProperties": false, "description": "Data transfer object for penalty points" }, + "PostApplicationForBEModel": { + "type": "object", + "properties": { + "ssn": { + "type": "string", + "description": "Social security number", + "nullable": true + }, + "instructorSSN": { + "type": "string", + "description": "Driving instructor social security number", + "nullable": true + }, + "primaryPhoneNumber": { + "type": "string", + "description": "Primary phone number", + "nullable": true + }, + "studentEmail": { + "type": "string", + "description": "Student email", + "nullable": true + }, + "districtId": { + "type": "integer", + "description": "Ordering district", + "format": "int32" + } + }, + "additionalProperties": false, + "description": "Post application for BE category" + }, "PostNewCollaborative": { "type": "object", "properties": { @@ -2835,6 +4483,11 @@ "type": "string", "description": "User id", "nullable": true + }, + "licenseStolenOrLost": { + "type": "boolean", + "description": "Has last license been lost or stolen", + "nullable": true } }, "additionalProperties": false, @@ -2902,6 +4555,11 @@ "type": "string", "description": "Address to send license to", "nullable": true + }, + "healtCertificate": { + "type": "string", + "description": "Healt certificate", + "nullable": true } }, "additionalProperties": false, @@ -2948,6 +4606,11 @@ "description": "Person social security number", "format": "date-time", "nullable": true + }, + "healtCertificate": { + "type": "string", + "description": "Healt certificate", + "nullable": true } }, "additionalProperties": false, @@ -3050,6 +4713,71 @@ "additionalProperties": false, "description": "Post new temporary license" }, + "PostTemporaryLicenseWithHealthDeclaration": { + "required": [ + "authority", + "bringNewPhoto", + "bringsHealthCertificate", + "instructorSSN", + "sendLicenseInMail", + "ssn" + ], + "type": "object", + "properties": { + "ssn": { + "maxLength": 10, + "minLength": 0, + "pattern": "^[0-9]{1,10}$", + "type": "string", + "description": "Social security number" + }, + "authority": { + "type": "integer", + "description": "Publishing authority", + "format": "int32" + }, + "bringsHealthCertificate": { + "type": "boolean", + "description": "Does person need to present health certificate" + }, + "bringNewPhoto": { + "type": "boolean", + "description": "Applicant will bring new photo for license" + }, + "sendLicenseInMail": { + "type": "boolean", + "description": "Applicant has asked to send license in mail" + }, + "sendToAddress": { + "maxLength": 100, + "minLength": 0, + "type": "string", + "description": "Address to send license to", + "nullable": true + }, + "instructorSSN": { + "minLength": 1, + "type": "string", + "description": "Social security number for driving teachser" + }, + "email": { + "type": "string", + "description": "Applicant email", + "nullable": true + }, + "gsm": { + "pattern": "^[0-9]{1,10}$", + "type": "string", + "description": "Applicant mobile number", + "nullable": true + }, + "healthDeclaration": { + "$ref": "#/components/schemas/HealthDeclarationModel" + } + }, + "additionalProperties": false, + "description": "Post new temporary license" + }, "PracticePermitDto": { "type": "object", "properties": { @@ -3063,7 +4791,10 @@ "description": "The instructor", "nullable": true }, - "isOk": { "type": "boolean", "description": "Is the record OK" }, + "isOk": { + "type": "boolean", + "description": "Is the record OK" + }, "errorCode": { "type": "string", "description": "Error code, if any", @@ -3076,11 +4807,27 @@ "ProblemDetails": { "type": "object", "properties": { - "type": { "type": "string", "nullable": true }, - "title": { "type": "string", "nullable": true }, - "status": { "type": "integer", "format": "int32", "nullable": true }, - "detail": { "type": "string", "nullable": true }, - "instance": { "type": "string", "nullable": true } + "type": { + "type": "string", + "nullable": true + }, + "title": { + "type": "string", + "nullable": true + }, + "status": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "detail": { + "type": "string", + "nullable": true + }, + "instance": { + "type": "string", + "nullable": true + } }, "additionalProperties": false }, @@ -3109,8 +4856,16 @@ "TegSviptingaDto": { "type": "object", "properties": { - "id": { "type": "integer", "description": "Id", "format": "int32" }, - "heiti": { "type": "string", "description": "Name", "nullable": true } + "id": { + "type": "integer", + "description": "Id", + "format": "int32" + }, + "heiti": { + "type": "string", + "description": "Name", + "nullable": true + } }, "additionalProperties": false, "description": "Dto for Tegund sviptinga" @@ -3186,6 +4941,11 @@ "type": "string", "description": "Origin of creation", "nullable": true + }, + "districtId": { + "type": "integer", + "description": "District id", + "format": "int32" } }, "additionalProperties": false, diff --git a/libs/clients/driving-license/src/v5/clientConfig.json b/libs/clients/driving-license/src/v5/clientConfig.json index 51844f36485a..eb4a547bab5f 100644 --- a/libs/clients/driving-license/src/v5/clientConfig.json +++ b/libs/clients/driving-license/src/v5/clientConfig.json @@ -3,7 +3,10 @@ "info": { "title": "RLS driver licence Rest API", "description": "RESTFul services for driver licences. Programmed in ASP.NET Core 3 API ", - "contact": { "name": "TMD", "email": "tmd@tmd.is" }, + "contact": { + "name": "TMD", + "email": "tmd@tmd.is" + }, "version": "5.0" }, "paths": { @@ -16,21 +19,29 @@ "name": "jwttoken", "in": "header", "description": "JWT token", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "requestBody": { @@ -68,13 +79,19 @@ "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } } } } @@ -91,21 +108,29 @@ "in": "path", "description": "RLS application id", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -133,13 +158,19 @@ "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } } } } @@ -156,14 +187,20 @@ "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -173,19 +210,25 @@ "text/plain": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/TegSviptingaDto" } + "items": { + "$ref": "#/components/schemas/TegSviptingaDto" + } } }, "application/json": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/TegSviptingaDto" } + "items": { + "$ref": "#/components/schemas/TegSviptingaDto" + } } }, "text/json": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/TegSviptingaDto" } + "items": { + "$ref": "#/components/schemas/TegSviptingaDto" + } } } } @@ -203,14 +246,20 @@ "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -220,19 +269,25 @@ "text/plain": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/TegundRettindaDto" } + "items": { + "$ref": "#/components/schemas/TegundRettindaDto" + } } }, "application/json": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/TegundRettindaDto" } + "items": { + "$ref": "#/components/schemas/TegundRettindaDto" + } } }, "text/json": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/TegundRettindaDto" } + "items": { + "$ref": "#/components/schemas/TegundRettindaDto" + } } } } @@ -250,14 +305,20 @@ "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -303,14 +364,20 @@ "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -320,19 +387,25 @@ "text/plain": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/EmbaettiDto" } + "items": { + "$ref": "#/components/schemas/EmbaettiDto" + } } }, "application/json": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/EmbaettiDto" } + "items": { + "$ref": "#/components/schemas/EmbaettiDto" + } } }, "text/json": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/EmbaettiDto" } + "items": { + "$ref": "#/components/schemas/EmbaettiDto" + } } } } @@ -349,21 +422,29 @@ "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -371,13 +452,22 @@ "description": "Success", "content": { "text/plain": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "application/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "text/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } } } } @@ -393,21 +483,29 @@ "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -415,13 +513,22 @@ "description": "Success", "content": { "text/plain": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "application/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "text/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } } } } @@ -437,21 +544,29 @@ "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -459,15 +574,28 @@ "description": "Success", "content": { "text/plain": { - "schema": { "type": "string", "format": "byte" } + "schema": { + "type": "string", + "format": "byte" + } }, "application/json": { - "schema": { "type": "string", "format": "byte" } + "schema": { + "type": "string", + "format": "byte" + } }, - "text/json": { "schema": { "type": "string", "format": "byte" } } + "text/json": { + "schema": { + "type": "string", + "format": "byte" + } + } } }, - "204": { "description": "No Content" } + "204": { + "description": "No Content" + } } } }, @@ -480,21 +608,29 @@ "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -502,15 +638,28 @@ "description": "Success", "content": { "text/plain": { - "schema": { "type": "string", "format": "byte" } + "schema": { + "type": "string", + "format": "byte" + } }, "application/json": { - "schema": { "type": "string", "format": "byte" } + "schema": { + "type": "string", + "format": "byte" + } }, - "text/json": { "schema": { "type": "string", "format": "byte" } } + "text/json": { + "schema": { + "type": "string", + "format": "byte" + } + } } }, - "204": { "description": "No Content" } + "204": { + "description": "No Content" + } } } }, @@ -524,21 +673,29 @@ "in": "path", "description": "Person social serial number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -575,21 +732,29 @@ "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -597,13 +762,19 @@ "description": "Success", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/DriverLicenseDto" } + "schema": { + "$ref": "#/components/schemas/DriverLicenseDto" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/DriverLicenseDto" } + "schema": { + "$ref": "#/components/schemas/DriverLicenseDto" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/DriverLicenseDto" } + "schema": { + "$ref": "#/components/schemas/DriverLicenseDto" + } } } }, @@ -611,13 +782,19 @@ "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } } } } @@ -633,36 +810,52 @@ "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { - "204": { "description": "No Content" }, + "204": { + "description": "No Content" + }, "400": { "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } } } } @@ -679,27 +872,37 @@ "in": "path", "description": "Category to check for (B, C, and so on)", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -736,28 +939,38 @@ "in": "path", "description": "Category in license", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "requestBody": { "description": "Model of application", "content": { "application/json": { - "schema": { "$ref": "#/components/schemas/PostNewFinalLicense" } + "schema": { + "$ref": "#/components/schemas/PostNewFinalLicense" + } } } }, @@ -766,13 +979,22 @@ "description": "Success", "content": { "text/plain": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "application/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "text/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } } } }, @@ -780,13 +1002,19 @@ "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } } } } @@ -802,28 +1030,38 @@ "name": "jwttoken", "in": "header", "description": "JWT token", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "requestBody": { "description": "Model of application", "content": { "application/json": { - "schema": { "$ref": "#/components/schemas/PostNewCollaborative" } + "schema": { + "$ref": "#/components/schemas/PostNewCollaborative" + } } } }, @@ -832,13 +1070,22 @@ "description": "Created", "content": { "text/plain": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "application/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "text/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } } } }, @@ -846,13 +1093,19 @@ "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } } } } @@ -868,21 +1121,29 @@ "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -890,13 +1151,19 @@ "description": "Success", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/DeprivationDto" } + "schema": { + "$ref": "#/components/schemas/DeprivationDto" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/DeprivationDto" } + "schema": { + "$ref": "#/components/schemas/DeprivationDto" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/DeprivationDto" } + "schema": { + "$ref": "#/components/schemas/DeprivationDto" + } } } } @@ -913,21 +1180,29 @@ "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "requestBody": { "description": "Model of application", "content": { "application/json": { - "schema": { "$ref": "#/components/schemas/PostTemporaryLicense" } + "schema": { + "$ref": "#/components/schemas/PostTemporaryLicense" + } } } }, @@ -984,21 +1259,29 @@ "name": "jwttoken", "in": "header", "description": "JWT token", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "requestBody": { @@ -1066,14 +1349,20 @@ "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "requestBody": { @@ -1139,21 +1428,29 @@ "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -1161,13 +1458,19 @@ "description": "Success", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/PenaltyPointsDto" } + "schema": { + "$ref": "#/components/schemas/PenaltyPointsDto" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/PenaltyPointsDto" } + "schema": { + "$ref": "#/components/schemas/PenaltyPointsDto" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/PenaltyPointsDto" } + "schema": { + "$ref": "#/components/schemas/PenaltyPointsDto" + } } } } @@ -1182,21 +1485,29 @@ { "name": "jwttoken", "in": "header", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -1233,13 +1544,19 @@ "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } } } } @@ -1255,21 +1572,29 @@ "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -1277,13 +1602,22 @@ "description": "Success", "content": { "text/plain": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "application/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "text/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } } } } @@ -1300,21 +1634,29 @@ "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -1350,21 +1692,29 @@ "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -1372,13 +1722,22 @@ "description": "Success", "content": { "text/plain": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "application/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "text/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } } } } @@ -1394,21 +1753,29 @@ "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -1416,13 +1783,22 @@ "description": "Success", "content": { "text/plain": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "application/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, "text/json": { - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } } } } @@ -1438,21 +1814,29 @@ "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -1460,15 +1844,28 @@ "description": "Success", "content": { "text/plain": { - "schema": { "type": "string", "format": "byte" } + "schema": { + "type": "string", + "format": "byte" + } }, "application/json": { - "schema": { "type": "string", "format": "byte" } + "schema": { + "type": "string", + "format": "byte" + } }, - "text/json": { "schema": { "type": "string", "format": "byte" } } + "text/json": { + "schema": { + "type": "string", + "format": "byte" + } + } } }, - "204": { "description": "No Content" } + "204": { + "description": "No Content" + } } } }, @@ -1481,21 +1878,29 @@ "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -1503,15 +1908,28 @@ "description": "Success", "content": { "text/plain": { - "schema": { "type": "string", "format": "byte" } + "schema": { + "type": "string", + "format": "byte" + } }, "application/json": { - "schema": { "type": "string", "format": "byte" } + "schema": { + "type": "string", + "format": "byte" + } }, - "text/json": { "schema": { "type": "string", "format": "byte" } } + "text/json": { + "schema": { + "type": "string", + "format": "byte" + } + } } }, - "204": { "description": "No Content" } + "204": { + "description": "No Content" + } } } }, @@ -1523,21 +1941,29 @@ { "name": "jwttoken", "in": "header", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -1574,14 +2000,20 @@ "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "requestBody": { @@ -1595,18 +2027,26 @@ } }, "responses": { - "204": { "description": "No Content" }, + "204": { + "description": "No Content" + }, "400": { "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } } } } @@ -1620,21 +2060,29 @@ "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -1662,13 +2110,19 @@ "description": "Not Found", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } } } } @@ -1685,14 +2139,20 @@ "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -1702,19 +2162,25 @@ "text/plain": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/InstructorDto" } + "items": { + "$ref": "#/components/schemas/InstructorDto" + } } }, "application/json": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/InstructorDto" } + "items": { + "$ref": "#/components/schemas/InstructorDto" + } } }, "text/json": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/InstructorDto" } + "items": { + "$ref": "#/components/schemas/InstructorDto" + } } } } @@ -1733,21 +2199,29 @@ "in": "path", "description": "Driver license number", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -1755,13 +2229,19 @@ "description": "Success", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/LicenseStatusDto" } + "schema": { + "$ref": "#/components/schemas/LicenseStatusDto" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/LicenseStatusDto" } + "schema": { + "$ref": "#/components/schemas/LicenseStatusDto" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/LicenseStatusDto" } + "schema": { + "$ref": "#/components/schemas/LicenseStatusDto" + } } } } @@ -1778,34 +2258,47 @@ "in": "path", "description": "Category to check, optional, default B", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "drivinglicenseid", "in": "path", "description": "License id, optional, default persons newest license", "required": true, - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, { "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -1813,13 +2306,19 @@ "description": "Success", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/CategoryValidDto" } + "schema": { + "$ref": "#/components/schemas/CategoryValidDto" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/CategoryValidDto" } + "schema": { + "$ref": "#/components/schemas/CategoryValidDto" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/CategoryValidDto" } + "schema": { + "$ref": "#/components/schemas/CategoryValidDto" + } } } } @@ -1836,27 +2335,37 @@ "in": "path", "description": "License category", "required": true, - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -1892,28 +2401,38 @@ "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "requestBody": { "description": "Model with information about the practice permit", "content": { "application/json": { - "schema": { "$ref": "#/components/schemas/PostPracticePermit" } + "schema": { + "$ref": "#/components/schemas/PostPracticePermit" + } } } }, @@ -1922,13 +2441,19 @@ "description": "Success", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } } } }, @@ -1936,13 +2461,19 @@ "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } } } } @@ -1958,28 +2489,38 @@ "name": "jwttoken", "in": "header", "description": "Token with national id", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "requestBody": { "description": "Model with information about the practice permit", "content": { "application/json": { - "schema": { "$ref": "#/components/schemas/PostPracticePermit" } + "schema": { + "$ref": "#/components/schemas/PostPracticePermit" + } } } }, @@ -1988,13 +2529,19 @@ "description": "Success", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } } } }, @@ -2002,13 +2549,19 @@ "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/PracticePermitDto" } + "schema": { + "$ref": "#/components/schemas/PracticePermitDto" + } } } } @@ -2024,28 +2577,38 @@ "name": "jwttoken", "in": "header", "description": "Token with person social security number", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "requestBody": { "description": "Model with information about the person", "content": { "application/json": { - "schema": { "$ref": "#/components/schemas/PostRenewal65AndOver" } + "schema": { + "$ref": "#/components/schemas/PostRenewal65AndOver" + } } } }, @@ -2054,13 +2617,19 @@ "description": "Success", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/Renewal65AndOver" } + "schema": { + "$ref": "#/components/schemas/Renewal65AndOver" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/Renewal65AndOver" } + "schema": { + "$ref": "#/components/schemas/Renewal65AndOver" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/Renewal65AndOver" } + "schema": { + "$ref": "#/components/schemas/Renewal65AndOver" + } } } }, @@ -2068,13 +2637,19 @@ "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/Renewal65AndOver" } + "schema": { + "$ref": "#/components/schemas/Renewal65AndOver" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/Renewal65AndOver" } + "schema": { + "$ref": "#/components/schemas/Renewal65AndOver" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/Renewal65AndOver" } + "schema": { + "$ref": "#/components/schemas/Renewal65AndOver" + } } } } @@ -2091,28 +2666,42 @@ "in": "path", "description": "Year from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 2022 } + "schema": { + "type": "integer", + "format": "int32", + "default": 2022 + } }, { "name": "monthfrom", "in": "path", "description": "Month from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 1 } + "schema": { + "type": "integer", + "format": "int32", + "default": 1 + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -2158,28 +2747,42 @@ "in": "path", "description": "Year from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 2022 } + "schema": { + "type": "integer", + "format": "int32", + "default": 2022 + } }, { "name": "monthfrom", "in": "path", "description": "Month from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 1 } + "schema": { + "type": "integer", + "format": "int32", + "default": 1 + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -2225,28 +2828,42 @@ "in": "path", "description": "Year from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 2022 } + "schema": { + "type": "integer", + "format": "int32", + "default": 2022 + } }, { "name": "monthfrom", "in": "path", "description": "Month from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 1 } + "schema": { + "type": "integer", + "format": "int32", + "default": 1 + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -2292,28 +2909,42 @@ "in": "path", "description": "Year from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 2022 } + "schema": { + "type": "integer", + "format": "int32", + "default": 2022 + } }, { "name": "monthfrom", "in": "path", "description": "Month from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 1 } + "schema": { + "type": "integer", + "format": "int32", + "default": 1 + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -2359,28 +2990,42 @@ "in": "path", "description": "Year from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 2022 } + "schema": { + "type": "integer", + "format": "int32", + "default": 2022 + } }, { "name": "monthfrom", "in": "path", "description": "Month from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 1 } + "schema": { + "type": "integer", + "format": "int32", + "default": 1 + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -2426,28 +3071,42 @@ "in": "path", "description": "Year from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 2022 } + "schema": { + "type": "integer", + "format": "int32", + "default": 2022 + } }, { "name": "monthfrom", "in": "path", "description": "Month from", "required": true, - "schema": { "type": "integer", "format": "int32", "default": 1 } + "schema": { + "type": "integer", + "format": "int32", + "default": 1 + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -2492,28 +3151,39 @@ "name": "jwttoken", "in": "header", "description": "jwt token", - "schema": { "type": "string" } + "schema": { + "type": "string" + } }, { "name": "licenseid", "in": "path", "description": "License id", "required": true, - "schema": { "type": "integer", "format": "int32" } + "schema": { + "type": "integer", + "format": "int32" + } }, { "name": "api-version", "in": "header", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } }, { "name": "api-version", "in": "query", "description": "The requested API version", "required": true, - "schema": { "type": "string", "default": "5.0" } + "schema": { + "type": "string", + "default": "5.0" + } } ], "responses": { @@ -2523,19 +3193,25 @@ "text/plain": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/MedferdDto" } + "items": { + "$ref": "#/components/schemas/MedferdDto" + } } }, "application/json": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/MedferdDto" } + "items": { + "$ref": "#/components/schemas/MedferdDto" + } } }, "text/json": { "schema": { "type": "array", - "items": { "$ref": "#/components/schemas/MedferdDto" } + "items": { + "$ref": "#/components/schemas/MedferdDto" + } } } } @@ -2544,13 +3220,19 @@ "description": "Bad Request", "content": { "text/plain": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "application/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } }, "text/json": { - "schema": { "$ref": "#/components/schemas/ProblemDetails" } + "schema": { + "$ref": "#/components/schemas/ProblemDetails" + } } } } @@ -2728,12 +3410,20 @@ "DriverLicenseDto": { "type": "object", "properties": { - "id": { "type": "integer", "description": "Id", "format": "int32" }, + "id": { + "type": "integer", + "description": "Id", + "format": "int32" + }, "temporaryLicense": { "type": "boolean", "description": "Is this license marked as temporary" }, - "name": { "type": "string", "description": "Name", "nullable": true }, + "name": { + "type": "string", + "description": "Name", + "nullable": true + }, "socialSecurityNumber": { "type": "string", "description": "Persond id number", @@ -2772,13 +3462,17 @@ }, "categories": { "type": "array", - "items": { "$ref": "#/components/schemas/CategoryDto" }, + "items": { + "$ref": "#/components/schemas/CategoryDto" + }, "description": "Category list", "nullable": true }, "comments": { "type": "array", - "items": { "$ref": "#/components/schemas/LicenseCommentsDto" }, + "items": { + "$ref": "#/components/schemas/LicenseCommentsDto" + }, "description": "Remark list", "nullable": true }, @@ -2794,9 +3488,15 @@ "format": "int32", "nullable": true }, - "photo": { "$ref": "#/components/schemas/ImageDto" }, - "signature": { "$ref": "#/components/schemas/ImageDto" }, - "deprivation": { "$ref": "#/components/schemas/DeprivationDto" } + "photo": { + "$ref": "#/components/schemas/ImageDto" + }, + "signature": { + "$ref": "#/components/schemas/ImageDto" + }, + "deprivation": { + "$ref": "#/components/schemas/DeprivationDto" + } }, "additionalProperties": false, "description": "Licence entity" @@ -2804,8 +3504,16 @@ "DriverLicenseWithoutImagesDto": { "type": "object", "properties": { - "id": { "type": "integer", "description": "Id", "format": "int32" }, - "name": { "type": "string", "description": "Name", "nullable": true }, + "id": { + "type": "integer", + "description": "Id", + "format": "int32" + }, + "name": { + "type": "string", + "description": "Name", + "nullable": true + }, "socialSecurityNumber": { "type": "string", "description": "Persond id number", @@ -2844,7 +3552,9 @@ }, "categories": { "type": "array", - "items": { "$ref": "#/components/schemas/CategoryDto" }, + "items": { + "$ref": "#/components/schemas/CategoryDto" + }, "description": "Category list", "nullable": true }, @@ -2855,11 +3565,15 @@ }, "comments": { "type": "array", - "items": { "$ref": "#/components/schemas/LicenseCommentsDto" }, + "items": { + "$ref": "#/components/schemas/LicenseCommentsDto" + }, "description": "Remark list", "nullable": true }, - "deprivation": { "$ref": "#/components/schemas/DeprivationDto" } + "deprivation": { + "$ref": "#/components/schemas/DeprivationDto" + } }, "additionalProperties": false, "description": "Licence entity" @@ -3172,7 +3886,9 @@ "properties": { "images": { "type": "array", - "items": { "$ref": "#/components/schemas/ImageFromThjodskraDto" }, + "items": { + "$ref": "#/components/schemas/ImageFromThjodskraDto" + }, "description": "Array of all images from thjodskra", "nullable": true } @@ -3188,7 +3904,11 @@ "description": "Public identity number", "nullable": true }, - "name": { "type": "string", "description": "Name", "nullable": true }, + "name": { + "type": "string", + "description": "Name", + "nullable": true + }, "driverLicenseId": { "type": "integer", "description": "Númer ökuskírteinis ökukennara", @@ -3747,7 +4467,10 @@ "description": "The instructor", "nullable": true }, - "isOk": { "type": "boolean", "description": "Is the record OK" }, + "isOk": { + "type": "boolean", + "description": "Is the record OK" + }, "errorCode": { "type": "string", "description": "Error code, if any", @@ -3760,11 +4483,27 @@ "ProblemDetails": { "type": "object", "properties": { - "type": { "type": "string", "nullable": true }, - "title": { "type": "string", "nullable": true }, - "status": { "type": "integer", "format": "int32", "nullable": true }, - "detail": { "type": "string", "nullable": true }, - "instance": { "type": "string", "nullable": true } + "type": { + "type": "string", + "nullable": true + }, + "title": { + "type": "string", + "nullable": true + }, + "status": { + "type": "integer", + "format": "int32", + "nullable": true + }, + "detail": { + "type": "string", + "nullable": true + }, + "instance": { + "type": "string", + "nullable": true + } }, "additionalProperties": false }, @@ -3793,8 +4532,16 @@ "TegSviptingaDto": { "type": "object", "properties": { - "id": { "type": "integer", "description": "Id", "format": "int32" }, - "heiti": { "type": "string", "description": "Name", "nullable": true } + "id": { + "type": "integer", + "description": "Id", + "format": "int32" + }, + "heiti": { + "type": "string", + "description": "Name", + "nullable": true + } }, "additionalProperties": false, "description": "Dto for Tegund sviptinga" diff --git a/libs/clients/ehic-client-v1/project.json b/libs/clients/ehic-client-v1/project.json index 96ca8f6e828d..33f6dcc0fd69 100644 --- a/libs/clients/ehic-client-v1/project.json +++ b/libs/clients/ehic-client-v1/project.json @@ -3,20 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/ehic-client-v1/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/clients/ehic-client-v1/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/ehic-client-v1"], "options": { - "jestConfig": "libs/clients/ehic-client-v1/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/ehic-client-v1/jest.config.ts" } }, "codegen/backend-client": { @@ -26,6 +22,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/electronic-registration-statistics/project.json b/libs/clients/electronic-registration-statistics/project.json index 1cbcd6fc9374..bbb869ab8f35 100644 --- a/libs/clients/electronic-registration-statistics/project.json +++ b/libs/clients/electronic-registration-statistics/project.json @@ -3,15 +3,10 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/electronic-registration-statistics/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/clients/electronic-registration-statistics/**/*.ts" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -19,8 +14,7 @@ "{workspaceRoot}/coverage/libs/clients/electronic-registration-statistics" ], "options": { - "jestConfig": "libs/clients/electronic-registration-statistics/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/electronic-registration-statistics/jest.config.ts" } }, "update-openapi-document": { @@ -40,6 +34,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/energy-funds/project.json b/libs/clients/energy-funds/project.json index d7f2ccf4348e..6a0d5f857c61 100644 --- a/libs/clients/energy-funds/project.json +++ b/libs/clients/energy-funds/project.json @@ -3,26 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/energy-funds/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/clients/energy-funds/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/clients/energy-funds/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/clients/energy-funds/jest.config.ts" } }, "update-openapi-document": { @@ -44,6 +34,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/finance-v2/project.json b/libs/clients/finance-v2/project.json index 01919c893f2a..67a8f7ae42d9 100644 --- a/libs/clients/finance-v2/project.json +++ b/libs/clients/finance-v2/project.json @@ -3,26 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/finance-v2/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/clients/finance-v2/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/clients/finance-v2/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/clients/finance-v2/jest.config.ts" } }, "codegen/backend-client": { @@ -32,6 +22,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/finance/project.json b/libs/clients/finance/project.json index 95c0f8cf158e..a1a477c1077f 100644 --- a/libs/clients/finance/project.json +++ b/libs/clients/finance/project.json @@ -3,21 +3,17 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/finance/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/clients/finance/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/finance"], "options": { - "jestConfig": "libs/clients/finance/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/finance/jest.config.ts" } } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/financial-statements-inao/project.json b/libs/clients/financial-statements-inao/project.json index 86f3eca07935..e2c35f9b31b4 100644 --- a/libs/clients/financial-statements-inao/project.json +++ b/libs/clients/financial-statements-inao/project.json @@ -2,13 +2,10 @@ "name": "clients-financial-statements-inao", "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/financial-statements-inao/src", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/clients/financial-statements-inao/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -16,10 +13,8 @@ "{workspaceRoot}/coverage/libs/clients/financial-statements-inao" ], "options": { - "jestConfig": "libs/clients/financial-statements-inao/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/financial-statements-inao/jest.config.ts" } } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/firearm-license/project.json b/libs/clients/firearm-license/project.json index 86644c4a547e..07cd9c128316 100644 --- a/libs/clients/firearm-license/project.json +++ b/libs/clients/firearm-license/project.json @@ -3,21 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/firearm-license/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/clients/firearm-license/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/firearm-license"], "options": { - "jestConfig": "libs/clients/firearm-license/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/firearm-license/jest.config.ts" } }, "codegen/backend-client": { @@ -27,6 +22,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/fishing-license/project.json b/libs/clients/fishing-license/project.json index 8295245e5a10..6e897f9e0ef1 100644 --- a/libs/clients/fishing-license/project.json +++ b/libs/clients/fishing-license/project.json @@ -3,21 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/fishing-license/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/clients/fishing-license/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/fishing-license"], "options": { - "jestConfig": "libs/clients/fishing-license/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/fishing-license/jest.config.ts" } }, "update-openapi-document": { @@ -39,6 +34,5 @@ }, "outputs": ["{projectRoot}/src/lib/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/fiskistofa/project.json b/libs/clients/fiskistofa/project.json index 14835f744481..845a4bfd4b30 100644 --- a/libs/clients/fiskistofa/project.json +++ b/libs/clients/fiskistofa/project.json @@ -3,20 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/fiskistofa/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/clients/fiskistofa/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/fiskistofa"], "options": { - "jestConfig": "libs/clients/fiskistofa/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/fiskistofa/jest.config.ts" } }, "update-openapi-document": { @@ -38,6 +34,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/health-directorate/project.json b/libs/clients/health-directorate/project.json index 589548d8b711..6cfa3951c186 100644 --- a/libs/clients/health-directorate/project.json +++ b/libs/clients/health-directorate/project.json @@ -2,20 +2,16 @@ "name": "clients-health-directorate", "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/health-directorate/src", + "tags": ["scope:client", "lib:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/clients/health-directorate/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/health-directorate"], "options": { - "jestConfig": "libs/clients/health-directorate/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/health-directorate/jest.config.ts" } }, "update-openapi-document": { @@ -36,6 +32,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["scope:client", "lib:client"] + } } diff --git a/libs/clients/hms-housing-benefits/project.json b/libs/clients/hms-housing-benefits/project.json index 79ee7a40ffd8..c55a8bb49141 100644 --- a/libs/clients/hms-housing-benefits/project.json +++ b/libs/clients/hms-housing-benefits/project.json @@ -3,26 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/hms-housing-benefits/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/clients/hms-housing-benefits/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/clients/hms-housing-benefits/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/clients/hms-housing-benefits/jest.config.ts" } }, "codegen/backend-client": { @@ -32,6 +22,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/hms-loans/project.json b/libs/clients/hms-loans/project.json index bc3eb9f663b9..53a7e1f30bd2 100644 --- a/libs/clients/hms-loans/project.json +++ b/libs/clients/hms-loans/project.json @@ -3,26 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/hms-loans/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/clients/hms-loans/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/clients/hms-loans/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/clients/hms-loans/jest.config.ts" } }, "update-openapi-document": { @@ -42,6 +32,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/housing-benefit-calculator/project.json b/libs/clients/housing-benefit-calculator/project.json index 9d9d533b2fba..24f46f541c4f 100644 --- a/libs/clients/housing-benefit-calculator/project.json +++ b/libs/clients/housing-benefit-calculator/project.json @@ -3,26 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/housing-benefit-calculator/src", "projectType": "library", + "tags": ["scope:client", "lib:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/clients/housing-benefit-calculator/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/clients/housing-benefit-calculator/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/clients/housing-benefit-calculator/jest.config.ts" } }, "update-openapi-document": { @@ -43,6 +33,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["scope:client", "lib:client"] + } } diff --git a/libs/clients/hunting-license/project.json b/libs/clients/hunting-license/project.json index 16848536d788..6fed424cc52a 100644 --- a/libs/clients/hunting-license/project.json +++ b/libs/clients/hunting-license/project.json @@ -3,26 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/hunting-license/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/clients/hunting-license/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/clients/hunting-license/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/clients/hunting-license/jest.config.ts" } }, "update-openapi-document": { @@ -42,6 +32,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/icelandic-government-institution-vacancies/project.json b/libs/clients/icelandic-government-institution-vacancies/project.json index 27998a0eeb7c..395c36e3ab35 100644 --- a/libs/clients/icelandic-government-institution-vacancies/project.json +++ b/libs/clients/icelandic-government-institution-vacancies/project.json @@ -2,15 +2,10 @@ "name": "clients-icelandic-government-institution-vacancies", "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/icelandic-government-institution-vacancies/src", + "tags": ["scope:client", "lib:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/clients/icelandic-government-institution-vacancies/**/*.ts" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -18,8 +13,7 @@ "{workspaceRoot}/coverage/libs/clients/icelandic-government-institution-vacancies" ], "options": { - "jestConfig": "libs/clients/icelandic-government-institution-vacancies/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/icelandic-government-institution-vacancies/jest.config.ts" } }, "update-openapi-document": { @@ -40,6 +34,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["scope:client", "lib:client"] + } } diff --git a/libs/clients/icelandic-health-insurance/health-insurance/project.json b/libs/clients/icelandic-health-insurance/health-insurance/project.json index 02539637c15a..7480f9aeadc4 100644 --- a/libs/clients/icelandic-health-insurance/health-insurance/project.json +++ b/libs/clients/icelandic-health-insurance/health-insurance/project.json @@ -3,14 +3,10 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/icelandic-health-insurance/health-insurance/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/clients/icelandic-health-insurance/health-insurance/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -18,8 +14,7 @@ "{workspaceRoot}/coverage/libs/clients/icelandic-health-insurance/health-insurance" ], "options": { - "jestConfig": "libs/clients/icelandic-health-insurance/health-insurance/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/icelandic-health-insurance/health-insurance/jest.config.ts" } }, "codegen/backend-client": { @@ -29,6 +24,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/icelandic-health-insurance/rights-portal/project.json b/libs/clients/icelandic-health-insurance/rights-portal/project.json index 52904db91d3c..a5211fe4cdf8 100644 --- a/libs/clients/icelandic-health-insurance/rights-portal/project.json +++ b/libs/clients/icelandic-health-insurance/rights-portal/project.json @@ -3,15 +3,10 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/icelandic-health-insurance/rights-portal/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/clients/icelandic-health-insurance/rights-portal/**/*.ts" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -19,8 +14,7 @@ "{workspaceRoot}/coverage/libs/clients/icelandic-health-insurance/rights-portal" ], "options": { - "jestConfig": "libs/clients/icelandic-health-insurance/rights-portal/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/icelandic-health-insurance/rights-portal/jest.config.ts" } }, "codegen/backend-client": { @@ -40,6 +34,5 @@ "cwd": "libs/clients/icelandic-health-insurance/rights-portal" } } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/identity/project.json b/libs/clients/identity/project.json index a0ab097bffcd..2d1e2b9e1295 100644 --- a/libs/clients/identity/project.json +++ b/libs/clients/identity/project.json @@ -3,21 +3,17 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/identity/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/clients/identity/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/identity"], "options": { - "jestConfig": "libs/clients/identity/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/identity/jest.config.ts" } } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/inna/project.json b/libs/clients/inna/project.json index 459f105196af..539e1532c0df 100644 --- a/libs/clients/inna/project.json +++ b/libs/clients/inna/project.json @@ -3,19 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/inna/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/clients/inna/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/inna"], "options": { - "jestConfig": "libs/clients/inna/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/inna/jest.config.ts" } }, "codegen/backend-client": { @@ -25,6 +22,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/intellectual-properties/project.json b/libs/clients/intellectual-properties/project.json index fa23bdef3413..601d3fd5e4d6 100644 --- a/libs/clients/intellectual-properties/project.json +++ b/libs/clients/intellectual-properties/project.json @@ -3,26 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/intellectual-properties/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/clients/intellectual-properties/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/clients/intellectual-properties/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/clients/intellectual-properties/jest.config.ts" } }, "update-openapi-document": { @@ -44,6 +34,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/islykill/project.json b/libs/clients/islykill/project.json index c03d9ca0af07..20e37a1832b8 100644 --- a/libs/clients/islykill/project.json +++ b/libs/clients/islykill/project.json @@ -3,19 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/islykill/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/clients/islykill/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/clients/islykill/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/islykill/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/clients/islykill"] }, @@ -26,6 +23,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/judicial-administration/project.json b/libs/clients/judicial-administration/project.json index 8d72498ddaa3..5a1bb171a678 100644 --- a/libs/clients/judicial-administration/project.json +++ b/libs/clients/judicial-administration/project.json @@ -3,14 +3,10 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/judicial-administration/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/clients/judicial-administration/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -18,8 +14,7 @@ "{workspaceRoot}/coverage/libs/clients/judicial-administration" ], "options": { - "jestConfig": "libs/clients/judicial-administration/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/judicial-administration/jest.config.ts" } }, "update-openapi-document": { @@ -39,6 +34,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/license-client/project.json b/libs/clients/license-client/project.json index 83bc4d41e7ec..47b286db2f08 100644 --- a/libs/clients/license-client/project.json +++ b/libs/clients/license-client/project.json @@ -3,21 +3,17 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/license-client/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/clients/license-client/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/license-client"], "options": { - "jestConfig": "libs/clients/license-client/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/license-client/jest.config.ts" } } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/license-client/src/lib/clients/machine-license-client/machineLicenseClient.service.ts b/libs/clients/license-client/src/lib/clients/machine-license-client/machineLicenseClient.service.ts index 56adc61b8297..f49c370c883b 100644 --- a/libs/clients/license-client/src/lib/clients/machine-license-client/machineLicenseClient.service.ts +++ b/libs/clients/license-client/src/lib/clients/machine-license-client/machineLicenseClient.service.ts @@ -16,7 +16,7 @@ import { PassDataInput, SmartSolutionsApi, } from '@island.is/clients/smartsolutions' -import { Locale } from 'locale' +import { Locale } from '@island.is/shared/types' import { LicenseClient, LicensePkPassAvailability, diff --git a/libs/clients/license-client/src/lib/utils/translations.ts b/libs/clients/license-client/src/lib/utils/translations.ts index 79d64d40412c..e8d22983e79b 100644 --- a/libs/clients/license-client/src/lib/utils/translations.ts +++ b/libs/clients/license-client/src/lib/utils/translations.ts @@ -1,4 +1,4 @@ -import { Locale } from 'locale' +import { Locale } from '@island.is/shared/types' import { LicenseLabelsObject } from '../licenseClient.type' export const getLabel = ( diff --git a/libs/clients/middlewares/project.json b/libs/clients/middlewares/project.json index 310b5b13bc77..094af574eab6 100644 --- a/libs/clients/middlewares/project.json +++ b/libs/clients/middlewares/project.json @@ -3,21 +3,17 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/middlewares/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/clients/middlewares/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/middlewares"], "options": { - "jestConfig": "libs/clients/middlewares/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/middlewares/jest.config.ts" } } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/mms/general/project.json b/libs/clients/mms/general/project.json index 3b63312152cc..48b63fbef8cf 100644 --- a/libs/clients/mms/general/project.json +++ b/libs/clients/mms/general/project.json @@ -3,12 +3,10 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/mms/general/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/clients/mms/general/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -36,6 +34,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/municipalities-financial-aid/project.json b/libs/clients/municipalities-financial-aid/project.json index 7eab7b9854fa..e5094a16a319 100644 --- a/libs/clients/municipalities-financial-aid/project.json +++ b/libs/clients/municipalities-financial-aid/project.json @@ -3,14 +3,11 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/municipalities-financial-aid/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], + "implicitDependencies": ["financial-aid-backend"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/clients/municipalities-financial-aid/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -18,8 +15,7 @@ "{workspaceRoot}/coverage/libs/clients/municipalities-financial-aid" ], "options": { - "jestConfig": "libs/clients/municipalities-financial-aid/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/municipalities-financial-aid/jest.config.ts" } }, "codegen/backend-client": { @@ -29,7 +25,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "implicitDependencies": ["financial-aid-backend"], - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/national-registry/v2/project.json b/libs/clients/national-registry/v2/project.json index 90a34c34391c..68f9d57d5113 100644 --- a/libs/clients/national-registry/v2/project.json +++ b/libs/clients/national-registry/v2/project.json @@ -3,21 +3,16 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/national-registry/v2/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/clients/national-registry/v2/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/national-registry/v2"], "options": { - "jestConfig": "libs/clients/national-registry/v2/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/national-registry/v2/jest.config.ts" } }, "update-openapi-document": { @@ -39,6 +34,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/national-registry/v3/project.json b/libs/clients/national-registry/v3/project.json index c16d2d33ad2e..aefa8309d002 100644 --- a/libs/clients/national-registry/v3/project.json +++ b/libs/clients/national-registry/v3/project.json @@ -3,21 +3,16 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/national-registry/v3/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/clients/national-registry/v3/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/national-registry/v3"], "options": { - "jestConfig": "libs/clients/national-registry/v3/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/national-registry/v3/jest.config.ts" } }, "update-openapi-document": { @@ -39,6 +34,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/official-journal-of-iceland/application/project.json b/libs/clients/official-journal-of-iceland/application/project.json index 547a34ecfc12..21e500db8397 100644 --- a/libs/clients/official-journal-of-iceland/application/project.json +++ b/libs/clients/official-journal-of-iceland/application/project.json @@ -3,28 +3,16 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/official-journal-of-iceland/application/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/clients/official-journal-of-iceland/application/**/*.ts" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/clients/official-journal-of-iceland/application/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/clients/official-journal-of-iceland/application/jest.config.ts" } }, "update-openapi-document": { @@ -45,6 +33,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/clients/official-journal-of-iceland/public/project.json b/libs/clients/official-journal-of-iceland/public/project.json index e51d48cdb285..16ecf737029c 100644 --- a/libs/clients/official-journal-of-iceland/public/project.json +++ b/libs/clients/official-journal-of-iceland/public/project.json @@ -3,28 +3,16 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/official-journal-of-iceland/public/src", "projectType": "library", + "tags": ["lib:api", "scope:api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/clients/official-journal-of-iceland/public/**/*.ts" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/clients/official-journal-of-iceland/public/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/clients/official-journal-of-iceland/public/jest.config.ts" } }, "update-openapi-document": { @@ -45,6 +33,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:api", "scope:api"] + } } diff --git a/libs/clients/p-card/project.json b/libs/clients/p-card/project.json index ab085cc9484a..9c441e1429c6 100644 --- a/libs/clients/p-card/project.json +++ b/libs/clients/p-card/project.json @@ -3,26 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/p-card/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/clients/p-card/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/clients/p-card/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/clients/p-card/jest.config.ts" } }, "update-openapi-document": { @@ -43,6 +33,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/passports/project.json b/libs/clients/passports/project.json index d98f7b3ff67e..eae147b5772a 100644 --- a/libs/clients/passports/project.json +++ b/libs/clients/passports/project.json @@ -3,19 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/passports/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/clients/passports/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/passports"], "options": { - "jestConfig": "libs/clients/passports/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/passports/jest.config.ts" } }, "update-openapi-document": { @@ -42,6 +39,5 @@ "{projectRoot}/src/clientConfig.json" ] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/payment-schedule/project.json b/libs/clients/payment-schedule/project.json index c330163ca520..94bdbcae9015 100644 --- a/libs/clients/payment-schedule/project.json +++ b/libs/clients/payment-schedule/project.json @@ -3,14 +3,10 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/payment-schedule/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/clients/payment-schedule/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "codegen/backend-client": { "executor": "nx:run-commands", @@ -23,10 +19,8 @@ "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/payment-schedule"], "options": { - "jestConfig": "libs/clients/payment-schedule/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/payment-schedule/jest.config.ts" } } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/regulations-admin/project.json b/libs/clients/regulations-admin/project.json index f2e955355fe3..21d2dde74536 100644 --- a/libs/clients/regulations-admin/project.json +++ b/libs/clients/regulations-admin/project.json @@ -3,19 +3,17 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/regulations-admin/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], + "implicitDependencies": ["regulations-admin-backend"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/clients/regulations-admin/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/clients/regulations-admin/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/regulations-admin/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/clients/regulations-admin"] }, @@ -26,7 +24,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "implicitDependencies": ["regulations-admin-backend"], - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/regulations/project.json b/libs/clients/regulations/project.json index 2fffdefcde5b..c1bf9fd8f96b 100644 --- a/libs/clients/regulations/project.json +++ b/libs/clients/regulations/project.json @@ -3,22 +3,18 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/regulations/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/clients/regulations/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/clients/regulations/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/regulations/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/clients/regulations"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/rsk/company-registry/project.json b/libs/clients/rsk/company-registry/project.json index 73d9ffddef35..e15c1606b978 100644 --- a/libs/clients/rsk/company-registry/project.json +++ b/libs/clients/rsk/company-registry/project.json @@ -3,21 +3,16 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/rsk/company-registry/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/clients/rsk/company-registry/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/rsk/company-registry"], "options": { - "jestConfig": "libs/clients/rsk/company-registry/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/rsk/company-registry/jest.config.ts" } }, "update-openapi-document": { @@ -39,6 +34,5 @@ }, "outputs": ["{projectRoot}/src/lib/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/rsk/personal-tax-return/project.json b/libs/clients/rsk/personal-tax-return/project.json index 82083c7c1739..7ddc39bb67f4 100644 --- a/libs/clients/rsk/personal-tax-return/project.json +++ b/libs/clients/rsk/personal-tax-return/project.json @@ -3,14 +3,10 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/rsk/personal-tax-return/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/clients/rsk/personal-tax-return/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -18,10 +14,8 @@ "{workspaceRoot}/coverage/libs/clients/rsk/personal-tax-return" ], "options": { - "jestConfig": "libs/clients/rsk/personal-tax-return/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/rsk/personal-tax-return/jest.config.ts" } } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/rsk/relationships/project.json b/libs/clients/rsk/relationships/project.json index ad6bfdf0df72..2dd9bcf0333f 100644 --- a/libs/clients/rsk/relationships/project.json +++ b/libs/clients/rsk/relationships/project.json @@ -3,21 +3,16 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/rsk/relationships/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/clients/rsk/relationships/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/rsk/relationships"], "options": { - "jestConfig": "libs/clients/rsk/relationships/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/rsk/relationships/jest.config.ts" } }, "update-openapi-document": { @@ -37,6 +32,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/sessions/project.json b/libs/clients/sessions/project.json index 131adae7c185..6ee76c30f79e 100644 --- a/libs/clients/sessions/project.json +++ b/libs/clients/sessions/project.json @@ -2,20 +2,17 @@ "name": "clients-sessions", "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/sessions/src", + "tags": ["scope:client", "lib:client"], + "implicitDependencies": ["services-sessions"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/clients/sessions/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/sessions"], "options": { - "jestConfig": "libs/clients/sessions/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/sessions/jest.config.ts" } }, "codegen/backend-client": { @@ -25,7 +22,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "implicitDependencies": ["services-sessions"], - "tags": ["scope:client", "lib:client"] + } } diff --git a/libs/clients/ship-registry/project.json b/libs/clients/ship-registry/project.json index 9466af56de39..8047f72df8e2 100644 --- a/libs/clients/ship-registry/project.json +++ b/libs/clients/ship-registry/project.json @@ -3,20 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/ship-registry/src", "projectType": "library", + "tags": ["scope:client", "lib:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/clients/ship-registry/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/clients/ship-registry/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/ship-registry/jest.config.ts" } }, "update-openapi-document": { @@ -38,6 +34,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["scope:client", "lib:client"] + } } diff --git a/libs/clients/signature-collection/project.json b/libs/clients/signature-collection/project.json index 20d5326d4719..6dfe5bd2bf87 100644 --- a/libs/clients/signature-collection/project.json +++ b/libs/clients/signature-collection/project.json @@ -3,26 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/signature-collection/src", "projectType": "library", + "tags": ["scope:client", "lib:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/clients/signature-collection/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/signature-collection"], "options": { - "jestConfig": "libs/clients/signature-collection/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/clients/signature-collection/jest.config.ts" } }, "update-openapi-document": { @@ -42,6 +32,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["scope:client", "lib:client"] + } } diff --git a/libs/clients/smartsolutions/project.json b/libs/clients/smartsolutions/project.json index 32f28304c21c..a0249a21d1c1 100644 --- a/libs/clients/smartsolutions/project.json +++ b/libs/clients/smartsolutions/project.json @@ -3,20 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/smartsolutions/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/clients/smartsolutions/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/smartsolutions"], "options": { - "jestConfig": "libs/clients/smartsolutions/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/smartsolutions/jest.config.ts" } }, "update-openapi-document": { @@ -32,6 +28,5 @@ }, "outputs": ["{projectRoot}/gen/schema.ts"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/social-insurance-administration/project.json b/libs/clients/social-insurance-administration/project.json index 36a67fafca82..069e7477a299 100644 --- a/libs/clients/social-insurance-administration/project.json +++ b/libs/clients/social-insurance-administration/project.json @@ -3,21 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/social-insurance-administration/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/clients/social-insurance-administration/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/clients/social-insurance-administration/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/social-insurance-administration/jest.config.ts" }, "outputs": [ "{workspaceRoot}/coverage/libs/clients/social-insurance-administration" @@ -45,6 +40,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/statistics/project.json b/libs/clients/statistics/project.json index 2df46aaabfb2..532310af846f 100644 --- a/libs/clients/statistics/project.json +++ b/libs/clients/statistics/project.json @@ -3,28 +3,17 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/statistics/src", "projectType": "library", + "tags": ["scope:client", "lib:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/clients/statistics/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/clients/statistics/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/clients/statistics/jest.config.ts" } } - }, - "tags": ["scope:client", "lib:client"] + } } diff --git a/libs/clients/syslumenn/project.json b/libs/clients/syslumenn/project.json index 9509de040cd1..8303e1590a13 100644 --- a/libs/clients/syslumenn/project.json +++ b/libs/clients/syslumenn/project.json @@ -3,19 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/syslumenn/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/clients/syslumenn/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/syslumenn"], "options": { - "jestConfig": "libs/clients/syslumenn/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/syslumenn/jest.config.ts" } }, "update-openapi-document": { @@ -35,6 +32,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/transport-authority/digital-tachograph-drivers-card/project.json b/libs/clients/transport-authority/digital-tachograph-drivers-card/project.json index 3cd4da36d950..c4c3afafc1b4 100644 --- a/libs/clients/transport-authority/digital-tachograph-drivers-card/project.json +++ b/libs/clients/transport-authority/digital-tachograph-drivers-card/project.json @@ -3,15 +3,10 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/transport-authority/digital-tachograph-drivers-card/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/clients/transport-authority/digital-tachograph-drivers-card/**/*.ts" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -19,8 +14,7 @@ "{workspaceRoot}/coverage/libs/clients/transport-authority/digital-tachograph-drivers-card" ], "options": { - "jestConfig": "libs/clients/transport-authority/digital-tachograph-drivers-card/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/transport-authority/digital-tachograph-drivers-card/jest.config.ts" } }, "update-openapi-document": { @@ -40,6 +34,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/transport-authority/vehicle-codetables/project.json b/libs/clients/transport-authority/vehicle-codetables/project.json index 176fb2f13694..3c75c4183cc8 100644 --- a/libs/clients/transport-authority/vehicle-codetables/project.json +++ b/libs/clients/transport-authority/vehicle-codetables/project.json @@ -3,15 +3,10 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/transport-authority/vehicle-codetables/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/clients/transport-authority/vehicle-codetables/**/*.ts" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -19,8 +14,7 @@ "{workspaceRoot}/coverage/libs/clients/transport-authority/vehicle-codetables" ], "options": { - "jestConfig": "libs/clients/transport-authority/vehicle-codetables/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/transport-authority/vehicle-codetables/jest.config.ts" } }, "update-openapi-document": { @@ -41,6 +35,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/transport-authority/vehicle-infolocks/project.json b/libs/clients/transport-authority/vehicle-infolocks/project.json index 8b8233454d3c..585d20ae2d28 100644 --- a/libs/clients/transport-authority/vehicle-infolocks/project.json +++ b/libs/clients/transport-authority/vehicle-infolocks/project.json @@ -3,15 +3,10 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/transport-authority/vehicle-infolocks/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/clients/transport-authority/vehicle-infolocks/**/*.ts" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -19,8 +14,7 @@ "{workspaceRoot}/coverage/libs/clients/transport-authority/vehicle-infolocks" ], "options": { - "jestConfig": "libs/clients/transport-authority/vehicle-infolocks/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/transport-authority/vehicle-infolocks/jest.config.ts" } }, "update-openapi-document": { @@ -41,6 +35,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/transport-authority/vehicle-operators/project.json b/libs/clients/transport-authority/vehicle-operators/project.json index c340ef003abd..026564d85779 100644 --- a/libs/clients/transport-authority/vehicle-operators/project.json +++ b/libs/clients/transport-authority/vehicle-operators/project.json @@ -3,15 +3,10 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/transport-authority/vehicle-operators/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/clients/transport-authority/vehicle-operators/**/*.ts" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -19,8 +14,7 @@ "{workspaceRoot}/coverage/libs/clients/transport-authority/vehicle-operators" ], "options": { - "jestConfig": "libs/clients/transport-authority/vehicle-operators/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/transport-authority/vehicle-operators/jest.config.ts" } }, "update-openapi-document": { @@ -43,6 +37,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/transport-authority/vehicle-owner-change/project.json b/libs/clients/transport-authority/vehicle-owner-change/project.json index 9535b0e86fc7..a7d5f1881811 100644 --- a/libs/clients/transport-authority/vehicle-owner-change/project.json +++ b/libs/clients/transport-authority/vehicle-owner-change/project.json @@ -3,15 +3,10 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/transport-authority/vehicle-owner-change/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/clients/transport-authority/vehicle-owner-change/**/*.ts" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -19,8 +14,7 @@ "{workspaceRoot}/coverage/libs/clients/transport-authority/vehicle-owner-change" ], "options": { - "jestConfig": "libs/clients/transport-authority/vehicle-owner-change/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/transport-authority/vehicle-owner-change/jest.config.ts" } }, "update-openapi-document": { @@ -45,6 +39,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/transport-authority/vehicle-plate-ordering/project.json b/libs/clients/transport-authority/vehicle-plate-ordering/project.json index aa85b1ec3492..aa3160728308 100644 --- a/libs/clients/transport-authority/vehicle-plate-ordering/project.json +++ b/libs/clients/transport-authority/vehicle-plate-ordering/project.json @@ -3,15 +3,10 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/transport-authority/vehicle-plate-ordering/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/clients/transport-authority/vehicle-plate-ordering/**/*.ts" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -19,8 +14,7 @@ "{workspaceRoot}/coverage/libs/clients/transport-authority/vehicle-plate-ordering" ], "options": { - "jestConfig": "libs/clients/transport-authority/vehicle-plate-ordering/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/transport-authority/vehicle-plate-ordering/jest.config.ts" } }, "update-openapi-document": { @@ -41,6 +35,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/transport-authority/vehicle-plate-renewal/project.json b/libs/clients/transport-authority/vehicle-plate-renewal/project.json index 7e5f326d9201..241f1f1573ac 100644 --- a/libs/clients/transport-authority/vehicle-plate-renewal/project.json +++ b/libs/clients/transport-authority/vehicle-plate-renewal/project.json @@ -3,15 +3,10 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/transport-authority/vehicle-plate-renewal/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/clients/transport-authority/vehicle-plate-renewal/**/*.ts" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -19,8 +14,7 @@ "{workspaceRoot}/coverage/libs/clients/transport-authority/vehicle-plate-renewal" ], "options": { - "jestConfig": "libs/clients/transport-authority/vehicle-plate-renewal/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/transport-authority/vehicle-plate-renewal/jest.config.ts" } }, "update-openapi-document": { @@ -41,6 +35,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/transport-authority/vehicle-printing/project.json b/libs/clients/transport-authority/vehicle-printing/project.json index df2ccd8e47e0..515c4c53ece1 100644 --- a/libs/clients/transport-authority/vehicle-printing/project.json +++ b/libs/clients/transport-authority/vehicle-printing/project.json @@ -3,15 +3,10 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/transport-authority/vehicle-printing/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/clients/transport-authority/vehicle-printing/**/*.ts" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -19,8 +14,7 @@ "{workspaceRoot}/coverage/libs/clients/transport-authority/vehicle-printing" ], "options": { - "jestConfig": "libs/clients/transport-authority/vehicle-printing/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/transport-authority/vehicle-printing/jest.config.ts" } }, "update-openapi-document": { @@ -41,6 +35,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/ultraviolet-radiation/project.json b/libs/clients/ultraviolet-radiation/project.json index c98e5b13a613..065125fbda48 100644 --- a/libs/clients/ultraviolet-radiation/project.json +++ b/libs/clients/ultraviolet-radiation/project.json @@ -3,26 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/ultraviolet-radiation/src", "projectType": "library", + "tags": ["scope:client", "lib:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/clients/ultraviolet-radiation/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/clients/ultraviolet-radiation/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/clients/ultraviolet-radiation/jest.config.ts" } }, "update-openapi-document": { @@ -43,6 +33,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["scope:client", "lib:client"] + } } diff --git a/libs/clients/university-application/agricultural-university-of-iceland/project.json b/libs/clients/university-application/agricultural-university-of-iceland/project.json index 86cd74d70589..1277e2262a02 100644 --- a/libs/clients/university-application/agricultural-university-of-iceland/project.json +++ b/libs/clients/university-application/agricultural-university-of-iceland/project.json @@ -3,28 +3,16 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/university-application/agricultural-university-of-iceland/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/clients/university-application/agricultural-university-of-iceland/**/*.ts" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/clients/university-application/agricultural-university-of-iceland/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/clients/university-application/agricultural-university-of-iceland/jest.config.ts" } }, "update-openapi-document": { @@ -47,6 +35,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/university-application/bifrost-university/project.json b/libs/clients/university-application/bifrost-university/project.json index f5a45f5dd701..5157737295e4 100644 --- a/libs/clients/university-application/bifrost-university/project.json +++ b/libs/clients/university-application/bifrost-university/project.json @@ -3,28 +3,16 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/university-application/bifrost-university/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/clients/university-application/bifrost-university/**/*.ts" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/clients/university-application/bifrost-university/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/clients/university-application/bifrost-university/jest.config.ts" } }, "update-openapi-document": { @@ -47,6 +35,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/university-application/holar-university/project.json b/libs/clients/university-application/holar-university/project.json index c71d0b80b3aa..d3aa1fdd22a4 100644 --- a/libs/clients/university-application/holar-university/project.json +++ b/libs/clients/university-application/holar-university/project.json @@ -3,28 +3,16 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/university-application/holar-university/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/clients/university-application/holar-university/**/*.ts" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/clients/university-application/holar-university/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/clients/university-application/holar-university/jest.config.ts" } }, "update-openapi-document": { @@ -47,6 +35,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/university-application/iceland-university-of-the-arts/project.json b/libs/clients/university-application/iceland-university-of-the-arts/project.json index 3ab0727e2824..0cf337cdd325 100644 --- a/libs/clients/university-application/iceland-university-of-the-arts/project.json +++ b/libs/clients/university-application/iceland-university-of-the-arts/project.json @@ -3,28 +3,16 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/university-application/iceland-university-of-the-arts/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/clients/university-application/iceland-university-of-the-arts/**/*.ts" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/clients/university-application/iceland-university-of-the-arts/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/clients/university-application/iceland-university-of-the-arts/jest.config.ts" } }, "update-openapi-document": { @@ -47,6 +35,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/university-application/reykjavik-university/project.json b/libs/clients/university-application/reykjavik-university/project.json index 671ca0693378..233abf4eeaa7 100644 --- a/libs/clients/university-application/reykjavik-university/project.json +++ b/libs/clients/university-application/reykjavik-university/project.json @@ -3,15 +3,10 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/university-application/reykjavik-university/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/clients/university-application/reykjavik-university/**/*.ts" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -19,8 +14,7 @@ "{workspaceRoot}/coverage/libs/clients/university-application/reykjavik-university" ], "options": { - "jestConfig": "libs/clients/university-application/reykjavik-university/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/university-application/reykjavik-university/jest.config.ts" } }, "codegen/backend-client": { @@ -32,6 +26,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/university-application/university-of-akureyri/project.json b/libs/clients/university-application/university-of-akureyri/project.json index 673fe6275913..a72748f028ba 100644 --- a/libs/clients/university-application/university-of-akureyri/project.json +++ b/libs/clients/university-application/university-of-akureyri/project.json @@ -3,28 +3,16 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/university-application/university-of-akureyri/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/clients/university-application/university-of-akureyri/**/*.ts" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/clients/university-application/university-of-akureyri/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/clients/university-application/university-of-akureyri/jest.config.ts" } }, "update-openapi-document": { @@ -47,6 +35,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/university-application/university-of-iceland/project.json b/libs/clients/university-application/university-of-iceland/project.json index 84a615a934e1..3688f5012a80 100644 --- a/libs/clients/university-application/university-of-iceland/project.json +++ b/libs/clients/university-application/university-of-iceland/project.json @@ -3,15 +3,10 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/university-application/university-of-iceland/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/clients/university-application/university-of-iceland/**/*.ts" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -19,8 +14,7 @@ "{workspaceRoot}/coverage/libs/clients/university-application/university-of-iceland" ], "options": { - "jestConfig": "libs/clients/university-application/university-of-iceland/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/university-application/university-of-iceland/jest.config.ts" } }, "update-openapi-document": { @@ -43,6 +37,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/university-careers/project.json b/libs/clients/university-careers/project.json index 99273e705973..5129cd85182c 100644 --- a/libs/clients/university-careers/project.json +++ b/libs/clients/university-careers/project.json @@ -3,26 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/university-careers/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/clients/university-careers/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/clients/university-careers/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/clients/university-careers/jest.config.ts" } }, "update-openapi-document": { @@ -60,6 +50,5 @@ }, "outputs": ["{projectRoot}/**/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/university-careers/src/lib/universityCareers.service.ts b/libs/clients/university-careers/src/lib/universityCareers.service.ts index 118abf86c849..8cc76c80eced 100644 --- a/libs/clients/university-careers/src/lib/universityCareers.service.ts +++ b/libs/clients/university-careers/src/lib/universityCareers.service.ts @@ -129,7 +129,7 @@ export class UniversityCareersClientService { .filter(isDefined) ?? [] if (!transcripts.length) { - this.logger.debug('No transcripts found for user', { + this.logger.info('No transcripts found for user', { university, }) } diff --git a/libs/clients/university-gateway-api/project.json b/libs/clients/university-gateway-api/project.json index c6860b817b90..f193fe5652ec 100644 --- a/libs/clients/university-gateway-api/project.json +++ b/libs/clients/university-gateway-api/project.json @@ -3,26 +3,17 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/university-gateway-api/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], + "implicitDependencies": ["services-university-gateway"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/clients/university-gateway-api/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/clients/university-gateway-api/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/clients/university-gateway-api/jest.config.ts" } }, "codegen/backend-client": { @@ -35,7 +26,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "implicitDependencies": ["services-university-gateway"], - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/user-notification/project.json b/libs/clients/user-notification/project.json index f6a344f68ebe..fcedaca903ba 100644 --- a/libs/clients/user-notification/project.json +++ b/libs/clients/user-notification/project.json @@ -3,26 +3,17 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/user-notification/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], + "implicitDependencies": ["services-user-notification"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/clients/user-notification/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/clients/user-notification/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/clients/user-notification/jest.config.ts" } }, "codegen/backend-client": { @@ -32,7 +23,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "implicitDependencies": ["services-user-notification"], - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/user-profile/project.json b/libs/clients/user-profile/project.json index 353453316448..929889c401e0 100644 --- a/libs/clients/user-profile/project.json +++ b/libs/clients/user-profile/project.json @@ -3,19 +3,17 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/user-profile/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], + "implicitDependencies": ["services-user-profile"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/clients/user-profile/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/user-profile"], "options": { - "jestConfig": "libs/clients/user-profile/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/user-profile/jest.config.ts" } }, "codegen/backend-client": { @@ -25,7 +23,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "implicitDependencies": ["services-user-profile"], - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/vehicle-service-fjs-v1/project.json b/libs/clients/vehicle-service-fjs-v1/project.json index 8fe270d6dce1..0fb48e5ee9d0 100644 --- a/libs/clients/vehicle-service-fjs-v1/project.json +++ b/libs/clients/vehicle-service-fjs-v1/project.json @@ -3,13 +3,10 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/vehicle-service-fjs-v1/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/clients/vehicle-service-fjs-v1/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -17,8 +14,7 @@ "{workspaceRoot}/coverage/libs/clients/vehicle-service-fjs-v1" ], "options": { - "jestConfig": "libs/clients/vehicle-service-fjs-v1/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/vehicle-service-fjs-v1/jest.config.ts" } }, "update-openapi-document": { @@ -38,6 +34,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/vehicles-mileage/project.json b/libs/clients/vehicles-mileage/project.json index a1e5c25123df..ef161d547864 100644 --- a/libs/clients/vehicles-mileage/project.json +++ b/libs/clients/vehicles-mileage/project.json @@ -3,26 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/vehicles-mileage/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/clients/vehicles-mileage/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/clients/vehicles-mileage/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/clients/vehicles-mileage/jest.config.ts" } }, "update-openapi-document": { @@ -44,6 +34,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/vehicles/project.json b/libs/clients/vehicles/project.json index 8054d9ea1060..f559ae71481e 100644 --- a/libs/clients/vehicles/project.json +++ b/libs/clients/vehicles/project.json @@ -3,19 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/vehicles/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/clients/vehicles/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/vehicles"], "options": { - "jestConfig": "libs/clients/vehicles/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/vehicles/jest.config.ts" } }, "update-openapi-document": { @@ -23,6 +20,7 @@ "options": { "commands": [ "curl -H \"X-Road-Client: IS-DEV/GOV/10000/island-is-client\" http://localhost:8081/r1/IS-DEV/GOV/10017/Samgongustofa-Protected/getOpenAPI?serviceCode=Mitt-Svaedi-V1 > src/clientConfig.json", + "iconv -f iso-8859-1 -t utf-8 src/clientConfig.json > src/clientConfigTmp.json && mv src/clientConfigTmp.json src/clientConfig.json", "jq '.components.schemas.ProblemDetails.additionalProperties = false' src/clientConfig.json > src/temp.json && mv src/temp.json src/clientConfig.json", "jq '.paths.\"/VehicleReportPdf\".get.responses.\"200\".content.\"application/pdf\".schema.format = \"binary\"' src/clientConfig.json > src/temp.json && mv src/temp.json src/clientConfig.json", "jq '.paths.\"/OwnershipReportPdf\".get.responses.\"200\".content.\"application/pdf\".schema.format = \"binary\"' src/clientConfig.json > src/temp.json && mv src/temp.json src/clientConfig.json", @@ -41,6 +39,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/vehicles/src/clientConfig.json b/libs/clients/vehicles/src/clientConfig.json index d1fca7395c60..672a7ace5061 100644 --- a/libs/clients/vehicles/src/clientConfig.json +++ b/libs/clients/vehicles/src/clientConfig.json @@ -1,8 +1,8 @@ { "openapi": "3.0.1", "info": { - "title": "Samgöngustofa", - "description": "Leitar eftir ökutækjum út frá fastanúmeri, skr�ningarnúmeri eða verksmiðjunúmeri - Release-36 : 20240403.1", + "title": "Samgöngustofa", + "description": "Leitar eftir ökutækjum út frá fastanúmeri, skr�ningarnúmeri eða verksmiðjunúmeri - Release-38 : 20240605.1", "contact": { "name": "Samgongustofa", "url": "https://www.samgongustofa.is/", @@ -38,7 +38,7 @@ ], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/pdf": { "schema": { @@ -76,7 +76,7 @@ ], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/pdf": { "schema": { @@ -114,7 +114,7 @@ ], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { @@ -151,7 +151,7 @@ "tags": ["VehicleSearch"], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { @@ -205,7 +205,7 @@ ], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { @@ -281,7 +281,7 @@ ], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { @@ -368,7 +368,7 @@ ], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { @@ -480,7 +480,7 @@ ], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { @@ -538,7 +538,7 @@ ], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { @@ -592,7 +592,7 @@ ], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { @@ -633,21 +633,24 @@ "name": "showOwned", "in": "query", "schema": { - "type": "boolean" + "type": "boolean", + "default": false } }, { "name": "showCoowned", "in": "query", "schema": { - "type": "boolean" + "type": "boolean", + "default": false } }, { "name": "showOperated", "in": "query", "schema": { - "type": "boolean" + "type": "boolean", + "default": false } }, { @@ -655,7 +658,8 @@ "in": "query", "schema": { "type": "integer", - "format": "int32" + "format": "int32", + "default": 1 } }, { @@ -663,7 +667,8 @@ "in": "query", "schema": { "type": "integer", - "format": "int32" + "format": "int32", + "default": 50 } }, { @@ -677,7 +682,7 @@ ], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { @@ -735,7 +740,7 @@ ], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { @@ -782,7 +787,7 @@ ], "responses": { "200": { - "description": "Success", + "description": "OK", "content": { "application/json": { "schema": { @@ -3401,7 +3406,7 @@ "authorizationUrl": "https://identity-server.dev01.devland.is/connect/authorize", "tokenUrl": "https://identity-server.dev01.devland.is/connect/token", "scopes": { - "@samgongustofa.is/vehicle-search": "Sækir OpenId, Profile og claimið sem þarf" + "@samgongustofa.is/vehicle-search": "Sækir OpenId, Profile og claimið sem þarf" } } } diff --git a/libs/clients/vmst/project.json b/libs/clients/vmst/project.json index 92473dca2036..9acc6d7fe88e 100644 --- a/libs/clients/vmst/project.json +++ b/libs/clients/vmst/project.json @@ -3,19 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/vmst/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/clients/vmst/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/clients/vmst/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/vmst/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/clients/vmst"] }, @@ -26,6 +23,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/vmst/src/lib/utils.ts b/libs/clients/vmst/src/lib/utils.ts index 753efdcc9b8b..0f140250dbf8 100644 --- a/libs/clients/vmst/src/lib/utils.ts +++ b/libs/clients/vmst/src/lib/utils.ts @@ -1,5 +1,53 @@ import fetch from 'isomorphic-fetch' import { logger } from '@island.is/logging' +import omit from 'lodash/omit' +import pick from 'lodash/pick' + +// A parental leave request body: +type Init = { + adoptionDate: string + applicationId: string + applicationFundId: string + applicant: string + otherParentId: string + expectedDateOfBirth: string + dateOfBirth: string + email: string + phoneNumber: string + paymentInfo: { + bankAccount: string + personalAllowance: number + personalAllowanceFromSpouse: number + union: { id: string; name: string } + pensionFund: { id: string; name: string } + privatePensionFund: { id: string; name: string } + privatePensionFundRatio: number + } + periods: [ + { + from: string + to: string + ratio: string + approved: boolean + paid: boolean + rightsCodePeriod: string + }, + ] + applicationComment: string + employers: { + email?: string // Modified to be optional + nationalRegistryId: string + approverNationalRegistryId?: string // Modified to be optional + }[] + status: string + rightsCode: string + attachments: { + attachmentBytes: string + attachmentType: string + }[] + testData: string + otherParentBlocked: boolean +} export const createWrappedFetchWithLogging = ( input: RequestInfo, @@ -8,39 +56,76 @@ export const createWrappedFetchWithLogging = ( return new Promise((resolve, reject) => { fetch(input, init) .then(async (response) => { - const body = init?.body ? JSON.parse(init?.body as string) : {} + // Filter known sensitive data + // First pick what we need + const requestBody = pick( + (init?.body ? JSON.parse(init?.body as string) : {}) as Partial, + [ + 'adoptionDate', + // 'applicant', + // 'applicationComment', + 'applicationFundId', + 'applicationId', + // 'attachments', + 'dateOfBirth', + // 'email', + 'employers', + 'expectedDateOfBirth', + 'otherParentBlocked', + // 'otherParentId', + // 'paymentInfo', + 'periods', + // 'phoneNumber', + // 'rightsCode', + // 'status', + 'testData', + ], + ) + // Then omit the sensitive sub-attributes + // requestBody = omit(requestBody, [ + // 'employers.approverNationalRegistryId', + // 'employers.email', + // 'paymentInfo.bankAccount', + // ]) + requestBody.employers = requestBody.employers?.map( + (employer: Init['employers'][number]) => { + return omit(employer, ['email', 'approverNationalRegistryId']) + }, + ) - const newInit = { - ...init, - body: { - ...body, - applicant: 'hidden', - otherParentId: '' ?? 'hidden', - email: 'hidden', - phoneNumber: 'hidden', - paymentInfo: { - ...body?.paymentInfo, - bankAccount: 'hidden', - }, - attachments: body?.attachments?.length, + const vmstMetadata = { + request: { + body: requestBody, + }, + response: { + status_text: response.statusText, + body: undefined, }, } + if (response.ok) { - logger.info( - `vmst-module.success: input - ${JSON.stringify( - input, - )}, init - ${JSON.stringify(init?.body ? newInit : init)}`, - ) + logger.info(`Successfully fetched from VMST`, { + vmst: { + ...vmstMetadata, + success: true, + }, + }) } else { - const body = await response.json() - logger.error( - `vmst-module.error: input - ${JSON.stringify( - input, - )}, init - ${JSON.stringify(newInit)}, response - ${JSON.stringify( - body, - )} status text: ${response.statusText}`, - ) - return reject(body) + let responseBody = await response.json() + responseBody = pick(responseBody, [ + 'hasError', + 'hasActivePregnancy', + 'errorCode', + 'status', + ]) + vmstMetadata.response.body = responseBody + logger.error(`Failed fetching from VMST`, { + vmst: { + ...vmstMetadata, + success: false, + }, + }) + return reject(requestBody) } return resolve(response) diff --git a/libs/clients/work-machines/project.json b/libs/clients/work-machines/project.json index 943b4ca73505..d05cce27639f 100644 --- a/libs/clients/work-machines/project.json +++ b/libs/clients/work-machines/project.json @@ -3,19 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/work-machines/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/clients/work-machines/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/work-machines"], "options": { - "jestConfig": "libs/clients/work-machines/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/work-machines/jest.config.ts" } }, "update-openapi-document": { @@ -37,6 +34,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/workpoint/arborg/project.json b/libs/clients/workpoint/arborg/project.json index 396bdd98f09f..f9fb6af6e7f8 100644 --- a/libs/clients/workpoint/arborg/project.json +++ b/libs/clients/workpoint/arborg/project.json @@ -3,13 +3,10 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/workpoint/arborg/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/clients/workpoint/arborg/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "codegen/backend-client": { "executor": "nx:run-commands", @@ -24,16 +21,8 @@ "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/clients/workpoint/arborg/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/clients/workpoint/arborg/jest.config.ts" } } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/clients/zendesk/project.json b/libs/clients/zendesk/project.json index 8d4aad0c7a4e..50b42e54c097 100644 --- a/libs/clients/zendesk/project.json +++ b/libs/clients/zendesk/project.json @@ -3,21 +3,17 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/clients/zendesk/src", "projectType": "library", + "tags": ["lib:client", "scope:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/clients/zendesk/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/clients/zendesk"], "options": { - "jestConfig": "libs/clients/zendesk/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/clients/zendesk/jest.config.ts" } } - }, - "tags": ["lib:client", "scope:client"] + } } diff --git a/libs/cms-translations/project.json b/libs/cms-translations/project.json index 65b7f39eb8e4..084323499127 100644 --- a/libs/cms-translations/project.json +++ b/libs/cms-translations/project.json @@ -3,22 +3,18 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/cms-translations/src", "projectType": "library", + "tags": ["lib:nest", "scope:nest"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/cms-translations/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/cms-translations/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/cms-translations/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/cms-translations"] } - }, - "tags": ["lib:nest", "scope:nest"] + } } diff --git a/libs/cms/project.json b/libs/cms/project.json index b296b4b89e53..5ad333450dd5 100644 --- a/libs/cms/project.json +++ b/libs/cms/project.json @@ -3,22 +3,18 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/cms/src", "projectType": "library", + "tags": ["lib:nest", "scope:nest"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/cms/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/cms/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/cms/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/cms"] } - }, - "tags": ["lib:nest", "scope:nest"] + } } diff --git a/libs/cms/src/lib/cms.elasticsearch.service.ts b/libs/cms/src/lib/cms.elasticsearch.service.ts index bc692fe7bb11..25ccddd2d897 100644 --- a/libs/cms/src/lib/cms.elasticsearch.service.ts +++ b/libs/cms/src/lib/cms.elasticsearch.service.ts @@ -22,7 +22,7 @@ import { OrganizationSubpage } from './models/organizationSubpage.model' import { GetPublishedMaterialInput } from './dto/getPublishedMaterial.input' import { EnhancedAssetSearchResult } from './models/enhancedAssetSearchResult.model' import { ApiResponse } from '@elastic/elasticsearch' -import { SearchResponse } from 'elastic' +import { SearchResponse } from '@island.is/shared/types' import { MappedData } from '@island.is/content-search-indexer/types' import { SupportQNA } from './models/supportQNA.model' import { GetFeaturedSupportQNAsInput } from './dto/getFeaturedSupportQNAs.input' diff --git a/libs/cms/src/lib/generated/contentfulTypes.d.ts b/libs/cms/src/lib/generated/contentfulTypes.d.ts index e67b8f4ed1e2..b152eb4b443b 100644 --- a/libs/cms/src/lib/generated/contentfulTypes.d.ts +++ b/libs/cms/src/lib/generated/contentfulTypes.d.ts @@ -4570,6 +4570,9 @@ export interface ITwoColumnTextFields { /** Left Title */ leftTitle?: string | undefined + /** Only use one title */ + onlyUseOneTitle?: boolean | undefined + /** Left Content */ leftContent?: Document | undefined diff --git a/libs/cms/src/lib/models/accordionSlice.model.ts b/libs/cms/src/lib/models/accordionSlice.model.ts index 1e0d52d38db3..3cfd749b749c 100644 --- a/libs/cms/src/lib/models/accordionSlice.model.ts +++ b/libs/cms/src/lib/models/accordionSlice.model.ts @@ -2,7 +2,7 @@ import { Field, ID, ObjectType } from '@nestjs/graphql' import { CacheField } from '@island.is/nest/graphql' import { IAccordionSlice } from '../generated/contentfulTypes' -import { SystemMetadata } from 'api-cms-domain' +import { SystemMetadata } from '@island.is/shared/types' import { mapOneColumnText, OneColumnText } from './oneColumnText.model' @ObjectType() diff --git a/libs/cms/src/lib/models/customPage.model.ts b/libs/cms/src/lib/models/customPage.model.ts index 95f4599cfaef..f73f2379e246 100644 --- a/libs/cms/src/lib/models/customPage.model.ts +++ b/libs/cms/src/lib/models/customPage.model.ts @@ -1,5 +1,5 @@ import { GraphQLJSONObject } from 'graphql-type-json' -import type { SystemMetadata } from 'api-cms-domain' +import type { SystemMetadata } from '@island.is/shared/types' import { Field, ObjectType, ID } from '@nestjs/graphql' import { CacheField } from '@island.is/nest/graphql' import { AlertBanner, mapAlertBanner } from './alertBanner.model' diff --git a/libs/cms/src/lib/models/manual.model.ts b/libs/cms/src/lib/models/manual.model.ts index 65dd54130741..f4c55cac6209 100644 --- a/libs/cms/src/lib/models/manual.model.ts +++ b/libs/cms/src/lib/models/manual.model.ts @@ -1,6 +1,6 @@ import { Field, ID, ObjectType } from '@nestjs/graphql' import { CacheField } from '@island.is/nest/graphql' -import { SystemMetadata } from 'api-cms-domain' +import { SystemMetadata } from '@island.is/shared/types' import { IManual } from '../generated/contentfulTypes' import { Organization, mapOrganization } from './organization.model' import { SliceUnion, mapDocument } from '../unions/slice.union' diff --git a/libs/cms/src/lib/models/sectionWithVideo.model.ts b/libs/cms/src/lib/models/sectionWithVideo.model.ts index 804427d7d569..131f10c1c3b7 100644 --- a/libs/cms/src/lib/models/sectionWithVideo.model.ts +++ b/libs/cms/src/lib/models/sectionWithVideo.model.ts @@ -3,7 +3,7 @@ import { Field, ID, ObjectType } from '@nestjs/graphql' import { EmbeddedVideo, mapEmbeddedVideo } from './embeddedVideo.model' import { Html, mapHtml } from './html.model' import { ISectionWithVideo } from '../generated/contentfulTypes' -import { SystemMetadata } from 'api-cms-domain' +import { SystemMetadata } from '@island.is/shared/types' import { Link, mapLink } from './link.model' @ObjectType() diff --git a/libs/cms/src/lib/models/stepper.model.ts b/libs/cms/src/lib/models/stepper.model.ts index 562030622b24..314d8f59e873 100644 --- a/libs/cms/src/lib/models/stepper.model.ts +++ b/libs/cms/src/lib/models/stepper.model.ts @@ -2,7 +2,7 @@ import { Field, ID, ObjectType } from '@nestjs/graphql' import { CacheField } from '@island.is/nest/graphql' import { IStepper } from '../generated/contentfulTypes' -import { SystemMetadata } from 'api-cms-domain' +import { SystemMetadata } from '@island.is/shared/types' import { mapStep, Step } from './step.model' @ObjectType() diff --git a/libs/cms/src/lib/models/twoColumnText.model.ts b/libs/cms/src/lib/models/twoColumnText.model.ts index 8b598223d42b..de1345812ca4 100644 --- a/libs/cms/src/lib/models/twoColumnText.model.ts +++ b/libs/cms/src/lib/models/twoColumnText.model.ts @@ -4,7 +4,7 @@ import { CacheField } from '@island.is/nest/graphql' import { ITwoColumnText } from '../generated/contentfulTypes' import { Link, mapLink } from './link.model' -import { SystemMetadata } from 'api-cms-domain' +import { SystemMetadata } from '@island.is/shared/types' import { mapDocument, SliceUnion } from '../unions/slice.union' @ObjectType() @@ -32,6 +32,9 @@ export class TwoColumnText { @Field(() => Boolean, { nullable: true }) dividerOnTop?: boolean + + @Field(() => Boolean, { nullable: true }) + onlyUseOneTitle?: boolean } export const mapTwoColumnText = ({ @@ -51,4 +54,5 @@ export const mapTwoColumnText = ({ : [], leftLink: fields.leftLink ? mapLink(fields.leftLink) : null, dividerOnTop: fields.dividerOnTop ?? true, + onlyUseOneTitle: fields.onlyUseOneTitle ?? false, }) diff --git a/libs/cms/src/lib/search/contentful.service.ts b/libs/cms/src/lib/search/contentful.service.ts index 05c6f54cb563..c604abd3f517 100644 --- a/libs/cms/src/lib/search/contentful.service.ts +++ b/libs/cms/src/lib/search/contentful.service.ts @@ -20,7 +20,7 @@ import { ElasticsearchIndexLocale, getElasticsearchIndex, } from '@island.is/content-search-index-manager' -import { Locale } from 'locale' +import { Locale } from '@island.is/shared/types' type SyncCollection = ContentfulSyncCollection & { nextPageToken?: string diff --git a/libs/content-search-index-manager/project.json b/libs/content-search-index-manager/project.json index 981bdb17a384..585c683f298a 100644 --- a/libs/content-search-index-manager/project.json +++ b/libs/content-search-index-manager/project.json @@ -3,24 +3,18 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/content-search-index-manager/src", "projectType": "library", + "tags": ["lib:js", "scope:js"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/content-search-index-manager/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/content-search-index-manager/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/content-search-index-manager/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/content-search-index-manager"] } - }, - "tags": ["lib:js", "scope:js"] + } } diff --git a/libs/content-search-indexer/project.json b/libs/content-search-indexer/project.json index a8e69d62094e..8913f5916bfd 100644 --- a/libs/content-search-indexer/project.json +++ b/libs/content-search-indexer/project.json @@ -3,22 +3,18 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/content-search-indexer/src", "projectType": "library", + "tags": ["lib:nest", "scope:nest"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/content-search-indexer/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/content-search-indexer/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/content-search-indexer/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/content-search-indexer"] } - }, - "tags": ["lib:nest", "scope:nest"] + } } diff --git a/libs/content-search-indexer/types/project.json b/libs/content-search-indexer/types/project.json index 21e77ac3fe23..0886ed947ac5 100644 --- a/libs/content-search-indexer/types/project.json +++ b/libs/content-search-indexer/types/project.json @@ -3,24 +3,18 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/content-search-indexer/types/src", "projectType": "library", + "tags": ["lib:nest", "scope:nest"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/content-search-indexer/types/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/content-search-indexer/types/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/content-search-indexer/types/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/content-search-indexer/types"] } - }, - "tags": ["lib:nest", "scope:nest"] + } } diff --git a/libs/content-search-metrics/project.json b/libs/content-search-metrics/project.json index 7da543e135ce..a730389c2a66 100644 --- a/libs/content-search-metrics/project.json +++ b/libs/content-search-metrics/project.json @@ -3,22 +3,18 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/content-search-metrics/src", "projectType": "library", + "tags": ["lib:nest", "scope:nest"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/content-search-metrics/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/content-search-metrics/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/content-search-metrics/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/content-search-metrics"] } - }, - "tags": ["lib:nest", "scope:nest"] + } } diff --git a/libs/content-search-toolkit/project.json b/libs/content-search-toolkit/project.json index 648d2f3897a0..96e808fc5f2c 100644 --- a/libs/content-search-toolkit/project.json +++ b/libs/content-search-toolkit/project.json @@ -3,22 +3,18 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/content-search-toolkit/src", "projectType": "library", + "tags": ["lib:nest", "scope:nest"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/content-search-toolkit/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/content-search-toolkit/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/content-search-toolkit/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/content-search-toolkit"] } - }, - "tags": ["lib:nest", "scope:nest"] + } } diff --git a/libs/dokobit-signing/project.json b/libs/dokobit-signing/project.json index e317ac6ab825..5fcc03adf56e 100644 --- a/libs/dokobit-signing/project.json +++ b/libs/dokobit-signing/project.json @@ -3,22 +3,18 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/dokobit-signing/src", "projectType": "library", + "tags": ["lib:nest", "scope:nest"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/dokobit-signing/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/dokobit-signing/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/dokobit-signing/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/dokobit-signing"] } - }, - "tags": ["lib:nest", "scope:nest"] + } } diff --git a/libs/email-service/project.json b/libs/email-service/project.json index d4afc9134170..bb3934df1ec4 100644 --- a/libs/email-service/project.json +++ b/libs/email-service/project.json @@ -3,13 +3,11 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/email-service/src", "projectType": "library", + "tags": ["lib:nest", "scope:nest"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/email-service/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "generate-html": { "executor": "nx:run-commands", @@ -20,11 +18,9 @@ "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/email-service/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/email-service/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/email-service"] } - }, - "tags": ["lib:nest", "scope:nest"] + } } diff --git a/libs/feature-flags/project.json b/libs/feature-flags/project.json index 78d09e127c75..b73d8cb2e548 100644 --- a/libs/feature-flags/project.json +++ b/libs/feature-flags/project.json @@ -3,22 +3,18 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/feature-flags/src", "projectType": "library", + "tags": ["lib:js", "scope:js"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/feature-flags/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/feature-flags/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/feature-flags/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/feature-flags"] } - }, - "tags": ["lib:js", "scope:js"] + } } diff --git a/libs/feature-flags/src/lib/server-side.ts b/libs/feature-flags/src/lib/server-side.ts index dc2c78ffaf16..e329ba5571e9 100644 --- a/libs/feature-flags/src/lib/server-side.ts +++ b/libs/feature-flags/src/lib/server-side.ts @@ -3,10 +3,12 @@ import { ServerSideFeature } from './features' export class ServerSideFeatures implements ServerSideFeatureClientType { input?: string - processed = false - featuresOn: ServerSideFeature[] = [] + processed + featuresOn: ServerSideFeature[] constructor(featuresOn?: string) { + this.processed = false + this.featuresOn = [] const isDev = process.env.NODE_ENV !== 'production' this.input = isDev ? featuresOn ?? '' : featuresOn } diff --git a/libs/file-storage/project.json b/libs/file-storage/project.json index 816813e0a349..4585288d1e79 100644 --- a/libs/file-storage/project.json +++ b/libs/file-storage/project.json @@ -3,22 +3,18 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/file-storage/src", "projectType": "library", + "tags": ["lib:nest", "scope:nest"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/file-storage/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/file-storage/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/file-storage/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/file-storage"] } - }, - "tags": ["lib:nest", "scope:nest"] + } } diff --git a/libs/financial-aid/shared/project.json b/libs/financial-aid/shared/project.json index 9e264dd48493..34fada0beacf 100644 --- a/libs/financial-aid/shared/project.json +++ b/libs/financial-aid/shared/project.json @@ -3,22 +3,18 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/financial-aid/shared/src", "projectType": "library", + "tags": ["lib:js", "scope:react", "TODO:splitUp"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/financial-aid/shared/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/financial-aid/shared/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/financial-aid/shared/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/financial-aid/shared"] } - }, - "tags": ["lib:js", "scope:react", "TODO:splitUp"] + } } diff --git a/libs/icelandic-names-registry/types/project.json b/libs/icelandic-names-registry/types/project.json index a9490b1f3a6c..eb03b5eb669b 100644 --- a/libs/icelandic-names-registry/types/project.json +++ b/libs/icelandic-names-registry/types/project.json @@ -3,26 +3,20 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/icelandic-names-registry/types/src", "projectType": "library", + "tags": ["lib:js", "scope:js"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/icelandic-names-registry/types/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/icelandic-names-registry/types/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/icelandic-names-registry/types/jest.config.ts" }, "outputs": [ "{workspaceRoot}/coverage/libs/icelandic-names-registry/types" ] } - }, - "tags": ["lib:js", "scope:js"] + } } diff --git a/libs/infra-express-server/project.json b/libs/infra-express-server/project.json index 785b4aacf860..00da287c603b 100644 --- a/libs/infra-express-server/project.json +++ b/libs/infra-express-server/project.json @@ -3,22 +3,18 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/infra-express-server/src", "projectType": "library", + "tags": ["lib:node", "scope:node"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/infra-express-server/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/infra-express-server/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/infra-express-server/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/infra-express-server"] } - }, - "tags": ["lib:node", "scope:node"] + } } diff --git a/libs/infra-metrics/project.json b/libs/infra-metrics/project.json index 1115e424419c..4dd1d17f8af6 100644 --- a/libs/infra-metrics/project.json +++ b/libs/infra-metrics/project.json @@ -3,22 +3,18 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/infra-metrics/src", "projectType": "library", + "tags": ["lib:node", "scope:node"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/infra-metrics/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/infra-metrics/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/infra-metrics/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/infra-metrics"] } - }, - "tags": ["lib:node", "scope:node"] + } } diff --git a/libs/infra-nest-server/project.json b/libs/infra-nest-server/project.json index 3dc76d197af2..d6cd9a7ce378 100644 --- a/libs/infra-nest-server/project.json +++ b/libs/infra-nest-server/project.json @@ -3,22 +3,18 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/infra-nest-server/src", "projectType": "library", + "tags": ["lib:nest", "scope:nest"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/infra-nest-server/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/infra-nest-server/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/infra-nest-server/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/infra-nest-server"] } - }, - "tags": ["lib:nest", "scope:nest"] + } } diff --git a/libs/infra-next-server/project.json b/libs/infra-next-server/project.json index b7fce47d7d2f..e7dd0f0fad8a 100644 --- a/libs/infra-next-server/project.json +++ b/libs/infra-next-server/project.json @@ -3,22 +3,18 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/infra-next-server/src", "projectType": "library", + "tags": ["lib:node", "scope:node"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/infra-next-server/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/infra-next-server/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/infra-next-server/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/infra-next-server"] } - }, - "tags": ["lib:node", "scope:node"] + } } diff --git a/libs/infra-tracing/project.json b/libs/infra-tracing/project.json index e0b149097e24..ea0b7fb854da 100644 --- a/libs/infra-tracing/project.json +++ b/libs/infra-tracing/project.json @@ -3,22 +3,18 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/infra-tracing/src", "projectType": "library", + "tags": ["scope:js", "lib:js"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/infra-tracing/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/infra-tracing/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/infra-tracing/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/infra-tracing"] } - }, - "tags": ["scope:js", "lib:js"] + } } diff --git a/libs/island-ui/contentful/project.json b/libs/island-ui/contentful/project.json index bc2c996fc5a9..6f5db94cbf9f 100644 --- a/libs/island-ui/contentful/project.json +++ b/libs/island-ui/contentful/project.json @@ -3,22 +3,18 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/island-ui/contentful/src", "projectType": "library", + "tags": ["lib:react", "scope:react"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/island-ui/contentful/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/island-ui/contentful/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/island-ui/contentful/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/island-ui/contentful"] } - }, - "tags": ["lib:react", "scope:react"] + } } diff --git a/libs/island-ui/contentful/src/lib/FaqList/FaqList.tsx b/libs/island-ui/contentful/src/lib/FaqList/FaqList.tsx index 0dae90ab208d..f49465932863 100644 --- a/libs/island-ui/contentful/src/lib/FaqList/FaqList.tsx +++ b/libs/island-ui/contentful/src/lib/FaqList/FaqList.tsx @@ -1,6 +1,6 @@ import { FC } from 'react' import slugify from '@sindresorhus/slugify' -import { Locale } from 'locale' +import { Locale } from '@island.is/shared/types' import { Stack, Text, diff --git a/libs/island-ui/contentful/src/lib/RichTextRC/RichText.tsx b/libs/island-ui/contentful/src/lib/RichTextRC/RichText.tsx index 46b81d2e5bf2..7ff16152957b 100644 --- a/libs/island-ui/contentful/src/lib/RichTextRC/RichText.tsx +++ b/libs/island-ui/contentful/src/lib/RichTextRC/RichText.tsx @@ -160,10 +160,11 @@ export const richText: RichText = ( marginBottom={[5, 5, 5, 6]} marginTop={[5, 5, 5, 6]} > - {/** - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict */} - {renderComponent[slice.__typename]?.(slice, locale)} + { + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore make web strict + renderComponent[slice.__typename]?.(slice) + } ) }) diff --git a/libs/island-ui/core/project.json b/libs/island-ui/core/project.json index 72bc3154ccf1..df92cf22201d 100644 --- a/libs/island-ui/core/project.json +++ b/libs/island-ui/core/project.json @@ -3,23 +3,19 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/island-ui/core/src", "projectType": "library", + "tags": ["lib:react", "scope:react"], + "implicitDependencies": ["island-ui-theme"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/island-ui/core/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/island-ui/core/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/island-ui/core/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/island-ui/core"] } - }, - "tags": ["lib:react", "scope:react"], - "implicitDependencies": ["island-ui-theme"] + } } diff --git a/libs/island-ui/core/src/lib/Hyphen/Hyphen.tsx b/libs/island-ui/core/src/lib/Hyphen/Hyphen.tsx index 44b80682f5be..9af8249a592e 100644 --- a/libs/island-ui/core/src/lib/Hyphen/Hyphen.tsx +++ b/libs/island-ui/core/src/lib/Hyphen/Hyphen.tsx @@ -1,7 +1,8 @@ import React, { useMemo } from 'react' -import Hypher from 'hypher' import { Locale } from '@island.is/shared/types' +import Hypher from 'hypher' + import is from './patterns/is' import en from './patterns/en' diff --git a/libs/island-ui/core/src/lib/PhoneInput/CountryCodeSelect/CountryCodeSelect.tsx b/libs/island-ui/core/src/lib/PhoneInput/CountryCodeSelect/CountryCodeSelect.tsx index 2a757afb9db7..f6c5f72a59cf 100644 --- a/libs/island-ui/core/src/lib/PhoneInput/CountryCodeSelect/CountryCodeSelect.tsx +++ b/libs/island-ui/core/src/lib/PhoneInput/CountryCodeSelect/CountryCodeSelect.tsx @@ -49,9 +49,6 @@ export const CountryCodeSelect = ({ })} data-testid={`country-code-select-${name}`} > - {/** - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict*/} , false, GroupBase>> instanceId={id} aria-labelledby={id} diff --git a/libs/island-ui/core/src/lib/PhoneInput/PhoneInput.tsx b/libs/island-ui/core/src/lib/PhoneInput/PhoneInput.tsx index 68a7b36e455e..d1d26cfa7df4 100644 --- a/libs/island-ui/core/src/lib/PhoneInput/PhoneInput.tsx +++ b/libs/island-ui/core/src/lib/PhoneInput/PhoneInput.tsx @@ -163,11 +163,11 @@ export const PhoneInput = forwardRef( : mapBlue(backgroundColor as InputBackgroundColor) /** - Used to handle autofill and paste events. - Value cannot start with '+' unless it is from autofill or paste, - because NumberFormat doesn't allow it. - So we know that if the value starts with '+', then we need to - extract the country code from it and set it as the selected country code. + Used to handle autofill and paste events. + Value cannot start with '+' unless it is from autofill or paste, + because NumberFormat doesn't allow it. + So we know that if the value starts with '+', then we need to + extract the country code from it and set it as the selected country code. */ const handleInputChange = (e: SyntheticEvent) => { if (e.currentTarget.value.startsWith('+')) { @@ -265,9 +265,6 @@ export const PhoneInput = forwardRef( )} - {/** - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict*/} - {/** - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict*/} , IsMulti, Group> instanceId={id} aria-labelledby={id} @@ -138,9 +135,6 @@ export const Select = < })} data-testid={`select-${name}`} > - {/** - // eslint-disable-next-line @typescript-eslint/ban-ts-comment - // @ts-ignore make web strict*/} , IsMulti, Group> instanceId={id} aria-labelledby={id} diff --git a/libs/island-ui/storybook/project.json b/libs/island-ui/storybook/project.json index a55e0556fbc0..90e6fcb4709c 100644 --- a/libs/island-ui/storybook/project.json +++ b/libs/island-ui/storybook/project.json @@ -3,13 +3,12 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/island-ui/storybook/src", "projectType": "library", + "tags": ["lib:react", "scope:react"], + "implicitDependencies": ["island-ui-core", "application-ui-fields"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/island-ui/storybook/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "serve": { "executor": "@nx/storybook:storybook", @@ -27,7 +26,7 @@ "executor": "@nx/storybook:build", "options": { "configDir": "libs/island-ui/storybook/config", - "outputDir": "dist/storybook/island-ui" + "outputDir": "dist/libs/island-ui/storybook" }, "configurations": { "ci": { @@ -41,8 +40,8 @@ }, "outputs": ["{options.outputDir}"] }, - "docker-static": {} - }, - "tags": ["lib:react", "scope:react"], - "implicitDependencies": ["island-ui-core", "application-ui-fields"] + "docker-static": { + "executor": "Intentionally left blank, only so this target is valid when using `nx show projects --with-target docker-static`" + } + } } diff --git a/libs/island-ui/theme/project.json b/libs/island-ui/theme/project.json index 0d48b73de34f..4744158708df 100644 --- a/libs/island-ui/theme/project.json +++ b/libs/island-ui/theme/project.json @@ -3,22 +3,18 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/island-ui/theme/src", "projectType": "library", + "tags": ["lib:react", "scope:react"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/island-ui/theme/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/island-ui/theme/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/island-ui/theme/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/island-ui/theme"] } - }, - "tags": ["lib:react", "scope:react"] + } } diff --git a/libs/island-ui/utils/project.json b/libs/island-ui/utils/project.json index ac04d6388ab4..f0920b5bced7 100644 --- a/libs/island-ui/utils/project.json +++ b/libs/island-ui/utils/project.json @@ -3,22 +3,18 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/island-ui/utils/src", "projectType": "library", + "tags": ["lib:react", "scope:react"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/island-ui/utils/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/island-ui/utils/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/island-ui/utils/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/island-ui/utils"] } - }, - "tags": ["lib:react", "scope:react"] + } } diff --git a/libs/island-ui/vanilla-extract-utils/project.json b/libs/island-ui/vanilla-extract-utils/project.json index 152b290110ca..d282838c347a 100644 --- a/libs/island-ui/vanilla-extract-utils/project.json +++ b/libs/island-ui/vanilla-extract-utils/project.json @@ -3,14 +3,10 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/island-ui/vanilla-extract-utils/src", "projectType": "library", + "tags": ["lib:react", "scope:react"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/island-ui/vanilla-extract-utils/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -18,10 +14,8 @@ "{workspaceRoot}/coverage/libs/island-ui/vanilla-extract-utils" ], "options": { - "jestConfig": "libs/island-ui/vanilla-extract-utils/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/island-ui/vanilla-extract-utils/jest.config.ts" } } - }, - "tags": ["lib:react", "scope:react"] + } } diff --git a/libs/judicial-system/audit-trail/project.json b/libs/judicial-system/audit-trail/project.json index e5879f12d405..618cb6171388 100644 --- a/libs/judicial-system/audit-trail/project.json +++ b/libs/judicial-system/audit-trail/project.json @@ -3,24 +3,18 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/judicial-system/audit-trail/src", "projectType": "library", + "tags": ["lib:judicial-system-api", "scope:judicial-system-api"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/judicial-system/audit-trail/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/judicial-system/audit-trail/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/judicial-system/audit-trail/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/judicial-system/audit-trail"] } - }, - "tags": ["lib:judicial-system-api", "scope:judicial-system-api"] + } } diff --git a/libs/judicial-system/auth/project.json b/libs/judicial-system/auth/project.json index b43e5c897c83..210fd29e0f8e 100644 --- a/libs/judicial-system/auth/project.json +++ b/libs/judicial-system/auth/project.json @@ -3,22 +3,18 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/judicial-system/auth/src", "projectType": "library", + "tags": ["lib:judicial-system-api", "scope:judicial-system-api"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/judicial-system/auth/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/judicial-system/auth/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/judicial-system/auth/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/judicial-system/auth"] } - }, - "tags": ["lib:judicial-system-api", "scope:judicial-system-api"] + } } diff --git a/libs/judicial-system/consts/project.json b/libs/judicial-system/consts/project.json index 24fcd64422e3..6e879dd828ba 100644 --- a/libs/judicial-system/consts/project.json +++ b/libs/judicial-system/consts/project.json @@ -3,22 +3,18 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/judicial-system/consts/src", "projectType": "library", + "tags": ["scope:judicial-system", "lib:judicial-system"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/judicial-system/consts/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/judicial-system/consts/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/judicial-system/consts/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/judicial-system/consts"] } - }, - "tags": ["scope:judicial-system", "lib:judicial-system"] + } } diff --git a/libs/judicial-system/court-client/project.json b/libs/judicial-system/court-client/project.json index fa5881952857..0bac5dc40cf1 100644 --- a/libs/judicial-system/court-client/project.json +++ b/libs/judicial-system/court-client/project.json @@ -3,21 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/judicial-system/court-client/src", "projectType": "library", + "tags": ["lib:judicial-system-api", "scope:judicial-system-api"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/judicial-system/court-client/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/judicial-system/court-client/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/judicial-system/court-client/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/judicial-system/court-client"] }, @@ -28,6 +23,5 @@ }, "outputs": ["{projectRoot}/gen/fetch"] } - }, - "tags": ["lib:judicial-system-api", "scope:judicial-system-api"] + } } diff --git a/libs/judicial-system/court-client/src/lib/courtClient.service.ts b/libs/judicial-system/court-client/src/lib/courtClient.service.ts index 23bbb8920683..cfa5a8d5a223 100644 --- a/libs/judicial-system/court-client/src/lib/courtClient.service.ts +++ b/libs/judicial-system/court-client/src/lib/courtClient.service.ts @@ -59,7 +59,7 @@ export type UpdateCaseWithDefendantArgs = Omit< 'authenticationToken' > -function injectAgentMiddleware(agent: Agent) { +const injectAgentMiddleware = (agent: Agent) => { return async (context: RequestContext): Promise => { const { url, init } = context @@ -67,7 +67,7 @@ function injectAgentMiddleware(agent: Agent) { } } -function stripResult(str: string): string { +const stripResult = (str: string): string => { if (str[0] !== '"') { return str } @@ -291,7 +291,7 @@ export class CourtClientServiceImplementation implements CourtClientService { private handleUnknownError( courtId: string, - reason: { status: string; message: string }, + reason: { status: string; message: unknown }, ) { // Get the connection state const connectionState = this.getConnectionState(courtId) @@ -308,10 +308,13 @@ export class CourtClientServiceImplementation implements CourtClientService { private handleCaseError( courtId: string, - reason: { status: string; message: string }, + reason: { status: string; message: unknown }, ): Error { // Check for known errors - if (reason.message?.startsWith('Case Not Found')) { + if ( + typeof reason.message === 'string' && + reason.message.startsWith('Case Not Found') + ) { return new NotFoundException(reason) } @@ -320,10 +323,13 @@ export class CourtClientServiceImplementation implements CourtClientService { private handleParticipantError( courtId: string, - reason: { status: string; message: string }, + reason: { status: string; message: unknown }, ): Error { // Check for known errors - if (reason.message?.startsWith("Incorrect 'CaseId/Number'")) { + if ( + typeof reason.message === 'string' && + reason.message.startsWith("Incorrect 'CaseId/Number'") + ) { return new NotFoundException({ ...reason, message: 'Case not found', @@ -362,7 +368,7 @@ export class CourtClientServiceImplementation implements CourtClientService { this.createDocumentApi.createDocument({ createDocumentData: { ...args, authenticationToken }, }), - ).catch((reason: { status: string; message: string }) => { + ).catch((reason: { status: string; message: unknown }) => { this.logger.warn('Court client error - createDocument', { courtId, reason, @@ -478,13 +484,16 @@ export class CourtClientServiceImplementation implements CourtClientService { this.updateCaseWithDefendantApi.updateCaseWithDefendant({ updateCaseWithDefendantData: { ...args, authenticationToken }, }), - ).catch((reason: { status: string; message: string }) => { + ).catch((reason: { status: string; message: unknown }) => { this.logger.warn('Court client error - updateCaseWithDefendant', { courtId, reason, }) - if (reason.message.startsWith("Can't find defendant with IdNumber")) { + if ( + typeof reason.message === 'string' && + reason.message.startsWith("Can't find defendant with IdNumber") + ) { throw new NotFoundException(reason) } diff --git a/libs/judicial-system/formatters/project.json b/libs/judicial-system/formatters/project.json index 2886e6754ae9..0610ea48fa80 100644 --- a/libs/judicial-system/formatters/project.json +++ b/libs/judicial-system/formatters/project.json @@ -3,24 +3,18 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/judicial-system/formatters/src", "projectType": "library", + "tags": ["scope:judicial-system", "lib:judicial-system"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/judicial-system/formatters/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/judicial-system/formatters/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/judicial-system/formatters/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/judicial-system/formatters"] } - }, - "tags": ["scope:judicial-system", "lib:judicial-system"] + } } diff --git a/libs/judicial-system/lawyers/project.json b/libs/judicial-system/lawyers/project.json index fc93d39dbe24..9bb1b7819574 100644 --- a/libs/judicial-system/lawyers/project.json +++ b/libs/judicial-system/lawyers/project.json @@ -3,24 +3,18 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/judicial-system/lawyers/src", "projectType": "library", + "tags": ["lib:judicial-system-api", "scope:judicial-system-api"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/judicial-system/lawyers/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/judicial-system/lawyers/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/judicial-system/lawyers/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/judicial-system/lawyers"] } - }, - "tags": ["lib:judicial-system-api", "scope:judicial-system-api"] + } } diff --git a/libs/judicial-system/message/project.json b/libs/judicial-system/message/project.json index 472a239c539d..0db78e92d34e 100644 --- a/libs/judicial-system/message/project.json +++ b/libs/judicial-system/message/project.json @@ -3,23 +3,17 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/judicial-system/message/src", "projectType": "library", + "tags": ["lib:judicial-system-api", "scope:judicial-system-api"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/judicial-system/message/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/judicial-system/message"], "options": { - "jestConfig": "libs/judicial-system/message/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/judicial-system/message/jest.config.ts" } } - }, - "tags": ["lib:judicial-system-api", "scope:judicial-system-api"] + } } diff --git a/libs/judicial-system/message/src/lib/message.ts b/libs/judicial-system/message/src/lib/message.ts index b11eaa68c14d..fb28d8b332dd 100644 --- a/libs/judicial-system/message/src/lib/message.ts +++ b/libs/judicial-system/message/src/lib/message.ts @@ -7,6 +7,7 @@ export enum MessageType { DELIVERY_TO_COURT_INDICTMENT_INFO = 'DELIVERY_TO_COURT_INDICTMENT_INFO', DELIVERY_TO_COURT_INDICTMENT_COURT_ROLES = 'DELIVERY_TO_COURT_INDICTMENT_COURT_ROLES', DELIVERY_TO_COURT_INDICTMENT_DEFENDER = 'DELIVERY_TO_COURT_INDICTMENT_DEFENDER', + DELIVERY_TO_COURT_INDICTMENT_CANCELLATION_NOTICE = 'DELIVERY_TO_COURT_INDICTMENT_CANCELLATION_NOTICE', DELIVERY_TO_COURT_CASE_FILE = 'DELIVERY_TO_COURT_CASE_FILE', DELIVERY_TO_COURT_CASE_FILES_RECORD = 'DELIVERY_TO_COURT_CASE_FILES_RECORD', DELIVERY_TO_COURT_REQUEST = 'DELIVERY_TO_COURT_REQUEST', @@ -35,6 +36,8 @@ export const messageEndpoint: { [key in MessageType]: string } = { 'deliverIndictmentCourtRolesToCourt', DELIVERY_TO_COURT_INDICTMENT_INFO: 'deliverIndictmentInfoToCourt', DELIVERY_TO_COURT_INDICTMENT_DEFENDER: 'deliverIndictmentDefenderToCourt', + DELIVERY_TO_COURT_INDICTMENT_CANCELLATION_NOTICE: + 'deliverIndictmentCancellationNoticeToCourt', DELIVERY_TO_COURT_CASE_FILE: 'deliverCaseFileToCourt', DELIVERY_TO_COURT_CASE_FILES_RECORD: 'deliverCaseFilesRecordToCourt', DELIVERY_TO_COURT_REQUEST: 'deliverRequestToCourt', diff --git a/libs/judicial-system/types/project.json b/libs/judicial-system/types/project.json index de84e83ac8b7..221d873b7fb6 100644 --- a/libs/judicial-system/types/project.json +++ b/libs/judicial-system/types/project.json @@ -3,21 +3,17 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/judicial-system/types/src", "projectType": "library", + "tags": ["scope:judicial-system", "lib:judicial-system"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/judicial-system/types/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/judicial-system/types/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/judicial-system/types/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/judicial-system/types"] } - }, - "tags": ["scope:judicial-system", "lib:judicial-system"] + } } diff --git a/libs/localization/project.json b/libs/localization/project.json index 39acba97e4fe..758acb639e1e 100644 --- a/libs/localization/project.json +++ b/libs/localization/project.json @@ -3,22 +3,18 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/localization/src", "projectType": "library", + "tags": ["lib:react", "scope:react", "TODO:RemoveOverrides"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/localization/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/localization/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/localization/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/localization"] } - }, - "tags": ["lib:react", "scope:react", "TODO:RemoveOverrides"] + } } diff --git a/libs/logging/project.json b/libs/logging/project.json index 422db5e555f7..d94379024d94 100644 --- a/libs/logging/project.json +++ b/libs/logging/project.json @@ -3,22 +3,18 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/logging/src", "projectType": "library", + "tags": ["lib:nest", "lib:node", "scope:nest", "TODO:splitUp"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/logging/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/logging/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/logging/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/logging"] } - }, - "tags": ["lib:nest", "lib:node", "scope:nest", "TODO:splitUp"] + } } diff --git a/libs/message-queue/project.json b/libs/message-queue/project.json index 1e4fab1f9eec..910f216a063c 100644 --- a/libs/message-queue/project.json +++ b/libs/message-queue/project.json @@ -3,23 +3,19 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/message-queue/src", "projectType": "library", + "tags": ["lib:nest", "scope:nest"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/message-queue/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { "jestConfig": "libs/message-queue/jest.config.ts", - "passWithNoTests": true, "runInBand": true }, "outputs": ["{workspaceRoot}/coverage/libs/message-queue"] } - }, - "tags": ["lib:nest", "scope:nest"] + } } diff --git a/libs/nest/audit/project.json b/libs/nest/audit/project.json index 7a26383e5f9b..d964d23b7327 100644 --- a/libs/nest/audit/project.json +++ b/libs/nest/audit/project.json @@ -3,21 +3,17 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/nest/audit/src", "projectType": "library", + "tags": ["lib:nest", "scope:nest"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/nest/audit/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/nest/audit"], "options": { - "jestConfig": "libs/nest/audit/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/nest/audit/jest.config.ts" } } - }, - "tags": ["lib:nest", "scope:nest"] + } } diff --git a/libs/nest/aws/project.json b/libs/nest/aws/project.json index 149575f009bc..236bde32481a 100644 --- a/libs/nest/aws/project.json +++ b/libs/nest/aws/project.json @@ -3,21 +3,17 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/nest/aws/src", "projectType": "library", + "tags": ["lib:nest", "scope:nest"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/nest/aws/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/nest/aws"], "options": { - "jestConfig": "libs/nest/aws/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/nest/aws/jest.config.ts" } } - }, - "tags": ["lib:nest", "scope:nest"] + } } diff --git a/libs/nest/config/project.json b/libs/nest/config/project.json index 0e54e769af09..2aed8402b633 100644 --- a/libs/nest/config/project.json +++ b/libs/nest/config/project.json @@ -3,21 +3,17 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/nest/config/src", "projectType": "library", + "tags": ["lib:nest", "scope:nest"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/nest/config/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/nest/config"], "options": { - "jestConfig": "libs/nest/config/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/nest/config/jest.config.ts" } } - }, - "tags": ["lib:nest", "scope:nest"] + } } diff --git a/libs/nest/core/project.json b/libs/nest/core/project.json index ebe67130b3a1..a3db6ee02d64 100644 --- a/libs/nest/core/project.json +++ b/libs/nest/core/project.json @@ -2,22 +2,17 @@ "name": "nest-core", "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/nest/core/src", + "tags": ["lib:nest", "scope:nest"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/nest/core/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/nest/core"], "options": { - "jestConfig": "libs/nest/core/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/nest/core/jest.config.ts" } } - }, - "tags": ["lib:nest", "scope:nest"] + } } diff --git a/libs/nest/dataloader/project.json b/libs/nest/dataloader/project.json index 72e92eb914d2..b626232c0313 100644 --- a/libs/nest/dataloader/project.json +++ b/libs/nest/dataloader/project.json @@ -2,22 +2,17 @@ "name": "nest-dataloader", "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/nest/dataloader/src", + "tags": ["lib:nest", "scope:nest"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/nest/dataloader/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/nest/dataloader"], "options": { - "jestConfig": "libs/nest/dataloader/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/nest/dataloader/jest.config.ts" } } - }, - "tags": ["lib:nest", "scope:nest"] + } } diff --git a/libs/nest/feature-flags/project.json b/libs/nest/feature-flags/project.json index a4dcb3e26fd3..fc78b8d4312f 100644 --- a/libs/nest/feature-flags/project.json +++ b/libs/nest/feature-flags/project.json @@ -3,21 +3,17 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/nest/feature-flags/src", "projectType": "library", + "tags": ["lib:nest", "scope:nest"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/nest/feature-flags/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/nest/feature-flags"], "options": { - "jestConfig": "libs/nest/feature-flags/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/nest/feature-flags/jest.config.ts" } } - }, - "tags": ["lib:nest", "scope:nest"] + } } diff --git a/libs/nest/graphql/project.json b/libs/nest/graphql/project.json index 1bb5d9d94025..9af203d611fe 100644 --- a/libs/nest/graphql/project.json +++ b/libs/nest/graphql/project.json @@ -3,21 +3,17 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/nest/graphql/src", "projectType": "library", + "tags": ["scope:nest", "lib:nest"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/nest/graphql/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/nest/graphql"], "options": { - "jestConfig": "libs/nest/graphql/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/nest/graphql/jest.config.ts" } } - }, - "tags": ["scope:nest", "lib:nest"] + } } diff --git a/libs/nest/pagination/project.json b/libs/nest/pagination/project.json index ab18defeee0e..bdc0a2af3ce1 100644 --- a/libs/nest/pagination/project.json +++ b/libs/nest/pagination/project.json @@ -3,21 +3,17 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/nest/pagination/src", "projectType": "library", + "tags": ["lib:nest", "scope:nest"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/nest/pagination/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/nest/pagination"], "options": { - "jestConfig": "libs/nest/pagination/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/nest/pagination/jest.config.ts" } } - }, - "tags": ["lib:nest", "scope:nest"] + } } diff --git a/libs/nest/problem/project.json b/libs/nest/problem/project.json index a5b26fe42e3b..667ebe4cdfef 100644 --- a/libs/nest/problem/project.json +++ b/libs/nest/problem/project.json @@ -3,21 +3,17 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/nest/problem/src", "projectType": "library", + "tags": ["lib:nest", "scope:nest"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/nest/problem/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/nest/problem"], "options": { - "jestConfig": "libs/nest/problem/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/nest/problem/jest.config.ts" } } - }, - "tags": ["lib:nest", "scope:nest"] + } } diff --git a/libs/nest/problem/src/lib/TemplateApiError.ts b/libs/nest/problem/src/lib/TemplateApiError.ts index 7c4059ce9184..a206d0571df9 100644 --- a/libs/nest/problem/src/lib/TemplateApiError.ts +++ b/libs/nest/problem/src/lib/TemplateApiError.ts @@ -1,5 +1,5 @@ import { ProblemType, ProviderErrorReason } from '@island.is/shared/problem' -import { StaticText } from 'static-text' +import { StaticText } from '@island.is/shared/types' import { ProblemError } from './ProblemError' export class TemplateApiError extends ProblemError { diff --git a/libs/nest/sequelize/project.json b/libs/nest/sequelize/project.json index f8befe420f0e..b4ebc20338bc 100644 --- a/libs/nest/sequelize/project.json +++ b/libs/nest/sequelize/project.json @@ -3,21 +3,17 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/nest/sequelize/src", "projectType": "library", + "tags": ["lib:nest", "scope:nest"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/nest/sequelize/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/nest/sequelize"], "options": { - "jestConfig": "libs/nest/sequelize/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/nest/sequelize/jest.config.ts" } } - }, - "tags": ["lib:nest", "scope:nest"] + } } diff --git a/libs/nest/swagger/project.json b/libs/nest/swagger/project.json index 72021411e4bb..7b858ab18388 100644 --- a/libs/nest/swagger/project.json +++ b/libs/nest/swagger/project.json @@ -3,21 +3,17 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/nest/swagger/src", "projectType": "library", + "tags": ["lib:nest", "scope:nest"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/nest/swagger/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/nest/swagger"], "options": { - "jestConfig": "libs/nest/swagger/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/nest/swagger/jest.config.ts" } } - }, - "tags": ["lib:nest", "scope:nest"] + } } diff --git a/libs/next-ids-auth/project.json b/libs/next-ids-auth/project.json index fbe12f23c4cd..d306f5f3a9ad 100644 --- a/libs/next-ids-auth/project.json +++ b/libs/next-ids-auth/project.json @@ -3,22 +3,18 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/next-ids-auth/src", "projectType": "library", + "tags": ["lib:react-next", "scope:react-next"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/next-ids-auth/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/next-ids-auth/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/next-ids-auth/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/next-ids-auth"] } - }, - "tags": ["lib:react-next", "scope:react-next"] + } } diff --git a/libs/nova-sms/project.json b/libs/nova-sms/project.json index ca596562041d..39fd6333e014 100644 --- a/libs/nova-sms/project.json +++ b/libs/nova-sms/project.json @@ -3,22 +3,18 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/nova-sms/src", "projectType": "library", + "tags": ["lib:nest", "scope:nest"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/nova-sms/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/nova-sms/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/nova-sms/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/nova-sms"] } - }, - "tags": ["lib:nest", "scope:nest"] + } } diff --git a/libs/plausible/project.json b/libs/plausible/project.json index fb2d149822e9..d2641102bf2a 100644 --- a/libs/plausible/project.json +++ b/libs/plausible/project.json @@ -3,22 +3,18 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/plausible/src", "projectType": "library", + "tags": ["lib:dom", "scope:dom"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/plausible/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/plausible/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/plausible/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/plausible"] } - }, - "tags": ["lib:dom", "scope:dom"] + } } diff --git a/libs/portals/admin/air-discount-scheme/project.json b/libs/portals/admin/air-discount-scheme/project.json index dcd36654188b..64de80cefc71 100644 --- a/libs/portals/admin/air-discount-scheme/project.json +++ b/libs/portals/admin/air-discount-scheme/project.json @@ -6,13 +6,7 @@ "tags": ["scope:portals-admin", "lib:portals-admin"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/portals/admin/air-discount-scheme/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -20,8 +14,7 @@ "{workspaceRoot}/coverage/libs/portals/admin/air-discount-scheme" ], "options": { - "jestConfig": "libs/portals/admin/air-discount-scheme/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/portals/admin/air-discount-scheme/jest.config.ts" } }, "codegen/frontend-client": { diff --git a/libs/portals/admin/application-system/project.json b/libs/portals/admin/application-system/project.json index d2026e0806c2..62d60744af5c 100644 --- a/libs/portals/admin/application-system/project.json +++ b/libs/portals/admin/application-system/project.json @@ -10,13 +10,7 @@ ], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/portals/admin/application-system//*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -24,8 +18,7 @@ "{workspaceRoot}/coverage/libs/portals/admin/application-system" ], "options": { - "jestConfig": "libs/portals/admin/application-system/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/portals/admin/application-system/jest.config.ts" } }, "codegen/frontend-client": { diff --git a/libs/portals/admin/application-system/src/screens/Statistics/Statistics.tsx b/libs/portals/admin/application-system/src/screens/Statistics/Statistics.tsx index 75d080044b4e..1fa525322984 100644 --- a/libs/portals/admin/application-system/src/screens/Statistics/Statistics.tsx +++ b/libs/portals/admin/application-system/src/screens/Statistics/Statistics.tsx @@ -12,7 +12,7 @@ import { StatisticsForm } from '../../components/StatisticsForm/StatisticsForm' import { useGetApplicationStatisticsQuery } from '../../queries/overview.generated' import { useState } from 'react' import StatisticsTable from '../../components/StatisticsTable/StatisticsTable' -import { startOfMonth } from 'date-fns' +import startOfMonth from 'date-fns/startOfMonth' const Statistics = () => { const { formatMessage } = useLocale() diff --git a/libs/portals/admin/core/project.json b/libs/portals/admin/core/project.json index caed6ed0db63..09eb9dea10a2 100644 --- a/libs/portals/admin/core/project.json +++ b/libs/portals/admin/core/project.json @@ -6,18 +6,13 @@ "tags": ["lib:portals-admin", "scope:portals-admin"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/portals/admin/core/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/portals/admin/core"], "options": { - "jestConfig": "libs/portals/admin/core/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/portals/admin/core/jest.config.ts" } }, "extract-strings": { diff --git a/libs/portals/admin/document-provider/project.json b/libs/portals/admin/document-provider/project.json index 6512b7b5e22f..087f449e39d2 100644 --- a/libs/portals/admin/document-provider/project.json +++ b/libs/portals/admin/document-provider/project.json @@ -3,21 +3,16 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/portals/admin/document-provider/src", "projectType": "library", + "tags": ["scope:portals-admin", "lib:portals-admin"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/portals/admin/document-provider/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/portals/admin/document-provider/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/portals/admin/document-provider/jest.config.ts" }, "outputs": [ "{workspaceRoot}/coverage/libs/portals/admin/document-provider" @@ -36,6 +31,5 @@ "command": "graphql-codegen --config libs/portals/admin/document-provider/codegen.yml" } } - }, - "tags": ["scope:portals-admin", "lib:portals-admin"] + } } diff --git a/libs/portals/admin/icelandic-names-registry/project.json b/libs/portals/admin/icelandic-names-registry/project.json index 5cf1c0d842a9..723ca54eb494 100644 --- a/libs/portals/admin/icelandic-names-registry/project.json +++ b/libs/portals/admin/icelandic-names-registry/project.json @@ -3,21 +3,16 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/portals/admin/icelandic-names-registry/src", "projectType": "library", + "tags": ["scope:portals-admin", "lib:portals-admin"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/portals/admin/icelandic-names-registry/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/portals/admin/icelandic-names-registry/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/portals/admin/icelandic-names-registry/jest.config.ts" }, "outputs": [ "{workspaceRoot}/coverage/libs/portals/admin/icelandic-names-registry" @@ -36,6 +31,5 @@ "command": "graphql-codegen --config libs/portals/admin/icelandic-names-registry/codegen.yml" } } - }, - "tags": ["scope:portals-admin", "lib:portals-admin"] + } } diff --git a/libs/portals/admin/ids-admin/project.json b/libs/portals/admin/ids-admin/project.json index 8c7e32ff0c2e..8c379b5a5f96 100644 --- a/libs/portals/admin/ids-admin/project.json +++ b/libs/portals/admin/ids-admin/project.json @@ -3,15 +3,10 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/portals/admin/ids-admin/src", "projectType": "library", + "tags": ["scope:portals-admin", "lib:portals-admin"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/portals/admin/ids-admin/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "codegen/frontend-client": { "executor": "nx:run-commands", @@ -24,10 +19,8 @@ "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/portals/admin/ids-admin"], "options": { - "jestConfig": "libs/portals/admin/ids-admin/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/portals/admin/ids-admin/jest.config.ts" } } - }, - "tags": ["scope:portals-admin", "lib:portals-admin"] + } } diff --git a/libs/portals/admin/petition/project.json b/libs/portals/admin/petition/project.json index 5ab45014f540..6c8919e64125 100644 --- a/libs/portals/admin/petition/project.json +++ b/libs/portals/admin/petition/project.json @@ -3,21 +3,17 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/portals/admin/petition/src", "projectType": "library", + "tags": ["scope:portals-admin", "lib:portals-admin"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/portals/admin/petition/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/portals/admin/petition"], "options": { - "jestConfig": "libs/portals/admin/petition/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/portals/admin/petition/jest.config.ts" } }, "codegen/frontend-client": { @@ -27,6 +23,5 @@ "command": "graphql-codegen --config libs/portals/admin/petition/codegen.yml" } } - }, - "tags": ["scope:portals-admin", "lib:portals-admin"] + } } diff --git a/libs/portals/admin/regulations-admin/project.json b/libs/portals/admin/regulations-admin/project.json index fdaa96d72142..d54e6587132a 100644 --- a/libs/portals/admin/regulations-admin/project.json +++ b/libs/portals/admin/regulations-admin/project.json @@ -6,13 +6,7 @@ "tags": ["lib:portals-admin", "scope:portals-admin"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/portals/admin/regulations-admin/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -20,8 +14,7 @@ "{workspaceRoot}/coverage/libs/portals/admin/regulations-admin" ], "options": { - "jestConfig": "libs/portals/admin/regulations-admin/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/portals/admin/regulations-admin/jest.config.ts" } }, "extract-strings": { diff --git a/libs/portals/admin/service-desk/project.json b/libs/portals/admin/service-desk/project.json index edbc058a7311..88018423351e 100644 --- a/libs/portals/admin/service-desk/project.json +++ b/libs/portals/admin/service-desk/project.json @@ -3,21 +3,16 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/portals/admin/service-desk/src", "projectType": "library", + "tags": ["scope:portals-admin", "lib:portals-admin"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/portals/admin/service-desk/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/portals/admin/service-desk"], "options": { - "jestConfig": "libs/portals/admin/service-desk/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/portals/admin/service-desk/jest.config.ts" } }, "codegen/frontend-client": { @@ -27,6 +22,5 @@ "command": "graphql-codegen --config libs/portals/admin/service-desk/codegen.yml" } } - }, - "tags": ["scope:portals-admin", "lib:portals-admin"] + } } diff --git a/libs/portals/admin/signature-collection/project.json b/libs/portals/admin/signature-collection/project.json index 272e9c9c42ad..60e048ead34f 100644 --- a/libs/portals/admin/signature-collection/project.json +++ b/libs/portals/admin/signature-collection/project.json @@ -3,16 +3,11 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/portals/admin/signature-collection/src", "projectType": "library", + "tags": ["scope:portals-admin", "lib:portals-admin"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/portals/admin/signature-collection/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -20,8 +15,7 @@ "{workspaceRoot}/coverage/libs/portals/admin/signature-collection" ], "options": { - "jestConfig": "libs/portals/admin/signature-collection/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/portals/admin/signature-collection/jest.config.ts" } }, "codegen/frontend-client": { @@ -36,6 +30,5 @@ "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract libs/portals/admin/signature-collection/src/lib/messages.ts" } } - }, - "tags": ["scope:portals-admin", "lib:portals-admin"] + } } diff --git a/libs/portals/core/project.json b/libs/portals/core/project.json index 803fe259af3c..1e65201dce4b 100644 --- a/libs/portals/core/project.json +++ b/libs/portals/core/project.json @@ -3,20 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/portals/core/src", "projectType": "library", + "tags": ["lib:portals", "scope:portals"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/portals/core/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/portals/core"], "options": { - "jestConfig": "libs/portals/core/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/portals/core/jest.config.ts" } }, "extract-strings": { @@ -25,6 +21,5 @@ "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/portals/core/src/{screens,components,lib}/**/*.{js,ts,tsx}'" } } - }, - "tags": ["lib:portals", "scope:portals"] + } } diff --git a/libs/portals/shared-modules/delegations/project.json b/libs/portals/shared-modules/delegations/project.json index f3c91f3646f3..abecccb91d11 100644 --- a/libs/portals/shared-modules/delegations/project.json +++ b/libs/portals/shared-modules/delegations/project.json @@ -3,15 +3,10 @@ "$schema": "../../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/portals/shared-modules/delegations/src", "projectType": "library", + "tags": ["lib:portals", "scope:portals"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/portals/shared-modules/delegations/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", @@ -19,8 +14,7 @@ "{workspaceRoot}/coverage/libs/portals/shared-modules/delegations" ], "options": { - "jestConfig": "libs/portals/shared-modules/delegations/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/portals/shared-modules/delegations/jest.config.ts" } }, "extract-strings": { @@ -36,6 +30,5 @@ "command": "graphql-codegen --config libs/portals/shared-modules/delegations/codegen.yml" } } - }, - "tags": ["lib:portals", "scope:portals"] + } } diff --git a/libs/react-spa/shared/project.json b/libs/react-spa/shared/project.json index 8ef7ca3f2c07..4d19cd90bb21 100644 --- a/libs/react-spa/shared/project.json +++ b/libs/react-spa/shared/project.json @@ -6,18 +6,13 @@ "tags": ["lib:react-spa", "scope:react-spa"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/react-spa/shared/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/react-spa/shared"], "options": { - "jestConfig": "libs/react-spa/shared/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/react-spa/shared/jest.config.ts" } }, "codegen/frontend-client": { diff --git a/libs/react-spa/shared/src/utils/notFoundError.ts b/libs/react-spa/shared/src/utils/notFoundError.ts index 6b6ed7b94999..b4fb142c6961 100644 --- a/libs/react-spa/shared/src/utils/notFoundError.ts +++ b/libs/react-spa/shared/src/utils/notFoundError.ts @@ -1,12 +1,13 @@ import { ProblemTypes } from '../components/problems/problem.types' export class NotFoundError extends Error { - code = ProblemTypes.notFound + code title: string | undefined description: string | undefined constructor(title?: string, description?: string) { super(title) + this.code = ProblemTypes.notFound this.title = title this.description = description } diff --git a/libs/react/components/project.json b/libs/react/components/project.json index fe61573326b3..87fc1d6f75ae 100644 --- a/libs/react/components/project.json +++ b/libs/react/components/project.json @@ -3,22 +3,17 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/react/components/src", "projectType": "library", + "tags": ["lib:react-spa", "scope:react-spa"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/react/components/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/react/components"], "options": { - "jestConfig": "libs/react/components/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/react/components/jest.config.ts" } } - }, - "tags": ["lib:react-spa", "scope:react-spa"] + } } diff --git a/libs/react/feature-flags/project.json b/libs/react/feature-flags/project.json index a33be97ce4b9..88915a540e2b 100644 --- a/libs/react/feature-flags/project.json +++ b/libs/react/feature-flags/project.json @@ -3,21 +3,17 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/react/feature-flags/src", "projectType": "library", + "tags": ["lib:react-spa", "scope:react-spa"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/react/feature-flags/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/react/feature-flags"], "options": { - "jestConfig": "libs/react/feature-flags/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/react/feature-flags/jest.config.ts" } } - }, - "tags": ["lib:react-spa", "scope:react-spa"] + } } diff --git a/libs/regulations/project.json b/libs/regulations/project.json index 3a7b8324c16f..b24966890c1e 100644 --- a/libs/regulations/project.json +++ b/libs/regulations/project.json @@ -3,21 +3,17 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/regulations/src", "projectType": "library", + "tags": ["lib:js", "scope:react", "TODO:splitUp"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/regulations/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/regulations"], "options": { - "jestConfig": "libs/regulations/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/regulations/jest.config.ts" } } - }, - "tags": ["lib:js", "scope:react", "TODO:splitUp"] + } } diff --git a/libs/residence-history/project.json b/libs/residence-history/project.json index 7dbb32bdcbb6..11ebfc2e9d16 100644 --- a/libs/residence-history/project.json +++ b/libs/residence-history/project.json @@ -3,21 +3,17 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/residence-history/src", "projectType": "library", + "tags": ["lib:js", "scope:js"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/residence-history/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/residence-history"], "options": { - "jestConfig": "libs/residence-history/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/residence-history/jest.config.ts" } } - }, - "tags": ["lib:js", "scope:js"] + } } diff --git a/libs/service-portal/air-discount/project.json b/libs/service-portal/air-discount/project.json index 3335fddae52e..69fbf39324fe 100644 --- a/libs/service-portal/air-discount/project.json +++ b/libs/service-portal/air-discount/project.json @@ -3,23 +3,17 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/service-portal/air-discount/src", "projectType": "library", + "tags": ["lib:portals-mypages", "scope:portals-mypages"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": [ - "libs/service-portal/air-discount/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/service-portal/air-discount"], "options": { - "jestConfig": "libs/service-portal/air-discount/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/service-portal/air-discount/jest.config.ts" } }, "extract-strings": { @@ -28,6 +22,5 @@ "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/service-portal/air-discount/src/{lib,components,screens}/**/*.{js,ts,tsx}'" } } - }, - "tags": ["lib:portals-mypages", "scope:portals-mypages"] + } } diff --git a/libs/service-portal/applications/project.json b/libs/service-portal/applications/project.json index 66b137f04f71..e52fc92ba202 100644 --- a/libs/service-portal/applications/project.json +++ b/libs/service-portal/applications/project.json @@ -3,21 +3,20 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/service-portal/applications/src", "projectType": "library", + "tags": [ + "lib:portals-mypages", + "scope:portals-mypages", + "TODO:RemoveOverrides" + ], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/service-portal/applications/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/service-portal/applications/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/service-portal/applications/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/service-portal/applications"] }, @@ -28,10 +27,5 @@ "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract libs/service-portal/applications/src/lib/messages.ts" } } - }, - "tags": [ - "lib:portals-mypages", - "scope:portals-mypages", - "TODO:RemoveOverrides" - ] + } } diff --git a/libs/service-portal/assets/project.json b/libs/service-portal/assets/project.json index 30ce3b7ff547..8c58a23035a8 100644 --- a/libs/service-portal/assets/project.json +++ b/libs/service-portal/assets/project.json @@ -3,19 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/service-portal/assets/src", "projectType": "library", + "tags": ["lib:portals-mypages", "scope:portals-mypages"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/service-portal/assets/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/service-portal/assets/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/service-portal/assets/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/service-portal/assets"] }, @@ -32,6 +29,5 @@ }, "outputs": ["{projectRoot}/src/**/*.generated.ts"] } - }, - "tags": ["lib:portals-mypages", "scope:portals-mypages"] + } } diff --git a/libs/service-portal/assets/src/screens/Lookup/Lookup.tsx b/libs/service-portal/assets/src/screens/Lookup/Lookup.tsx index 5e9378196877..c9c0f7ed971b 100644 --- a/libs/service-portal/assets/src/screens/Lookup/Lookup.tsx +++ b/libs/service-portal/assets/src/screens/Lookup/Lookup.tsx @@ -85,7 +85,7 @@ const Lookup = () => { const noInfo = vehicleSearch?.data?.vehiclesSearch === null || - typeof vehicleSearch?.data?.vehiclesSearch === undefined + typeof vehicleSearch?.data?.vehiclesSearch === 'undefined' const noSearchData = searchLimitData?.data?.vehiclesSearchLimit === undefined || diff --git a/libs/service-portal/consent/project.json b/libs/service-portal/consent/project.json index 46cf24f13e82..84637d11d997 100644 --- a/libs/service-portal/consent/project.json +++ b/libs/service-portal/consent/project.json @@ -6,11 +6,7 @@ "tags": ["lib:portals-mypages", "scope:portals-mypages"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/service-portal/consent/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "extract-strings": { "executor": "nx:run-commands", @@ -29,8 +25,7 @@ "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/service-portal/consent"], "options": { - "jestConfig": "libs/service-portal/consent/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/service-portal/consent/jest.config.ts" } } } diff --git a/libs/service-portal/constants/project.json b/libs/service-portal/constants/project.json index 7f2ce82ea6a8..79a80a5ff2fe 100644 --- a/libs/service-portal/constants/project.json +++ b/libs/service-portal/constants/project.json @@ -3,24 +3,18 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/service-portal/constants/src", "projectType": "library", + "tags": ["lib:portals-mypages", "scope:portals-mypages"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/service-portal/constants/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/service-portal/constants/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/service-portal/constants/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/service-portal/constants"] } - }, - "tags": ["lib:portals-mypages", "scope:portals-mypages"] + } } diff --git a/libs/service-portal/core/project.json b/libs/service-portal/core/project.json index 67d76444da43..2131f9cba8b8 100644 --- a/libs/service-portal/core/project.json +++ b/libs/service-portal/core/project.json @@ -3,19 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/service-portal/core/src", "projectType": "library", + "tags": ["lib:portals-mypages", "scope:portals-mypages"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/service-portal/core/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/service-portal/core/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/service-portal/core/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/service-portal/core"] }, @@ -25,6 +22,5 @@ "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/service-portal/core/src/{lib,components,helpers,screens}/**/*.{js,ts,tsx}'" } } - }, - "tags": ["lib:portals-mypages", "scope:portals-mypages"] + } } diff --git a/libs/service-portal/core/src/components/Gallery/GalleryModal.tsx b/libs/service-portal/core/src/components/Gallery/GalleryModal.tsx index f1d6e164b642..057b94e7b640 100644 --- a/libs/service-portal/core/src/components/Gallery/GalleryModal.tsx +++ b/libs/service-portal/core/src/components/Gallery/GalleryModal.tsx @@ -157,7 +157,7 @@ export const GalleryModal: FC = ({ return ( (imageRefs.current[i] = el)} + ref={(el) => (imageRefs.current[i] = el) as any} component="button" color="blueberry" aria-selected={activeItem === i} diff --git a/libs/service-portal/core/src/lib/messages.ts b/libs/service-portal/core/src/lib/messages.ts index fc0b4c1fe818..c581e9d10946 100644 --- a/libs/service-portal/core/src/lib/messages.ts +++ b/libs/service-portal/core/src/lib/messages.ts @@ -508,6 +508,10 @@ export const m = defineMessages({ id: 'service.portal:notifications', defaultMessage: 'Tilkynningar', }, + notificationsUnread: { + id: 'service.portal:notifications-unread-a11y', + defaultMessage: 'Þú átt ólesnar tilkynningar', + }, notificationsViewAll: { id: 'service.portal:notifications-view-all', defaultMessage: 'Sjá allar tilkynningar', diff --git a/libs/service-portal/documents/project.json b/libs/service-portal/documents/project.json index d7e2237bcac8..f811b4e8168c 100644 --- a/libs/service-portal/documents/project.json +++ b/libs/service-portal/documents/project.json @@ -3,21 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/service-portal/documents/src", "projectType": "library", + "tags": ["lib:portals-mypages", "scope:portals-mypages"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/service-portal/documents/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/service-portal/documents/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/service-portal/documents/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/service-portal/documents"] }, @@ -34,6 +29,5 @@ }, "outputs": ["{projectRoot}/src/**/*.generated.ts"] } - }, - "tags": ["lib:portals-mypages", "scope:portals-mypages"] + } } diff --git a/libs/service-portal/documents/src/components/DocumentLine/DocumentLine.tsx b/libs/service-portal/documents/src/components/DocumentLine/DocumentLine.tsx index ed0a2a140f7d..a7b4dc4f74c0 100644 --- a/libs/service-portal/documents/src/components/DocumentLine/DocumentLine.tsx +++ b/libs/service-portal/documents/src/components/DocumentLine/DocumentLine.tsx @@ -9,7 +9,7 @@ import { } from '@island.is/api/schema' import { Box, Text, LoadingDots, Icon } from '@island.is/island-ui/core' import { dateFormat } from '@island.is/shared/constants' -import { ServicePortalPaths, m } from '@island.is/service-portal/core' +import { m } from '@island.is/service-portal/core' import * as styles from './DocumentLine.css' import { gql, useLazyQuery } from '@apollo/client' import { useLocale } from '@island.is/localization' diff --git a/libs/service-portal/documents/src/components/DocumentLine/DocumentLineV2.tsx b/libs/service-portal/documents/src/components/DocumentLine/DocumentLineV2.tsx index 594254264bdc..c7ecaeac78df 100644 --- a/libs/service-portal/documents/src/components/DocumentLine/DocumentLineV2.tsx +++ b/libs/service-portal/documents/src/components/DocumentLine/DocumentLineV2.tsx @@ -64,8 +64,13 @@ export const DocumentLine: FC = ({ const { activeArchive, fetchObject, refetch } = useDocumentList() - const { setActiveDocument, setDocumentDisplayError, setDocLoading } = - useDocumentContext() + const { + setActiveDocument, + setDocumentDisplayError, + setDocLoading, + setLocalRead, + localRead, + } = useDocumentContext() const wrapperRef = useRef(null) const avatarRef = useRef(null) @@ -124,6 +129,7 @@ export const DocumentLine: FC = ({ if (docContent) { displayPdf(docContent) setDocumentDisplayError(undefined) + setLocalRead([...localRead, documentLine.id]) } else { setDocumentDisplayError(formatMessage(messages.documentErrorLoad)) } @@ -162,7 +168,7 @@ export const DocumentLine: FC = ({ getDocument() } - const unread = !documentLine.opened + const unread = !documentLine.opened && !localRead.includes(documentLine.id) const isBookmarked = bookmarked || bookmarkSuccess const isArchived = activeArchive || archiveSuccess diff --git a/libs/service-portal/documents/src/components/NoPDF/NoPDF.tsx b/libs/service-portal/documents/src/components/NoPDF/NoPDF.tsx index 602ccecb714a..f927cc923ec3 100644 --- a/libs/service-portal/documents/src/components/NoPDF/NoPDF.tsx +++ b/libs/service-portal/documents/src/components/NoPDF/NoPDF.tsx @@ -5,6 +5,7 @@ import { Text, Box } from '@island.is/island-ui/core' import { EmptyImageSmall } from './EmptyImage' import { messages } from '../../utils/messages' import { Problem } from '@island.is/react-spa/shared' +import { helperStyles } from '@island.is/island-ui/theme' import * as styles from '../OverviewDisplay/OverviewDisplay.css' type DocumentRendererProps = { @@ -28,11 +29,16 @@ export const NoPDF: FC = ({ text, error }) => { className={styles.docWrap} > {error ? ( - + <> + +

+ {formatMessage(m.errorTitle)}. {formatMessage(m.errorFetch)} +

+ ) : ( { const { formatMessage } = useLocale() @@ -55,6 +56,7 @@ export const useMailAction = () => { } if (actionName === 'archive') { setArchiveSuccess(true) + toast.success(formatMessage(docMessages.successArchive)) setDataSuccess({ ...dataSuccess, archive: true, @@ -62,6 +64,7 @@ export const useMailAction = () => { } if (actionName === 'unarchive') { setArchiveSuccess(false) + toast.success(formatMessage(docMessages.successUnarchive)) setDataSuccess({ ...dataSuccess, unarchive: true, @@ -88,6 +91,7 @@ export const useMailAction = () => { if (refetch) { refetch(fetchObject) } + toast.success(formatMessage(docMessages.successArchiveMulti)) } else { toast.error(formatMessage(m.errorTitle)) } diff --git a/libs/service-portal/documents/src/screens/Overview/DocumentContext.tsx b/libs/service-portal/documents/src/screens/Overview/DocumentContext.tsx index cb7aec1dcbc4..986c183578ab 100644 --- a/libs/service-portal/documents/src/screens/Overview/DocumentContext.tsx +++ b/libs/service-portal/documents/src/screens/Overview/DocumentContext.tsx @@ -1,9 +1,4 @@ -import { - DocumentProviderCategory, - DocumentProviderType, - DocumentsV2Category, - DocumentsV2Sender, -} from '@island.is/api/schema' +import { DocumentsV2Category, DocumentsV2Sender } from '@island.is/api/schema' import { createContext, Dispatch, @@ -29,6 +24,7 @@ export type DocumentsStateProps = { categoriesAvailable: DocumentsV2Category[] docLoading: boolean documentDisplayError?: string + localRead: string[] setSelectedLines: Dispatch> setActiveDocument: Dispatch> @@ -39,6 +35,7 @@ export type DocumentsStateProps = { setCategoriesAvailable: Dispatch> setDocLoading: Dispatch> setDocumentDisplayError: Dispatch> + setLocalRead: Dispatch> } export const DocumentsContext = createContext({ @@ -51,6 +48,7 @@ export const DocumentsContext = createContext({ sendersAvailable: [], docLoading: false, documentDisplayError: undefined, + localRead: [], setSelectedLines: () => undefined, setActiveDocument: () => undefined, @@ -61,6 +59,7 @@ export const DocumentsContext = createContext({ setCategoriesAvailable: () => undefined, setDocLoading: () => undefined, setDocumentDisplayError: () => undefined, + setLocalRead: () => undefined, }) export const DocumentsProvider: FC> = ({ @@ -82,6 +81,7 @@ export const DocumentsProvider: FC> = ({ const [totalPages, setTotalPages] = useState(0) const [docLoading, setDocLoading] = useState(false) const [documentDisplayError, setDocumentDisplayError] = useState() + const [localRead, setLocalRead] = useState([]) return ( > = ({ sendersAvailable, docLoading, documentDisplayError, + localRead, setSelectedLines, setActiveDocument, @@ -105,6 +106,7 @@ export const DocumentsProvider: FC> = ({ setSendersAvailable, setDocLoading, setDocumentDisplayError, + setLocalRead, }} > {children} diff --git a/libs/service-portal/documents/src/screens/Overview/Overview.tsx b/libs/service-portal/documents/src/screens/Overview/Overview.tsx index ccdeef75e7b3..ffe87e0176a7 100644 --- a/libs/service-portal/documents/src/screens/Overview/Overview.tsx +++ b/libs/service-portal/documents/src/screens/Overview/Overview.tsx @@ -415,6 +415,14 @@ export const ServicePortalDocuments = () => { }, }, }) + .then(() => { + toast.success( + formatMessage(messages.successArchiveMulti), + ) + }) + .catch((e) => { + toast.error(formatMessage(m.errorTitle)) + }) } onFav={() => bulkMailAction({ diff --git a/libs/service-portal/documents/src/utils/messages.ts b/libs/service-portal/documents/src/utils/messages.ts index 3217c416b153..9e76b51e8690 100644 --- a/libs/service-portal/documents/src/utils/messages.ts +++ b/libs/service-portal/documents/src/utils/messages.ts @@ -92,4 +92,16 @@ export const messages = defineMessages({ id: 'sp.documents:mark-as-bulk-selection', defaultMessage: 'Merkja skjal fyrir fjöldaframkvæmd', }, + successArchiveMulti: { + id: 'sp.documents:success-archive-messages', + defaultMessage: 'Skjöl sett í geymslu', + }, + successArchive: { + id: 'sp.documents:success-archive-message', + defaultMessage: 'Skjal sett í geymslu', + }, + successUnarchive: { + id: 'sp.documents:success-unarchive-message', + defaultMessage: 'Skjal tekið úr geymslu', + }, }) diff --git a/libs/service-portal/documents/src/utils/useSubmitMailAction.ts b/libs/service-portal/documents/src/utils/useSubmitMailAction.ts index 51aa59c17340..f86a94e0c7ae 100644 --- a/libs/service-portal/documents/src/utils/useSubmitMailAction.ts +++ b/libs/service-portal/documents/src/utils/useSubmitMailAction.ts @@ -4,6 +4,7 @@ import { useState } from 'react' import { toast } from '@island.is/island-ui/core' import { useLocale } from '@island.is/localization' import { m } from '@island.is/service-portal/core' +import { messages } from './messages' const POST_MAIL_ACTION = gql` mutation PostMailActionMutation($input: PostMailActionResolverInput!) { @@ -61,6 +62,7 @@ export const useSubmitMailAction = (input?: { messageId: string }) => { } if (actionName === 'archive') { setArchiveSuccess(true) + toast.success(formatMessage(messages.successArchive)) setDataSuccess({ ...dataSuccess, archive: true, @@ -68,6 +70,7 @@ export const useSubmitMailAction = (input?: { messageId: string }) => { } if (actionName === 'unarchive') { setArchiveSuccess(false) + toast.success(formatMessage(messages.successUnarchive)) setDataSuccess({ ...dataSuccess, unarchive: true, diff --git a/libs/service-portal/education-career/project.json b/libs/service-portal/education-career/project.json index ee0b1b67fe08..663312e1ced8 100644 --- a/libs/service-portal/education-career/project.json +++ b/libs/service-portal/education-career/project.json @@ -3,26 +3,20 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/service-portal/education-career/src", "projectType": "library", + "tags": ["lib:portals-mypages", "scope:portals-mypages"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/service-portal/education-career/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/service-portal/education-career/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/service-portal/education-career/jest.config.ts" }, "outputs": [ "{workspaceRoot}/coverage/libs/service-portal/education-career" ] } - }, - "tags": ["lib:portals-mypages", "scope:portals-mypages"] + } } diff --git a/libs/service-portal/education-degree/project.json b/libs/service-portal/education-degree/project.json index 844528402dcd..15ddfb4a047e 100644 --- a/libs/service-portal/education-degree/project.json +++ b/libs/service-portal/education-degree/project.json @@ -3,26 +3,20 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/service-portal/education-degree/src", "projectType": "library", + "tags": ["lib:portals-mypages", "scope:portals-mypages"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/service-portal/education-degree/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/service-portal/education-degree/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/service-portal/education-degree/jest.config.ts" }, "outputs": [ "{workspaceRoot}/coverage/libs/service-portal/education-degree" ] } - }, - "tags": ["lib:portals-mypages", "scope:portals-mypages"] + } } diff --git a/libs/service-portal/education-license/project.json b/libs/service-portal/education-license/project.json index aad39ab25d81..87a736e9f056 100644 --- a/libs/service-portal/education-license/project.json +++ b/libs/service-portal/education-license/project.json @@ -3,26 +3,20 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/service-portal/education-license/src", "projectType": "library", + "tags": ["lib:portals-mypages", "scope:portals-mypages"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/service-portal/education-license/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/service-portal/education-license/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/service-portal/education-license/jest.config.ts" }, "outputs": [ "{workspaceRoot}/coverage/libs/service-portal/education-license" ] } - }, - "tags": ["lib:portals-mypages", "scope:portals-mypages"] + } } diff --git a/libs/service-portal/education-student-assessment/project.json b/libs/service-portal/education-student-assessment/project.json index 17262566c8a5..3e36e26e836d 100644 --- a/libs/service-portal/education-student-assessment/project.json +++ b/libs/service-portal/education-student-assessment/project.json @@ -3,26 +3,20 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/service-portal/education-student-assessment/src", "projectType": "library", + "tags": ["lib:portals-mypages", "scope:portals-mypages"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/service-portal/education-student-assessment/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/service-portal/education-student-assessment/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/service-portal/education-student-assessment/jest.config.ts" }, "outputs": [ "{workspaceRoot}/coverage/libs/service-portal/education-student-assessment" ] } - }, - "tags": ["lib:portals-mypages", "scope:portals-mypages"] + } } diff --git a/libs/service-portal/education/project.json b/libs/service-portal/education/project.json index f80f16d19a4b..1859b1b41cb1 100644 --- a/libs/service-portal/education/project.json +++ b/libs/service-portal/education/project.json @@ -3,21 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/service-portal/education/src", "projectType": "library", + "tags": ["lib:portals-mypages", "scope:portals-mypages"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/service-portal/education/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/service-portal/education/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/service-portal/education/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/service-portal/education"] }, @@ -58,6 +53,5 @@ "command": "graphql-codegen --config libs/service-portal/education/codegen.yml" } } - }, - "tags": ["lib:portals-mypages", "scope:portals-mypages"] + } } diff --git a/libs/service-portal/education/src/screens/EducationGraduation/EducationGraduation.graphql b/libs/service-portal/education/src/screens/EducationGraduation/EducationGraduation.graphql index bc575fc2e2cf..c1df1f09b1da 100644 --- a/libs/service-portal/education/src/screens/EducationGraduation/EducationGraduation.graphql +++ b/libs/service-portal/education/src/screens/EducationGraduation/EducationGraduation.graphql @@ -1,27 +1,27 @@ query studentInfo($input: UniversityCareersStudentInfoInput!) { universityCareersStudentTrackHistory(input: $input) { __typename - trackResults { - ... on UniversityCareersStudentTrackTranscript { - name - nationalId - graduationDate - trackNumber - institution { - id - displayName - logoUrl - } - school - faculty - studyProgram - degree + transcripts { + name + nationalId + graduationDate + trackNumber + institution { + id + displayName + logoUrl } - ... on UniversityCareersStudentTrackTranscriptError { - __typename - university - error + school + faculty + studyProgram + degree + } + errors { + institution { + id + displayName } + error } } } diff --git a/libs/service-portal/education/src/screens/EducationGraduation/EducationGraduation.tsx b/libs/service-portal/education/src/screens/EducationGraduation/EducationGraduation.tsx index 3711096c79b1..b840febd2543 100644 --- a/libs/service-portal/education/src/screens/EducationGraduation/EducationGraduation.tsx +++ b/libs/service-portal/education/src/screens/EducationGraduation/EducationGraduation.tsx @@ -1,5 +1,4 @@ import { defineMessage } from 'react-intl' - import { AlertMessage, Box, Stack } from '@island.is/island-ui/core' import { useLocale, useNamespaces } from '@island.is/localization' import { @@ -12,11 +11,6 @@ import { isDefined } from '@island.is/shared/utils' import { EducationPaths } from '../../lib/paths' import { Problem } from '@island.is/react-spa/shared' import { useStudentInfoQuery } from './EducationGraduation.generated' -import { - UniversityCareersStudentTrackTranscript, - UniversityCareersStudentTrackTranscriptError, -} from '@island.is/api/schema' -import { useOrganizations } from '@island.is/service-portal/graphql' import { useMemo } from 'react' import { mapUniversityToSlug } from '../../utils/mapUniversitySlug' @@ -32,34 +26,17 @@ export const EducationGraduation = () => { }, }) - const { data: organizations } = useOrganizations() - - const tracks: Array = - data?.universityCareersStudentTrackHistory?.trackResults - .filter((u) => u.__typename === 'UniversityCareersStudentTrackTranscript') - .filter(isDefined) - .map((u) => u as UniversityCareersStudentTrackTranscript) ?? [] - - const errors: Array = - useMemo(() => { - return ( - data?.universityCareersStudentTrackHistory?.trackResults - .filter( - (u) => - u.__typename === 'UniversityCareersStudentTrackTranscriptError', - ) - .filter(isDefined) - .map((u) => u as UniversityCareersStudentTrackTranscriptError) ?? [] - ) - }, [data?.universityCareersStudentTrackHistory.trackResults]) + const errors = data?.universityCareersStudentTrackHistory?.errors + const transcripts = data?.universityCareersStudentTrackHistory?.transcripts const errorString = useMemo(() => { - return errors - .map((e) => mapUniversityToSlug(e.university)) - .map((e) => (organizations ?? []).find((o) => o.slug === e)?.title) - .filter(isDefined) - .join(', ') - }, [errors, organizations]) + if (errors) { + return errors + .map((e) => e.institution.displayName) + .filter(isDefined) + .join(', ') + } + }, [errors]) return ( @@ -72,7 +49,7 @@ export const EducationGraduation = () => { description: 'education graduation intro', })} /> - {!!errors.length && !error && !loading && ( + {!!errors?.length && !error && !loading && ( { )} {error && !loading && } {loading && !error && } - {!loading && !error && !tracks?.length && !errors?.length && ( + {!loading && !error && !transcripts?.length && !errors?.length && ( { )} - {!!tracks?.length && - tracks?.map((item, index) => { + {!!transcripts?.length && + transcripts?.map((item, index) => { if (!item.institution.id) { return null } diff --git a/libs/service-portal/finance/project.json b/libs/service-portal/finance/project.json index 2dee7b252731..adeb6586ce64 100644 --- a/libs/service-portal/finance/project.json +++ b/libs/service-portal/finance/project.json @@ -3,19 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/service-portal/finance/src", "projectType": "library", + "tags": ["lib:portals-mypages", "scope:portals-mypages"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/service-portal/finance/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/service-portal/finance/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/service-portal/finance/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/service-portal/finance"] }, @@ -32,6 +29,5 @@ "command": "graphql-codegen --config libs/service-portal/finance/codegen.yml" } } - }, - "tags": ["lib:portals-mypages", "scope:portals-mypages"] + } } diff --git a/libs/service-portal/graphql/project.json b/libs/service-portal/graphql/project.json index 2b6c24e4e11a..6155790d49b5 100644 --- a/libs/service-portal/graphql/project.json +++ b/libs/service-portal/graphql/project.json @@ -3,19 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/service-portal/graphql/src", "projectType": "library", + "tags": ["lib:portals-mypages", "scope:portals-mypages"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/service-portal/graphql/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/service-portal/graphql/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/service-portal/graphql/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/service-portal/graphql"] }, @@ -26,6 +23,5 @@ "command": "graphql-codegen --config libs/service-portal/graphql/codegen.yml" } } - }, - "tags": ["lib:portals-mypages", "scope:portals-mypages"] + } } diff --git a/libs/service-portal/health/project.json b/libs/service-portal/health/project.json index 916471b8f27f..586aa676ce97 100644 --- a/libs/service-portal/health/project.json +++ b/libs/service-portal/health/project.json @@ -3,19 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/service-portal/health/src", "projectType": "library", + "tags": ["lib:portals-mypages", "scope:portals-mypages"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/service-portal/health/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/service-portal/health/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/service-portal/health/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/service-portal/health"] }, @@ -32,6 +29,5 @@ "command": "graphql-codegen --config libs/service-portal/health/codegen.yml" } } - }, - "tags": ["lib:portals-mypages", "scope:portals-mypages"] + } } diff --git a/libs/service-portal/information/project.json b/libs/service-portal/information/project.json index c7d097c4d436..d6a2795ddfa1 100644 --- a/libs/service-portal/information/project.json +++ b/libs/service-portal/information/project.json @@ -3,21 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/service-portal/information/src", "projectType": "library", + "tags": ["lib:portals-mypages", "scope:portals-mypages"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/service-portal/information/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/service-portal/information"], "options": { - "jestConfig": "libs/service-portal/information/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/service-portal/information/jest.config.ts" } }, "extract-strings": { @@ -33,6 +28,5 @@ "command": "graphql-codegen --config libs/service-portal/information/codegen.yml" } } - }, - "tags": ["lib:portals-mypages", "scope:portals-mypages"] + } } diff --git a/libs/service-portal/licenses/project.json b/libs/service-portal/licenses/project.json index 66d7167cfe4f..f73a6c127560 100644 --- a/libs/service-portal/licenses/project.json +++ b/libs/service-portal/licenses/project.json @@ -3,21 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/service-portal/licenses/src", "projectType": "library", + "tags": ["lib:portals-mypages", "scope:portals-mypages"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/service-portal/licenses/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/service-portal/licenses"], "options": { - "jestConfig": "libs/service-portal/licenses/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/service-portal/licenses/jest.config.ts" } }, "extract-strings": { @@ -26,6 +21,5 @@ "command": "yarn ts-node -P libs/localization/tsconfig.lib.json libs/localization/scripts/extract 'libs/service-portal/licenses/src/{lib,components,screens}/**/*.{js,ts,tsx}'" } } - }, - "tags": ["lib:portals-mypages", "scope:portals-mypages"] + } } diff --git a/libs/service-portal/occupational-licenses/project.json b/libs/service-portal/occupational-licenses/project.json index c96f51b78a8e..09a85e529ee0 100644 --- a/libs/service-portal/occupational-licenses/project.json +++ b/libs/service-portal/occupational-licenses/project.json @@ -3,21 +3,16 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/service-portal/occupational-licenses/src", "projectType": "library", + "tags": ["lib:portals-mypages", "scope:portals-mypages"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": [ - "libs/service-portal/occupational-licenses/**/*.{ts,tsx,js,jsx}" - ] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/libs/service-portal/occupational-licenses"], "options": { - "jestConfig": "libs/service-portal/occupational-licenses/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/service-portal/occupational-licenses/jest.config.ts" } }, "extract-strings": { @@ -33,6 +28,5 @@ "command": "graphql-codegen --config libs/service-portal/occupational-licenses/codegen.yml" } } - }, - "tags": ["lib:portals-mypages", "scope:portals-mypages"] + } } diff --git a/libs/service-portal/occupational-licenses/src/lib/messages.ts b/libs/service-portal/occupational-licenses/src/lib/messages.ts index be3dad30e6e9..c52d804140a4 100644 --- a/libs/service-portal/occupational-licenses/src/lib/messages.ts +++ b/libs/service-portal/occupational-licenses/src/lib/messages.ts @@ -87,6 +87,10 @@ export const olMessage = defineMessages({ id: 'sp.occupational-licenses:name-of-individual', defaultMessage: 'Nafn einstaklings', }, + licenseNumber: { + id: 'sp.occupational-licenses:license-number', + defaultMessage: 'Skírteinisnúmer', + }, dateOfBirth: { id: 'sp.occupational-licenses:date-of-birth', defaultMessage: 'Fæðingardagur', diff --git a/libs/service-portal/occupational-licenses/src/screens/v2/OccupationalLicensesDetail/OccupationalLicensesDetail.graphql b/libs/service-portal/occupational-licenses/src/screens/v2/OccupationalLicensesDetail/OccupationalLicensesDetail.graphql index 06ddfcdd566b..908abaa77867 100644 --- a/libs/service-portal/occupational-licenses/src/screens/v2/OccupationalLicensesDetail/OccupationalLicensesDetail.graphql +++ b/libs/service-portal/occupational-licenses/src/screens/v2/OccupationalLicensesDetail/OccupationalLicensesDetail.graphql @@ -5,6 +5,7 @@ query getOccupationalLicenseById($input: OccupationalLicensesV2LicenseInput!) { __typename type licenseId + licenseNumber profession licenseHolderName dateOfBirth diff --git a/libs/service-portal/occupational-licenses/src/screens/v2/OccupationalLicensesDetail/OccupationalLicensesDetail.tsx b/libs/service-portal/occupational-licenses/src/screens/v2/OccupationalLicensesDetail/OccupationalLicensesDetail.tsx index 6d903a886271..3ddd41937da8 100644 --- a/libs/service-portal/occupational-licenses/src/screens/v2/OccupationalLicensesDetail/OccupationalLicensesDetail.tsx +++ b/libs/service-portal/occupational-licenses/src/screens/v2/OccupationalLicensesDetail/OccupationalLicensesDetail.tsx @@ -134,6 +134,13 @@ const OccupationalLicenseDetail = () => { label={formatMessage(om.nameOfIndividual)} content={license?.licenseHolderName ?? ''} /> + {license?.licenseNumber && ( + + )} {(license?.dateOfBirth || loading) && ( { + constructor() { this.storage = {} } - getItem = (name: string): string | null => { + clear(): void { + this.storage = {} + } + + getItem(name: string): string | null { if (Object.prototype.hasOwnProperty.call(this.storage, name)) { return this.storage[name] } return null } - key = (index: number): string | null => { + key(index: number): string | null { return Object.keys(this.storage)[index] || null } - removeItem = (name: string): void => { + removeItem(name: string): void { delete this.storage[name] } - setItem = (name: string, value: string): void => { + setItem(name: string, value: string): void { this.storage[name] = String(value) // not everyone uses TypeScript } diff --git a/libs/skilavottord/consts/project.json b/libs/skilavottord/consts/project.json index 8db4390c4ae9..54d6d98912f9 100644 --- a/libs/skilavottord/consts/project.json +++ b/libs/skilavottord/consts/project.json @@ -3,22 +3,18 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/skilavottord/consts/src", "projectType": "library", + "tags": ["lib:nest", "scope:nest"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/skilavottord/consts/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/skilavottord/consts/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/skilavottord/consts/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/skilavottord/consts"] } - }, - "tags": ["lib:nest", "scope:nest"] + } } diff --git a/libs/skilavottord/types/project.json b/libs/skilavottord/types/project.json index 05021d6ee514..1748eff7a748 100644 --- a/libs/skilavottord/types/project.json +++ b/libs/skilavottord/types/project.json @@ -3,22 +3,18 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/skilavottord/types/src", "projectType": "library", + "tags": ["lib:nest", "scope:nest"], "generators": {}, "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/skilavottord/types/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "options": { - "jestConfig": "libs/skilavottord/types/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/skilavottord/types/jest.config.ts" }, "outputs": ["{workspaceRoot}/coverage/libs/skilavottord/types"] } - }, - "tags": ["lib:nest", "scope:nest"] + } } diff --git a/libs/testing/containers/project.json b/libs/testing/containers/project.json index 9425944a9c43..542eea7e3e3f 100644 --- a/libs/testing/containers/project.json +++ b/libs/testing/containers/project.json @@ -3,21 +3,17 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/testing/containers/src", "projectType": "library", + "tags": ["lib:js", "scope:js"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/testing/containers/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/testing/containers"], "options": { - "jestConfig": "libs/testing/containers/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/testing/containers/jest.config.ts" } } - }, - "tags": ["lib:js", "scope:js"] + } } diff --git a/libs/testing/fixtures/project.json b/libs/testing/fixtures/project.json index c5c3dbedade5..fdc2e1555cb5 100644 --- a/libs/testing/fixtures/project.json +++ b/libs/testing/fixtures/project.json @@ -3,27 +3,23 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/testing/fixtures/src", "projectType": "library", + "tags": [ + "lib:nest", + "scope:nest", + "lib:application-system", + "lib:js", + "TODO:splitUp" + ], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/testing/fixtures/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/testing/fixtures"], "options": { - "jestConfig": "libs/testing/fixtures/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/testing/fixtures/jest.config.ts" } } - }, - "tags": [ - "lib:nest", - "scope:nest", - "lib:application-system", - "lib:js", - "TODO:splitUp" - ] + } } diff --git a/libs/testing/nest/project.json b/libs/testing/nest/project.json index 5ec3a014866e..daed24a7d5e2 100644 --- a/libs/testing/nest/project.json +++ b/libs/testing/nest/project.json @@ -3,21 +3,17 @@ "$schema": "../../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/testing/nest/src", "projectType": "library", + "tags": ["lib:nest", "scope:nest"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/testing/nest/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/testing/nest"], "options": { - "jestConfig": "libs/testing/nest/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/testing/nest/jest.config.ts" } } - }, - "tags": ["lib:nest", "scope:nest"] + } } diff --git a/libs/university-gateway/project.json b/libs/university-gateway/project.json index da43c6c1e955..99c527408c3d 100644 --- a/libs/university-gateway/project.json +++ b/libs/university-gateway/project.json @@ -3,28 +3,17 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/university-gateway/src", "projectType": "library", + "tags": ["scope:client", "lib:client"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "outputs": ["{options.outputFile}"], - "options": { - "lintFilePatterns": ["libs/university-gateway/**/*.ts"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/{projectRoot}"], "options": { - "jestConfig": "libs/university-gateway/jest.config.ts", - "passWithNoTests": true - }, - "configurations": { - "ci": { - "ci": true, - "codeCoverage": true - } + "jestConfig": "libs/university-gateway/jest.config.ts" } } - }, - "tags": ["scope:client", "lib:client"] + } } diff --git a/libs/user-monitoring/project.json b/libs/user-monitoring/project.json index 4a3ffbf41c36..7fff096fba21 100644 --- a/libs/user-monitoring/project.json +++ b/libs/user-monitoring/project.json @@ -3,21 +3,17 @@ "$schema": "../../node_modules/nx/schemas/project-schema.json", "sourceRoot": "libs/user-monitoring/src", "projectType": "library", + "tags": ["lib:dom", "scope:dom"], "targets": { "lint": { - "executor": "@nx/linter:eslint", - "options": { - "lintFilePatterns": ["libs/user-monitoring/**/*.{ts,tsx,js,jsx}"] - } + "executor": "@nx/eslint:lint" }, "test": { "executor": "@nx/jest:jest", "outputs": ["{workspaceRoot}/coverage/libs/user-monitoring"], "options": { - "jestConfig": "libs/user-monitoring/jest.config.ts", - "passWithNoTests": true + "jestConfig": "libs/user-monitoring/jest.config.ts" } } - }, - "tags": ["lib:dom", "scope:dom"] + } } diff --git a/nx.json b/nx.json index e47e35e8dbb6..2c273e35a623 100644 --- a/nx.json +++ b/nx.json @@ -1,8 +1,4 @@ { - "affected": { - "defaultBase": "main" - }, - "npmScope": "island.is", "tasksRunnerOptions": { "default": { "runner": "nx/tasks-runners/default", @@ -110,9 +106,6 @@ "test": { "inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"] }, - "external-test": { - "inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"] - }, "codegen/backend-client": { "dependsOn": ["^codegen/backend-client", "^codegen/backend-schema"], "inputs": ["schema-files"] @@ -133,18 +126,42 @@ "{projectRoot}/**/fragmentTypes.json", "{projectRoot}/**/*.generated.ts" ] + }, + "@nx/jest:jest": { + "cache": true, + "inputs": ["default", "^production", "{workspaceRoot}/jest.preset.js"], + "options": { + "passWithNoTests": true + }, + "configurations": { + "ci": { + "ci": true, + "codeCoverage": true + } + } + }, + "@nx/eslint:lint": { + "inputs": ["default", "{workspaceRoot}/.eslintrc.json"], + "cache": true } }, "namedInputs": { "default": ["{projectRoot}/**/*", "sharedGlobals"], + "nodeVersion": [ + { + "runtime": "node --version" + } + ], "sharedGlobals": [ "{workspaceRoot}/eslint-local-rules.js", "{workspaceRoot}/nx.json", "{workspaceRoot}/tsconfig.base.json", + "{workspaceRoot}/tsconfig.shared.json", "{workspaceRoot}/babel.config.json" ], "production": [ "default", + "nodeVersion", "!{projectRoot}/.eslintrc.json", "!{projectRoot}/.storybook/**/*", "!{projectRoot}/**/*.stories.@(js|jsx|ts|tsx|mdx)", @@ -169,5 +186,7 @@ "dependentTasksOutputFiles": "**/api.graphql" } ] - } + }, + "useInferencePlugins": false, + "defaultBase": "main" } diff --git a/package.json b/package.json index 2dc0911fceeb..42347671de0d 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "license": "MIT", "engines": { "npm": "please-use-yarn", - "node": "20.14.0", + "node": "20.15.0", "yarn": "3.2" }, "repository": { @@ -21,7 +21,7 @@ "deploy": "nx deploy", "test": "nx test", "lint": "nx lint", - "clean": "./scripts/clean.sh", + "clean": "node ./scripts/clean.mjs", "dev-services": "nx dev-services", "dev": "nx dev", "dev-init": "nx dev-init", @@ -117,7 +117,7 @@ "@simplewebauthn/server": "10.0.0", "@sindresorhus/slugify": "1.0.0", "@statoscope/webpack-plugin": "5.20.1", - "@storybook/core-server": "7.4.1", + "@storybook/core-server": "7.6.9", "@types/faker": "5.5.3", "@types/nodemailer": "6.4.1", "@types/pdfkit": "0.11.2", @@ -142,7 +142,7 @@ "aws-elasticsearch-connector": "9.0.0", "aws-sdk": "2.814.0", "aws4": "1.11.0", - "axios": "1.6.2", + "axios": "1.7.2", "bottleneck": "2.19.5", "bull": "4.10.4", "cache-manager": "5.2.3", @@ -157,7 +157,7 @@ "contentful-ui-extensions-sdk": "3.32.0", "cookie-parser": "1.4.5", "copy-to-clipboard": "3.3.1", - "core-js": "3.6.5", + "core-js": "3.36.1", "crypto-browserify": "3.12.0", "crypto-js": "4.2.0", "csv-stringify": "5.6.5", @@ -219,7 +219,7 @@ "mobx": "6.3.7", "msw": "0.21.3", "nest-winston": "1.4.0", - "next": "13.3.0", + "next": "14.2.3", "next-auth": "3.29.10", "next-cookies": "2.0.3", "next-usequerystate": "1.8.4", @@ -240,12 +240,12 @@ "powerbi-client-react": "1.3.5", "prom-client": "14.1.0", "pubsub-js": "1.8.0", - "react": "18.2.0", + "react": "18.3.1", "react-alice-carousel": "1.19.3", "react-animate-height": "3.1.2", "react-csv": "2.0.3", "react-datepicker": "4.10.0", - "react-dom": "18.2.0", + "react-dom": "18.3.1", "react-dropzone": "11.7.1", "react-focus-lock": "2.9.4", "react-hook-form": "7.43.3", @@ -253,7 +253,7 @@ "react-infinite-scroller": "^1.2.6", "react-input-mask": "3.0.0-alpha.2", "react-intl": "5.13.1", - "react-is": "18.2.0", + "react-is": "18.3.1", "react-keyed-flatten-children": "1.2.0", "react-modal": "3.15.1", "react-number-format": "4.9.1", @@ -275,7 +275,7 @@ "rosetta": "1.0.0", "rxjs": "7.8.1", "sanitize-html": "2.10.0", - "sequelize": "6.29.0", + "sequelize": "6.37.3", "sequelize-replace-enum-postgres": "1.6.0", "sequelize-typescript": "2.1.3", "short-unique-id": "5.0.3", @@ -338,33 +338,33 @@ "@graphql-codegen/typescript-resolvers": "2.7.3", "@nestjs/schematics": "10.0.1", "@nestjs/testing": "10.0.5", - "@nx/cypress": "16.9.0", - "@nx/eslint-plugin": "16.9.0", - "@nx/express": "16.9.0", - "@nx/jest": "16.9.0", - "@nx/js": "16.9.0", - "@nx/linter": "16.9.0", - "@nx/nest": "16.9.0", - "@nx/next": "16.9.0", - "@nx/node": "16.9.0", - "@nx/react": "16.9.0", - "@nx/storybook": "16.9.0", - "@nx/web": "16.9.0", - "@nx/webpack": "16.9.0", - "@nx/workspace": "16.9.0", + "@nx/cypress": "19.4.0", + "@nx/eslint": "19.4.0", + "@nx/eslint-plugin": "19.4.0", + "@nx/express": "19.4.0", + "@nx/jest": "19.4.0", + "@nx/js": "19.4.0", + "@nx/nest": "19.4.0", + "@nx/next": "19.4.0", + "@nx/node": "19.4.0", + "@nx/react": "19.4.0", + "@nx/storybook": "19.4.0", + "@nx/web": "19.4.0", + "@nx/webpack": "19.4.0", + "@nx/workspace": "19.4.0", "@openapitools/openapi-generator-cli": "1.0.15-4.3.1", "@playwright/test": "1.29", - "@storybook/addon-a11y": "7.4.1", - "@storybook/addon-essentials": "7.4.1", - "@storybook/addon-mdx-gfm": "7.4.1", + "@storybook/addon-a11y": "7.6.9", + "@storybook/addon-essentials": "7.6.9", + "@storybook/addon-mdx-gfm": "7.6.9", "@storybook/addons": "7.0.20", - "@storybook/react": "7.4.1", - "@storybook/react-webpack5": "7.4.1", + "@storybook/react": "7.6.9", + "@storybook/react-webpack5": "7.6.9", "@storybook/source-loader": "7.0.20", "@storybook/theming": "7.0.20", "@testing-library/cypress": "8.0.3", "@testing-library/jest-dom": "5.16.5", - "@testing-library/react": "14.0.0", + "@testing-library/react": "15.0.6", "@testing-library/user-event": "14.4.3", "@types/aws-sdk": "2.7.0", "@types/aws4": "1.5.1", @@ -388,14 +388,14 @@ "@types/lodash": "4.17.1", "@types/mailparser": "3.4.0", "@types/memoizee": "0.4.5", - "@types/node": "18.14.2", + "@types/node": "18.16.9", "@types/opossum": "4.1.1", "@types/passport-jwt": "3.0.8", "@types/pg": "8.6.4", "@types/prettier": "2.6.2", - "@types/react": "18.2.14", + "@types/react": "18.3.3", "@types/react-datepicker": "4.10.0", - "@types/react-dom": "18.2.6", + "@types/react-dom": "18.3.0", "@types/react-html-parser": "2.0.1", "@types/react-infinite-scroller": "^1.2.3", "@types/request": "2.48.5", @@ -409,8 +409,8 @@ "@types/xml2js": "0.4.9", "@types/yargs": "17.0.24", "@types/yup": "0.29.6", - "@typescript-eslint/eslint-plugin": "5.62.0", - "@typescript-eslint/parser": "5.62.0", + "@typescript-eslint/eslint-plugin": "7.9.0", + "@typescript-eslint/parser": "7.9.0", "babel-jest": "29.4.3", "babel-loader": "8.2.5", "babel-plugin-transform-class-properties": "6.24.1", @@ -422,13 +422,13 @@ "cross-spawn": "7.0.3", "csstype": "2.6.13", "csv-parse": "4.16.0", - "cypress": "13.0.0", + "cypress": "13.9.0", "cypress-file-upload": "5.0.8", "dotenv": "16.3.1", - "esbuild": "0.15.7", - "eslint": "8.46.0", - "eslint-config-next": "13.1.1", - "eslint-config-prettier": "8.1.0", + "esbuild": "^0.16.17", + "eslint": "8.57.0", + "eslint-config-next": "14.2.3", + "eslint-config-prettier": "9.1.0", "eslint-plugin-cypress": "2.14.0", "eslint-plugin-import": "2.27.5", "eslint-plugin-jsx-a11y": "6.7.1", @@ -447,7 +447,7 @@ "license-checker": "25.0.1", "mailparser": "3.5.0", "next-secure-headers": "2.1.0", - "nx": "16.9.0", + "nx": "19.4.0", "prettier": "2.6.2", "sequelize-cli": "6.4.1", "sort-paths": "1.1.1", @@ -460,7 +460,7 @@ "ts-morph": "16.0.0", "ts-node": "10.9.2", "type-fest": "1.1.3", - "typescript": "5.1.6", + "typescript": "5.4.5", "webpack-bundle-analyzer": "4.5.0" }, "resolutions": { @@ -490,7 +490,7 @@ "dd-trace@5.14.1": "patch:dd-trace@npm%3A5.14.1#./.yarn/patches/dd-trace-npm-5.14.1-8d45ad14d6.patch" }, "volta": { - "node": "20.14.0", + "node": "20.15.0", "yarn": "3.2.3" }, "packageManager": "yarn@3.2.3" diff --git a/scripts/ci/Dockerfile b/scripts/ci/Dockerfile index 0d482c1203d7..affb5bc69cc2 100644 --- a/scripts/ci/Dockerfile +++ b/scripts/ci/Dockerfile @@ -81,7 +81,7 @@ ENV PORT=4200 COPY --from=deps /build/node_modules /webapp/node_modules COPY --from=builder /build/${APP_DIST_HOME} /webapp/ -ENTRYPOINT [ "node", "--no-experimental-fetch", "main.js" ] +ENTRYPOINT [ "node", "main.js" ] FROM $DOCKER_IMAGE_REGISTRY/nginx/nginx:1.21-alpine as output-static ARG APP diff --git a/scripts/ci/_docker.sh b/scripts/ci/_docker.sh index 8e2f937211a1..a3d981115e0d 100755 --- a/scripts/ci/_docker.sh +++ b/scripts/ci/_docker.sh @@ -8,7 +8,8 @@ DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)" source "$DIR"/_common.sh APP_HOME=$(yarn nx show project $APP | jq ".root" -r) -APP_DIST_HOME=$(yarn nx show project $APP | jq ".targets.build.options | .outputPath // .outputDir" -r) +# APP_DIST_HOME=$(yarn nx show project $APP | jq ".targets.build.outputs[0]" -r | sed "s|{workspaceRoot}/||") +APP_DIST_HOME="dist/${APP_HOME}" DOCKERFILE=${1:-Dockerfile} TARGET=${TARGET:-${2:-''}} ACTION=${3:-docker_build} diff --git a/scripts/ci/cache/package.json b/scripts/ci/cache/package.json index 56e72c7bd5ae..d590ae1e2a27 100644 --- a/scripts/ci/cache/package.json +++ b/scripts/ci/cache/package.json @@ -1,7 +1,7 @@ { "dependencies": { "@actions/cache": "3.2.4", - "glob": "10.4.1" + "glob": "10.4.2" }, "resolutions": { "@actions/cache@3.2.4": "patch:@actions/cache@npm%3A3.2.4#./.yarn/patches/@actions-cache-npm-3.2.4-c57b047f14.patch" diff --git a/scripts/ci/cache/yarn.lock b/scripts/ci/cache/yarn.lock index fae81660e280..be32bd4ca1cf 100644 --- a/scripts/ci/cache/yarn.lock +++ b/scripts/ci/cache/yarn.lock @@ -492,18 +492,19 @@ __metadata: languageName: node linkType: hard -"glob@npm:10.4.1": - version: 10.4.1 - resolution: "glob@npm:10.4.1" +"glob@npm:10.4.2": + version: 10.4.2 + resolution: "glob@npm:10.4.2" dependencies: foreground-child: ^3.1.0 jackspeak: ^3.1.2 minimatch: ^9.0.4 minipass: ^7.1.2 + package-json-from-dist: ^1.0.0 path-scurry: ^1.11.1 bin: glob: dist/esm/bin.mjs - checksum: 5d33c686c80bf6877f4284adf99a8c3cbb2a6eccbc92342943fe5d4b42c01d78c1881f2223d950c92a938d0f857e12e37b86a8e5483ab2141822e053b67d0dde + checksum: bd7c0e30701136e936f414e5f6f82c7f04503f01df77408f177aa584927412f0bde0338e6ec541618cd21eacc57dde33e7b3c6c0a779cc1c6e6a0e14f3d15d9b languageName: node linkType: hard @@ -623,6 +624,13 @@ __metadata: languageName: node linkType: hard +"package-json-from-dist@npm:^1.0.0": + version: 1.0.0 + resolution: "package-json-from-dist@npm:1.0.0" + checksum: ac706ec856a5a03f5261e4e48fa974f24feb044d51f84f8332e2af0af04fbdbdd5bbbfb9cbbe354190409bc8307c83a9e38c6672c3c8855f709afb0006a009ea + languageName: node + linkType: hard + "path-key@npm:^3.1.0": version: 3.1.1 resolution: "path-key@npm:3.1.1" @@ -645,7 +653,7 @@ __metadata: resolution: "root-workspace-0b6124@workspace:." dependencies: "@actions/cache": 3.2.4 - glob: 10.4.1 + glob: 10.4.2 languageName: unknown linkType: soft diff --git a/scripts/clean-generated-files.sh b/scripts/clean-generated-files.sh deleted file mode 100755 index c52ecb53b4d8..000000000000 --- a/scripts/clean-generated-files.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -echo "Use the new clean.sh script instead of this clean-generated-files.sh" -./scripts/clean.sh --generated "$@" diff --git a/scripts/clean.mjs b/scripts/clean.mjs new file mode 100644 index 000000000000..8b28c5687f9c --- /dev/null +++ b/scripts/clean.mjs @@ -0,0 +1,304 @@ +#!/usr/bin/env node +// @ts-check + +import fs from 'fs' +import path from 'path' +import { execSync } from 'child_process' + +const config = { + CLEAN_DRY: process.env.CLEAN_DRY === 'true', + CLEAN_CACHES: process.env.CLEAN_CACHES === 'true', + CLEAN_YARN: process.env.CLEAN_YARN === 'true', + CLEAN_GENERATED: process.env.CLEAN_GENERATED === 'true', + CLEAN_NODE_MODULES: process.env.CLEAN_NODE_MODULES === 'true', + CLEAN_DIST: process.env.CLEAN_DIST === 'true', + CLEAN_ALL: process.env.CLEAN_ALL === 'true', + CLEAN_CACHES_LIST: ['.cache'], + CLEAN_YARN_IGNORES_LIST: ['patches', 'releases'], + SEARCH_DIRECTORIES: ['apps', 'libs'], + GENERATED_PATTERNS: [ + /\/openapi\.yaml$/, + /\/api\.graphql$/, + /\/schema\.d\.ts$/, + /\/schema\.tsx$/, + /\/schema\.ts$/, + /\/gen\/graphql\.ts$/, + /\/.*\.generated\.ts$/, + /\/possibleTypes\.json$/, + /\/fragmentTypes\.json$/, + ], + DIRS_TO_DELETE: ['gen/fetch'], +} + +/** + * Logs messages to the console. + * @param {...any} messages - The messages to log. + */ +function log(...messages) { + console.error(...messages) +} + +/** + * Performs a dry run if configured. + * @param {string} message - The message to log during a dry run. + * @returns {boolean} - Returns true if it's a dry run. + */ +function dry(message) { + if (config.CLEAN_DRY) { + log(`Dry run: ${message}`) + return true + } + return false +} + +function showHelp() { + console.log(`Usage: ${process.argv[1]} [OPTIONS] + +Options: + --generated Clean generated files + --yarn Clean yarn files + --cache Clean cache files + --node-modules Clean node_modules folder + --dist Clean dist directories + --all Clean all (generated, yarn, cache, dist, and node_modules files) + -n, --dry Dry run (show what would be done without actually doing it) + -h, --help Show this help message`) +} + +/** + * Parses command line arguments. + * @param {string[]} args - The command line arguments. + */ +function parseArgs(args) { + if (args.length === 0) { + showHelp() + process.exit(0) + } + + args.forEach((arg) => { + switch (arg) { + case '--generated': + config.CLEAN_GENERATED = true + break + case '--yarn': + config.CLEAN_YARN = true + break + case '--cache': + config.CLEAN_CACHES = true + break + case '--node-modules': + config.CLEAN_NODE_MODULES = true + break + case '--dist': + config.CLEAN_DIST = true + break + case '--all': + config.CLEAN_ALL = true + break + case '-n': + case '--dry': + config.CLEAN_DRY = true + break + case '-h': + case '--help': + showHelp() + process.exit(0) + default: + showHelp() + process.exit(1) + } + }) + + if (config.CLEAN_ALL) { + config.CLEAN_GENERATED = true + config.CLEAN_YARN = true + config.CLEAN_CACHES = true + config.CLEAN_NODE_MODULES = true + config.CLEAN_DIST = true + } +} + +/** + * Checks if a file is tracked by git. + * @param {string} filePath - The path to the file. + * @returns {boolean} - Returns true if the file is tracked by git. + */ +function isGitTracked(filePath) { + try { + execSync(`git ls-files --error-unmatch ${filePath}`, { stdio: 'ignore' }) + return true + } catch { + return false + } +} + +/** + * Recursively finds and deletes files or directories based on given conditions. + * + * @param {string} baseDir - The base directory to start the search from. + * @param {(filePath: string) => boolean} patternCheck - A function that takes a file path and returns true if the path should be deleted. + * @param {boolean} [deleteDirectories=false] - Whether to delete directories that match the pattern. + */ +function findAndDelete(baseDir, patternCheck, deleteDirectories = false) { + /** + * Recursively walks through directories and files. + * + * @param {string} currentDirPath - The current directory path. + */ + function walkSync(currentDirPath) { + if (currentDirPath.includes('node_modules')) return + + fs.readdirSync(currentDirPath).forEach((name) => { + const filePath = path.join(currentDirPath, name) + const stat = fs.statSync(filePath) + + if (stat.isDirectory()) { + if (!deleteDirectories || !patternCheck(filePath)) { + walkSync(filePath) + return + } + if (isGitTracked(filePath)) { + log(`Skipping git-tracked directory: ${filePath}`) + return + } + + if (dry(`Would delete directory: ${filePath}`)) return + try { + log(`Deleting directory now: ${filePath}`) + fs.rmSync(filePath, { recursive: true, force: true }) + } catch (err) { + log(`Failed to delete directory: ${filePath}`, err) + } + return + } + + if (!stat.isFile()) return + + if (!patternCheck(filePath)) return + + if (isGitTracked(filePath)) { + log(`Skipping git-tracked file: ${filePath}`) + return + } + + if (dry(`Would delete: ${filePath}`)) return + try { + log(`Deleting now: ${filePath}`) + fs.unlinkSync(filePath) + } catch (err) { + log(`Failed to delete file: ${filePath}`, err) + } + }) + } + + if (!deleteDirectories || !patternCheck(baseDir)) return walkSync(baseDir) + if (dry(`Would delete directory: ${baseDir}`)) return + try { + log(`Deleting directory now: ${baseDir}`) + fs.rmSync(baseDir, { recursive: true, force: true }) + } catch (err) { + log(`Failed to delete directory: ${baseDir}`, err) + } +} + +function cleanGenerated() { + config.SEARCH_DIRECTORIES.forEach((baseDir) => { + if (fs.existsSync(baseDir)) { + findAndDelete(baseDir, (filePath) => + config.GENERATED_PATTERNS.some((regex) => regex.test(filePath)), + ) + config.DIRS_TO_DELETE.forEach((dirToDelete) => { + findAndDelete( + baseDir, + (filePath) => filePath.includes(dirToDelete), + true, // Indicate that we are deleting directories + ) + }) + } + }) +} + +function cleanCaches() { + const yarnCacheFolder = execSync('yarn config get cacheFolder', { + encoding: 'utf-8', + }).trim() + + const cachesToDelete = [...config.CLEAN_CACHES_LIST, yarnCacheFolder] + + cachesToDelete.forEach((item) => { + if (fs.existsSync(item)) { + findAndDelete( + item, + (_) => true, // No specific pattern, delete all items in cache + true, // Indicate that we are deleting directories + ) + } else { + log(`Skipping ${item}: directory does not exist`) + } + }) +} + +function cleanDist() { + const baseDir = './' + if (fs.existsSync(baseDir)) { + findAndDelete( + baseDir, + (filePath) => path.basename(filePath) === 'dist', + true, // Indicate that we are deleting directories + ) + } +} + +function cleanYarn() { + if (fs.existsSync('.yarn')) { + const r = new RegExp( + `\\.yarn/(${config.CLEAN_YARN_IGNORES_LIST.join('|')})`, + ) + findAndDelete( + '.yarn', + (filePath) => r.test(filePath), + true, // Indicate that we are deleting directories + ) + } else { + log('No .yarn folder found') + } +} + +function cleanNodeModules() { + const baseDir = './' + findAndDelete( + baseDir, + (filePath) => path.basename(filePath) === 'node_modules', + true, // Indicate that we are deleting directories + ) +} + +function cleanAll() { + const tasks = [ + { + name: 'generated files', + flag: config.CLEAN_GENERATED, + func: cleanGenerated, + }, + { name: 'cache files', flag: config.CLEAN_CACHES, func: cleanCaches }, + { name: 'yarn files', flag: config.CLEAN_YARN, func: cleanYarn }, + { name: 'dist directories', flag: config.CLEAN_DIST, func: cleanDist }, + { + name: 'node_modules', + flag: config.CLEAN_NODE_MODULES, + func: cleanNodeModules, + }, + ] + + tasks.forEach(({ name, flag, func }) => { + if (flag) { + log(`Cleaning ${name}`) + func() + } else { + log(`Skipping ${name}`) + } + }) +} + +parseArgs(process.argv.slice(2)) +cleanAll() diff --git a/scripts/clean.sh b/scripts/clean.sh deleted file mode 100755 index b8f8fce76af1..000000000000 --- a/scripts/clean.sh +++ /dev/null @@ -1,170 +0,0 @@ -#!/bin/bash - -set -euo pipefail - -# Configuration variables -: "${CLEAN_DRY:=false}" -: "${CLEAN_CACHES:=false}" -: "${CLEAN_YARN:=false}" -: "${CLEAN_GENERATED:=false}" -: "${CLEAN_NODE_MODULES:=false}" -: "${CLEAN_ALL:=false}" -CLEAN_CACHES_LIST=(.cache dist) -CLEAN_YARN_IGNORES_LIST=(patches releases) - -log() { - echo "$@" >&2 -} - -dry() { - if [[ "$CLEAN_DRY" == "true" ]]; then - log "Dry run: $*" - return 0 - else - return 1 - fi -} - -show_help() { - cat < { + // Update the webpack config as needed here. + // e.g. `config.plugins.push(new MyPlugin())` + return config +}) diff --git a/tsconfig.base.json b/tsconfig.base.json index a5b1a95ed6b3..e875a083d3ba 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -1,26 +1,7 @@ { - "compileOnSave": false, + "extends": "./tsconfig.shared.json", "compilerOptions": { - "useUnknownInCatchVariables": false, - "rootDir": ".", - "sourceMap": true, - "declaration": false, - "moduleResolution": "node", - "emitDecoratorMetadata": true, - "experimentalDecorators": true, - "importHelpers": true, - "target": "es2015", - "module": "esnext", - "typeRoots": ["node_modules/@types"], - "lib": ["es2019", "dom", "dom.iterable"], - "skipLibCheck": true, - "skipDefaultLibCheck": true, - "allowSyntheticDefaultImports": true, - "esModuleInterop": true, - "baseUrl": ".", - "strict": true, "paths": { - "*": ["libs/shared/types/src/lib/*"], "@island.is/air-discount-scheme-web/*": [ "apps/air-discount-scheme/web/*" ], @@ -1098,6 +1079,5 @@ "@island.is/web/*": ["apps/web/*"], "@island.is/web/component*": ["apps/web/component*/real.ts"] } - }, - "exclude": ["node_modules", "tmp"] + } } diff --git a/tsconfig.shared.json b/tsconfig.shared.json new file mode 100644 index 000000000000..7239bd9bccc4 --- /dev/null +++ b/tsconfig.shared.json @@ -0,0 +1,29 @@ +{ + "compileOnSave": false, + "compilerOptions": { + "useUnknownInCatchVariables": false, + "rootDir": ".", + "sourceMap": true, + "declaration": false, + "moduleResolution": "node", + "emitDecoratorMetadata": true, + "experimentalDecorators": true, + "importHelpers": true, + "target": "es2015", + "module": "esnext", + "typeRoots": ["node_modules/@types", "libs/shared/types/src/lib"], + "lib": ["es2019", "dom", "dom.iterable"], + "skipLibCheck": true, + "skipDefaultLibCheck": true, + "allowSyntheticDefaultImports": true, + "esModuleInterop": true, + "baseUrl": ".", + "strict": true + }, + "exclude": ["node_modules", "tmp"], + "references": [ + { + "path": "./tsconfig.base.json" + } + ] +} diff --git a/yarn.lock b/yarn.lock index 72ad0f3d8c7c..772817908b22 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1545,6 +1545,16 @@ __metadata: languageName: node linkType: hard +"@babel/code-frame@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/code-frame@npm:7.24.6" + dependencies: + "@babel/highlight": ^7.24.6 + picocolors: ^1.0.0 + checksum: 0904514ea7079a9590c1c546cd20b9c1beab9649873f2a0703429860775c1713a8dfb2daacd781a0210bb3930c656c1c436013fb20eaa3644880fb3a2b34541d + languageName: node + linkType: hard + "@babel/compat-data@npm:^7.17.10, @babel/compat-data@npm:^7.19.3": version: 7.19.4 resolution: "@babel/compat-data@npm:7.19.4" @@ -1580,6 +1590,13 @@ __metadata: languageName: node linkType: hard +"@babel/compat-data@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/compat-data@npm:7.24.6" + checksum: 92233c708f7c349923c1f9a2b3c9354875a951ac3afaca0a2c159de1c808f6799ad4433652b90870015281aa466ec6e9aa8922e755cd7ac1413a3a5782cd685d + languageName: node + linkType: hard + "@babel/core@npm:7.22.5": version: 7.22.5 resolution: "@babel/core@npm:7.22.5" @@ -1649,6 +1666,29 @@ __metadata: languageName: node linkType: hard +"@babel/core@npm:^7.18.9, @babel/core@npm:^7.23.2": + version: 7.24.6 + resolution: "@babel/core@npm:7.24.6" + dependencies: + "@ampproject/remapping": ^2.2.0 + "@babel/code-frame": ^7.24.6 + "@babel/generator": ^7.24.6 + "@babel/helper-compilation-targets": ^7.24.6 + "@babel/helper-module-transforms": ^7.24.6 + "@babel/helpers": ^7.24.6 + "@babel/parser": ^7.24.6 + "@babel/template": ^7.24.6 + "@babel/traverse": ^7.24.6 + "@babel/types": ^7.24.6 + convert-source-map: ^2.0.0 + debug: ^4.1.0 + gensync: ^1.0.0-beta.2 + json5: ^2.2.3 + semver: ^6.3.1 + checksum: f8af23de19865818c27c2fbe0d87b0834b118386da5ee09b20ae0cf7a5540065054ef2b70f377d025d9feee765db18df39900e4c18e905988b94b54a104c738e + languageName: node + linkType: hard + "@babel/core@npm:^7.21.3": version: 7.22.1 resolution: "@babel/core@npm:7.22.1" @@ -1695,7 +1735,7 @@ __metadata: languageName: node linkType: hard -"@babel/generator@npm:^7.12.11, @babel/generator@npm:^7.14.0, @babel/generator@npm:^7.19.3, @babel/generator@npm:^7.19.4, @babel/generator@npm:^7.7.2": +"@babel/generator@npm:^7.14.0, @babel/generator@npm:^7.19.3, @babel/generator@npm:^7.19.4, @babel/generator@npm:^7.7.2": version: 7.19.5 resolution: "@babel/generator@npm:7.19.5" dependencies: @@ -1754,6 +1794,18 @@ __metadata: languageName: node linkType: hard +"@babel/generator@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/generator@npm:7.24.6" + dependencies: + "@babel/types": ^7.24.6 + "@jridgewell/gen-mapping": ^0.3.5 + "@jridgewell/trace-mapping": ^0.3.25 + jsesc: ^2.5.1 + checksum: a477e03129106908f464b195c4f138052d732cfca47506b127edbed6a496371bae821662a8a4e51e6d144ac236a5d05dc2da0e145e29bb8e19d3e7c480ac00fe + languageName: node + linkType: hard + "@babel/helper-annotate-as-pure@npm:^7.16.0, @babel/helper-annotate-as-pure@npm:^7.16.7, @babel/helper-annotate-as-pure@npm:^7.18.6": version: 7.18.6 resolution: "@babel/helper-annotate-as-pure@npm:7.18.6" @@ -1772,6 +1824,15 @@ __metadata: languageName: node linkType: hard +"@babel/helper-annotate-as-pure@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/helper-annotate-as-pure@npm:7.24.6" + dependencies: + "@babel/types": ^7.24.6 + checksum: 9ddcc2ddfa64213311d71bead56ecccdadca5455dc54528c545a2efc1d8010fb7327aef2d90ac7e71b0d0becfed0ffb00553b1e192ff00596efe4161511891cf + languageName: node + linkType: hard + "@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.18.6": version: 7.18.9 resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.18.9" @@ -1791,6 +1852,15 @@ __metadata: languageName: node linkType: hard +"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.24.6" + dependencies: + "@babel/types": ^7.24.6 + checksum: aec1792a92331f0d915eaab562ecf7a160d84958e4606425e26795dd848ddab0421190d6e15dbb58cb105caa5b4f53af7179449bc53ca2381866b064e8f8fcc6 + languageName: node + linkType: hard + "@babel/helper-compilation-targets@npm:^7.16.7, @babel/helper-compilation-targets@npm:^7.17.10, @babel/helper-compilation-targets@npm:^7.19.3": version: 7.19.3 resolution: "@babel/helper-compilation-targets@npm:7.19.3" @@ -1848,6 +1918,19 @@ __metadata: languageName: node linkType: hard +"@babel/helper-compilation-targets@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/helper-compilation-targets@npm:7.24.6" + dependencies: + "@babel/compat-data": ^7.24.6 + "@babel/helper-validator-option": ^7.24.6 + browserslist: ^4.22.2 + lru-cache: ^5.1.1 + semver: ^6.3.1 + checksum: c66bf86387fbeefc617db9510de553880ed33dc91308421ee36a7b489d0e8c8eb615e0f467a9ec886eada7c05b03e421e55b2a724ff302402fdd4e0c0b2b0443 + languageName: node + linkType: hard + "@babel/helper-create-class-features-plugin@npm:^7.18.6, @babel/helper-create-class-features-plugin@npm:^7.21.0": version: 7.21.4 resolution: "@babel/helper-create-class-features-plugin@npm:7.21.4" @@ -1904,6 +1987,25 @@ __metadata: languageName: node linkType: hard +"@babel/helper-create-class-features-plugin@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/helper-create-class-features-plugin@npm:7.24.6" + dependencies: + "@babel/helper-annotate-as-pure": ^7.24.6 + "@babel/helper-environment-visitor": ^7.24.6 + "@babel/helper-function-name": ^7.24.6 + "@babel/helper-member-expression-to-functions": ^7.24.6 + "@babel/helper-optimise-call-expression": ^7.24.6 + "@babel/helper-replace-supers": ^7.24.6 + "@babel/helper-skip-transparent-expression-wrappers": ^7.24.6 + "@babel/helper-split-export-declaration": ^7.24.6 + semver: ^6.3.1 + peerDependencies: + "@babel/core": ^7.0.0 + checksum: 82feb93690cd543fdd9da54d71b950ca4323a99a022e73753dd4c0cd93eed44b25301182a14c626ffbef40afb00c5a4e46f646c1d1f4b501d4badaff0cab3892 + languageName: node + linkType: hard + "@babel/helper-create-regexp-features-plugin@npm:^7.16.7, @babel/helper-create-regexp-features-plugin@npm:^7.17.12": version: 7.17.12 resolution: "@babel/helper-create-regexp-features-plugin@npm:7.17.12" @@ -1954,6 +2056,19 @@ __metadata: languageName: node linkType: hard +"@babel/helper-create-regexp-features-plugin@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/helper-create-regexp-features-plugin@npm:7.24.6" + dependencies: + "@babel/helper-annotate-as-pure": ^7.24.6 + regexpu-core: ^5.3.1 + semver: ^6.3.1 + peerDependencies: + "@babel/core": ^7.0.0 + checksum: 606c43600b5c02014f871dc313f06b250b98e0e63fb7d14f1bea56cd8af5737cb7a9c7c28a16dd7712539a19bdac0a877614c9f7427c1fc005181c6a04eda978 + languageName: node + linkType: hard + "@babel/helper-define-polyfill-provider@npm:^0.3.3": version: 0.3.3 resolution: "@babel/helper-define-polyfill-provider@npm:0.3.3" @@ -2001,6 +2116,21 @@ __metadata: languageName: node linkType: hard +"@babel/helper-define-polyfill-provider@npm:^0.6.1, @babel/helper-define-polyfill-provider@npm:^0.6.2": + version: 0.6.2 + resolution: "@babel/helper-define-polyfill-provider@npm:0.6.2" + dependencies: + "@babel/helper-compilation-targets": ^7.22.6 + "@babel/helper-plugin-utils": ^7.22.5 + debug: ^4.1.1 + lodash.debounce: ^4.0.8 + resolve: ^1.14.2 + peerDependencies: + "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 + checksum: 2bba965ea9a4887ddf9c11d51d740ab473bd7597b787d042c325f6a45912dfe908c2d6bb1d837bf82f7e9fa51e6ad5150563c58131d2bb85515e63d971414a9c + languageName: node + linkType: hard + "@babel/helper-environment-visitor@npm:^7.16.7, @babel/helper-environment-visitor@npm:^7.18.9": version: 7.18.9 resolution: "@babel/helper-environment-visitor@npm:7.18.9" @@ -2029,6 +2159,13 @@ __metadata: languageName: node linkType: hard +"@babel/helper-environment-visitor@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/helper-environment-visitor@npm:7.24.6" + checksum: 9c2b3f1ee7ba46b61b0482efab6d37f5c76f0ea4e9d9775df44a89644729c3a50101040a0233543ec6c3f416d8e548d337f310ff3e164f847945507428ee39e5 + languageName: node + linkType: hard + "@babel/helper-explode-assignable-expression@npm:^7.18.6": version: 7.18.6 resolution: "@babel/helper-explode-assignable-expression@npm:7.18.6" @@ -2078,6 +2215,16 @@ __metadata: languageName: node linkType: hard +"@babel/helper-function-name@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/helper-function-name@npm:7.24.6" + dependencies: + "@babel/template": ^7.24.6 + "@babel/types": ^7.24.6 + checksum: d7a2198b6bf2cae9767d5b0d6cb5d3cbd9a07640ad4b6798abb7d7242e8f32765a94fd98ab1a039d7607f0ddbeaf9ddc822dd536b856e499f7082899c6f455f0 + languageName: node + linkType: hard + "@babel/helper-hoist-variables@npm:^7.18.6": version: 7.18.6 resolution: "@babel/helper-hoist-variables@npm:7.18.6" @@ -2096,6 +2243,15 @@ __metadata: languageName: node linkType: hard +"@babel/helper-hoist-variables@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/helper-hoist-variables@npm:7.24.6" + dependencies: + "@babel/types": ^7.24.6 + checksum: 4819b574393a5214aff6ae02a6e5250ace2564f8bcdb28d580ffec57bbb2092425e8f39563d75cfa268940a01fd425bad503c0b92717c12426f15cf6847855d3 + languageName: node + linkType: hard + "@babel/helper-member-expression-to-functions@npm:^7.18.9": version: 7.18.9 resolution: "@babel/helper-member-expression-to-functions@npm:7.18.9" @@ -2132,6 +2288,15 @@ __metadata: languageName: node linkType: hard +"@babel/helper-member-expression-to-functions@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/helper-member-expression-to-functions@npm:7.24.6" + dependencies: + "@babel/types": ^7.24.6 + checksum: 9b027842d50fd4b80213903a97e1addcab7051de76090c3e908377fab31f73371beacefa9dfaf95416e57d3bda0fae83633ea4d206669262dde6267d802ece7b + languageName: node + linkType: hard + "@babel/helper-module-imports@npm:^7.0.0, @babel/helper-module-imports@npm:^7.16.0, @babel/helper-module-imports@npm:^7.16.7, @babel/helper-module-imports@npm:^7.18.6": version: 7.18.6 resolution: "@babel/helper-module-imports@npm:7.18.6" @@ -2159,6 +2324,15 @@ __metadata: languageName: node linkType: hard +"@babel/helper-module-imports@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/helper-module-imports@npm:7.24.6" + dependencies: + "@babel/types": ^7.24.6 + checksum: 3484420c45529aac34cb14111a03c78edab84e5c4419634affe61176d832af82963395ea319f67c7235fd4106d9052a9f3ce012d2d57d56644572d3f7d495231 + languageName: node + linkType: hard + "@babel/helper-module-transforms@npm:^7.18.0, @babel/helper-module-transforms@npm:^7.19.0": version: 7.19.0 resolution: "@babel/helper-module-transforms@npm:7.19.0" @@ -2237,6 +2411,21 @@ __metadata: languageName: node linkType: hard +"@babel/helper-module-transforms@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/helper-module-transforms@npm:7.24.6" + dependencies: + "@babel/helper-environment-visitor": ^7.24.6 + "@babel/helper-module-imports": ^7.24.6 + "@babel/helper-simple-access": ^7.24.6 + "@babel/helper-split-export-declaration": ^7.24.6 + "@babel/helper-validator-identifier": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0 + checksum: 904e2a0701eb1eeb84b0d0df5dacdc40291307025b7e3a9a3c6f3eee912c893524f9dc7f5624225a5783a258dec2eb2489a9638bf5f3de26ebfcbcac1b5cc2fc + languageName: node + linkType: hard + "@babel/helper-optimise-call-expression@npm:^7.16.7, @babel/helper-optimise-call-expression@npm:^7.18.6": version: 7.18.6 resolution: "@babel/helper-optimise-call-expression@npm:7.18.6" @@ -2255,6 +2444,15 @@ __metadata: languageName: node linkType: hard +"@babel/helper-optimise-call-expression@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/helper-optimise-call-expression@npm:7.24.6" + dependencies: + "@babel/types": ^7.24.6 + checksum: 2f1d37b2491843a60e8d1736d435aee793feb726292367df1dc25e938b93458aeeb384a329f7438b51e50fd420a71149992c1ef09249eba7041229f230c64db7 + languageName: node + linkType: hard + "@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.13.0, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.16.7, @babel/helper-plugin-utils@npm:^7.17.12, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.19.0, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3": version: 7.19.0 resolution: "@babel/helper-plugin-utils@npm:7.19.0" @@ -2283,6 +2481,13 @@ __metadata: languageName: node linkType: hard +"@babel/helper-plugin-utils@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/helper-plugin-utils@npm:7.24.6" + checksum: d22bb82c75afed0d8c37784876fd6deb9db06ef21526db909ef7986a6050b50beb60a7823c08a1bb7c57c668af2e086d8086e88b6f9140b0d9ade07472f7c748 + languageName: node + linkType: hard + "@babel/helper-remap-async-to-generator@npm:^7.18.9": version: 7.18.9 resolution: "@babel/helper-remap-async-to-generator@npm:7.18.9" @@ -2310,6 +2515,19 @@ __metadata: languageName: node linkType: hard +"@babel/helper-remap-async-to-generator@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/helper-remap-async-to-generator@npm:7.24.6" + dependencies: + "@babel/helper-annotate-as-pure": ^7.24.6 + "@babel/helper-environment-visitor": ^7.24.6 + "@babel/helper-wrap-function": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0 + checksum: d34142cdfecb94655730a3903039fd7459f36696a8eeca80be58ebe46d2ca517d46907c389020735d1c4325d44f7cc7581d3f9b995337d8c32c9b0552bc58759 + languageName: node + linkType: hard + "@babel/helper-replace-supers@npm:^7.16.7": version: 7.19.1 resolution: "@babel/helper-replace-supers@npm:7.19.1" @@ -2364,6 +2582,19 @@ __metadata: languageName: node linkType: hard +"@babel/helper-replace-supers@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/helper-replace-supers@npm:7.24.6" + dependencies: + "@babel/helper-environment-visitor": ^7.24.6 + "@babel/helper-member-expression-to-functions": ^7.24.6 + "@babel/helper-optimise-call-expression": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0 + checksum: f9e32592860733d63cf554e4ade277917af162efb30e75c45fbd35bb4c05f7f0f37042857eb66cec0b5e1aedf199e06e55af6c322bcb17533a20782ec2aaa3a1 + languageName: node + linkType: hard + "@babel/helper-simple-access@npm:^7.18.2, @babel/helper-simple-access@npm:^7.18.6": version: 7.19.4 resolution: "@babel/helper-simple-access@npm:7.19.4" @@ -2400,6 +2631,15 @@ __metadata: languageName: node linkType: hard +"@babel/helper-simple-access@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/helper-simple-access@npm:7.24.6" + dependencies: + "@babel/types": ^7.24.6 + checksum: 929162e887efc1bcadd4e141ed7782b45fccc6873d5023a744fee9c94d16d3a13dbfb66eb259181613a36c2d35f7d2088ee37e76014223d3b9b6c9ef1094e4b6 + languageName: node + linkType: hard + "@babel/helper-skip-transparent-expression-wrappers@npm:^7.16.0": version: 7.16.0 resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.16.0" @@ -2427,6 +2667,15 @@ __metadata: languageName: node linkType: hard +"@babel/helper-skip-transparent-expression-wrappers@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.24.6" + dependencies: + "@babel/types": ^7.24.6 + checksum: dd93d95a7ee815a3784de324d7fd6c495660576ec49ff5e9c608d6409441ebc7764fc0e7b198062784511301f4dc8fdc59263d5c3efcb65fe66b08b008b602f7 + languageName: node + linkType: hard + "@babel/helper-split-export-declaration@npm:^7.16.7, @babel/helper-split-export-declaration@npm:^7.18.6": version: 7.18.6 resolution: "@babel/helper-split-export-declaration@npm:7.18.6" @@ -2445,6 +2694,15 @@ __metadata: languageName: node linkType: hard +"@babel/helper-split-export-declaration@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/helper-split-export-declaration@npm:7.24.6" + dependencies: + "@babel/types": ^7.24.6 + checksum: b546fd7e186b4aa69f96e041b6c4c9154115a2579a297b86773719dbed53b938cfc3f6b4996ae410296bb8aa30ea031f9ff31f1255aa25c3af75026c5b7c4059 + languageName: node + linkType: hard + "@babel/helper-string-parser@npm:^7.19.4": version: 7.19.4 resolution: "@babel/helper-string-parser@npm:7.19.4" @@ -2466,6 +2724,13 @@ __metadata: languageName: node linkType: hard +"@babel/helper-string-parser@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/helper-string-parser@npm:7.24.6" + checksum: c8c614a663928b67c5c65cfea958ed20c858fa2af8c957d301bd852c0ab98adae0861f081fd8f5add16539d9393bd4b10b8c86a97a9d7304f70a6a67b2c2ff07 + languageName: node + linkType: hard + "@babel/helper-validator-identifier@npm:^7.18.6, @babel/helper-validator-identifier@npm:^7.19.1": version: 7.19.1 resolution: "@babel/helper-validator-identifier@npm:7.19.1" @@ -2487,6 +2752,13 @@ __metadata: languageName: node linkType: hard +"@babel/helper-validator-identifier@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/helper-validator-identifier@npm:7.24.6" + checksum: a265a6fba570332dca63ad7e749b867d29b52da2573dc62bf19b5b8c5387d4f4296af33da9da7c71ffe3d3abecd743418278f56d38b057ad4b53f09b937fe113 + languageName: node + linkType: hard + "@babel/helper-validator-option@npm:^7.18.6": version: 7.18.6 resolution: "@babel/helper-validator-option@npm:7.18.6" @@ -2508,6 +2780,13 @@ __metadata: languageName: node linkType: hard +"@babel/helper-validator-option@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/helper-validator-option@npm:7.24.6" + checksum: 5defb2da74e1cac9497016f4e41698aeed75ec7a5e9dc07e777cdb67ef73cd2e27bd2bf8a3ab8d37e0b93a6a45524a9728f03e263afdef452436cf74794bde87 + languageName: node + linkType: hard + "@babel/helper-wrap-function@npm:^7.18.9": version: 7.20.5 resolution: "@babel/helper-wrap-function@npm:7.20.5" @@ -2531,6 +2810,17 @@ __metadata: languageName: node linkType: hard +"@babel/helper-wrap-function@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/helper-wrap-function@npm:7.24.6" + dependencies: + "@babel/helper-function-name": ^7.24.6 + "@babel/template": ^7.24.6 + "@babel/types": ^7.24.6 + checksum: 0cf28533392b994e25590e9060d05bebc882e2a8e22ab77672799d53859f71dc87debd6d5429eeed0eb0de0038708c50576e322e6042cd4e358940939fd9b721 + languageName: node + linkType: hard + "@babel/helpers@npm:^7.19.0": version: 7.19.4 resolution: "@babel/helpers@npm:7.19.4" @@ -2586,6 +2876,16 @@ __metadata: languageName: node linkType: hard +"@babel/helpers@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/helpers@npm:7.24.6" + dependencies: + "@babel/template": ^7.24.6 + "@babel/types": ^7.24.6 + checksum: c936058fd5caf7173e157f790fdbe9535237a7b8bc2c3d084bdf16467a034f73bd5d731deb514aa84e356c72de1cc93500a376f9d481f5c1e335f5a563426e58 + languageName: node + linkType: hard + "@babel/highlight@npm:^7.10.4, @babel/highlight@npm:^7.18.6": version: 7.18.6 resolution: "@babel/highlight@npm:7.18.6" @@ -2608,6 +2908,18 @@ __metadata: languageName: node linkType: hard +"@babel/highlight@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/highlight@npm:7.24.6" + dependencies: + "@babel/helper-validator-identifier": ^7.24.6 + chalk: ^2.4.2 + js-tokens: ^4.0.0 + picocolors: ^1.0.0 + checksum: 2f8f7f060eeccc3ddf03ba12c263995de0e6c0dd31ad224bed58d983b3bb08fe34dfc01440396266456a4cad83226c38ad6814805bc5d0c774a056cac9182eca + languageName: node + linkType: hard + "@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.12.0, @babel/parser@npm:^7.14.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.16.8, @babel/parser@npm:^7.18.10, @babel/parser@npm:^7.19.3, @babel/parser@npm:^7.19.4": version: 7.19.4 resolution: "@babel/parser@npm:7.19.4" @@ -2653,6 +2965,15 @@ __metadata: languageName: node linkType: hard +"@babel/parser@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/parser@npm:7.24.6" + bin: + parser: ./bin/babel-parser.js + checksum: ca3773f5b2a4a065b827990ca0c867e670f01d7a7d7278838bd64d583e68ed52356b5a613303c5aa736d20f024728fec80fc5845fed1eb751ab5f1bfbdc1dd3c + languageName: node + linkType: hard + "@babel/parser@npm:^7.9.4": version: 7.20.13 resolution: "@babel/parser@npm:7.20.13" @@ -2662,6 +2983,18 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:7.24.6" + dependencies: + "@babel/helper-environment-visitor": ^7.24.6 + "@babel/helper-plugin-utils": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0 + checksum: fe18f25b8507fec9ccf32f5961cd2f17d09f5695f542271b15a49ae00b8f02bfcb43fe707cd4791217ebe16de4f96898e49a5edced0e54da481f502f9a745388 + languageName: node + linkType: hard + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.18.6": version: 7.18.6 resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.18.6" @@ -2684,6 +3017,17 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.24.6" + dependencies: + "@babel/helper-plugin-utils": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0 + checksum: 7530579cd6794ae4d3a53bf388de87fc94a090829eeff15cf01e345bb71db4aff57c28dbe595cef8d185edb1baed6a0107d772a71e919d398346876da4fe1f2c + languageName: node + linkType: hard + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.20.7": version: 7.20.7 resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.20.7" @@ -2723,6 +3067,31 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.24.6" + dependencies: + "@babel/helper-plugin-utils": ^7.24.6 + "@babel/helper-skip-transparent-expression-wrappers": ^7.24.6 + "@babel/plugin-transform-optional-chaining": ^7.24.6 + peerDependencies: + "@babel/core": ^7.13.0 + checksum: 69d5a725ad755572c9f677d07cc0c48c74cbe538869fd14e91436c4313adf4eab9838bf9ca26caa30998d89a17e86a335c36050d3b93493824788667a6508f21 + languageName: node + linkType: hard + +"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:7.24.6" + dependencies: + "@babel/helper-environment-visitor": ^7.24.6 + "@babel/helper-plugin-utils": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0 + checksum: 6bbd91b0038e54119ae4df594e4c1b2dc0299d2ff9533f20b8fc6870252ba7cfe480151c6dde59d0310ab23348e8556b8ae42267dbdb35b67857649161bca8d0 + languageName: node + linkType: hard + "@babel/plugin-proposal-async-generator-functions@npm:^7.0.0, @babel/plugin-proposal-async-generator-functions@npm:^7.20.7": version: 7.20.7 resolution: "@babel/plugin-proposal-async-generator-functions@npm:7.20.7" @@ -3126,14 +3495,14 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-syntax-flow@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-syntax-flow@npm:7.22.5" +"@babel/plugin-syntax-flow@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-syntax-flow@npm:7.24.6" dependencies: - "@babel/helper-plugin-utils": ^7.22.5 + "@babel/helper-plugin-utils": ^7.24.6 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 84c8c40fcfe8e78cecdd6fb90e8f97f419e3f3b27a33de8324ae97d5ce1b87cdd98a636fa21a68d4d2c37c7d63f3a279bb84b6956b849921affed6b806b6ffe7 + checksum: 0df374b03344c2fda8639f50fe445ce1fb90e947da20880b468a9419123f39b4f0e1de6aef92615c5668754cd2058d8a918e7c4fdd20fe3cf55b86c1370d6fab languageName: node linkType: hard @@ -3159,6 +3528,17 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-syntax-import-assertions@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-syntax-import-assertions@npm:7.24.6" + dependencies: + "@babel/helper-plugin-utils": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: abd640f9e2cd9b17d8f88a4431229429d57369d4fa5cbdab62b7a329812b3e7733e3f9f316dd393addb6db8d9b9b58dbd8ac39685a0c1e07bbb89b6c82445ae9 + languageName: node + linkType: hard + "@babel/plugin-syntax-import-attributes@npm:^7.22.3": version: 7.22.3 resolution: "@babel/plugin-syntax-import-attributes@npm:7.22.3" @@ -3181,6 +3561,17 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-syntax-import-attributes@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-syntax-import-attributes@npm:7.24.6" + dependencies: + "@babel/helper-plugin-utils": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 81d83ad26dddfe0da86a34722ced7f938741fa18afe5b02fbabfa99ae4e14d97be185dbedc746eab2f1c3e6dc5560054c3cb780cb946be4533f648dca593c92b + languageName: node + linkType: hard + "@babel/plugin-syntax-import-meta@npm:^7.10.4, @babel/plugin-syntax-import-meta@npm:^7.8.3": version: 7.10.4 resolution: "@babel/plugin-syntax-import-meta@npm:7.10.4" @@ -3236,6 +3627,17 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-syntax-jsx@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-syntax-jsx@npm:7.24.6" + dependencies: + "@babel/helper-plugin-utils": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: e288681cab57d059b0b2e132040eb5e21a158c40229c600e77cb0289ba5d32a2102af94e43390d270e0ddd968685e9de8d10dab0291c53b84e2219a7bc4cdb54 + languageName: node + linkType: hard + "@babel/plugin-syntax-logical-assignment-operators@npm:^7.10.4, @babel/plugin-syntax-logical-assignment-operators@npm:^7.8.3": version: 7.10.4 resolution: "@babel/plugin-syntax-logical-assignment-operators@npm:7.10.4" @@ -3413,6 +3815,17 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-arrow-functions@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-arrow-functions@npm:7.24.6" + dependencies: + "@babel/helper-plugin-utils": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: be99f3208d1e828d923ad8d437644e3e62f6cb1b68acb7ec1b1e5cf169d3df8441aa8eaa1ea22fdf2e7d1a37a2d422ce04121829e625d5c56403bb3923226719 + languageName: node + linkType: hard + "@babel/plugin-transform-async-generator-functions@npm:^7.22.15, @babel/plugin-transform-async-generator-functions@npm:^7.22.5": version: 7.22.15 resolution: "@babel/plugin-transform-async-generator-functions@npm:7.22.15" @@ -3441,6 +3854,20 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-async-generator-functions@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-async-generator-functions@npm:7.24.6" + dependencies: + "@babel/helper-environment-visitor": ^7.24.6 + "@babel/helper-plugin-utils": ^7.24.6 + "@babel/helper-remap-async-to-generator": ^7.24.6 + "@babel/plugin-syntax-async-generators": ^7.8.4 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 9c9a49c7350c330964420dfc1263ed2e7accf53ce9bf4bec556500b99b9a81701497618d755c78924270ee263aad61564dc6ec3d13c634b2be91f8cdbaeea874 + languageName: node + linkType: hard + "@babel/plugin-transform-async-to-generator@npm:^7.0.0, @babel/plugin-transform-async-to-generator@npm:^7.20.7": version: 7.20.7 resolution: "@babel/plugin-transform-async-to-generator@npm:7.20.7" @@ -3467,6 +3894,19 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-async-to-generator@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-async-to-generator@npm:7.24.6" + dependencies: + "@babel/helper-module-imports": ^7.24.6 + "@babel/helper-plugin-utils": ^7.24.6 + "@babel/helper-remap-async-to-generator": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 3ac6dc52328b81361cce2c77f81f9e3e6deb48086cbb1410282ba27d4eb9aae28386cd33480a607072ce1c17c4b61300520fa1671599a3a21facc7ba2b69cd32 + languageName: node + linkType: hard + "@babel/plugin-transform-block-scoped-functions@npm:^7.0.0": version: 7.16.7 resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.16.7" @@ -3500,6 +3940,17 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-block-scoped-functions@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.24.6" + dependencies: + "@babel/helper-plugin-utils": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 77b5dba0b46de2b2e5a62968418bdc76e4245603866e8d53c1f413cdfb2b4a0352893ce1e039a383d8e50617c73f4622dfab1d9d56081e8926672de655361683 + languageName: node + linkType: hard + "@babel/plugin-transform-block-scoping@npm:^7.0.0": version: 7.17.12 resolution: "@babel/plugin-transform-block-scoping@npm:7.17.12" @@ -3544,6 +3995,17 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-block-scoping@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-block-scoping@npm:7.24.6" + dependencies: + "@babel/helper-plugin-utils": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: a8113f1bf2e8fb83de1b608daf3c924f08b54b98e0fb5076379f35ff1b8310e5f2eba510356a425f0c3f027a777777851066acb92d3e72624c37293465b93c5a + languageName: node + linkType: hard + "@babel/plugin-transform-class-properties@npm:7.22.5, @babel/plugin-transform-class-properties@npm:^7.22.5": version: 7.22.5 resolution: "@babel/plugin-transform-class-properties@npm:7.22.5" @@ -3568,6 +4030,18 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-class-properties@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-class-properties@npm:7.24.6" + dependencies: + "@babel/helper-create-class-features-plugin": ^7.24.6 + "@babel/helper-plugin-utils": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 79228c7eade70fed3459426233f6e507ab0c238b91cd53a527005c4e175ad2a20c918f1de09ca869a7bcd920b5452e80a1cfe7c51e4f80602c412865f049153a + languageName: node + linkType: hard + "@babel/plugin-transform-class-static-block@npm:^7.22.11, @babel/plugin-transform-class-static-block@npm:^7.22.5": version: 7.22.11 resolution: "@babel/plugin-transform-class-static-block@npm:7.22.11" @@ -3594,6 +4068,19 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-class-static-block@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-class-static-block@npm:7.24.6" + dependencies: + "@babel/helper-create-class-features-plugin": ^7.24.6 + "@babel/helper-plugin-utils": ^7.24.6 + "@babel/plugin-syntax-class-static-block": ^7.14.5 + peerDependencies: + "@babel/core": ^7.12.0 + checksum: a574d565b6416ae98ce3d918bbbdfdf215440dee5a028f1076a963c90b8d7c64e5f1aae54afe605d3e607b93732a6f87b5fb62177680f895de47e2b4c7d92b78 + languageName: node + linkType: hard + "@babel/plugin-transform-classes@npm:^7.0.0": version: 7.17.12 resolution: "@babel/plugin-transform-classes@npm:7.17.12" @@ -3650,6 +4137,24 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-classes@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-classes@npm:7.24.6" + dependencies: + "@babel/helper-annotate-as-pure": ^7.24.6 + "@babel/helper-compilation-targets": ^7.24.6 + "@babel/helper-environment-visitor": ^7.24.6 + "@babel/helper-function-name": ^7.24.6 + "@babel/helper-plugin-utils": ^7.24.6 + "@babel/helper-replace-supers": ^7.24.6 + "@babel/helper-split-export-declaration": ^7.24.6 + globals: ^11.1.0 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 2891dfcb1d905df55437f7a29a67b9373f6ca79bb14fadff132e56be1618e02cfd959780f3d49aa2aed9d6daa0b6ea879f5de25118c5c2210b5bb798be291eb8 + languageName: node + linkType: hard + "@babel/plugin-transform-computed-properties@npm:^7.0.0": version: 7.17.12 resolution: "@babel/plugin-transform-computed-properties@npm:7.17.12" @@ -3697,6 +4202,18 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-computed-properties@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-computed-properties@npm:7.24.6" + dependencies: + "@babel/helper-plugin-utils": ^7.24.6 + "@babel/template": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: be2d0d193b07a1c7efae2fd67d33f6b71d1a8f7cb1f3f07667717c072aaa4e7164d71b6cdd654a9352a7ddd104bdb7a5c69cb4c10d105128326cb08c792a0658 + languageName: node + linkType: hard + "@babel/plugin-transform-destructuring@npm:^7.0.0": version: 7.18.0 resolution: "@babel/plugin-transform-destructuring@npm:7.18.0" @@ -3741,6 +4258,17 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-destructuring@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-destructuring@npm:7.24.6" + dependencies: + "@babel/helper-plugin-utils": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: b81f74939a949bf366f18efabf560c5aa03aacd5cd561313918dbefbc779fb26a63fc903156deebf859ecf40df8ca23a6bcbfa0c003b64e9082d75dc5a11e79b + languageName: node + linkType: hard + "@babel/plugin-transform-dotall-regex@npm:^7.18.6": version: 7.18.6 resolution: "@babel/plugin-transform-dotall-regex@npm:7.18.6" @@ -3765,6 +4293,18 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-dotall-regex@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-dotall-regex@npm:7.24.6" + dependencies: + "@babel/helper-create-regexp-features-plugin": ^7.24.6 + "@babel/helper-plugin-utils": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: bd5cae74e3c5642416bae04985cfe3478315ad48a0f934169253b1eecc1365c6880d350b4077fdee72172602f8dbec32766dfe8f17776d5b2d3b53dd01382713 + languageName: node + linkType: hard + "@babel/plugin-transform-dotall-regex@npm:^7.4.4": version: 7.16.7 resolution: "@babel/plugin-transform-dotall-regex@npm:7.16.7" @@ -3799,6 +4339,17 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-duplicate-keys@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-duplicate-keys@npm:7.24.6" + dependencies: + "@babel/helper-plugin-utils": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 5a1f54aa7731816d722a0627176af0c810061275c22c981e09c0da2648372ca39cf331b6e7a8dad380db09100c1a655dc13307758df9a9bf88f605a99eba4e02 + languageName: node + linkType: hard + "@babel/plugin-transform-dynamic-import@npm:^7.22.1": version: 7.22.1 resolution: "@babel/plugin-transform-dynamic-import@npm:7.22.1" @@ -3823,6 +4374,18 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-dynamic-import@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-dynamic-import@npm:7.24.6" + dependencies: + "@babel/helper-plugin-utils": ^7.24.6 + "@babel/plugin-syntax-dynamic-import": ^7.8.3 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 20360f1147af18c9669742c2ee1a832c4130dce3e73c453692edb16ea920cc4cb8e06e79cbc87ecc39c5db1ccc126bc28994cf6c4ffff59366301cc52cc2cef9 + languageName: node + linkType: hard + "@babel/plugin-transform-exponentiation-operator@npm:^7.0.0, @babel/plugin-transform-exponentiation-operator@npm:^7.18.6": version: 7.18.6 resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.18.6" @@ -3847,6 +4410,18 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-exponentiation-operator@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.24.6" + dependencies: + "@babel/helper-builder-binary-assignment-operator-visitor": ^7.24.6 + "@babel/helper-plugin-utils": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: d377fe651677a6dfb2dbfb3ade2e80ece6704b225b463a42cc72330a688a6d85a6c28062d0f0cc2eb6d265e2d9294a14be8f0e144a782996d0acdd86a58e139e + languageName: node + linkType: hard + "@babel/plugin-transform-export-namespace-from@npm:^7.22.11, @babel/plugin-transform-export-namespace-from@npm:^7.22.5": version: 7.22.11 resolution: "@babel/plugin-transform-export-namespace-from@npm:7.22.11" @@ -3871,6 +4446,18 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-export-namespace-from@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-export-namespace-from@npm:7.24.6" + dependencies: + "@babel/helper-plugin-utils": ^7.24.6 + "@babel/plugin-syntax-export-namespace-from": ^7.8.3 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 3e42cac016ce10aaaa66a905e4a1112beafe90c9d1919ba91653758c9f576f2c8f3211e191885e227e2d1dd77c111bb4d31b832876883a115047f6dae9ce1dce + languageName: node + linkType: hard + "@babel/plugin-transform-flow-strip-types@npm:^7.0.0": version: 7.13.0 resolution: "@babel/plugin-transform-flow-strip-types@npm:7.13.0" @@ -3895,15 +4482,15 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-flow-strip-types@npm:^7.22.5": - version: 7.22.5 - resolution: "@babel/plugin-transform-flow-strip-types@npm:7.22.5" +"@babel/plugin-transform-flow-strip-types@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-flow-strip-types@npm:7.24.6" dependencies: - "@babel/helper-plugin-utils": ^7.22.5 - "@babel/plugin-syntax-flow": ^7.22.5 + "@babel/helper-plugin-utils": ^7.24.6 + "@babel/plugin-syntax-flow": ^7.24.6 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 1ba48187d6f33814be01c6870489f0b1858256cf2b9dd7e62f02af8b30049bf375112f1d44692c5fed3cb9cd26ee2fb32e358cd79b6ad2360a51e8f993e861bf + checksum: bef6c7d725ec3572d9cef6847129db109a9822c283435b69a6e6aca9c3c3078e20cf9c537a77cff2cc60c52936c82d68100298787f6d1cae7b48e261511385c3 languageName: node linkType: hard @@ -3951,6 +4538,18 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-for-of@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-for-of@npm:7.24.6" + dependencies: + "@babel/helper-plugin-utils": ^7.24.6 + "@babel/helper-skip-transparent-expression-wrappers": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 7094f775acc7c7ccb7b5141ced7312f3cd7b1be3a1afda72548a21b8234d70693a6fc26b0c7ef02719f9b3ee7a0702057c3eed6d3caeee2c3631db7f414baaca + languageName: node + linkType: hard + "@babel/plugin-transform-function-name@npm:^7.0.0": version: 7.16.7 resolution: "@babel/plugin-transform-function-name@npm:7.16.7" @@ -3990,6 +4589,19 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-function-name@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-function-name@npm:7.24.6" + dependencies: + "@babel/helper-compilation-targets": ^7.24.6 + "@babel/helper-function-name": ^7.24.6 + "@babel/helper-plugin-utils": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: d9f51a89522f988d45c5b3ef09a1f9efde2122b94f5c1231bc381023738a46808b45645e0708d1ae86be86a9670f29c1b0a24be633c3a2729bcc2b0511521051 + languageName: node + linkType: hard + "@babel/plugin-transform-json-strings@npm:^7.22.11, @babel/plugin-transform-json-strings@npm:^7.22.5": version: 7.22.11 resolution: "@babel/plugin-transform-json-strings@npm:7.22.11" @@ -4014,6 +4626,18 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-json-strings@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-json-strings@npm:7.24.6" + dependencies: + "@babel/helper-plugin-utils": ^7.24.6 + "@babel/plugin-syntax-json-strings": ^7.8.3 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: fd67fab338687250cb49ac9cd67514a38884013bfc172b834c2862509c40e5b436e716e6cea0ebbfd9d1fad4cae0132da187548c6af6f67717876744c17f5ce4 + languageName: node + linkType: hard + "@babel/plugin-transform-literals@npm:^7.0.0": version: 7.17.12 resolution: "@babel/plugin-transform-literals@npm:7.17.12" @@ -4047,6 +4671,17 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-literals@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-literals@npm:7.24.6" + dependencies: + "@babel/helper-plugin-utils": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 128da0047b66bce51b94bf50c2a73727e51c7ac661b641b0e0fc1e700dae11697412fa739cc01183919c427e7f970f384186f246fbab575195217d6a8df97381 + languageName: node + linkType: hard + "@babel/plugin-transform-logical-assignment-operators@npm:^7.22.11, @babel/plugin-transform-logical-assignment-operators@npm:^7.22.5": version: 7.22.11 resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.22.11" @@ -4071,6 +4706,18 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-logical-assignment-operators@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.24.6" + dependencies: + "@babel/helper-plugin-utils": ^7.24.6 + "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: f2b97be1ff770be1467f172492f5c1fbc074ea60de1f8c515684b49c248bd87ae44626368fc577e5239522cb640f351531ef32a45b2e88a049279f2f28246777 + languageName: node + linkType: hard + "@babel/plugin-transform-member-expression-literals@npm:^7.0.0": version: 7.16.7 resolution: "@babel/plugin-transform-member-expression-literals@npm:7.16.7" @@ -4104,6 +4751,17 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-member-expression-literals@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-member-expression-literals@npm:7.24.6" + dependencies: + "@babel/helper-plugin-utils": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: b30bd3df2932af85116a8ea38e040987ea5caf268c634902195e5b9eb0d4c76ee34b01309c2fb28e362f3c2636d4927c19783f3f8eea33ac451885ec29b61a56 + languageName: node + linkType: hard + "@babel/plugin-transform-modules-amd@npm:^7.20.11": version: 7.20.11 resolution: "@babel/plugin-transform-modules-amd@npm:7.20.11" @@ -4128,6 +4786,18 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-modules-amd@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-modules-amd@npm:7.24.6" + dependencies: + "@babel/helper-module-transforms": ^7.24.6 + "@babel/helper-plugin-utils": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 47d85aefb44b85168792266220e184722f96031a40a0d09a2ac026b6997927ea553cfc83bd0a77363873467120140b899fefa8e4c49475d1d21e15c651553086 + languageName: node + linkType: hard + "@babel/plugin-transform-modules-commonjs@npm:^7.0.0": version: 7.18.2 resolution: "@babel/plugin-transform-modules-commonjs@npm:7.18.2" @@ -4194,6 +4864,19 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-modules-commonjs@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-modules-commonjs@npm:7.24.6" + dependencies: + "@babel/helper-module-transforms": ^7.24.6 + "@babel/helper-plugin-utils": ^7.24.6 + "@babel/helper-simple-access": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 8fc772df64d58a431351984f7f34896f61ba8911fde547cd041b6234117e8b84a37f62a4f12c1153df7002d356b8e81944923cc9b37e96face76436cf57ac800 + languageName: node + linkType: hard + "@babel/plugin-transform-modules-systemjs@npm:^7.20.11": version: 7.20.11 resolution: "@babel/plugin-transform-modules-systemjs@npm:7.20.11" @@ -4250,6 +4933,20 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-modules-systemjs@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-modules-systemjs@npm:7.24.6" + dependencies: + "@babel/helper-hoist-variables": ^7.24.6 + "@babel/helper-module-transforms": ^7.24.6 + "@babel/helper-plugin-utils": ^7.24.6 + "@babel/helper-validator-identifier": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: cc65e757290924c7a37a9e606801b14f8bc3dc7c4281448ce27d8cf63e17ff5ac0c02a4d864bbe0aa950ae84cef9590347d1231a260a3cf0c3ec1cb6b89d939a + languageName: node + linkType: hard + "@babel/plugin-transform-modules-umd@npm:^7.18.6": version: 7.18.6 resolution: "@babel/plugin-transform-modules-umd@npm:7.18.6" @@ -4274,6 +4971,18 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-modules-umd@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-modules-umd@npm:7.24.6" + dependencies: + "@babel/helper-module-transforms": ^7.24.6 + "@babel/helper-plugin-utils": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: e12f64e4b197b833f2a2923002db810a3e3071be2fc62b201c0b048142a32bbc4709633d346aaa301534c9c447b9e68800f24dcbbd3e1c1f3de04c737379fc24 + languageName: node + linkType: hard + "@babel/plugin-transform-named-capturing-groups-regex@npm:^7.0.0, @babel/plugin-transform-named-capturing-groups-regex@npm:^7.20.5": version: 7.20.5 resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.20.5" @@ -4310,6 +5019,18 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.24.6" + dependencies: + "@babel/helper-create-regexp-features-plugin": ^7.24.6 + "@babel/helper-plugin-utils": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0 + checksum: a86048c47178af3d752a458b49c8483ceccbb0cff1775a6d0929415734280f42f14d48bf62d327f6fb0f8c0dff496258b59705debdd4ea68a3b247649f945f2f + languageName: node + linkType: hard + "@babel/plugin-transform-new-target@npm:^7.18.6": version: 7.18.6 resolution: "@babel/plugin-transform-new-target@npm:7.18.6" @@ -4343,6 +5064,17 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-new-target@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-new-target@npm:7.24.6" + dependencies: + "@babel/helper-plugin-utils": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 9d5de07a334eb9d2521cf7d319b23f8cdf234e4fe003d034de448a506ae3f4756227ce34aafa037c6541ec4d993eb15075bcb3c064d3eaae64eba4f405d6f232 + languageName: node + linkType: hard + "@babel/plugin-transform-nullish-coalescing-operator@npm:^7.22.11, @babel/plugin-transform-nullish-coalescing-operator@npm:^7.22.5": version: 7.22.11 resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.22.11" @@ -4367,6 +5099,18 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.24.6" + dependencies: + "@babel/helper-plugin-utils": ^7.24.6 + "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 828b815276153ffa8b53e74a1ff9dd2cd51c2e76f6fbcd8c71c3c21953dcbd14e2fe2e317989c3a93f4896e21205d978773932e414a2ea4b89609a74130a2623 + languageName: node + linkType: hard + "@babel/plugin-transform-numeric-separator@npm:^7.22.11, @babel/plugin-transform-numeric-separator@npm:^7.22.5": version: 7.22.11 resolution: "@babel/plugin-transform-numeric-separator@npm:7.22.11" @@ -4391,6 +5135,18 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-numeric-separator@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-numeric-separator@npm:7.24.6" + dependencies: + "@babel/helper-plugin-utils": ^7.24.6 + "@babel/plugin-syntax-numeric-separator": ^7.10.4 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: e3d608693d9329704145fb6b8e001dd4e671ddfdbb6770ecebdffae350b16a83b4d01f69ba849d73e4a58cbe802d42be2f883b52b98f9d372020e5d1b1f4f8ed + languageName: node + linkType: hard + "@babel/plugin-transform-object-rest-spread@npm:^7.22.15, @babel/plugin-transform-object-rest-spread@npm:^7.22.5": version: 7.22.15 resolution: "@babel/plugin-transform-object-rest-spread@npm:7.22.15" @@ -4421,6 +5177,20 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-object-rest-spread@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-object-rest-spread@npm:7.24.6" + dependencies: + "@babel/helper-compilation-targets": ^7.24.6 + "@babel/helper-plugin-utils": ^7.24.6 + "@babel/plugin-syntax-object-rest-spread": ^7.8.3 + "@babel/plugin-transform-parameters": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 5b5d6a3735d1b8fcc768c9acc1191b9dd1964e3454b0195d15346f889fb2134d3a8910a863359620775d5b7d56b3f4534429012eeef6a9c6d0518e6adfe5c552 + languageName: node + linkType: hard + "@babel/plugin-transform-object-super@npm:^7.0.0": version: 7.16.7 resolution: "@babel/plugin-transform-object-super@npm:7.16.7" @@ -4457,6 +5227,18 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-object-super@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-object-super@npm:7.24.6" + dependencies: + "@babel/helper-plugin-utils": ^7.24.6 + "@babel/helper-replace-supers": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 291bb801050d9041a34da81fc68f6465d22a34bb2aef73b5cb0ecd756c0245c0af7e99e8c46d63e3e74e1cf598be1c6624da67f49d7b13e9a16e019634082466 + languageName: node + linkType: hard + "@babel/plugin-transform-optional-catch-binding@npm:^7.22.11, @babel/plugin-transform-optional-catch-binding@npm:^7.22.5": version: 7.22.11 resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.22.11" @@ -4481,6 +5263,18 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-optional-catch-binding@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.24.6" + dependencies: + "@babel/helper-plugin-utils": ^7.24.6 + "@babel/plugin-syntax-optional-catch-binding": ^7.8.3 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: ab12b52d0007a835242505df0348743c84014e733b534583ddd786aa40dd5145d875606a666255ac823a6ccc65f649c3cebb5e5e76f8bf7b8bdf26450c7b6c8a + languageName: node + linkType: hard + "@babel/plugin-transform-optional-chaining@npm:^7.22.15": version: 7.22.15 resolution: "@babel/plugin-transform-optional-chaining@npm:7.22.15" @@ -4520,6 +5314,19 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-optional-chaining@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-optional-chaining@npm:7.24.6" + dependencies: + "@babel/helper-plugin-utils": ^7.24.6 + "@babel/helper-skip-transparent-expression-wrappers": ^7.24.6 + "@babel/plugin-syntax-optional-chaining": ^7.8.3 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 6a3a363775dc83d6a2812bbbe695fce89a23872ecc71d81484a8bdf8747b7ad53a2559d0a752f412b994b0c043e7379de09b17bff70ea38916e60c7260c91bac + languageName: node + linkType: hard + "@babel/plugin-transform-parameters@npm:^7.0.0, @babel/plugin-transform-parameters@npm:^7.17.12": version: 7.17.12 resolution: "@babel/plugin-transform-parameters@npm:7.17.12" @@ -4564,6 +5371,17 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-parameters@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-parameters@npm:7.24.6" + dependencies: + "@babel/helper-plugin-utils": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: e8c70d736cee3752444bd2c047542a82eec81583cb1bf69094608dc50645ca660a85833cc775644d8dac11128d3297e7dc5c2cb964da1c18a96d004ff645149d + languageName: node + linkType: hard + "@babel/plugin-transform-private-methods@npm:7.22.5, @babel/plugin-transform-private-methods@npm:^7.22.5": version: 7.22.5 resolution: "@babel/plugin-transform-private-methods@npm:7.22.5" @@ -4588,6 +5406,18 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-private-methods@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-private-methods@npm:7.24.6" + dependencies: + "@babel/helper-create-class-features-plugin": ^7.24.6 + "@babel/helper-plugin-utils": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: ee6aae3ec45fc33cc7f02c3092b3bba35bde02c8293e11c87e7549d6afb3dde024a968542fbb5d5204a74aa5b909e717c09d37f4e1be39a8ef3f26466c0391e0 + languageName: node + linkType: hard + "@babel/plugin-transform-private-property-in-object@npm:7.22.5": version: 7.22.5 resolution: "@babel/plugin-transform-private-property-in-object@npm:7.22.5" @@ -4630,6 +5460,20 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-private-property-in-object@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-private-property-in-object@npm:7.24.6" + dependencies: + "@babel/helper-annotate-as-pure": ^7.24.6 + "@babel/helper-create-class-features-plugin": ^7.24.6 + "@babel/helper-plugin-utils": ^7.24.6 + "@babel/plugin-syntax-private-property-in-object": ^7.14.5 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: a6b0f578a1f9195956fb66686a6e03b03b1293abd5f9b244fc077669ae3365391d61a4107ac9f2f019accfb3f09c19ede4b5811082c116709c7aa6b08efc9ffb + languageName: node + linkType: hard + "@babel/plugin-transform-property-literals@npm:^7.0.0": version: 7.16.7 resolution: "@babel/plugin-transform-property-literals@npm:7.16.7" @@ -4663,6 +5507,17 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-property-literals@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-property-literals@npm:7.24.6" + dependencies: + "@babel/helper-plugin-utils": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 003bbec02aaddde04de492ef63cd4aab131ac65bc8ae0f2b49394b93b1c6a3d104ef62b57184569332de0149aa9cb4b2528b40e0ca9c5884117b7c379cd1a017 + languageName: node + linkType: hard + "@babel/plugin-transform-react-constant-elements@npm:^7.21.3": version: 7.22.3 resolution: "@babel/plugin-transform-react-constant-elements@npm:7.22.3" @@ -4696,6 +5551,17 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-react-display-name@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-react-display-name@npm:7.24.6" + dependencies: + "@babel/helper-plugin-utils": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 23e5992815b4f9bda6b90673d94ba74d001281fa2b02780d59f666234ed9b05782546364b13009fe0d72b3d5b829f2c6831948b0af120294f5f2e5f4da9c7eab + languageName: node + linkType: hard + "@babel/plugin-transform-react-jsx-development@npm:^7.18.6": version: 7.18.6 resolution: "@babel/plugin-transform-react-jsx-development@npm:7.18.6" @@ -4718,6 +5584,17 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-react-jsx-development@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-react-jsx-development@npm:7.24.6" + dependencies: + "@babel/plugin-transform-react-jsx": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 912993aa8546d3aa129d6a567018c29bc99f0a3c9a99062f756d48c8ad0444f42314a245a1434964e23685a59c4a1564abb8e9a251d8ca216ed726661ede50d9 + languageName: node + linkType: hard + "@babel/plugin-transform-react-jsx-self@npm:^7.0.0": version: 7.21.0 resolution: "@babel/plugin-transform-react-jsx-self@npm:7.21.0" @@ -4770,7 +5647,22 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-react-jsx@npm:^7.22.15, @babel/plugin-transform-react-jsx@npm:^7.22.5": +"@babel/plugin-transform-react-jsx@npm:^7.22.3": + version: 7.22.3 + resolution: "@babel/plugin-transform-react-jsx@npm:7.22.3" + dependencies: + "@babel/helper-annotate-as-pure": ^7.18.6 + "@babel/helper-module-imports": ^7.21.4 + "@babel/helper-plugin-utils": ^7.21.5 + "@babel/plugin-syntax-jsx": ^7.21.4 + "@babel/types": ^7.22.3 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 063243f5767de490d10ed671223f27baababa4b89b67d1d77207f8f91f8915c485b877773472c97398aef3ce898c3570d367994d5598a0686e18ff5bf3472f31 + languageName: node + linkType: hard + +"@babel/plugin-transform-react-jsx@npm:^7.22.5": version: 7.22.15 resolution: "@babel/plugin-transform-react-jsx@npm:7.22.15" dependencies: @@ -4785,18 +5677,18 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-react-jsx@npm:^7.22.3": - version: 7.22.3 - resolution: "@babel/plugin-transform-react-jsx@npm:7.22.3" +"@babel/plugin-transform-react-jsx@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-react-jsx@npm:7.24.6" dependencies: - "@babel/helper-annotate-as-pure": ^7.18.6 - "@babel/helper-module-imports": ^7.21.4 - "@babel/helper-plugin-utils": ^7.21.5 - "@babel/plugin-syntax-jsx": ^7.21.4 - "@babel/types": ^7.22.3 + "@babel/helper-annotate-as-pure": ^7.24.6 + "@babel/helper-module-imports": ^7.24.6 + "@babel/helper-plugin-utils": ^7.24.6 + "@babel/plugin-syntax-jsx": ^7.24.6 + "@babel/types": ^7.24.6 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 063243f5767de490d10ed671223f27baababa4b89b67d1d77207f8f91f8915c485b877773472c97398aef3ce898c3570d367994d5598a0686e18ff5bf3472f31 + checksum: 6e6ef2a9c364c81dc865cfac12fb45075470e918af648239b3ef9d4720577762950b9db6db2d1f8c2e4f3f0c2e4e169d4ebc7c5c2037fc0755ee606016a413f0 languageName: node linkType: hard @@ -4824,6 +5716,18 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-react-pure-annotations@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-react-pure-annotations@npm:7.24.6" + dependencies: + "@babel/helper-annotate-as-pure": ^7.24.6 + "@babel/helper-plugin-utils": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: e358ecabb328a952d8aa36acbbf7bf017b1905d97401eaafb6b99572d8d4b477a3e37cccc1cd582d980952936b7e6dd370ade488e167591c1c9fb7940141c301 + languageName: node + linkType: hard + "@babel/plugin-transform-regenerator@npm:^7.20.5": version: 7.20.5 resolution: "@babel/plugin-transform-regenerator@npm:7.20.5" @@ -4860,6 +5764,18 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-regenerator@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-regenerator@npm:7.24.6" + dependencies: + "@babel/helper-plugin-utils": ^7.24.6 + regenerator-transform: ^0.15.2 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 78ee16d3ac5c53d6f4526cc45d66dfd163625c62efb8e75cebbc8fcc2f4f13967b2a7e3464f854b559dcd93c4a21fc139ddcb7c70ada7074b53872a1378632f8 + languageName: node + linkType: hard + "@babel/plugin-transform-reserved-words@npm:^7.18.6": version: 7.18.6 resolution: "@babel/plugin-transform-reserved-words@npm:7.18.6" @@ -4882,6 +5798,17 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-reserved-words@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-reserved-words@npm:7.24.6" + dependencies: + "@babel/helper-plugin-utils": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 37097ad5333629d52092bf9e7573e9c5012b3ea6c9148540b9780e754a1bbafa9df6506a054743cd928bd83989bb8c507280e1ebec955de87745bbe11f7dd0be + languageName: node + linkType: hard + "@babel/plugin-transform-runtime@npm:7.22.5": version: 7.22.5 resolution: "@babel/plugin-transform-runtime@npm:7.22.5" @@ -4914,19 +5841,19 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-runtime@npm:^7.22.9": - version: 7.22.15 - resolution: "@babel/plugin-transform-runtime@npm:7.22.15" +"@babel/plugin-transform-runtime@npm:^7.23.2": + version: 7.24.6 + resolution: "@babel/plugin-transform-runtime@npm:7.24.6" dependencies: - "@babel/helper-module-imports": ^7.22.15 - "@babel/helper-plugin-utils": ^7.22.5 - babel-plugin-polyfill-corejs2: ^0.4.5 - babel-plugin-polyfill-corejs3: ^0.8.3 - babel-plugin-polyfill-regenerator: ^0.5.2 + "@babel/helper-module-imports": ^7.24.6 + "@babel/helper-plugin-utils": ^7.24.6 + babel-plugin-polyfill-corejs2: ^0.4.10 + babel-plugin-polyfill-corejs3: ^0.10.1 + babel-plugin-polyfill-regenerator: ^0.6.1 semver: ^6.3.1 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 7edf20b13d02f856276221624abf3b8084daa3f265a6e5c70ee0d0c63087fcf726dc8756a9c8bb3d25a1ce8697ab66ec8cdd15be992c21aed9971cb5bfe80a5b + checksum: 8400f52f1a54e635ff3eae10c717448488e33429777d22ab4b8c486c8bae054da34f4d435242f943bc881bbacf15c139c3dd4837db4d023abaa15ce414b95c2b languageName: node linkType: hard @@ -4963,6 +5890,17 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-shorthand-properties@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-shorthand-properties@npm:7.24.6" + dependencies: + "@babel/helper-plugin-utils": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 6c7c8a2ef45b3e9d5ddf1e2dcb5fc40a581cf218f2122c5f2104b91d518d2d21d8d30f4c1db7f3c1c6c68283ec86e8a19d3b8478582306f6529388503d04b61f + languageName: node + linkType: hard + "@babel/plugin-transform-spread@npm:^7.0.0": version: 7.17.12 resolution: "@babel/plugin-transform-spread@npm:7.17.12" @@ -4999,6 +5937,18 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-spread@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-spread@npm:7.24.6" + dependencies: + "@babel/helper-plugin-utils": ^7.24.6 + "@babel/helper-skip-transparent-expression-wrappers": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: aa86664134e03f0e2d70522e5634c67a31b8f93abd00755e98f0c5dbcb2411bd1f2745e0b3b4e6ed2d280b48b15136225c457df89b16f1fff1f98eac999f2064 + languageName: node + linkType: hard + "@babel/plugin-transform-sticky-regex@npm:^7.0.0, @babel/plugin-transform-sticky-regex@npm:^7.18.6": version: 7.18.6 resolution: "@babel/plugin-transform-sticky-regex@npm:7.18.6" @@ -5021,6 +5971,17 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-sticky-regex@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-sticky-regex@npm:7.24.6" + dependencies: + "@babel/helper-plugin-utils": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 960962195044c0a66c8a12ba59e72271cf2ab5774606018622012bfac7172d1edebb189c91ca2399f610166b9578c769f09f2802eeff1d0866f50642caa15c6d + languageName: node + linkType: hard + "@babel/plugin-transform-template-literals@npm:^7.0.0": version: 7.18.2 resolution: "@babel/plugin-transform-template-literals@npm:7.18.2" @@ -5054,6 +6015,17 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-template-literals@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-template-literals@npm:7.24.6" + dependencies: + "@babel/helper-plugin-utils": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 9518e4cdf399505645b13a80171199b0b9a8366df5dcc547359430b9a1b9f00260da20cdec7fe0ed8709e5224c67e08e793f85be674e23937650e592d453b8bf + languageName: node + linkType: hard + "@babel/plugin-transform-typeof-symbol@npm:^7.18.9": version: 7.18.9 resolution: "@babel/plugin-transform-typeof-symbol@npm:7.18.9" @@ -5076,6 +6048,17 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-typeof-symbol@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-typeof-symbol@npm:7.24.6" + dependencies: + "@babel/helper-plugin-utils": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 91af214cffe5b8ae33702beb1f9ad0fa14b7809662118b78bb1a2e8a50e016f4c3d2b1505a3140245161daf988498509ca35b741bab91024dffe128682ac24d6 + languageName: node + linkType: hard + "@babel/plugin-transform-typescript@npm:^7.21.3, @babel/plugin-transform-typescript@npm:^7.5.0": version: 7.21.3 resolution: "@babel/plugin-transform-typescript@npm:7.21.3" @@ -5137,6 +6120,17 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-unicode-escapes@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-unicode-escapes@npm:7.24.6" + dependencies: + "@babel/helper-plugin-utils": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 905211493c9d97993476d1596c46a18e40aaa4c310b4464e05979f5a16f3d31fcf111d67c1c3912cfc2e3cdf6e6cb51c22fd69aea7a017759c790bfe897871e9 + languageName: node + linkType: hard + "@babel/plugin-transform-unicode-property-regex@npm:^7.22.3": version: 7.22.3 resolution: "@babel/plugin-transform-unicode-property-regex@npm:7.22.3" @@ -5161,6 +6155,18 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-unicode-property-regex@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-unicode-property-regex@npm:7.24.6" + dependencies: + "@babel/helper-create-regexp-features-plugin": ^7.24.6 + "@babel/helper-plugin-utils": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 141df101ffd31f8c1f92c62548020240af71811b1d1bad63f7e41aaf6084ec758715a42eb9f80f00b6a04b6d260ad8e362083372b4106cf5aca304e214c66068 + languageName: node + linkType: hard + "@babel/plugin-transform-unicode-regex@npm:^7.0.0, @babel/plugin-transform-unicode-regex@npm:^7.18.6": version: 7.18.6 resolution: "@babel/plugin-transform-unicode-regex@npm:7.18.6" @@ -5185,6 +6191,18 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-unicode-regex@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-unicode-regex@npm:7.24.6" + dependencies: + "@babel/helper-create-regexp-features-plugin": ^7.24.6 + "@babel/helper-plugin-utils": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 5f4ba063221f5f4034ee008b15a4f12b8939f47782c5e9aac198b72e4fe1aafa35dd60795eb979ced25ee0d6dbd7656ae424cfd00206cd59c956c5e3a7976e0d + languageName: node + linkType: hard + "@babel/plugin-transform-unicode-sets-regex@npm:^7.22.3": version: 7.22.3 resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.22.3" @@ -5209,6 +6227,18 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-unicode-sets-regex@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.24.6" + dependencies: + "@babel/helper-create-regexp-features-plugin": ^7.24.6 + "@babel/helper-plugin-utils": ^7.24.6 + peerDependencies: + "@babel/core": ^7.0.0 + checksum: a62af3b80f4f89fb30e1735fe4b2b16e00da552c3bd8af1cce2e54ae7c50398286f729b961fcd0caf675c69289620991be90c3628ea76e5a0d15c864e97351d2 + languageName: node + linkType: hard + "@babel/preset-env@npm:7.22.5": version: 7.22.5 resolution: "@babel/preset-env@npm:7.22.5" @@ -5564,6 +6594,97 @@ __metadata: languageName: node linkType: hard +"@babel/preset-env@npm:^7.23.2": + version: 7.24.6 + resolution: "@babel/preset-env@npm:7.24.6" + dependencies: + "@babel/compat-data": ^7.24.6 + "@babel/helper-compilation-targets": ^7.24.6 + "@babel/helper-plugin-utils": ^7.24.6 + "@babel/helper-validator-option": ^7.24.6 + "@babel/plugin-bugfix-firefox-class-in-computed-class-key": ^7.24.6 + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": ^7.24.6 + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": ^7.24.6 + "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": ^7.24.6 + "@babel/plugin-proposal-private-property-in-object": 7.21.0-placeholder-for-preset-env.2 + "@babel/plugin-syntax-async-generators": ^7.8.4 + "@babel/plugin-syntax-class-properties": ^7.12.13 + "@babel/plugin-syntax-class-static-block": ^7.14.5 + "@babel/plugin-syntax-dynamic-import": ^7.8.3 + "@babel/plugin-syntax-export-namespace-from": ^7.8.3 + "@babel/plugin-syntax-import-assertions": ^7.24.6 + "@babel/plugin-syntax-import-attributes": ^7.24.6 + "@babel/plugin-syntax-import-meta": ^7.10.4 + "@babel/plugin-syntax-json-strings": ^7.8.3 + "@babel/plugin-syntax-logical-assignment-operators": ^7.10.4 + "@babel/plugin-syntax-nullish-coalescing-operator": ^7.8.3 + "@babel/plugin-syntax-numeric-separator": ^7.10.4 + "@babel/plugin-syntax-object-rest-spread": ^7.8.3 + "@babel/plugin-syntax-optional-catch-binding": ^7.8.3 + "@babel/plugin-syntax-optional-chaining": ^7.8.3 + "@babel/plugin-syntax-private-property-in-object": ^7.14.5 + "@babel/plugin-syntax-top-level-await": ^7.14.5 + "@babel/plugin-syntax-unicode-sets-regex": ^7.18.6 + "@babel/plugin-transform-arrow-functions": ^7.24.6 + "@babel/plugin-transform-async-generator-functions": ^7.24.6 + "@babel/plugin-transform-async-to-generator": ^7.24.6 + "@babel/plugin-transform-block-scoped-functions": ^7.24.6 + "@babel/plugin-transform-block-scoping": ^7.24.6 + "@babel/plugin-transform-class-properties": ^7.24.6 + "@babel/plugin-transform-class-static-block": ^7.24.6 + "@babel/plugin-transform-classes": ^7.24.6 + "@babel/plugin-transform-computed-properties": ^7.24.6 + "@babel/plugin-transform-destructuring": ^7.24.6 + "@babel/plugin-transform-dotall-regex": ^7.24.6 + "@babel/plugin-transform-duplicate-keys": ^7.24.6 + "@babel/plugin-transform-dynamic-import": ^7.24.6 + "@babel/plugin-transform-exponentiation-operator": ^7.24.6 + "@babel/plugin-transform-export-namespace-from": ^7.24.6 + "@babel/plugin-transform-for-of": ^7.24.6 + "@babel/plugin-transform-function-name": ^7.24.6 + "@babel/plugin-transform-json-strings": ^7.24.6 + "@babel/plugin-transform-literals": ^7.24.6 + "@babel/plugin-transform-logical-assignment-operators": ^7.24.6 + "@babel/plugin-transform-member-expression-literals": ^7.24.6 + "@babel/plugin-transform-modules-amd": ^7.24.6 + "@babel/plugin-transform-modules-commonjs": ^7.24.6 + "@babel/plugin-transform-modules-systemjs": ^7.24.6 + "@babel/plugin-transform-modules-umd": ^7.24.6 + "@babel/plugin-transform-named-capturing-groups-regex": ^7.24.6 + "@babel/plugin-transform-new-target": ^7.24.6 + "@babel/plugin-transform-nullish-coalescing-operator": ^7.24.6 + "@babel/plugin-transform-numeric-separator": ^7.24.6 + "@babel/plugin-transform-object-rest-spread": ^7.24.6 + "@babel/plugin-transform-object-super": ^7.24.6 + "@babel/plugin-transform-optional-catch-binding": ^7.24.6 + "@babel/plugin-transform-optional-chaining": ^7.24.6 + "@babel/plugin-transform-parameters": ^7.24.6 + "@babel/plugin-transform-private-methods": ^7.24.6 + "@babel/plugin-transform-private-property-in-object": ^7.24.6 + "@babel/plugin-transform-property-literals": ^7.24.6 + "@babel/plugin-transform-regenerator": ^7.24.6 + "@babel/plugin-transform-reserved-words": ^7.24.6 + "@babel/plugin-transform-shorthand-properties": ^7.24.6 + "@babel/plugin-transform-spread": ^7.24.6 + "@babel/plugin-transform-sticky-regex": ^7.24.6 + "@babel/plugin-transform-template-literals": ^7.24.6 + "@babel/plugin-transform-typeof-symbol": ^7.24.6 + "@babel/plugin-transform-unicode-escapes": ^7.24.6 + "@babel/plugin-transform-unicode-property-regex": ^7.24.6 + "@babel/plugin-transform-unicode-regex": ^7.24.6 + "@babel/plugin-transform-unicode-sets-regex": ^7.24.6 + "@babel/preset-modules": 0.1.6-no-external-plugins + babel-plugin-polyfill-corejs2: ^0.4.10 + babel-plugin-polyfill-corejs3: ^0.10.4 + babel-plugin-polyfill-regenerator: ^0.6.1 + core-js-compat: ^3.31.0 + semver: ^6.3.1 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 3467171641b0e38dcddef9b16f11676585bbfe32eab3674a881b6437eee330211c01cecd608d3d4e01607b1faf168184db041782ce90fe437f5a635e6bd7676c + languageName: node + linkType: hard + "@babel/preset-flow@npm:^7.13.13": version: 7.21.4 resolution: "@babel/preset-flow@npm:7.21.4" @@ -5577,16 +6698,16 @@ __metadata: languageName: node linkType: hard -"@babel/preset-flow@npm:^7.22.5": - version: 7.22.15 - resolution: "@babel/preset-flow@npm:7.22.15" +"@babel/preset-flow@npm:^7.22.15": + version: 7.24.6 + resolution: "@babel/preset-flow@npm:7.24.6" dependencies: - "@babel/helper-plugin-utils": ^7.22.5 - "@babel/helper-validator-option": ^7.22.15 - "@babel/plugin-transform-flow-strip-types": ^7.22.5 + "@babel/helper-plugin-utils": ^7.24.6 + "@babel/helper-validator-option": ^7.24.6 + "@babel/plugin-transform-flow-strip-types": ^7.24.6 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 17f8b80b1012802f983227b423c8823990db9748aec4f8bfd56ff774d8d954e9bdea67377788abac526754b3d307215c063c9beadf5f1b4331b30d4ba0593286 + checksum: e2c69ff6df437d6fdd8c069d6bfcc0a091d40537f01d6214e6b7fb0999e4fe0b814fd52bb8f2b5120e0f5df56586f19427480730e0035f93d6164a5a8a017c53 languageName: node linkType: hard @@ -5650,19 +6771,19 @@ __metadata: languageName: node linkType: hard -"@babel/preset-react@npm:^7.22.5": - version: 7.22.15 - resolution: "@babel/preset-react@npm:7.22.15" +"@babel/preset-react@npm:^7.22.15": + version: 7.24.6 + resolution: "@babel/preset-react@npm:7.24.6" dependencies: - "@babel/helper-plugin-utils": ^7.22.5 - "@babel/helper-validator-option": ^7.22.15 - "@babel/plugin-transform-react-display-name": ^7.22.5 - "@babel/plugin-transform-react-jsx": ^7.22.15 - "@babel/plugin-transform-react-jsx-development": ^7.22.5 - "@babel/plugin-transform-react-pure-annotations": ^7.22.5 + "@babel/helper-plugin-utils": ^7.24.6 + "@babel/helper-validator-option": ^7.24.6 + "@babel/plugin-transform-react-display-name": ^7.24.6 + "@babel/plugin-transform-react-jsx": ^7.24.6 + "@babel/plugin-transform-react-jsx-development": ^7.24.6 + "@babel/plugin-transform-react-pure-annotations": ^7.24.6 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: c3ef99dfa2e9f57d2e08603e883aa20f47630a826c8e413888a93ae6e0084b5016871e463829be125329d40a1ba0a89f7c43d77b6dab52083c225cb43e63d10e + checksum: 3bf120b3c29521f1e9f7d5cea864ea3cf411b385bc32f516b5956e209cca074f05c32a1c2baa8b24f3100c7868832f9a37d6f3ad6989aec3592bc09ab90e991a languageName: node linkType: hard @@ -5748,17 +6869,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime-corejs3@npm:^7.10.2": - version: 7.13.10 - resolution: "@babel/runtime-corejs3@npm:7.13.10" - dependencies: - core-js-pure: ^3.0.0 - regenerator-runtime: ^0.13.4 - checksum: 9f88f6dbd800ab70d4c116c9df9aa555f6879ef4e54899a13c20082b57f0cf161397663cfa061c1351162d130bcb60ab52bc87d472ec1314c2d472c5bf04aee4 - languageName: node - linkType: hard - -"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.14.0, @babel/runtime@npm:^7.14.6, @babel/runtime@npm:^7.14.8, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.3.4, @babel/runtime@npm:^7.4.5, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2, @babel/runtime@npm:^7.9.6": +"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.1.2, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.14.0, @babel/runtime@npm:^7.14.6, @babel/runtime@npm:^7.14.8, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.3.4, @babel/runtime@npm:^7.4.5, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.8.7, @babel/runtime@npm:^7.9.2, @babel/runtime@npm:^7.9.6": version: 7.18.6 resolution: "@babel/runtime@npm:7.18.6" dependencies: @@ -5812,6 +6923,15 @@ __metadata: languageName: node linkType: hard +"@babel/runtime@npm:^7.23.2": + version: 7.24.6 + resolution: "@babel/runtime@npm:7.24.6" + dependencies: + regenerator-runtime: ^0.14.0 + checksum: 44d95ca743898fed31b4cefef31de6fd3cf7906e94493368e9d6538289cc52c6c46185205d9c01d38466a5b3f673550f80892d30b1ed02a2c13e704863a8cc48 + languageName: node + linkType: hard + "@babel/template@npm:^7.0.0, @babel/template@npm:^7.20.7": version: 7.20.7 resolution: "@babel/template@npm:7.20.7" @@ -5856,6 +6976,17 @@ __metadata: languageName: node linkType: hard +"@babel/template@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/template@npm:7.24.6" + dependencies: + "@babel/code-frame": ^7.24.6 + "@babel/parser": ^7.24.6 + "@babel/types": ^7.24.6 + checksum: 8e532ebdd5e1398c030af16881061bad43b9c3b758a193a6289dc5be5988cc543f7aa56a360e15b755258c0b3d387f3cd78b505835b040a2729d0261d0ff1711 + languageName: node + linkType: hard + "@babel/traverse@npm:7, @babel/traverse@npm:^7.20.0, @babel/traverse@npm:^7.20.5, @babel/traverse@npm:^7.20.7, @babel/traverse@npm:^7.21.0, @babel/traverse@npm:^7.21.2, @babel/traverse@npm:^7.21.4": version: 7.21.4 resolution: "@babel/traverse@npm:7.21.4" @@ -5874,24 +7005,6 @@ __metadata: languageName: node linkType: hard -"@babel/traverse@npm:^7.1.6, @babel/traverse@npm:^7.22.1": - version: 7.22.4 - resolution: "@babel/traverse@npm:7.22.4" - dependencies: - "@babel/code-frame": ^7.21.4 - "@babel/generator": ^7.22.3 - "@babel/helper-environment-visitor": ^7.22.1 - "@babel/helper-function-name": ^7.21.0 - "@babel/helper-hoist-variables": ^7.18.6 - "@babel/helper-split-export-declaration": ^7.18.6 - "@babel/parser": ^7.22.4 - "@babel/types": ^7.22.4 - debug: ^4.1.0 - globals: ^11.1.0 - checksum: 9560ae22092d5a7c52849145dd3e5aed2ffb73d61255e70e19e3fbd06bcbafbbdecea28df40a42ee3b60b01e85a42224ec841df93e867547e329091cc2f2bb6f - languageName: node - linkType: hard - "@babel/traverse@npm:^7.14.0, @babel/traverse@npm:^7.16.8, @babel/traverse@npm:^7.19.0, @babel/traverse@npm:^7.19.1, @babel/traverse@npm:^7.19.3, @babel/traverse@npm:^7.19.4, @babel/traverse@npm:^7.4.5": version: 7.19.4 resolution: "@babel/traverse@npm:7.19.4" @@ -5910,6 +7023,42 @@ __metadata: languageName: node linkType: hard +"@babel/traverse@npm:^7.18.9, @babel/traverse@npm:^7.23.2, @babel/traverse@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/traverse@npm:7.24.6" + dependencies: + "@babel/code-frame": ^7.24.6 + "@babel/generator": ^7.24.6 + "@babel/helper-environment-visitor": ^7.24.6 + "@babel/helper-function-name": ^7.24.6 + "@babel/helper-hoist-variables": ^7.24.6 + "@babel/helper-split-export-declaration": ^7.24.6 + "@babel/parser": ^7.24.6 + "@babel/types": ^7.24.6 + debug: ^4.3.1 + globals: ^11.1.0 + checksum: 654151b2ab5c9d5031c274cf197f707b8a27a1c70b38fcb8d1bf5ad2d8848f38675ab9c2a86aeb804657c5817124ac5be4cb6f5defa8ef7ac40596e1220697aa + languageName: node + linkType: hard + +"@babel/traverse@npm:^7.22.1": + version: 7.22.4 + resolution: "@babel/traverse@npm:7.22.4" + dependencies: + "@babel/code-frame": ^7.21.4 + "@babel/generator": ^7.22.3 + "@babel/helper-environment-visitor": ^7.22.1 + "@babel/helper-function-name": ^7.21.0 + "@babel/helper-hoist-variables": ^7.18.6 + "@babel/helper-split-export-declaration": ^7.18.6 + "@babel/parser": ^7.22.4 + "@babel/types": ^7.22.4 + debug: ^4.1.0 + globals: ^11.1.0 + checksum: 9560ae22092d5a7c52849145dd3e5aed2ffb73d61255e70e19e3fbd06bcbafbbdecea28df40a42ee3b60b01e85a42224ec841df93e867547e329091cc2f2bb6f + languageName: node + linkType: hard + "@babel/traverse@npm:^7.22.15, @babel/traverse@npm:^7.22.17, @babel/traverse@npm:^7.22.8": version: 7.22.17 resolution: "@babel/traverse@npm:7.22.17" @@ -5957,25 +7106,25 @@ __metadata: languageName: node linkType: hard -"@babel/types@npm:^7.2.0, @babel/types@npm:^7.21.3, @babel/types@npm:^7.21.5, @babel/types@npm:^7.22.0, @babel/types@npm:^7.22.3, @babel/types@npm:^7.22.4": - version: 7.22.4 - resolution: "@babel/types@npm:7.22.4" +"@babel/types@npm:^7.20.0, @babel/types@npm:^7.20.2, @babel/types@npm:^7.20.5, @babel/types@npm:^7.20.7, @babel/types@npm:^7.21.0, @babel/types@npm:^7.21.2, @babel/types@npm:^7.21.4": + version: 7.21.4 + resolution: "@babel/types@npm:7.21.4" dependencies: - "@babel/helper-string-parser": ^7.21.5 + "@babel/helper-string-parser": ^7.19.4 "@babel/helper-validator-identifier": ^7.19.1 to-fast-properties: ^2.0.0 - checksum: ffe36bb4f4a99ad13c426a98c3b508d70736036cae4e471d9c862e3a579847ed4f480686af0fce2633f6f7c0f0d3bf02da73da36e7edd3fde0b2061951dcba9a + checksum: 587bc55a91ce003b0f8aa10d70070f8006560d7dc0360dc0406d306a2cb2a10154e2f9080b9c37abec76907a90b330a536406cb75e6bdc905484f37b75c73219 languageName: node linkType: hard -"@babel/types@npm:^7.20.0, @babel/types@npm:^7.20.2, @babel/types@npm:^7.20.5, @babel/types@npm:^7.20.7, @babel/types@npm:^7.21.0, @babel/types@npm:^7.21.2, @babel/types@npm:^7.21.4": - version: 7.21.4 - resolution: "@babel/types@npm:7.21.4" +"@babel/types@npm:^7.21.3, @babel/types@npm:^7.21.5, @babel/types@npm:^7.22.0, @babel/types@npm:^7.22.3, @babel/types@npm:^7.22.4": + version: 7.22.4 + resolution: "@babel/types@npm:7.22.4" dependencies: - "@babel/helper-string-parser": ^7.19.4 + "@babel/helper-string-parser": ^7.21.5 "@babel/helper-validator-identifier": ^7.19.1 to-fast-properties: ^2.0.0 - checksum: 587bc55a91ce003b0f8aa10d70070f8006560d7dc0360dc0406d306a2cb2a10154e2f9080b9c37abec76907a90b330a536406cb75e6bdc905484f37b75c73219 + checksum: ffe36bb4f4a99ad13c426a98c3b508d70736036cae4e471d9c862e3a579847ed4f480686af0fce2633f6f7c0f0d3bf02da73da36e7edd3fde0b2061951dcba9a languageName: node linkType: hard @@ -6001,6 +7150,17 @@ __metadata: languageName: node linkType: hard +"@babel/types@npm:^7.24.6": + version: 7.24.6 + resolution: "@babel/types@npm:7.24.6" + dependencies: + "@babel/helper-string-parser": ^7.24.6 + "@babel/helper-validator-identifier": ^7.24.6 + to-fast-properties: ^2.0.0 + checksum: 58d798dd37e6b14f818730b4536795d68d28ccd5dc2a105fd977104789b20602be11d92cdd47cdbd48d8cce3cc0e14c7773813357ad9d5d6e94d70587eb45bf5 + languageName: node + linkType: hard + "@base2/pretty-print-object@npm:1.0.1": version: 1.0.1 resolution: "@base2/pretty-print-object@npm:1.0.1" @@ -8555,6 +9715,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/android-arm64@npm:0.16.17": + version: 0.16.17 + resolution: "@esbuild/android-arm64@npm:0.16.17" + conditions: os=android & cpu=arm64 + languageName: node + linkType: hard + "@esbuild/android-arm64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/android-arm64@npm:0.18.20" @@ -8562,6 +9729,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/android-arm@npm:0.16.17": + version: 0.16.17 + resolution: "@esbuild/android-arm@npm:0.16.17" + conditions: os=android & cpu=arm + languageName: node + linkType: hard + "@esbuild/android-arm@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/android-arm@npm:0.18.20" @@ -8569,6 +9743,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/android-x64@npm:0.16.17": + version: 0.16.17 + resolution: "@esbuild/android-x64@npm:0.16.17" + conditions: os=android & cpu=x64 + languageName: node + linkType: hard + "@esbuild/android-x64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/android-x64@npm:0.18.20" @@ -8576,6 +9757,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/darwin-arm64@npm:0.16.17": + version: 0.16.17 + resolution: "@esbuild/darwin-arm64@npm:0.16.17" + conditions: os=darwin & cpu=arm64 + languageName: node + linkType: hard + "@esbuild/darwin-arm64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/darwin-arm64@npm:0.18.20" @@ -8583,6 +9771,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/darwin-x64@npm:0.16.17": + version: 0.16.17 + resolution: "@esbuild/darwin-x64@npm:0.16.17" + conditions: os=darwin & cpu=x64 + languageName: node + linkType: hard + "@esbuild/darwin-x64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/darwin-x64@npm:0.18.20" @@ -8590,6 +9785,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/freebsd-arm64@npm:0.16.17": + version: 0.16.17 + resolution: "@esbuild/freebsd-arm64@npm:0.16.17" + conditions: os=freebsd & cpu=arm64 + languageName: node + linkType: hard + "@esbuild/freebsd-arm64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/freebsd-arm64@npm:0.18.20" @@ -8597,6 +9799,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/freebsd-x64@npm:0.16.17": + version: 0.16.17 + resolution: "@esbuild/freebsd-x64@npm:0.16.17" + conditions: os=freebsd & cpu=x64 + languageName: node + linkType: hard + "@esbuild/freebsd-x64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/freebsd-x64@npm:0.18.20" @@ -8604,6 +9813,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-arm64@npm:0.16.17": + version: 0.16.17 + resolution: "@esbuild/linux-arm64@npm:0.16.17" + conditions: os=linux & cpu=arm64 + languageName: node + linkType: hard + "@esbuild/linux-arm64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/linux-arm64@npm:0.18.20" @@ -8611,6 +9827,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-arm@npm:0.16.17": + version: 0.16.17 + resolution: "@esbuild/linux-arm@npm:0.16.17" + conditions: os=linux & cpu=arm + languageName: node + linkType: hard + "@esbuild/linux-arm@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/linux-arm@npm:0.18.20" @@ -8618,6 +9841,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-ia32@npm:0.16.17": + version: 0.16.17 + resolution: "@esbuild/linux-ia32@npm:0.16.17" + conditions: os=linux & cpu=ia32 + languageName: node + linkType: hard + "@esbuild/linux-ia32@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/linux-ia32@npm:0.18.20" @@ -8625,9 +9855,9 @@ __metadata: languageName: node linkType: hard -"@esbuild/linux-loong64@npm:0.15.7": - version: 0.15.7 - resolution: "@esbuild/linux-loong64@npm:0.15.7" +"@esbuild/linux-loong64@npm:0.16.17": + version: 0.16.17 + resolution: "@esbuild/linux-loong64@npm:0.16.17" conditions: os=linux & cpu=loong64 languageName: node linkType: hard @@ -8639,6 +9869,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-mips64el@npm:0.16.17": + version: 0.16.17 + resolution: "@esbuild/linux-mips64el@npm:0.16.17" + conditions: os=linux & cpu=mips64el + languageName: node + linkType: hard + "@esbuild/linux-mips64el@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/linux-mips64el@npm:0.18.20" @@ -8646,6 +9883,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-ppc64@npm:0.16.17": + version: 0.16.17 + resolution: "@esbuild/linux-ppc64@npm:0.16.17" + conditions: os=linux & cpu=ppc64 + languageName: node + linkType: hard + "@esbuild/linux-ppc64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/linux-ppc64@npm:0.18.20" @@ -8653,6 +9897,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-riscv64@npm:0.16.17": + version: 0.16.17 + resolution: "@esbuild/linux-riscv64@npm:0.16.17" + conditions: os=linux & cpu=riscv64 + languageName: node + linkType: hard + "@esbuild/linux-riscv64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/linux-riscv64@npm:0.18.20" @@ -8660,6 +9911,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-s390x@npm:0.16.17": + version: 0.16.17 + resolution: "@esbuild/linux-s390x@npm:0.16.17" + conditions: os=linux & cpu=s390x + languageName: node + linkType: hard + "@esbuild/linux-s390x@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/linux-s390x@npm:0.18.20" @@ -8667,6 +9925,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/linux-x64@npm:0.16.17": + version: 0.16.17 + resolution: "@esbuild/linux-x64@npm:0.16.17" + conditions: os=linux & cpu=x64 + languageName: node + linkType: hard + "@esbuild/linux-x64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/linux-x64@npm:0.18.20" @@ -8674,6 +9939,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/netbsd-x64@npm:0.16.17": + version: 0.16.17 + resolution: "@esbuild/netbsd-x64@npm:0.16.17" + conditions: os=netbsd & cpu=x64 + languageName: node + linkType: hard + "@esbuild/netbsd-x64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/netbsd-x64@npm:0.18.20" @@ -8681,6 +9953,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/openbsd-x64@npm:0.16.17": + version: 0.16.17 + resolution: "@esbuild/openbsd-x64@npm:0.16.17" + conditions: os=openbsd & cpu=x64 + languageName: node + linkType: hard + "@esbuild/openbsd-x64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/openbsd-x64@npm:0.18.20" @@ -8688,6 +9967,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/sunos-x64@npm:0.16.17": + version: 0.16.17 + resolution: "@esbuild/sunos-x64@npm:0.16.17" + conditions: os=sunos & cpu=x64 + languageName: node + linkType: hard + "@esbuild/sunos-x64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/sunos-x64@npm:0.18.20" @@ -8695,6 +9981,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/win32-arm64@npm:0.16.17": + version: 0.16.17 + resolution: "@esbuild/win32-arm64@npm:0.16.17" + conditions: os=win32 & cpu=arm64 + languageName: node + linkType: hard + "@esbuild/win32-arm64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/win32-arm64@npm:0.18.20" @@ -8702,6 +9995,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/win32-ia32@npm:0.16.17": + version: 0.16.17 + resolution: "@esbuild/win32-ia32@npm:0.16.17" + conditions: os=win32 & cpu=ia32 + languageName: node + linkType: hard + "@esbuild/win32-ia32@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/win32-ia32@npm:0.18.20" @@ -8709,6 +10009,13 @@ __metadata: languageName: node linkType: hard +"@esbuild/win32-x64@npm:0.16.17": + version: 0.16.17 + resolution: "@esbuild/win32-x64@npm:0.16.17" + conditions: os=win32 & cpu=x64 + languageName: node + linkType: hard + "@esbuild/win32-x64@npm:0.18.20": version: 0.18.20 resolution: "@esbuild/win32-x64@npm:0.18.20" @@ -8716,7 +10023,7 @@ __metadata: languageName: node linkType: hard -"@eslint-community/eslint-utils@npm:^4.2.0": +"@eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.4.0": version: 4.4.0 resolution: "@eslint-community/eslint-utils@npm:4.4.0" dependencies: @@ -8727,10 +10034,10 @@ __metadata: languageName: node linkType: hard -"@eslint-community/regexpp@npm:^4.4.0": - version: 4.5.1 - resolution: "@eslint-community/regexpp@npm:4.5.1" - checksum: 6d901166d64998d591fab4db1c2f872981ccd5f6fe066a1ad0a93d4e11855ecae6bfb76660869a469563e8882d4307228cebd41142adb409d182f2966771e57e +"@eslint-community/regexpp@npm:^4.10.0": + version: 4.10.1 + resolution: "@eslint-community/regexpp@npm:4.10.1" + checksum: 1e04bc366fb8152c9266258cd25e3fded102f1d212a9476928e3cb98c48be645df6d676728d1c596053992fb9134879fe0de23c9460035b342cceb22d3af1776 languageName: node linkType: hard @@ -8741,9 +10048,9 @@ __metadata: languageName: node linkType: hard -"@eslint/eslintrc@npm:^2.1.1": - version: 2.1.2 - resolution: "@eslint/eslintrc@npm:2.1.2" +"@eslint/eslintrc@npm:^2.1.4": + version: 2.1.4 + resolution: "@eslint/eslintrc@npm:2.1.4" dependencies: ajv: ^6.12.4 debug: ^4.3.2 @@ -8754,14 +10061,14 @@ __metadata: js-yaml: ^4.1.0 minimatch: ^3.1.2 strip-json-comments: ^3.1.1 - checksum: bc742a1e3b361f06fedb4afb6bf32cbd27171292ef7924f61c62f2aed73048367bcc7ac68f98c06d4245cd3fabc43270f844e3c1699936d4734b3ac5398814a7 + checksum: 10957c7592b20ca0089262d8c2a8accbad14b4f6507e35416c32ee6b4dbf9cad67dfb77096bbd405405e9ada2b107f3797fe94362e1c55e0b09d6e90dd149127 languageName: node linkType: hard -"@eslint/js@npm:^8.46.0": - version: 8.49.0 - resolution: "@eslint/js@npm:8.49.0" - checksum: a6601807c8aeeefe866926ad92ed98007c034a735af20ff709009e39ad1337474243d47908500a3bde04e37bfba16bcf1d3452417f962e1345bc8756edd6b830 +"@eslint/js@npm:8.57.0": + version: 8.57.0 + resolution: "@eslint/js@npm:8.57.0" + checksum: 315dc65b0e9893e2bff139bddace7ea601ad77ed47b4550e73da8c9c2d2766c7a575c3cddf17ef85b8fd6a36ff34f91729d0dcca56e73ca887c10df91a41b0bb languageName: node linkType: hard @@ -10679,14 +11986,14 @@ __metadata: languageName: node linkType: hard -"@humanwhocodes/config-array@npm:^0.11.10": - version: 0.11.11 - resolution: "@humanwhocodes/config-array@npm:0.11.11" +"@humanwhocodes/config-array@npm:^0.11.14": + version: 0.11.14 + resolution: "@humanwhocodes/config-array@npm:0.11.14" dependencies: - "@humanwhocodes/object-schema": ^1.2.1 - debug: ^4.1.1 + "@humanwhocodes/object-schema": ^2.0.2 + debug: ^4.3.1 minimatch: ^3.0.5 - checksum: db84507375ab77b8ffdd24f498a5b49ad6b64391d30dd2ac56885501d03964d29637e05b1ed5aefa09d57ac667e28028bc22d2da872bfcd619652fbdb5f4ca19 + checksum: 861ccce9eaea5de19546653bccf75bf09fe878bc39c3aab00aeee2d2a0e654516adad38dd1098aab5e3af0145bbcbf3f309bdf4d964f8dab9dcd5834ae4c02f2 languageName: node linkType: hard @@ -10697,10 +12004,10 @@ __metadata: languageName: node linkType: hard -"@humanwhocodes/object-schema@npm:^1.2.1": - version: 1.2.1 - resolution: "@humanwhocodes/object-schema@npm:1.2.1" - checksum: a824a1ec31591231e4bad5787641f59e9633827d0a2eaae131a288d33c9ef0290bd16fda8da6f7c0fcb014147865d12118df10db57f27f41e20da92369fcb3f1 +"@humanwhocodes/object-schema@npm:^2.0.2": + version: 2.0.3 + resolution: "@humanwhocodes/object-schema@npm:2.0.3" + checksum: d3b78f6c5831888c6ecc899df0d03bcc25d46f3ad26a11d7ea52944dc36a35ef543fad965322174238d677a43d5c694434f6607532cff7077062513ad7022631 languageName: node linkType: hard @@ -10857,7 +12164,7 @@ __metadata: languageName: node linkType: hard -"@istanbuljs/schema@npm:^0.1.2, @istanbuljs/schema@npm:^0.1.3": +"@istanbuljs/schema@npm:^0.1.2": version: 0.1.3 resolution: "@istanbuljs/schema@npm:0.1.3" checksum: 5282759d961d61350f33d9118d16bcaed914ebf8061a52f4fa474b2cb08720c9c81d165e13b82f2e5a8a212cc5af482f0c6fc1ac27b9e067e5394c9a6ed186c9 @@ -11432,6 +12739,17 @@ __metadata: languageName: node linkType: hard +"@jridgewell/gen-mapping@npm:^0.3.5": + version: 0.3.5 + resolution: "@jridgewell/gen-mapping@npm:0.3.5" + dependencies: + "@jridgewell/set-array": ^1.2.1 + "@jridgewell/sourcemap-codec": ^1.4.10 + "@jridgewell/trace-mapping": ^0.3.24 + checksum: ff7a1764ebd76a5e129c8890aa3e2f46045109dabde62b0b6c6a250152227647178ff2069ea234753a690d8f3c4ac8b5e7b267bbee272bffb7f3b0a370ab6e52 + languageName: node + linkType: hard + "@jridgewell/resolve-uri@npm:3.1.0": version: 3.1.0 resolution: "@jridgewell/resolve-uri@npm:3.1.0" @@ -11446,6 +12764,13 @@ __metadata: languageName: node linkType: hard +"@jridgewell/resolve-uri@npm:^3.1.0": + version: 3.1.2 + resolution: "@jridgewell/resolve-uri@npm:3.1.2" + checksum: 83b85f72c59d1c080b4cbec0fef84528963a1b5db34e4370fa4bd1e3ff64a0d80e0cee7369d11d73c704e0286fb2865b530acac7a871088fbe92b5edf1000870 + languageName: node + linkType: hard + "@jridgewell/set-array@npm:^1.0.1": version: 1.1.2 resolution: "@jridgewell/set-array@npm:1.1.2" @@ -11453,6 +12778,13 @@ __metadata: languageName: node linkType: hard +"@jridgewell/set-array@npm:^1.2.1": + version: 1.2.1 + resolution: "@jridgewell/set-array@npm:1.2.1" + checksum: 832e513a85a588f8ed4f27d1279420d8547743cc37fcad5a5a76fc74bb895b013dfe614d0eed9cb860048e6546b798f8f2652020b4b2ba0561b05caa8c654b10 + languageName: node + linkType: hard + "@jridgewell/source-map@npm:^0.3.2, @jridgewell/source-map@npm:^0.3.3": version: 0.3.3 resolution: "@jridgewell/source-map@npm:0.3.3" @@ -11477,7 +12809,7 @@ __metadata: languageName: node linkType: hard -"@jridgewell/sourcemap-codec@npm:^1.4.13": +"@jridgewell/sourcemap-codec@npm:^1.4.13, @jridgewell/sourcemap-codec@npm:^1.4.14, @jridgewell/sourcemap-codec@npm:^1.4.15": version: 1.4.15 resolution: "@jridgewell/sourcemap-codec@npm:1.4.15" checksum: b881c7e503db3fc7f3c1f35a1dd2655a188cc51a3612d76efc8a6eb74728bef5606e6758ee77423e564092b4a518aba569bbb21c9bac5ab7a35b0c6ae7e344c8 @@ -11524,6 +12856,16 @@ __metadata: languageName: node linkType: hard +"@jridgewell/trace-mapping@npm:^0.3.24, @jridgewell/trace-mapping@npm:^0.3.25": + version: 0.3.25 + resolution: "@jridgewell/trace-mapping@npm:0.3.25" + dependencies: + "@jridgewell/resolve-uri": ^3.1.0 + "@jridgewell/sourcemap-codec": ^1.4.14 + checksum: 9d3c40d225e139987b50c48988f8717a54a8c994d8a948ee42e1412e08988761d0754d7d10b803061cc3aebf35f92a5dbbab493bd0e1a9ef9e89a2130e83ba34 + languageName: node + linkType: hard + "@juggle/resize-observer@npm:^3.3.1, @juggle/resize-observer@npm:^3.4.0": version: 3.4.0 resolution: "@juggle/resize-observer@npm:3.4.0" @@ -12277,81 +13619,81 @@ __metadata: languageName: node linkType: hard -"@next/env@npm:13.3.0": - version: 13.3.0 - resolution: "@next/env@npm:13.3.0" - checksum: 17dbea6d019df98f8abebadcaed635d792c69368389c7869ca023acfba240294368a58eda761fb8047403b84e82edf25ea2af45afe06cc1807a25de42e256dd3 +"@next/env@npm:14.2.3": + version: 14.2.3 + resolution: "@next/env@npm:14.2.3" + checksum: 47ddb64ec6cdc13dfcf560ba42cce71d7948174bf800162738e20ba0147cc46a5f6fdde1eb7957a3676a9eca6dccf6603836ed7c755eab238d9f5c73614d9880 languageName: node linkType: hard -"@next/eslint-plugin-next@npm:13.1.1": - version: 13.1.1 - resolution: "@next/eslint-plugin-next@npm:13.1.1" +"@next/eslint-plugin-next@npm:14.2.3": + version: 14.2.3 + resolution: "@next/eslint-plugin-next@npm:14.2.3" dependencies: - glob: 7.1.7 - checksum: 27e49ef988db3203d494930ad1fcdc270761a61a41e6925c0eadf1e2b1ebd6648722a3aaec7f0c0266eea8771797e06d52f041d33c93d21ba3b361ffe696c36c + glob: 10.3.10 + checksum: f149344f0f347e02a7d2302c0e318a42a565e6930cd7a72b4681e157a0aa2c5079d2c5cf019b9b58a1e19ff5a3fe273fd80d53add8b3c1a9fe5b7ed70d70ae4a languageName: node linkType: hard -"@next/swc-darwin-arm64@npm:13.3.0": - version: 13.3.0 - resolution: "@next/swc-darwin-arm64@npm:13.3.0" +"@next/swc-darwin-arm64@npm:14.2.3": + version: 14.2.3 + resolution: "@next/swc-darwin-arm64@npm:14.2.3" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@next/swc-darwin-x64@npm:13.3.0": - version: 13.3.0 - resolution: "@next/swc-darwin-x64@npm:13.3.0" +"@next/swc-darwin-x64@npm:14.2.3": + version: 14.2.3 + resolution: "@next/swc-darwin-x64@npm:14.2.3" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@next/swc-linux-arm64-gnu@npm:13.3.0": - version: 13.3.0 - resolution: "@next/swc-linux-arm64-gnu@npm:13.3.0" +"@next/swc-linux-arm64-gnu@npm:14.2.3": + version: 14.2.3 + resolution: "@next/swc-linux-arm64-gnu@npm:14.2.3" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@next/swc-linux-arm64-musl@npm:13.3.0": - version: 13.3.0 - resolution: "@next/swc-linux-arm64-musl@npm:13.3.0" +"@next/swc-linux-arm64-musl@npm:14.2.3": + version: 14.2.3 + resolution: "@next/swc-linux-arm64-musl@npm:14.2.3" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@next/swc-linux-x64-gnu@npm:13.3.0": - version: 13.3.0 - resolution: "@next/swc-linux-x64-gnu@npm:13.3.0" +"@next/swc-linux-x64-gnu@npm:14.2.3": + version: 14.2.3 + resolution: "@next/swc-linux-x64-gnu@npm:14.2.3" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@next/swc-linux-x64-musl@npm:13.3.0": - version: 13.3.0 - resolution: "@next/swc-linux-x64-musl@npm:13.3.0" +"@next/swc-linux-x64-musl@npm:14.2.3": + version: 14.2.3 + resolution: "@next/swc-linux-x64-musl@npm:14.2.3" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@next/swc-win32-arm64-msvc@npm:13.3.0": - version: 13.3.0 - resolution: "@next/swc-win32-arm64-msvc@npm:13.3.0" +"@next/swc-win32-arm64-msvc@npm:14.2.3": + version: 14.2.3 + resolution: "@next/swc-win32-arm64-msvc@npm:14.2.3" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@next/swc-win32-ia32-msvc@npm:13.3.0": - version: 13.3.0 - resolution: "@next/swc-win32-ia32-msvc@npm:13.3.0" +"@next/swc-win32-ia32-msvc@npm:14.2.3": + version: 14.2.3 + resolution: "@next/swc-win32-ia32-msvc@npm:14.2.3" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@next/swc-win32-x64-msvc@npm:13.3.0": - version: 13.3.0 - resolution: "@next/swc-win32-x64-msvc@npm:13.3.0" +"@next/swc-win32-x64-msvc@npm:14.2.3": + version: 14.2.3 + resolution: "@next/swc-win32-x64-msvc@npm:14.2.3" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -12474,21 +13816,12 @@ __metadata: languageName: node linkType: hard -"@nrwl/cypress@npm:*": - version: 16.9.0 - resolution: "@nrwl/cypress@npm:16.9.0" - dependencies: - "@nx/cypress": 16.9.0 - checksum: a6f132722e87b0bb922d3fb0165edbb88bd39fcd417180b17ddce2fd13d0e912d2245e1d23d9ac71d61d67ec0785bb7726632ebe2a3f27055daeceb537d96f64 - languageName: node - linkType: hard - -"@nrwl/devkit@npm:*": - version: 16.9.0 - resolution: "@nrwl/devkit@npm:16.9.0" +"@nrwl/cypress@npm:19.4.0": + version: 19.4.0 + resolution: "@nrwl/cypress@npm:19.4.0" dependencies: - "@nx/devkit": 16.9.0 - checksum: c6ee2bd9c2e3c68acdf14e61ad37b322186d59c0088a7edeff8423d82a95e5782eac19f5b43095366901c5d8e0fbd2578f6dc115dd0cbaa0631f964cb1343e02 + "@nx/cypress": 19.4.0 + checksum: 35be9be9c7d40ab454dc549b0d476dbd393f14861ea2b40b5f25c6400fef3481519b408033f3b71c2fb3c27aaf511a00f46669280fd45871f7e856612689d12a languageName: node linkType: hard @@ -12506,30 +13839,30 @@ __metadata: languageName: node linkType: hard -"@nrwl/eslint-plugin-nx@npm:*": - version: 16.9.0 - resolution: "@nrwl/eslint-plugin-nx@npm:16.9.0" +"@nrwl/devkit@npm:19.4.0": + version: 19.4.0 + resolution: "@nrwl/devkit@npm:19.4.0" dependencies: - "@nx/eslint-plugin": 16.9.0 - checksum: f2570751d80aac0e434a3030a825538d7a5acbc88c63dbf613ea1a48c7be34fcc4888273bcf655320437488e6db157319a24006327e8dba00b13a6e53b449bcc + "@nx/devkit": 19.4.0 + checksum: 9173986571e4ec167bd1ba7e382643775d6cb10f7b8631b223dc33b3075c9637ef6f8f2df4befc4b2600014461007262dee06c3abf081555fc8add2f6f62d0ee languageName: node linkType: hard -"@nrwl/express@npm:*": - version: 16.9.0 - resolution: "@nrwl/express@npm:16.9.0" +"@nrwl/eslint-plugin-nx@npm:19.4.0": + version: 19.4.0 + resolution: "@nrwl/eslint-plugin-nx@npm:19.4.0" dependencies: - "@nx/express": 16.9.0 - checksum: 11a57a3a014fe66c3d1ff6eecc28ce046861ca66469d87dd9dd0646c54b2a98b14106ad83107b784c0520480559e8963ec49a71cd762e05f65d865c3ae581cca + "@nx/eslint-plugin": 19.4.0 + checksum: 570b1378ef7208e9b960c0f46a84404843bec975db96dfc27e4f0bf1de31c6d875a26a2b303cd616b6d26bcd4e484320286383efd107e820e56cdced5db4bc36 languageName: node linkType: hard -"@nrwl/jest@npm:*": - version: 16.9.0 - resolution: "@nrwl/jest@npm:16.9.0" +"@nrwl/express@npm:19.4.0": + version: 19.4.0 + resolution: "@nrwl/express@npm:19.4.0" dependencies: - "@nx/jest": 16.9.0 - checksum: 307fa37a8d3524d20fc4d520433153564933d0e9dece33d007f6abcb661d10aed578e74c697c6977e4b24eb5e63d901bbfaa4c7ee1f907f3c3edfd6b99d0a010 + "@nx/express": 19.4.0 + checksum: be14045af7aec6d990331875c6c2450e6ee33b590a8102a4a9995542c3abf41268696fd49acb4a88f46d107feabce23606a1837228ee256e9267820849e8b736 languageName: node linkType: hard @@ -12551,21 +13884,21 @@ __metadata: languageName: node linkType: hard -"@nrwl/js@npm:*": - version: 16.9.0 - resolution: "@nrwl/js@npm:16.9.0" +"@nrwl/jest@npm:19.4.0": + version: 19.4.0 + resolution: "@nrwl/jest@npm:19.4.0" dependencies: - "@nx/js": 16.9.0 - checksum: 076ca8912cc16f0cfee81fc3193aaf0af751f414e3b61fda9ef54b534feff780293b83325a71e17261d4d99af05e148d93162cbe92a62145589cbe7e29437316 + "@nx/jest": 19.4.0 + checksum: f743076dd4cdaad8f2f2ec5641f877b96d5c4312fdae6b621b5449b6d217e28d5f6176a075c680f86edcb2904bc4a04b37887626d69d38e4d1ee6547dbd35925 languageName: node linkType: hard -"@nrwl/linter@npm:*": - version: 16.9.0 - resolution: "@nrwl/linter@npm:16.9.0" +"@nrwl/js@npm:19.4.0": + version: 19.4.0 + resolution: "@nrwl/js@npm:19.4.0" dependencies: - "@nx/linter": 16.9.0 - checksum: a936bcc0df250faf12a46ee0e7d588d1090e6fe95be239672238103af337a1d2990eb9c816d4eeb753b48c5b352b0278210b3e1bf554ae19ac7199557fd72829 + "@nx/js": 19.4.0 + checksum: 86e3266d6ca6e4a0832a3a03e01c62c7ee77f4407558fc46e80fa693903a0920541e355596d5a5bcc3e224981ed4fed1d9bef0ed4fa86eb42adf5203a7bcb7ec languageName: node linkType: hard @@ -12583,60 +13916,48 @@ __metadata: languageName: node linkType: hard -"@nrwl/nest@npm:*": - version: 16.9.0 - resolution: "@nrwl/nest@npm:16.9.0" - dependencies: - "@nx/nest": 16.9.0 - checksum: 1de85659ac8f0b7134e4902309d08e690b02d8208e80c116d8fa041d7ed69839e1ee29d9cdac41b2360d6206f74af41957e25dd8192bbd578436a324d7a20988 - languageName: node - linkType: hard - -"@nrwl/next@npm:*": - version: 16.9.0 - resolution: "@nrwl/next@npm:16.9.0" +"@nrwl/nest@npm:19.4.0": + version: 19.4.0 + resolution: "@nrwl/nest@npm:19.4.0" dependencies: - "@nx/next": 16.9.0 - checksum: f02d94fe0e53c6cb8c4e8219c480f34394827b3f2af69a2368ff312d81e7b442cbc1d2ac72679eec3d6af9504e1ca30e5a02a3f1d9bdb8a76a3a342138c400ae + "@nx/nest": 19.4.0 + checksum: 5604e0d9abce8e7527047470fb378986e70d2dd54f8e860d525fe2cf2e509c3bc1096b22eace059641439f8f747646ed5a7dccfb5d3589c5d166ecbf1c4b1049 languageName: node linkType: hard -"@nrwl/node@npm:*": - version: 16.9.0 - resolution: "@nrwl/node@npm:16.9.0" +"@nrwl/next@npm:19.4.0": + version: 19.4.0 + resolution: "@nrwl/next@npm:19.4.0" dependencies: - "@nx/node": 16.9.0 - checksum: 887183fa9cdc5660b004f4b232512d8f7b103d551a7f55ac2fc0d33499ee55a2f62fd04653d116db913547b74d50e22ad54bcfd2a4f4468d16d9698c74056910 + "@nx/next": 19.4.0 + checksum: 06a0eacb5e617c3b80717bd4470dedca1ebf159d3383e5f6abd75103546f6c89fd7e14023aeb998744b083f0356785857960b452d66080a19c66b9f98a0868f8 languageName: node linkType: hard -"@nrwl/react@npm:*": - version: 16.9.0 - resolution: "@nrwl/react@npm:16.9.0" +"@nrwl/node@npm:19.4.0": + version: 19.4.0 + resolution: "@nrwl/node@npm:19.4.0" dependencies: - "@nx/react": 16.9.0 - checksum: c19ac800c460e25b4621a1050c4e37720c9529b2e567587fcb09ea3cb57d1bd7e887167992c93df1d8a23a5e7ae8fbce4bff6aa9ac45711f1c2365e7e2b794cb + "@nx/node": 19.4.0 + checksum: 517527a09dfdc929efa23e45089a8c39175b4f98464b4f645da769b707decb3ecc78230a3be381e05152ac55dd1bb3f16eee4d45cb4fbaa7641600b6dc2e000f languageName: node linkType: hard -"@nrwl/storybook@npm:*": - version: 16.9.0 - resolution: "@nrwl/storybook@npm:16.9.0" +"@nrwl/react@npm:19.4.0": + version: 19.4.0 + resolution: "@nrwl/react@npm:19.4.0" dependencies: - "@nx/storybook": 16.9.0 - checksum: ecea027ec79686bdafe5f242accdbd4dbe7b18d0245c7ce9cd6f65bf89fa6d7f78b105079366cc6773a458bd931a78c13ed9bcf4fa01a4542767afa36c778844 + "@nx/react": 19.4.0 + checksum: 3a539c537a139fa34719be10668f409eeee1326c450e0370d8cad7f73426f07f8f00ad77ba10e52525b17b0296f82658036a8c0dd263d31edd5ffebd6f8bf926 languageName: node linkType: hard -"@nrwl/tao@npm:*": - version: 16.9.0 - resolution: "@nrwl/tao@npm:16.9.0" +"@nrwl/storybook@npm:19.4.0": + version: 19.4.0 + resolution: "@nrwl/storybook@npm:19.4.0" dependencies: - nx: 16.9.0 - tslib: ^2.3.0 - bin: - tao: index.js - checksum: c76cec8824af9257016a0e1787b2cbfba61869ec3fb9e99c9580842fba2bd6a00116b2a06c3367cc55c610ea8cd4d4f94cb0c375d4c9857ad131eb5f1fdf8f40 + "@nx/storybook": 19.4.0 + checksum: 8b24b90e81b57f6ce4fb70bb4fb59c182b8e8dba5a361e24fafa733515522e7ca24617b2290ca8549f79c1d6346b7eef05a6b0c4d41a70a1761fd71d422d1666 languageName: node linkType: hard @@ -12672,30 +13993,42 @@ __metadata: languageName: node linkType: hard -"@nrwl/web@npm:*": - version: 16.9.0 - resolution: "@nrwl/web@npm:16.9.0" +"@nrwl/tao@npm:19.4.0": + version: 19.4.0 + resolution: "@nrwl/tao@npm:19.4.0" + dependencies: + nx: 19.4.0 + tslib: ^2.3.0 + bin: + tao: index.js + checksum: a278ed43e996a9275a9b8a010a28681e3df56fcb672b540e74e6a8c6de18452f24888ee480b251141b9acd3e0f2e114342144d692387744b93cbb6f63edfda26 + languageName: node + linkType: hard + +"@nrwl/web@npm:19.4.0": + version: 19.4.0 + resolution: "@nrwl/web@npm:19.4.0" dependencies: - "@nx/web": 16.9.0 - checksum: c1cc0924cb23d183dadb800bc2b70e8916101cea9c62f327f71c8b6061f7f7560f8ab37485f15b61d90b07221d1006df982817d48fa5a502104c752e2db0d821 + "@nx/web": 19.4.0 + checksum: 1bd4cc3661eebe8433f2bd6b5ae26af637b4b1d51cbe000662ff0681327e6d28331c96d1c735a038a1e5106f52d1ba7cb3e0b2ab10f85ac31884fe7649c8bda9 languageName: node linkType: hard -"@nrwl/webpack@npm:*": - version: 16.9.0 - resolution: "@nrwl/webpack@npm:16.9.0" +"@nrwl/webpack@npm:19.4.0": + version: 19.4.0 + resolution: "@nrwl/webpack@npm:19.4.0" dependencies: - "@nx/webpack": 16.9.0 - checksum: 7215e7027369575a17190797be6508da446740728f667a38f121745ec6db7e0ee238ef163fe78c3172ac20df3bbf751b951481ebdff51b0f5bb826f7e6193203 + "@nx/webpack": 19.4.0 + checksum: f5105bd92fcc61d55e0cbdbd7db45c41c78eb19f3945a639b9db08032be9fe391344b36d835073a99e8878e1717abfb19c044f28917476ff6cc5ecc9be4da2f0 languageName: node linkType: hard -"@nrwl/workspace@npm:*": - version: 16.9.0 - resolution: "@nrwl/workspace@npm:16.9.0" +"@nrwl/workspace@npm:19.4.0": + version: 19.4.0 + resolution: "@nrwl/workspace@npm:19.4.0" dependencies: - "@nx/workspace": 16.9.0 - checksum: 6a7c438fcd28a08a72f71c3b8e6307db8201c428537e1fb69955eb0e2d999b34f887f566e05abd891b1f5a7772890b298c1834fe26276fcd16638fd283b8a403 + "@nx/workspace": 19.4.0 + checksum: 0abee2b9bc1a5f3c1c14222f17f9f5189434facb1d6b63b1be9baa2790b85091ab010cb003952921931924f5c7e13498c253fd767be5abf5d86d3c4a3e0c3500 languageName: node linkType: hard @@ -12747,121 +14080,143 @@ __metadata: languageName: node linkType: hard -"@nx/cypress@npm:16.9.0": - version: 16.9.0 - resolution: "@nx/cypress@npm:16.9.0" +"@nx/cypress@npm:19.4.0": + version: 19.4.0 + resolution: "@nx/cypress@npm:19.4.0" dependencies: - "@nrwl/cypress": "*" - "@nx/devkit": 16.9.0 - "@nx/js": 16.9.0 - "@nx/linter": 16.9.0 + "@nrwl/cypress": 19.4.0 + "@nx/devkit": 19.4.0 + "@nx/eslint": 19.4.0 + "@nx/js": 19.4.0 "@phenomnomnominal/tsquery": ~5.0.1 detect-port: ^1.5.1 - semver: 7.5.3 tslib: ^2.3.0 peerDependencies: cypress: ">= 3 < 14" peerDependenciesMeta: cypress: optional: true - checksum: 2fd30e3d069d2539d190b405ca64c429c16d118d2fbe3466f73412918fc5924c43cbb0e2dc7ab457f0f84166beb16215ce24120b57e3fd84873a3ec6421e2b9e + checksum: be64ca266f9edc2f810c39f238dadd3d78ecf9314912b66a9d44d4aa4e013f081bd4f431f58f8ceb0dddf0c17f86232bbcd63d7c5acf79c4723558f77633e0ac languageName: node linkType: hard -"@nx/devkit@npm:16.9.0": - version: 16.9.0 - resolution: "@nx/devkit@npm:16.9.0" +"@nx/devkit@npm:19.4.0": + version: 19.4.0 + resolution: "@nx/devkit@npm:19.4.0" dependencies: - "@nrwl/devkit": "*" + "@nrwl/devkit": 19.4.0 ejs: ^3.1.7 enquirer: ~2.3.6 ignore: ^5.0.4 - semver: 7.5.3 + minimatch: 9.0.3 + semver: ^7.5.3 tmp: ~0.2.1 tslib: ^2.3.0 + yargs-parser: 21.1.1 peerDependencies: - nx: ">= 15 <= 17" - checksum: a725b7ce3c6c14c30c8210bc1a0686ac5beee089462d23897c2e73f0860d108c11b75a03673454186a27251a368250874bbf1575c8a39fc7f7a282d96c0a009b + nx: ">= 17 <= 20" + checksum: 3be3a8da8ad52ecf5e6536720f8bdab63446b3be3728502761566ae749327796c8a8cccee55fd41ed2ba6efbfceff3e2266dcc5cb61563194e901baa8a9f3079 languageName: node linkType: hard -"@nx/eslint-plugin@npm:16.9.0": - version: 16.9.0 - resolution: "@nx/eslint-plugin@npm:16.9.0" +"@nx/eslint-plugin@npm:19.4.0": + version: 19.4.0 + resolution: "@nx/eslint-plugin@npm:19.4.0" dependencies: - "@nrwl/eslint-plugin-nx": "*" - "@nx/devkit": 16.9.0 - "@nx/js": 16.9.0 - "@typescript-eslint/type-utils": ^5.60.1 - "@typescript-eslint/utils": ^5.60.1 + "@nrwl/eslint-plugin-nx": 19.4.0 + "@nx/devkit": 19.4.0 + "@nx/js": 19.4.0 + "@typescript-eslint/type-utils": ^7.3.0 + "@typescript-eslint/utils": ^7.3.0 chalk: ^4.1.0 confusing-browser-globals: ^1.0.9 jsonc-eslint-parser: ^2.1.0 - semver: 7.5.3 + semver: ^7.5.3 tslib: ^2.3.0 peerDependencies: - "@typescript-eslint/parser": ^5.60.1 - eslint-config-prettier: ^8.1.0 + "@typescript-eslint/parser": ^6.13.2 || ^7.0.0 + eslint-config-prettier: ^9.0.0 peerDependenciesMeta: eslint-config-prettier: optional: true - checksum: 7c48af79fa86d8ce0595cb9ceeaa7aa9c5fc962f7a105a343fb3e1cdea45dd99f4122c8648a7f7b7f2d2a35b1989990b44868f028e45c0025e7b54601f020ec2 + checksum: 192104ef9333a2bca09c987b63dea1965d1d68870c2ee1dd1fca8cc8678297dabb90e4a445ce3a7e140aebe9a9a0872446f624a542015acfb5f26798323d4740 languageName: node linkType: hard -"@nx/express@npm:16.9.0": - version: 16.9.0 - resolution: "@nx/express@npm:16.9.0" +"@nx/eslint@npm:19.4.0": + version: 19.4.0 + resolution: "@nx/eslint@npm:19.4.0" dependencies: - "@nrwl/express": "*" - "@nx/devkit": 16.9.0 - "@nx/node": 16.9.0 + "@nx/devkit": 19.4.0 + "@nx/js": 19.4.0 + "@nx/linter": 19.4.0 + semver: ^7.5.3 + tslib: ^2.3.0 + typescript: ~5.4.2 + peerDependencies: + "@zkochan/js-yaml": 0.0.7 + eslint: ^8.0.0 || ^9.0.0 + peerDependenciesMeta: + "@zkochan/js-yaml": + optional: true + checksum: 67c41b9dcabec6b2bea8ca18f1f647372db189f5f6e73824f7e27444f4742aef7b64e897b61eec0a4d38637ad06b8ddb0a6395d2535563893f5b46420936086e + languageName: node + linkType: hard + +"@nx/express@npm:19.4.0": + version: 19.4.0 + resolution: "@nx/express@npm:19.4.0" + dependencies: + "@nrwl/express": 19.4.0 + "@nx/devkit": 19.4.0 + "@nx/node": 19.4.0 tslib: ^2.3.0 peerDependencies: express: ^4.18.1 peerDependenciesMeta: express: optional: true - checksum: 790e6a4a2ed09f0e619a0ae722271ca3b0cada11ff75589193358a09e0fe7a7ebe3c7c8c9f88c22c98753c45024bff3e156884ae9d96232e819466c6fe6690fe + checksum: 6a567e7b57b1f7fd5a5a82da90328115291c4be09616715b0326c425379f29b55fd71a2ae5e867925dc9d8f1cc5da1e1ac0173321e7b5650c6f7b832f9cb6c9b languageName: node linkType: hard -"@nx/jest@npm:16.9.0": - version: 16.9.0 - resolution: "@nx/jest@npm:16.9.0" +"@nx/jest@npm:19.4.0": + version: 19.4.0 + resolution: "@nx/jest@npm:19.4.0" dependencies: "@jest/reporters": ^29.4.1 "@jest/test-result": ^29.4.1 - "@nrwl/jest": "*" - "@nx/devkit": 16.9.0 - "@nx/js": 16.9.0 + "@nrwl/jest": 19.4.0 + "@nx/devkit": 19.4.0 + "@nx/js": 19.4.0 "@phenomnomnominal/tsquery": ~5.0.1 chalk: ^4.1.0 identity-obj-proxy: 3.0.0 jest-config: ^29.4.1 jest-resolve: ^29.4.1 jest-util: ^29.4.1 + minimatch: 9.0.3 resolve.exports: 1.1.0 tslib: ^2.3.0 - checksum: b9f18ce183307748d72c20de2d31ac74a44f8cfb36a092656ad81ed112ee6825c37aecf089e3bad610f525b3c2ca1a7529d56371eb6b0a424b6ba57a437fdb22 + yargs-parser: 21.1.1 + checksum: 09770f16d71ae6da9266694e557b9e80ff771a5115fbe11a3ede48c3d36e598c8dbd35a37745ca4e2cb8bb23b3153cbd58642a0bc92dab9b4471ef8d1695fc67 languageName: node linkType: hard -"@nx/js@npm:16.9.0": - version: 16.9.0 - resolution: "@nx/js@npm:16.9.0" +"@nx/js@npm:19.4.0": + version: 19.4.0 + resolution: "@nx/js@npm:19.4.0" dependencies: - "@babel/core": ^7.22.9 - "@babel/plugin-proposal-class-properties": ^7.18.6 + "@babel/core": ^7.23.2 "@babel/plugin-proposal-decorators": ^7.22.7 - "@babel/plugin-transform-runtime": ^7.22.9 - "@babel/preset-env": ^7.22.9 + "@babel/plugin-transform-class-properties": ^7.22.5 + "@babel/plugin-transform-runtime": ^7.23.2 + "@babel/preset-env": ^7.23.2 "@babel/preset-typescript": ^7.22.5 "@babel/runtime": ^7.22.6 - "@nrwl/js": "*" - "@nx/devkit": 16.9.0 - "@nx/workspace": 16.9.0 - "@phenomnomnominal/tsquery": ~5.0.1 + "@nrwl/js": 19.4.0 + "@nx/devkit": 19.4.0 + "@nx/workspace": 19.4.0 babel-plugin-const-enum: ^1.0.1 babel-plugin-macros: ^2.8.0 babel-plugin-transform-typescript-metadata: ^0.3.1 @@ -12872,11 +14227,11 @@ __metadata: fs-extra: ^11.1.0 ignore: ^5.0.4 js-tokens: ^4.0.0 - minimatch: 3.0.5 + minimatch: 9.0.3 npm-package-arg: 11.0.1 npm-run-path: ^4.0.1 ora: 5.3.0 - semver: 7.5.3 + semver: ^7.5.3 source-map-support: 0.5.19 ts-node: 10.9.1 tsconfig-paths: ^4.1.2 @@ -12886,219 +14241,208 @@ __metadata: peerDependenciesMeta: verdaccio: optional: true - checksum: 6f91085427cc038c44efe21839183134be696d4761341f101e0cc3ae06d6b9ee20872b15f5dd66a89b450136a72afdf7af116f3df98ff365c8ef1dca2d0ebcd7 + checksum: 7fe8afcaeed4ed5d42a75a34e74ec22a5b9af2c8b828da8313f933508351aedabeb656be34bb02faa7efa888f7f9bd45bd2e266429777cccda862f5b02b3cdda languageName: node linkType: hard -"@nx/linter@npm:16.9.0": - version: 16.9.0 - resolution: "@nx/linter@npm:16.9.0" +"@nx/linter@npm:19.4.0": + version: 19.4.0 + resolution: "@nx/linter@npm:19.4.0" dependencies: - "@nrwl/linter": "*" - "@nx/devkit": 16.9.0 - "@nx/js": 16.9.0 - "@phenomnomnominal/tsquery": ~5.0.1 - tmp: ~0.2.1 - tslib: ^2.3.0 - typescript: ~5.1.3 - peerDependencies: - eslint: ^8.0.0 - peerDependenciesMeta: - eslint: - optional: true - checksum: 2b08ae09f550357dbd3a13e3aa32970f0a2fc0ef84e9fb7f89674257457fcc853a2483ba1a5792a784c68d0a750e65f6f36b9bee2f10fedf7e180c72fe6d1ab8 + "@nx/eslint": 19.4.0 + checksum: 0c39259290cc6b5bba11bd32b37cd91aceacd5fcbebec8bfa9bf0f26a33262f0f91125e92951953b232f71df49782d17936d37bb3fc21fe41e9ff89e20a5e0cd languageName: node linkType: hard -"@nx/nest@npm:16.9.0": - version: 16.9.0 - resolution: "@nx/nest@npm:16.9.0" +"@nx/nest@npm:19.4.0": + version: 19.4.0 + resolution: "@nx/nest@npm:19.4.0" dependencies: "@nestjs/schematics": ^9.1.0 - "@nrwl/nest": "*" - "@nx/devkit": 16.9.0 - "@nx/js": 16.9.0 - "@nx/linter": 16.9.0 - "@nx/node": 16.9.0 + "@nrwl/nest": 19.4.0 + "@nx/devkit": 19.4.0 + "@nx/eslint": 19.4.0 + "@nx/js": 19.4.0 + "@nx/node": 19.4.0 "@phenomnomnominal/tsquery": ~5.0.1 - enquirer: ~2.3.6 - semver: 7.5.3 tslib: ^2.3.0 - checksum: ce29c68a9504d5f94880521faf493f1ac0c7bafa3c084e64bd8b5ed710d370a692804dbca8ffaaad1bc722f6b59e25e48bb117549b02123e50f423cb90e3e56f + checksum: 9f45be88bfe98deb99a5e6e99edd5c42937ddbe96a672536e69f8330b357fcecf5f1c5341980674746e332adb523c9e3e710d41fa205a7c21fe35846b6581b99 languageName: node linkType: hard -"@nx/next@npm:16.9.0": - version: 16.9.0 - resolution: "@nx/next@npm:16.9.0" +"@nx/next@npm:19.4.0": + version: 19.4.0 + resolution: "@nx/next@npm:19.4.0" dependencies: "@babel/plugin-proposal-decorators": ^7.22.7 - "@nrwl/next": "*" - "@nx/devkit": 16.9.0 - "@nx/js": 16.9.0 - "@nx/linter": 16.9.0 - "@nx/react": 16.9.0 - "@nx/web": 16.9.0 - "@nx/workspace": 16.9.0 + "@nrwl/next": 19.4.0 + "@nx/devkit": 19.4.0 + "@nx/eslint": 19.4.0 + "@nx/js": 19.4.0 + "@nx/react": 19.4.0 + "@nx/web": 19.4.0 + "@nx/webpack": 19.4.0 + "@nx/workspace": 19.4.0 + "@phenomnomnominal/tsquery": ~5.0.1 "@svgr/webpack": ^8.0.1 chalk: ^4.1.0 copy-webpack-plugin: ^10.2.4 + file-loader: ^6.2.0 fs-extra: ^11.1.0 ignore: ^5.0.4 - semver: 7.5.3 + semver: ^7.5.3 tslib: ^2.3.0 - url-loader: ^4.1.1 webpack-merge: ^5.8.0 peerDependencies: - next: ">=13.0.0" - checksum: f4e84c60a3f386c55ff4716b9ca3ca63f425337924391f2bad8c82c3508c6b840eb3450f274ccecaceeddc8f8b8d0af68806443aedc7dd8bc639900bb0926fd9 + next: ">=14.0.0" + checksum: 20c98dbc795f7a2145a45cb6323114ca6e1000f1f60e4aa40b7eb2d193132f8b8695bbcad3f3912388780a28b379c0e4dcff4b99f5c3fbba269a3ee10be69670 languageName: node linkType: hard -"@nx/node@npm:16.9.0": - version: 16.9.0 - resolution: "@nx/node@npm:16.9.0" +"@nx/node@npm:19.4.0": + version: 19.4.0 + resolution: "@nx/node@npm:19.4.0" dependencies: - "@nrwl/node": "*" - "@nx/devkit": 16.9.0 - "@nx/jest": 16.9.0 - "@nx/js": 16.9.0 - "@nx/linter": 16.9.0 - "@nx/workspace": 16.9.0 + "@nrwl/node": 19.4.0 + "@nx/devkit": 19.4.0 + "@nx/eslint": 19.4.0 + "@nx/jest": 19.4.0 + "@nx/js": 19.4.0 tslib: ^2.3.0 - checksum: c7689f003be1cd6f26fb1971a22defe41635886bea8fc325d572aea9a30f7169b2bb42e40883b66e780a0416ab1c85ee1261c29216f50345f9ed7c15cd9eec8b + checksum: 2763d80ec4945cbdc362d7298b7861c54967151302f6330b75f7c4de81cdbbbf7a0cb3ab1132885284383fdf49cc31cd92db726feed615eb39488668a2c7613b languageName: node linkType: hard -"@nx/nx-darwin-arm64@npm:16.9.0": - version: 16.9.0 - resolution: "@nx/nx-darwin-arm64@npm:16.9.0" +"@nx/nx-darwin-arm64@npm:19.4.0": + version: 19.4.0 + resolution: "@nx/nx-darwin-arm64@npm:19.4.0" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@nx/nx-darwin-x64@npm:16.9.0": - version: 16.9.0 - resolution: "@nx/nx-darwin-x64@npm:16.9.0" +"@nx/nx-darwin-x64@npm:19.4.0": + version: 19.4.0 + resolution: "@nx/nx-darwin-x64@npm:19.4.0" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@nx/nx-freebsd-x64@npm:16.9.0": - version: 16.9.0 - resolution: "@nx/nx-freebsd-x64@npm:16.9.0" +"@nx/nx-freebsd-x64@npm:19.4.0": + version: 19.4.0 + resolution: "@nx/nx-freebsd-x64@npm:19.4.0" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard -"@nx/nx-linux-arm-gnueabihf@npm:16.9.0": - version: 16.9.0 - resolution: "@nx/nx-linux-arm-gnueabihf@npm:16.9.0" +"@nx/nx-linux-arm-gnueabihf@npm:19.4.0": + version: 19.4.0 + resolution: "@nx/nx-linux-arm-gnueabihf@npm:19.4.0" conditions: os=linux & cpu=arm languageName: node linkType: hard -"@nx/nx-linux-arm64-gnu@npm:16.9.0": - version: 16.9.0 - resolution: "@nx/nx-linux-arm64-gnu@npm:16.9.0" +"@nx/nx-linux-arm64-gnu@npm:19.4.0": + version: 19.4.0 + resolution: "@nx/nx-linux-arm64-gnu@npm:19.4.0" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@nx/nx-linux-arm64-musl@npm:16.9.0": - version: 16.9.0 - resolution: "@nx/nx-linux-arm64-musl@npm:16.9.0" +"@nx/nx-linux-arm64-musl@npm:19.4.0": + version: 19.4.0 + resolution: "@nx/nx-linux-arm64-musl@npm:19.4.0" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@nx/nx-linux-x64-gnu@npm:16.9.0": - version: 16.9.0 - resolution: "@nx/nx-linux-x64-gnu@npm:16.9.0" +"@nx/nx-linux-x64-gnu@npm:19.4.0": + version: 19.4.0 + resolution: "@nx/nx-linux-x64-gnu@npm:19.4.0" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@nx/nx-linux-x64-musl@npm:16.9.0": - version: 16.9.0 - resolution: "@nx/nx-linux-x64-musl@npm:16.9.0" +"@nx/nx-linux-x64-musl@npm:19.4.0": + version: 19.4.0 + resolution: "@nx/nx-linux-x64-musl@npm:19.4.0" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@nx/nx-win32-arm64-msvc@npm:16.9.0": - version: 16.9.0 - resolution: "@nx/nx-win32-arm64-msvc@npm:16.9.0" +"@nx/nx-win32-arm64-msvc@npm:19.4.0": + version: 19.4.0 + resolution: "@nx/nx-win32-arm64-msvc@npm:19.4.0" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@nx/nx-win32-x64-msvc@npm:16.9.0": - version: 16.9.0 - resolution: "@nx/nx-win32-x64-msvc@npm:16.9.0" +"@nx/nx-win32-x64-msvc@npm:19.4.0": + version: 19.4.0 + resolution: "@nx/nx-win32-x64-msvc@npm:19.4.0" conditions: os=win32 & cpu=x64 languageName: node linkType: hard -"@nx/react@npm:16.9.0": - version: 16.9.0 - resolution: "@nx/react@npm:16.9.0" +"@nx/react@npm:19.4.0": + version: 19.4.0 + resolution: "@nx/react@npm:19.4.0" dependencies: - "@nrwl/react": "*" - "@nx/devkit": 16.9.0 - "@nx/js": 16.9.0 - "@nx/linter": 16.9.0 - "@nx/web": 16.9.0 + "@nrwl/react": 19.4.0 + "@nx/devkit": 19.4.0 + "@nx/eslint": 19.4.0 + "@nx/js": 19.4.0 + "@nx/web": 19.4.0 "@phenomnomnominal/tsquery": ~5.0.1 "@svgr/webpack": ^8.0.1 chalk: ^4.1.0 file-loader: ^6.2.0 - minimatch: 3.0.5 + minimatch: 9.0.3 tslib: ^2.3.0 - checksum: 135bf050e6aa1a18491eecb61985aecfca0f5c998bb63893e823bc8bd83ebb1ea9eb21f125d74f2b3917852ec0a4defed8adcec7fc922ecbb45483ae79a96e29 + checksum: 96d624a57cde85de4957a96597d4ead93be3df1a63d73f8f9d2a22d621d81120d4067662fd5af7017ce0f2a8fb63dbd32c26dd774f1a4015fb44fc4100341590 languageName: node linkType: hard -"@nx/storybook@npm:16.9.0": - version: 16.9.0 - resolution: "@nx/storybook@npm:16.9.0" +"@nx/storybook@npm:19.4.0": + version: 19.4.0 + resolution: "@nx/storybook@npm:19.4.0" dependencies: - "@nrwl/storybook": "*" - "@nx/cypress": 16.9.0 - "@nx/devkit": 16.9.0 - "@nx/js": 16.9.0 - "@nx/linter": 16.9.0 - "@nx/workspace": 16.9.0 + "@nrwl/storybook": 19.4.0 + "@nx/cypress": 19.4.0 + "@nx/devkit": 19.4.0 + "@nx/eslint": 19.4.0 + "@nx/js": 19.4.0 "@phenomnomnominal/tsquery": ~5.0.1 - semver: 7.5.3 + semver: ^7.5.3 tslib: ^2.3.0 - checksum: 27b293c9a52c0739c660aaff76e542aa3654f74a2ed2b021fbbbc1ce3cd033b05f26e7468c403be1ca000cdf576aff4eadbadb2a8d4419180e3672339c6ec5a8 + checksum: 31b0c31ec1a002fe123b1955cc519c97edf5e2fd6c8a7e55b6b3092557a79f0e8bbbfbd8bd110ef5f1dd58f73a7af355005364eaf3f73def5865df3fbea30fa5 languageName: node linkType: hard -"@nx/web@npm:16.9.0": - version: 16.9.0 - resolution: "@nx/web@npm:16.9.0" +"@nx/web@npm:19.4.0": + version: 19.4.0 + resolution: "@nx/web@npm:19.4.0" dependencies: - "@nrwl/web": "*" - "@nx/devkit": 16.9.0 - "@nx/js": 16.9.0 + "@nrwl/web": 19.4.0 + "@nx/devkit": 19.4.0 + "@nx/js": 19.4.0 chalk: ^4.1.0 detect-port: ^1.5.1 http-server: ^14.1.0 tslib: ^2.3.0 - checksum: 89ed1ed00df21c8a0f66b7fa5446e805685a5c1c3c8781f64477af1da00ea7733458eca2af7ade74047c129374b6cae7de93b7c71ac471fc68dd214a840b6ebe + checksum: 5d534b493a5c3a0bb240c8d45e1c46eea97cb28e715a665b86779621ec2417ae2a7e77ee82bea6239b32ae94934ef9a23cba8301b3e01d613cb6801768714048 languageName: node linkType: hard -"@nx/webpack@npm:16.9.0": - version: 16.9.0 - resolution: "@nx/webpack@npm:16.9.0" +"@nx/webpack@npm:19.4.0": + version: 19.4.0 + resolution: "@nx/webpack@npm:19.4.0" dependencies: - "@babel/core": ^7.22.9 - "@nrwl/webpack": "*" - "@nx/devkit": 16.9.0 - "@nx/js": 16.9.0 + "@babel/core": ^7.23.2 + "@nrwl/webpack": 19.4.0 + "@nx/devkit": 19.4.0 + "@nx/js": 19.4.0 + "@phenomnomnominal/tsquery": ~5.0.1 + ajv: ^8.12.0 autoprefixer: ^10.4.9 babel-loader: ^9.1.2 browserslist: ^4.21.4 @@ -13113,13 +14457,13 @@ __metadata: loader-utils: ^2.0.3 mini-css-extract-plugin: ~2.4.7 parse5: 4.0.0 - postcss: ^8.4.14 + postcss: ^8.4.38 postcss-import: ~14.1.0 postcss-loader: ^6.1.1 rxjs: ^7.8.0 sass: ^1.42.1 sass-loader: ^12.2.0 - source-map-loader: ^3.0.0 + source-map-loader: ^5.0.0 style-loader: ^3.3.0 stylus: ^0.59.0 stylus-loader: ^7.1.0 @@ -13131,24 +14475,22 @@ __metadata: webpack-dev-server: ^4.9.3 webpack-node-externals: ^3.0.0 webpack-subresource-integrity: ^5.1.0 - checksum: 8e1c80fdb8320572215983d9ca1f262adb686e0869837697e14360202544e1623f05c2e0a9cb79299a72209715cde763bcd0a7e5629cbd25a3363252d60c9c67 + checksum: 1311f8512792b8093eb6adda5d558cb9853e9bc609abf95e6f642a5c1e5b1554065384468bd9306076a4d00f4ddcfff6b24f576f8cad26fdf939431b7f5a23e9 languageName: node linkType: hard -"@nx/workspace@npm:16.9.0": - version: 16.9.0 - resolution: "@nx/workspace@npm:16.9.0" +"@nx/workspace@npm:19.4.0": + version: 19.4.0 + resolution: "@nx/workspace@npm:19.4.0" dependencies: - "@nrwl/workspace": "*" - "@nx/devkit": 16.9.0 + "@nrwl/workspace": 19.4.0 + "@nx/devkit": 19.4.0 chalk: ^4.1.0 enquirer: ~2.3.6 - ignore: ^5.0.4 - nx: 16.9.0 - rxjs: ^7.8.0 + nx: 19.4.0 tslib: ^2.3.0 yargs-parser: 21.1.1 - checksum: 9b3a68d074f060de71da2a67d7d675d7afaf49a73490b9eb63d1ae6d14edaf5490a85fd1744845d6c003b525e3b54bf0d8cacff624ceaeb58f8cafcb16705758 + checksum: ae1dcf4e337c59c34c5bd798479c920e2379f305c9632758538695665a6ec7c12579213bf8d3ba5e6067f23363345a92ee49e7aab4fcc50650821b93000fe0ec languageName: node linkType: hard @@ -13383,26 +14725,24 @@ __metadata: languageName: node linkType: hard -"@pmmmwh/react-refresh-webpack-plugin@npm:^0.5.5": - version: 0.5.10 - resolution: "@pmmmwh/react-refresh-webpack-plugin@npm:0.5.10" +"@pmmmwh/react-refresh-webpack-plugin@npm:^0.5.11": + version: 0.5.15 + resolution: "@pmmmwh/react-refresh-webpack-plugin@npm:0.5.15" dependencies: - ansi-html-community: ^0.0.8 - common-path-prefix: ^3.0.0 + ansi-html: ^0.0.9 core-js-pure: ^3.23.3 error-stack-parser: ^2.0.6 - find-up: ^5.0.0 html-entities: ^2.1.0 loader-utils: ^2.0.4 - schema-utils: ^3.0.0 + schema-utils: ^4.2.0 source-map: ^0.7.3 peerDependencies: "@types/webpack": 4.x || 5.x react-refresh: ">=0.10.0 <1.0.0" sockjs-client: ^1.4.0 - type-fest: ">=0.17.0 <4.0.0" + type-fest: ">=0.17.0 <5.0.0" webpack: ">=4.43.0 <6.0.0" - webpack-dev-server: 3.x || 4.x + webpack-dev-server: 3.x || 4.x || 5.x webpack-hot-middleware: 2.x webpack-plugin-serve: 0.x || 1.x peerDependenciesMeta: @@ -13418,7 +14758,7 @@ __metadata: optional: true webpack-plugin-serve: optional: true - checksum: c45beded9c56fbbdc7213a2c36131ace5db360ed704d462cc39d6678f980173a91c9a3f691e6bd3a026f25486644cd0027e8a12a0a4eced8e8b886a0472e7d34 + checksum: 82df6244146209d63a12f0ca2e70b05274ee058c7e6d6eb4ced1228afde3b039a7f3f3cc0c76f1bb4b28deadbcf08bc2821c814f0bfee06979128578300fff3d languageName: node linkType: hard @@ -14827,10 +16167,10 @@ __metadata: languageName: node linkType: hard -"@rushstack/eslint-patch@npm:^1.1.3": - version: 1.2.0 - resolution: "@rushstack/eslint-patch@npm:1.2.0" - checksum: faa749faae0e83c26ae9eb00ad36a897ac78f3cf27da8e8ff21c00bcf7973b598d823d8f2b3957ef66079288bcf577f94df831eae2d65f3f68d8ca32f18b6aff +"@rushstack/eslint-patch@npm:^1.3.3": + version: 1.10.3 + resolution: "@rushstack/eslint-patch@npm:1.10.3" + checksum: 1042779367ee102576a3c132f052d718d7111fee9f815758a72b21e8145620f7d3403c14fcde3b4cfa1cbc14b08b8519151ff77d0f353bf647f0a0a16eafdef5 languageName: node linkType: hard @@ -15151,140 +16491,71 @@ __metadata: languageName: node linkType: hard -"@storybook/addon-a11y@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/addon-a11y@npm:7.4.1" +"@storybook/addon-a11y@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/addon-a11y@npm:7.6.9" dependencies: - "@storybook/addon-highlight": 7.4.1 - "@storybook/channels": 7.4.1 - "@storybook/client-logger": 7.4.1 - "@storybook/components": 7.4.1 - "@storybook/core-events": 7.4.1 - "@storybook/global": ^5.0.0 - "@storybook/manager-api": 7.4.1 - "@storybook/preview-api": 7.4.1 - "@storybook/theming": 7.4.1 - "@storybook/types": 7.4.1 + "@storybook/addon-highlight": 7.6.9 axe-core: ^4.2.0 - lodash: ^4.17.21 - react-resize-detector: ^7.1.2 - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - react: - optional: true - react-dom: - optional: true - checksum: 50fe0e25f170d892dc97b8b7d7a8193d664a8bd84ccb53cb2e162cd5270d4dc5fa86b0f623620c10fbbac4998fd13bf583b423f2ef540fd40d933df222e83bf1 + checksum: 9b7b38cd5b2f42cd22067a2bb4391dada6d16112147db96890edf9460cc8d63494965981e8b418bc0ad8cdb161243fa0920c699200d90c044a263a5a90ee963f languageName: node linkType: hard -"@storybook/addon-actions@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/addon-actions@npm:7.4.1" +"@storybook/addon-actions@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/addon-actions@npm:7.6.9" dependencies: - "@storybook/client-logger": 7.4.1 - "@storybook/components": 7.4.1 - "@storybook/core-events": 7.4.1 + "@storybook/core-events": 7.6.9 "@storybook/global": ^5.0.0 - "@storybook/manager-api": 7.4.1 - "@storybook/preview-api": 7.4.1 - "@storybook/theming": 7.4.1 - "@storybook/types": 7.4.1 + "@types/uuid": ^9.0.1 dequal: ^2.0.2 - lodash: ^4.17.21 polished: ^4.2.2 - prop-types: ^15.7.2 - react-inspector: ^6.0.0 - telejson: ^7.2.0 - ts-dedent: ^2.0.0 uuid: ^9.0.0 - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - react: - optional: true - react-dom: - optional: true - checksum: 454cd57744f0d710783689a626ff6a5899f6012c92ae3c6c671ce0fe543dca70259a75d9e0dff5a08157ba80e24d3280c89db8a06e2102a8c8ec6b0890948231 + checksum: c78a62f909bd6d7b0d314b0c5f439c58789cedc624773d4fe822880bf802863b128c91c5a48f874af9950bd9f6d9624deac9572f14d97832f5e38ebb7ee4377c languageName: node linkType: hard -"@storybook/addon-backgrounds@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/addon-backgrounds@npm:7.4.1" +"@storybook/addon-backgrounds@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/addon-backgrounds@npm:7.6.9" dependencies: - "@storybook/client-logger": 7.4.1 - "@storybook/components": 7.4.1 - "@storybook/core-events": 7.4.1 "@storybook/global": ^5.0.0 - "@storybook/manager-api": 7.4.1 - "@storybook/preview-api": 7.4.1 - "@storybook/theming": 7.4.1 - "@storybook/types": 7.4.1 memoizerific: ^1.11.3 ts-dedent: ^2.0.0 - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - react: - optional: true - react-dom: - optional: true - checksum: 9ac49d9c46359a32d2ab90781be0b6d1c1e352a4070c7509779f5fdf6e80b57d81aa6851c654280c3453de644464fd2d344c6f268b455d7281a0f052954aca63 + checksum: 076d21dbdf7d6bb48d38769d80ae4f093d20763faa057d466ba01aec5222e068761b205ac3461b49647af0aca5899af9efb9efdf509aac7591d623b14fd35fd8 languageName: node linkType: hard -"@storybook/addon-controls@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/addon-controls@npm:7.4.1" - dependencies: - "@storybook/blocks": 7.4.1 - "@storybook/client-logger": 7.4.1 - "@storybook/components": 7.4.1 - "@storybook/core-common": 7.4.1 - "@storybook/core-events": 7.4.1 - "@storybook/manager-api": 7.4.1 - "@storybook/node-logger": 7.4.1 - "@storybook/preview-api": 7.4.1 - "@storybook/theming": 7.4.1 - "@storybook/types": 7.4.1 +"@storybook/addon-controls@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/addon-controls@npm:7.6.9" + dependencies: + "@storybook/blocks": 7.6.9 lodash: ^4.17.21 ts-dedent: ^2.0.0 - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - react: - optional: true - react-dom: - optional: true - checksum: a9120f8f908a0965d27763603a7762efb5ab6516d2ed1f1c19d02689fc9439f618d1a963dfc15695fb4eada6cd60e5d6d01f56b357772426d23ca981864031c7 + checksum: 40e5002c46eb1a2d30b39b7b5f6073115f3fce2704ff18bfd4164d7816c9d1c69b645a46cf3808c8e29e59987cb2941e09f1a1684332a2adb4282222e7ce257f languageName: node linkType: hard -"@storybook/addon-docs@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/addon-docs@npm:7.4.1" +"@storybook/addon-docs@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/addon-docs@npm:7.6.9" dependencies: "@jest/transform": ^29.3.1 "@mdx-js/react": ^2.1.5 - "@storybook/blocks": 7.4.1 - "@storybook/client-logger": 7.4.1 - "@storybook/components": 7.4.1 - "@storybook/csf-plugin": 7.4.1 - "@storybook/csf-tools": 7.4.1 + "@storybook/blocks": 7.6.9 + "@storybook/client-logger": 7.6.9 + "@storybook/components": 7.6.9 + "@storybook/csf-plugin": 7.6.9 + "@storybook/csf-tools": 7.6.9 "@storybook/global": ^5.0.0 "@storybook/mdx2-csf": ^1.0.0 - "@storybook/node-logger": 7.4.1 - "@storybook/postinstall": 7.4.1 - "@storybook/preview-api": 7.4.1 - "@storybook/react-dom-shim": 7.4.1 - "@storybook/theming": 7.4.1 - "@storybook/types": 7.4.1 + "@storybook/node-logger": 7.6.9 + "@storybook/postinstall": 7.6.9 + "@storybook/preview-api": 7.6.9 + "@storybook/react-dom-shim": 7.6.9 + "@storybook/theming": 7.6.9 + "@storybook/types": 7.6.9 fs-extra: ^11.1.0 remark-external-links: ^8.0.0 remark-slug: ^6.0.0 @@ -15292,148 +16563,88 @@ __metadata: peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: dbbe2e2352a5ce29f51520bddeeaf18892e551198323f4266089a70124ed65691b5ca2f2552063baf935ed068dbd6f258d05f426fdc52b57d5b0ca10d104ea9a - languageName: node - linkType: hard - -"@storybook/addon-essentials@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/addon-essentials@npm:7.4.1" - dependencies: - "@storybook/addon-actions": 7.4.1 - "@storybook/addon-backgrounds": 7.4.1 - "@storybook/addon-controls": 7.4.1 - "@storybook/addon-docs": 7.4.1 - "@storybook/addon-highlight": 7.4.1 - "@storybook/addon-measure": 7.4.1 - "@storybook/addon-outline": 7.4.1 - "@storybook/addon-toolbars": 7.4.1 - "@storybook/addon-viewport": 7.4.1 - "@storybook/core-common": 7.4.1 - "@storybook/manager-api": 7.4.1 - "@storybook/node-logger": 7.4.1 - "@storybook/preview-api": 7.4.1 + checksum: 31b2b3635c85c95078275bf6f4d66643bc809c6b173b7585aa81459ccd9d5d59d40575400e92c637b4536979292864ef27232bdf7094d29ac23db37840450dec + languageName: node + linkType: hard + +"@storybook/addon-essentials@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/addon-essentials@npm:7.6.9" + dependencies: + "@storybook/addon-actions": 7.6.9 + "@storybook/addon-backgrounds": 7.6.9 + "@storybook/addon-controls": 7.6.9 + "@storybook/addon-docs": 7.6.9 + "@storybook/addon-highlight": 7.6.9 + "@storybook/addon-measure": 7.6.9 + "@storybook/addon-outline": 7.6.9 + "@storybook/addon-toolbars": 7.6.9 + "@storybook/addon-viewport": 7.6.9 + "@storybook/core-common": 7.6.9 + "@storybook/manager-api": 7.6.9 + "@storybook/node-logger": 7.6.9 + "@storybook/preview-api": 7.6.9 ts-dedent: ^2.0.0 peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: df6018544fa8ef7bbcf6d845ac2472d0e6c7e9ac0f4a12219fbdf5bce722d2cdc1605ba4e8bea9d86cfa9b54ca4564385db0ca044581e176e763e315ffdff1df + checksum: 00a84179d90aefe9f3a979e8e6ddca6774a69c7401de0f20a1c78571d29753946f6a0759496fec4a578904aae8e6d2404218b918269e6cd0bfd23c5fd312daa0 languageName: node linkType: hard -"@storybook/addon-highlight@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/addon-highlight@npm:7.4.1" +"@storybook/addon-highlight@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/addon-highlight@npm:7.6.9" dependencies: - "@storybook/core-events": 7.4.1 "@storybook/global": ^5.0.0 - "@storybook/preview-api": 7.4.1 - checksum: 96a056c0224b4c86b2f35577a8e28269269f9a323d2597c5aaef61706ac7ca93bec6e6b9dd8ec8413d6ff78ba17f225d210ab5bee7af4cb72db6886adddaeb5f + checksum: 70196d459ef5cf43f9eb51ebabe05fa389fdd8a2f8f04e37501d5ba899b9927ae9edecf5effc8b8a10b309ceedf218b4fe630a12424db422bb31376960cc013f languageName: node linkType: hard -"@storybook/addon-mdx-gfm@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/addon-mdx-gfm@npm:7.4.1" +"@storybook/addon-mdx-gfm@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/addon-mdx-gfm@npm:7.6.9" dependencies: - "@storybook/node-logger": 7.4.1 + "@storybook/node-logger": 7.6.9 remark-gfm: ^3.0.1 ts-dedent: ^2.0.0 - checksum: fe2e067c8b549147fa038a1a8ecb54674a0aec06aa2e9cce5ef632836eb3e483a0c8bb2c2c1b37f66599c6c6d8d5ab45731f0c0e3305fd097bc057a319411ca5 + checksum: 56e592cf6a95ae5c196b6ef6a32952bbfa595c1ec4aecb1959766753a0e13e0491b6dd179f60320aaf3e945fff1ce57d30c453258bd8f332c1e86369f19ce4be languageName: node linkType: hard -"@storybook/addon-measure@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/addon-measure@npm:7.4.1" +"@storybook/addon-measure@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/addon-measure@npm:7.6.9" dependencies: - "@storybook/client-logger": 7.4.1 - "@storybook/components": 7.4.1 - "@storybook/core-events": 7.4.1 "@storybook/global": ^5.0.0 - "@storybook/manager-api": 7.4.1 - "@storybook/preview-api": 7.4.1 - "@storybook/types": 7.4.1 tiny-invariant: ^1.3.1 - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - react: - optional: true - react-dom: - optional: true - checksum: 4c7a5ced663c08e9948b9af29f2200bac6be8893e13c38ac1453c11c79a5dbde2203ee4a736dc498f2a10c652173856d31fa449a122a6ca60b666ef0a0c25bc1 + checksum: cf9a9b094b500b694feb2fb0281e4fe3dda17682ec95a06f57c3804ae4df340a606227da8e34127fed2c24c858f587ae0ecfaa1bf30872a9b4317dbb962fb39c languageName: node linkType: hard -"@storybook/addon-outline@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/addon-outline@npm:7.4.1" +"@storybook/addon-outline@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/addon-outline@npm:7.6.9" dependencies: - "@storybook/client-logger": 7.4.1 - "@storybook/components": 7.4.1 - "@storybook/core-events": 7.4.1 "@storybook/global": ^5.0.0 - "@storybook/manager-api": 7.4.1 - "@storybook/preview-api": 7.4.1 - "@storybook/types": 7.4.1 ts-dedent: ^2.0.0 - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - react: - optional: true - react-dom: - optional: true - checksum: 10b0675a6407e6a592e767d23b1399f496e87bd452a65e3650b5ec9209473cc387e648901143020fae819ca7dd9c799927fc85f4f960594c066a72e57b422f53 + checksum: b2401218b2e7dd5d038e18dd2a8c1685fb374eaffdb64ec29bdfa2782321713e6f76f325726462422fc04c388ba23b3ffbdfc9e388fde687bbe49ea2751f2323 languageName: node linkType: hard -"@storybook/addon-toolbars@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/addon-toolbars@npm:7.4.1" - dependencies: - "@storybook/client-logger": 7.4.1 - "@storybook/components": 7.4.1 - "@storybook/manager-api": 7.4.1 - "@storybook/preview-api": 7.4.1 - "@storybook/theming": 7.4.1 - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - react: - optional: true - react-dom: - optional: true - checksum: 8e3fbc624a3702d0b838f1e9e77321be2be707777ea18bfa2ce49f2bd5bdd9debc263afc63d8790901cb26f2133d3b9a9330b4e5cdeae24563fc1b121e9017b3 +"@storybook/addon-toolbars@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/addon-toolbars@npm:7.6.9" + checksum: d99ed3bd5705c0943c0da00a03d12953c998089abf83f10f7e5e804a76965ea0e82ed20d0b994cb3699a0b54b9481467c0f4f5f988ebce4aafbbc1cbb0e8c2c1 languageName: node linkType: hard -"@storybook/addon-viewport@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/addon-viewport@npm:7.4.1" +"@storybook/addon-viewport@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/addon-viewport@npm:7.6.9" dependencies: - "@storybook/client-logger": 7.4.1 - "@storybook/components": 7.4.1 - "@storybook/core-events": 7.4.1 - "@storybook/global": ^5.0.0 - "@storybook/manager-api": 7.4.1 - "@storybook/preview-api": 7.4.1 - "@storybook/theming": 7.4.1 memoizerific: ^1.11.3 - prop-types: ^15.7.2 - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - peerDependenciesMeta: - react: - optional: true - react-dom: - optional: true - checksum: 58372cb6e890a0f8435783799ffa96d9d9afa0f3ef57d404dc8a901f93527a957ea64ac0e1b9b013139337df8cef7364639779c0697476383bcb4b2d0f1e212b + checksum: d447ae4149686411a7e5a0d44ebfd3b00bd289e99b50ad7df2609b32e09b1a83a3caf68c19801442d2224a3eab1f86875eec825615335b69778ff36ef528337b languageName: node linkType: hard @@ -15451,35 +16662,21 @@ __metadata: languageName: node linkType: hard -"@storybook/addons@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/addons@npm:7.4.1" +"@storybook/blocks@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/blocks@npm:7.6.9" dependencies: - "@storybook/manager-api": 7.4.1 - "@storybook/preview-api": 7.4.1 - "@storybook/types": 7.4.1 - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: 4c89bf6473e1f6913c8822d325e54fd283e11b532aa44d4d7837431dbadf3c47e4bb95b98019078ff73b5f3e219398b88a26c08cc871bf4ec95021d8f3bee25f - languageName: node - linkType: hard - -"@storybook/blocks@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/blocks@npm:7.4.1" - dependencies: - "@storybook/channels": 7.4.1 - "@storybook/client-logger": 7.4.1 - "@storybook/components": 7.4.1 - "@storybook/core-events": 7.4.1 - "@storybook/csf": ^0.1.0 - "@storybook/docs-tools": 7.4.1 + "@storybook/channels": 7.6.9 + "@storybook/client-logger": 7.6.9 + "@storybook/components": 7.6.9 + "@storybook/core-events": 7.6.9 + "@storybook/csf": ^0.1.2 + "@storybook/docs-tools": 7.6.9 "@storybook/global": ^5.0.0 - "@storybook/manager-api": 7.4.1 - "@storybook/preview-api": 7.4.1 - "@storybook/theming": 7.4.1 - "@storybook/types": 7.4.1 + "@storybook/manager-api": 7.6.9 + "@storybook/preview-api": 7.6.9 + "@storybook/theming": 7.6.9 + "@storybook/types": 7.6.9 "@types/lodash": ^4.14.167 color-convert: ^2.0.1 dequal: ^2.0.2 @@ -15495,7 +16692,7 @@ __metadata: peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: 08873c11b8cb1648a7746f254a4dd10cf4f689b3f14373230a2444bfbf275fb70f317d4bf755d75aceef2af86a363941b7ed5071479cf840958d8581c046f7a2 + checksum: 58d3c2bf9c5c3b891313b15e4ef2db1a4dfbf86aeca14f5cb1b781e24f5fd949093417d1b80aaccfe123b2c7c94293692196b5773bd8f441bee1132fedf4f7ae languageName: node linkType: hard @@ -15523,14 +16720,14 @@ __metadata: languageName: node linkType: hard -"@storybook/builder-manager@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/builder-manager@npm:7.4.1" +"@storybook/builder-manager@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/builder-manager@npm:7.6.9" dependencies: "@fal-works/esbuild-plugin-global-externals": ^2.1.2 - "@storybook/core-common": 7.4.1 - "@storybook/manager": 7.4.1 - "@storybook/node-logger": 7.4.1 + "@storybook/core-common": 7.6.9 + "@storybook/manager": 7.6.9 + "@storybook/node-logger": 7.6.9 "@types/ejs": ^3.1.1 "@types/find-cache-dir": ^3.2.1 "@yarnpkg/esbuild-plugin-pnp": ^3.0.0-rc.10 @@ -15543,44 +16740,38 @@ __metadata: fs-extra: ^11.1.0 process: ^0.11.10 util: ^0.12.4 - checksum: 81a2bdf551541db7b9671373083bf16b079e345e7b580c45e6237661bf5ee4faa65f5fac19f6cffb00bc24c81988d89c9d6975a8b5a961a73cbaeb3287ea29fb + checksum: a3e3f5b6eb4f6c81793fe0a8d238c6a189bfd92b43dcc61a6b574eeb41869a93afdd35345c04b21dab074443ba5cc869f083fe113946ced74ae01bce62430a9f languageName: node linkType: hard -"@storybook/builder-webpack5@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/builder-webpack5@npm:7.4.1" +"@storybook/builder-webpack5@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/builder-webpack5@npm:7.6.9" dependencies: - "@babel/core": ^7.22.9 - "@storybook/addons": 7.4.1 - "@storybook/channels": 7.4.1 - "@storybook/client-api": 7.4.1 - "@storybook/client-logger": 7.4.1 - "@storybook/components": 7.4.1 - "@storybook/core-common": 7.4.1 - "@storybook/core-events": 7.4.1 - "@storybook/core-webpack": 7.4.1 - "@storybook/global": ^5.0.0 - "@storybook/manager-api": 7.4.1 - "@storybook/node-logger": 7.4.1 - "@storybook/preview": 7.4.1 - "@storybook/preview-api": 7.4.1 - "@storybook/router": 7.4.1 - "@storybook/store": 7.4.1 - "@storybook/theming": 7.4.1 - "@swc/core": ^1.3.49 - "@types/node": ^16.0.0 + "@babel/core": ^7.23.2 + "@storybook/channels": 7.6.9 + "@storybook/client-logger": 7.6.9 + "@storybook/core-common": 7.6.9 + "@storybook/core-events": 7.6.9 + "@storybook/core-webpack": 7.6.9 + "@storybook/node-logger": 7.6.9 + "@storybook/preview": 7.6.9 + "@storybook/preview-api": 7.6.9 + "@swc/core": ^1.3.82 + "@types/node": ^18.0.0 "@types/semver": ^7.3.4 babel-loader: ^9.0.0 - babel-plugin-named-exports-order: ^0.0.2 browser-assert: ^1.2.1 case-sensitive-paths-webpack-plugin: ^2.4.0 + cjs-module-lexer: ^1.2.3 constants-browserify: ^1.0.0 css-loader: ^6.7.1 + es-module-lexer: ^1.4.1 express: ^4.17.3 fork-ts-checker-webpack-plugin: ^8.0.0 fs-extra: ^11.1.0 html-webpack-plugin: ^5.5.0 + magic-string: ^0.30.5 path-browserify: ^1.0.1 process: ^0.11.10 semver: ^7.3.7 @@ -15595,13 +16786,10 @@ __metadata: webpack-dev-middleware: ^6.1.1 webpack-hot-middleware: ^2.25.1 webpack-virtual-modules: ^0.5.0 - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 43268293cb8de1107f475f8aa992583e068d4badfdfd4699bab644cc7135a57e66b6253c0f256e8206201cb127f759312cf11a1c8fc07f9f90ed675eba7908ae + checksum: 51f356f63ae86dffaf9458a71c25604f86f12ae83432bff92b16ca8ad2034fb90efce0dda746529bb0dae5d2ca25ac371bffd4f3bd9ce0b4701dc83677001a1d languageName: node linkType: hard @@ -15647,17 +16835,17 @@ __metadata: languageName: node linkType: hard -"@storybook/channels@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/channels@npm:7.4.1" +"@storybook/channels@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/channels@npm:7.6.9" dependencies: - "@storybook/client-logger": 7.4.1 - "@storybook/core-events": 7.4.1 + "@storybook/client-logger": 7.6.9 + "@storybook/core-events": 7.6.9 "@storybook/global": ^5.0.0 qs: ^6.10.0 telejson: ^7.2.0 tiny-invariant: ^1.3.1 - checksum: 64ddd212d2b1b46ca5a4caa55537f0962bb53c864159422c253194ed2744dc4af87adee834d4cc32028b3293150287803d4380f57ccf9e397f9e170ed807530a + checksum: d6dbb60709e52e5d6f3d74e5745d97e6c74e6eb25d63b84e18c6a8035c59b23e1e58c8d7a95df441cbf2a59defdd2423b2b614a4e5202c279ca7e93c34dcc60f languageName: node linkType: hard @@ -15712,16 +16900,6 @@ __metadata: languageName: node linkType: hard -"@storybook/client-api@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/client-api@npm:7.4.1" - dependencies: - "@storybook/client-logger": 7.4.1 - "@storybook/preview-api": 7.4.1 - checksum: 67d31752a29377480ad1f7360955249306f1fdd37eddaf35240761e0b666312fdbd2bd48433f86dd9da506d4c8264345c4049c37704de0be48add841d61af447 - languageName: node - linkType: hard - "@storybook/client-logger@npm:7.0.20": version: 7.0.20 resolution: "@storybook/client-logger@npm:7.0.20" @@ -15749,12 +16927,12 @@ __metadata: languageName: node linkType: hard -"@storybook/client-logger@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/client-logger@npm:7.4.1" +"@storybook/client-logger@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/client-logger@npm:7.6.9" dependencies: "@storybook/global": ^5.0.0 - checksum: 46b420f0ab9da2a590f39e215471706de324e20e21c5d859153ab2c919a43aaac8e15515392489fcc598775f36b5f772e5c4ae5a92da9f4702791faabe25dae0 + checksum: 4db2d435e6503818f1ea1d2396625ba021a6fd07d23174817b6dd3a9dc2c357f1a689daaba26e1cf63a9ed4602f76aa9ef81c9e8c2f4186f8dcf5f79662002fa languageName: node linkType: hard @@ -15780,24 +16958,24 @@ __metadata: languageName: node linkType: hard -"@storybook/components@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/components@npm:7.4.1" +"@storybook/components@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/components@npm:7.6.9" dependencies: "@radix-ui/react-select": ^1.2.2 "@radix-ui/react-toolbar": ^1.0.4 - "@storybook/client-logger": 7.4.1 - "@storybook/csf": ^0.1.0 + "@storybook/client-logger": 7.6.9 + "@storybook/csf": ^0.1.2 "@storybook/global": ^5.0.0 - "@storybook/theming": 7.4.1 - "@storybook/types": 7.4.1 + "@storybook/theming": 7.6.9 + "@storybook/types": 7.6.9 memoizerific: ^1.11.3 use-resize-observer: ^9.1.0 util-deprecate: ^1.0.2 peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: 45502741b3663dc30536275ed2b577ec1de747244f16c07f59e8b7bb3a805a0edf6224d7ff99636b0461ebcf3c99f871dc39986daf72e8cf84750448d3041404 + checksum: cfd9ea4ff61eb97773806771af5478389a702781e5f1115bcf859e77c107d7a4536652e4e146c5663503101b226471f3fdebd1f0e7a1092bde09105254f051b5 languageName: node linkType: hard @@ -15820,13 +16998,13 @@ __metadata: languageName: node linkType: hard -"@storybook/core-client@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/core-client@npm:7.4.1" +"@storybook/core-client@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/core-client@npm:7.6.9" dependencies: - "@storybook/client-logger": 7.4.1 - "@storybook/preview-api": 7.4.1 - checksum: 7acd8e4aac0a7014cd18383572bb5e85dc5016c455a79ab6309e7e6737d7f90c5ea27b7b4df5d0baa4e78c924af490754ec3127e3a06abba72533d694807cc86 + "@storybook/client-logger": 7.6.9 + "@storybook/preview-api": 7.6.9 + checksum: ea29030727a0b25058265f8e309a4bd31cacc96aba523c8e83d0b2fb365ac08028ad5bf89a5aa55762fe21c758126df13afa8bf4f761209c4c84fd06d9b1e2b1 languageName: node linkType: hard @@ -15860,20 +17038,20 @@ __metadata: languageName: node linkType: hard -"@storybook/core-common@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/core-common@npm:7.4.1" +"@storybook/core-common@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/core-common@npm:7.6.9" dependencies: - "@storybook/core-events": 7.4.1 - "@storybook/node-logger": 7.4.1 - "@storybook/types": 7.4.1 + "@storybook/core-events": 7.6.9 + "@storybook/node-logger": 7.6.9 + "@storybook/types": 7.6.9 "@types/find-cache-dir": ^3.2.1 - "@types/node": ^16.0.0 + "@types/node": ^18.0.0 "@types/node-fetch": ^2.6.4 "@types/pretty-hrtime": ^1.0.0 chalk: ^4.1.0 esbuild: ^0.18.0 - esbuild-register: ^3.4.0 + esbuild-register: ^3.5.0 file-system-cache: 2.3.0 find-cache-dir: ^3.0.0 find-up: ^5.0.0 @@ -15887,7 +17065,7 @@ __metadata: pretty-hrtime: ^1.0.3 resolve-from: ^5.0.0 ts-dedent: ^2.0.0 - checksum: 251a4be734c7c915af16808ea1a18a75e31a0e1a5e45c8cd2428aece0535f5711cfdf6af2377ea3b6dff911892688269d1870255ebbd027b1effce9f969a772a + checksum: a7a02fe306be52e322a1c66f24128e7c7af5557f3ab18b21182e9636bba17275e293d6b65cf410a9c332698c1403b74d9afd1c82a4f0a9a406fea20d237ef0a8 languageName: node linkType: hard @@ -15905,12 +17083,12 @@ __metadata: languageName: node linkType: hard -"@storybook/core-events@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/core-events@npm:7.4.1" +"@storybook/core-events@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/core-events@npm:7.6.9" dependencies: ts-dedent: ^2.0.0 - checksum: ef5f0333c630d1d290ce6730d7253b6f2320bfefc010975c0bcfac4564771f7f40794d28a8a80122f2eb80788d1042ad939f7abaf3103f4efd050822235b3c89 + checksum: 83553b54401a3b40f3fd48168eeb405b3d7a67d4d3442adb94a88b55255efd8284feb0594e6b0f0ab8aa65069151d59daf6266777cbe3ba416ae1c44701ec103 languageName: node linkType: hard @@ -15964,27 +17142,27 @@ __metadata: languageName: node linkType: hard -"@storybook/core-server@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/core-server@npm:7.4.1" +"@storybook/core-server@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/core-server@npm:7.6.9" dependencies: "@aw-web-design/x-default-browser": 1.4.126 "@discoveryjs/json-ext": ^0.5.3 - "@storybook/builder-manager": 7.4.1 - "@storybook/channels": 7.4.1 - "@storybook/core-common": 7.4.1 - "@storybook/core-events": 7.4.1 - "@storybook/csf": ^0.1.0 - "@storybook/csf-tools": 7.4.1 + "@storybook/builder-manager": 7.6.9 + "@storybook/channels": 7.6.9 + "@storybook/core-common": 7.6.9 + "@storybook/core-events": 7.6.9 + "@storybook/csf": ^0.1.2 + "@storybook/csf-tools": 7.6.9 "@storybook/docs-mdx": ^0.1.0 "@storybook/global": ^5.0.0 - "@storybook/manager": 7.4.1 - "@storybook/node-logger": 7.4.1 - "@storybook/preview-api": 7.4.1 - "@storybook/telemetry": 7.4.1 - "@storybook/types": 7.4.1 + "@storybook/manager": 7.6.9 + "@storybook/node-logger": 7.6.9 + "@storybook/preview-api": 7.6.9 + "@storybook/telemetry": 7.6.9 + "@storybook/types": 7.6.9 "@types/detect-port": ^1.3.0 - "@types/node": ^16.0.0 + "@types/node": ^18.0.0 "@types/pretty-hrtime": ^1.0.0 "@types/semver": ^7.3.4 better-opn: ^3.0.2 @@ -16002,7 +17180,6 @@ __metadata: prompts: ^2.4.0 read-pkg-up: ^7.0.1 semver: ^7.3.7 - serve-favicon: ^2.5.0 telejson: ^7.2.0 tiny-invariant: ^1.3.1 ts-dedent: ^2.0.0 @@ -16010,30 +17187,30 @@ __metadata: util-deprecate: ^1.0.2 watchpack: ^2.2.0 ws: ^8.2.3 - checksum: a09892a1f1d2f27e7425fc401ae34a4519a0c12d3b2c1790f5b70198168dab64ab7f496da2bf97f84a1700a67eccc9b08f00ef9c028265b6fa37eb375f94ee63 + checksum: 8dc1b653cdb1bd4f7baa4a64e1a7dd75635d4939620846651c2c7677b2532cef624068762a9bda564d61cd03ccff19caa47cf33e52c46b3384bbdebf24eb2fe4 languageName: node linkType: hard -"@storybook/core-webpack@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/core-webpack@npm:7.4.1" +"@storybook/core-webpack@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/core-webpack@npm:7.6.9" dependencies: - "@storybook/core-common": 7.4.1 - "@storybook/node-logger": 7.4.1 - "@storybook/types": 7.4.1 - "@types/node": ^16.0.0 + "@storybook/core-common": 7.6.9 + "@storybook/node-logger": 7.6.9 + "@storybook/types": 7.6.9 + "@types/node": ^18.0.0 ts-dedent: ^2.0.0 - checksum: b7d1b29fdf7e6fda94cdb9c002bb09f69dc5625edba61bac3fc0721c657bdc3507d0bc40ed0d9bc1e5f7c3fae52a349ccd1f62a143bbe08458f820de1b8328f7 + checksum: 7436ca963eb381b48d29f9293369c74ebedb56467a2ab5d3a1e840363cdfe20cccb061232b918c6c6eb046af86a81a2d69e26e7f69749f4a396af33b3cd387be languageName: node linkType: hard -"@storybook/csf-plugin@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/csf-plugin@npm:7.4.1" +"@storybook/csf-plugin@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/csf-plugin@npm:7.6.9" dependencies: - "@storybook/csf-tools": 7.4.1 + "@storybook/csf-tools": 7.6.9 unplugin: ^1.3.1 - checksum: 554a4077bf6ac74117e2391b37ab2962644c2f973b01e3b0d57d66856032fb3068234958545afacad4da504505e3b09c7411e7ccf102d3748f1e4171e27961a3 + checksum: e92082571d85ccd7fd5123289a599c0d956c5b68f2a3e5658002fe89b962d926e46bd88538b07f4d8897515155e98f71ea8e79b2ab2b10b0e1abdd819eba7e4e languageName: node linkType: hard @@ -16055,20 +17232,20 @@ __metadata: languageName: node linkType: hard -"@storybook/csf-tools@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/csf-tools@npm:7.4.1" +"@storybook/csf-tools@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/csf-tools@npm:7.6.9" dependencies: - "@babel/generator": ^7.22.9 - "@babel/parser": ^7.22.7 - "@babel/traverse": ^7.22.8 - "@babel/types": ^7.22.5 - "@storybook/csf": ^0.1.0 - "@storybook/types": 7.4.1 + "@babel/generator": ^7.23.0 + "@babel/parser": ^7.23.0 + "@babel/traverse": ^7.23.2 + "@babel/types": ^7.23.0 + "@storybook/csf": ^0.1.2 + "@storybook/types": 7.6.9 fs-extra: ^11.1.0 recast: ^0.23.1 ts-dedent: ^2.0.0 - checksum: 9916612fb1faa6f92c6d327d2973ba56f1fc66bcf44992181595bfd6bbcb827e730bde953641966f5950af8ef8251888563686604810eaed0f98e9e51b64f630 + checksum: 99ba81a42cdae43bedb2ef1f53d856cf75fce26fa6481b7cb2e7219e5bde7411b621e83c4eeee2c9d17ec34724de8e2e9ee8c7044bd12c2bf064d10163349a8f languageName: node linkType: hard @@ -16090,6 +17267,15 @@ __metadata: languageName: node linkType: hard +"@storybook/csf@npm:^0.1.2": + version: 0.1.8 + resolution: "@storybook/csf@npm:0.1.8" + dependencies: + type-fest: ^2.19.0 + checksum: d5ab90e8d7b9ee6b2c0ce455488b76b487cb4485cc49b6e3c96ea6e4c535960361aa68b8b7b0b7a6b9865fadc24030368d177da0deb1ce870a1f521f53132408 + languageName: node + linkType: hard + "@storybook/docs-mdx@npm:^0.1.0": version: 0.1.0 resolution: "@storybook/docs-mdx@npm:0.1.0" @@ -16097,17 +17283,18 @@ __metadata: languageName: node linkType: hard -"@storybook/docs-tools@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/docs-tools@npm:7.4.1" +"@storybook/docs-tools@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/docs-tools@npm:7.6.9" dependencies: - "@storybook/core-common": 7.4.1 - "@storybook/preview-api": 7.4.1 - "@storybook/types": 7.4.1 + "@storybook/core-common": 7.6.9 + "@storybook/preview-api": 7.6.9 + "@storybook/types": 7.6.9 "@types/doctrine": ^0.0.3 + assert: ^2.1.0 doctrine: ^3.0.0 lodash: ^4.17.21 - checksum: d450ee0d54c113aa798898d0be2ba60427d4e1802e5822a37cd17f95957473a44b923aad6bdcef7df1be21a368a7563df41c36741f870618536abad7e19398dc + checksum: b475910b141dd39da18d765ae7c27356eaf9b36693d167e89cb424cb8f2cb3bfb3fb69556bcca528563e1c4282b0cb1fe3552ec785aa504784609611bc808445 languageName: node linkType: hard @@ -16144,29 +17331,25 @@ __metadata: languageName: node linkType: hard -"@storybook/manager-api@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/manager-api@npm:7.4.1" +"@storybook/manager-api@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/manager-api@npm:7.6.9" dependencies: - "@storybook/channels": 7.4.1 - "@storybook/client-logger": 7.4.1 - "@storybook/core-events": 7.4.1 - "@storybook/csf": ^0.1.0 + "@storybook/channels": 7.6.9 + "@storybook/client-logger": 7.6.9 + "@storybook/core-events": 7.6.9 + "@storybook/csf": ^0.1.2 "@storybook/global": ^5.0.0 - "@storybook/router": 7.4.1 - "@storybook/theming": 7.4.1 - "@storybook/types": 7.4.1 + "@storybook/router": 7.6.9 + "@storybook/theming": 7.6.9 + "@storybook/types": 7.6.9 dequal: ^2.0.2 lodash: ^4.17.21 memoizerific: ^1.11.3 - semver: ^7.3.7 store2: ^2.14.2 telejson: ^7.2.0 ts-dedent: ^2.0.0 - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: c44e986dffc472c0f80003b16875724c37eccfc3bf9151b245823a897a45c4f4ede325c4095196e99f6d0e5fc89e7f059b1fce8a26b63bea4cfb8888c5394a31 + checksum: e90767cecb2bd0872e1b9b797fee38a8f7e6b9f677df008ef55a6ad75ed1fb1db5de2284f840f41ac8e36d72cdd3bdd821b55ac0929cc81443683841acf06a88 languageName: node linkType: hard @@ -16177,10 +17360,10 @@ __metadata: languageName: node linkType: hard -"@storybook/manager@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/manager@npm:7.4.1" - checksum: 43b3039a742137c4b48aaeea4b3d9cd75eb7c990183acefa53f7d2a86272667ea226eb90e865cab3a7983c5f735e68e9683c6a1888fad3de1c3beb9819f03692 +"@storybook/manager@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/manager@npm:7.6.9" + checksum: b3e3211373db9b4e02a18f5a721cb9cd66e33c47d2cf568676bd949331e9db5cf89b5fb42e0ff121c3c43884705a2f03c31467a1be22347dfcfc76e68b1f22dd languageName: node linkType: hard @@ -16198,38 +17381,39 @@ __metadata: languageName: node linkType: hard -"@storybook/node-logger@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/node-logger@npm:7.4.1" - checksum: 1d75f688c4183418b215d50c0c1e4b5eaf191e936cc08975a2a2970b1811fd34cc227100c6f57697997c920a6902c862a4a860ebcbecc7e9e28a3d7be10914be +"@storybook/node-logger@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/node-logger@npm:7.6.9" + checksum: f2f4475e365a952dca5150e3a18162dc91a0e0e2df0deb7c5c7f014f2d8f18da23bc42742b121df34a2f99021d76b24fc86525941047f7d98f00a85421d13361 languageName: node linkType: hard -"@storybook/postinstall@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/postinstall@npm:7.4.1" - checksum: ba4c7c95e9d3943ae971608f1928860b62d4b240df05436e1c3a42f7ea65f6257515d442da07e21695649e763fade9c8cbb260d15d18fdf37ba5a0350cab54b2 +"@storybook/postinstall@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/postinstall@npm:7.6.9" + checksum: fa47403b950706381d599439d4555c0566ee6497be2d2f20e0fbfd9eb337cb1cb36d1c990bdac3830c8fb98cd0fef64cd35f9ec6964e640f35e557e5bdfcfbba languageName: node linkType: hard -"@storybook/preset-react-webpack@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/preset-react-webpack@npm:7.4.1" - dependencies: - "@babel/preset-flow": ^7.22.5 - "@babel/preset-react": ^7.22.5 - "@pmmmwh/react-refresh-webpack-plugin": ^0.5.5 - "@storybook/core-webpack": 7.4.1 - "@storybook/docs-tools": 7.4.1 - "@storybook/node-logger": 7.4.1 - "@storybook/react": 7.4.1 +"@storybook/preset-react-webpack@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/preset-react-webpack@npm:7.6.9" + dependencies: + "@babel/preset-flow": ^7.22.15 + "@babel/preset-react": ^7.22.15 + "@pmmmwh/react-refresh-webpack-plugin": ^0.5.11 + "@storybook/core-webpack": 7.6.9 + "@storybook/docs-tools": 7.6.9 + "@storybook/node-logger": 7.6.9 + "@storybook/react": 7.6.9 "@storybook/react-docgen-typescript-plugin": 1.0.6--canary.9.0c3f3b7.0 - "@types/node": ^16.0.0 + "@types/node": ^18.0.0 "@types/semver": ^7.3.4 babel-plugin-add-react-displayname: ^0.0.5 - babel-plugin-react-docgen: ^4.2.1 fs-extra: ^11.1.0 - react-refresh: ^0.11.0 + magic-string: ^0.30.5 + react-docgen: ^7.0.0 + react-refresh: ^0.14.0 semver: ^7.3.7 webpack: 5 peerDependencies: @@ -16241,7 +17425,7 @@ __metadata: optional: true typescript: optional: true - checksum: a6da7ebd2d522ceaafe9ce324c93e58ace94c548700e084f109318e7f34be13925bd51c75dd37282e56fb62e06485e9c323092709a524df60f3ae19c97982e78 + checksum: 7067c94b2e02f3664c10b4ff0bf0fe3a7d9abe7c65c8a10ca70cdab4591f8ca209cae0181691a393882da4de495c465b3e74f6566ad545678ffb4bd386bb582a languageName: node linkType: hard @@ -16290,16 +17474,16 @@ __metadata: languageName: node linkType: hard -"@storybook/preview-api@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/preview-api@npm:7.4.1" +"@storybook/preview-api@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/preview-api@npm:7.6.9" dependencies: - "@storybook/channels": 7.4.1 - "@storybook/client-logger": 7.4.1 - "@storybook/core-events": 7.4.1 - "@storybook/csf": ^0.1.0 + "@storybook/channels": 7.6.9 + "@storybook/client-logger": 7.6.9 + "@storybook/core-events": 7.6.9 + "@storybook/csf": ^0.1.2 "@storybook/global": ^5.0.0 - "@storybook/types": 7.4.1 + "@storybook/types": 7.6.9 "@types/qs": ^6.9.5 dequal: ^2.0.2 lodash: ^4.17.21 @@ -16308,14 +17492,14 @@ __metadata: synchronous-promise: ^2.0.15 ts-dedent: ^2.0.0 util-deprecate: ^1.0.2 - checksum: 8d05c5831b78743eee6397c4a317404c63df502959add4bee23efb7f8c2a5ca4cee517ff39719198378326b616f59786cd904bd4034333ee70b679a28adc6436 + checksum: 078dff0de6913611efcd1481b1896d0c10438429c986414b60f48cb9aa4bdcefe27f20f09a464bde33425e8f9c2dd99f068bec0050c139210a47e304319cbab8 languageName: node linkType: hard -"@storybook/preview@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/preview@npm:7.4.1" - checksum: 93b56a3138869b671be73596a4b275c88653206cf617fa551a79b2c7183abcb95d54bafd02f8f6c03689e940347bd61d94838c52ff73238d845ee9c7cf10da24 +"@storybook/preview@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/preview@npm:7.6.9" + checksum: 95a452ecdd3fe909dd962eaa59c25d8c509fe7f1f13e7e5ff2359eb8672e126b9ff87d7036baead82797e73723123ca8438ecea75e2754b367c91ae3ae616140 languageName: node linkType: hard @@ -16337,24 +17521,24 @@ __metadata: languageName: node linkType: hard -"@storybook/react-dom-shim@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/react-dom-shim@npm:7.4.1" +"@storybook/react-dom-shim@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/react-dom-shim@npm:7.6.9" peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: 10f6e8bed6cf29ea6f26a0d83b3ffc64679ba4b57a807c4bb8fbcdc43f5b7dd3c0fdecd0b993b91f1b25c2e26642426cbad360476fdc5b5a5a6cdcbcafced668 + checksum: ff7fe4a98e05540b5b16e7dc9b1ecc3cc9a086ede99f3fe0247257ca8619ec926065994e4ccc08fb576f3cf2b832d6aaef933215646e49421655273eb3bdb6fb languageName: node linkType: hard -"@storybook/react-webpack5@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/react-webpack5@npm:7.4.1" +"@storybook/react-webpack5@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/react-webpack5@npm:7.6.9" dependencies: - "@storybook/builder-webpack5": 7.4.1 - "@storybook/preset-react-webpack": 7.4.1 - "@storybook/react": 7.4.1 - "@types/node": ^16.0.0 + "@storybook/builder-webpack5": 7.6.9 + "@storybook/preset-react-webpack": 7.6.9 + "@storybook/react": 7.6.9 + "@types/node": ^18.0.0 peerDependencies: "@babel/core": ^7.22.0 react: ^16.8.0 || ^17.0.0 || ^18.0.0 @@ -16365,24 +17549,24 @@ __metadata: optional: true typescript: optional: true - checksum: 2de844cd2f46f2bdac498c6a3ce7d1080805cb3871dd6cc64259fe5942fd11ae9cfe48eea545b56c47be77f1386e6ba8479003320b10fde03ddbdaaa8648ccc8 + checksum: 7b97d1d288029c24373eaf3621e7b32b97c01196466a17a2598d71ccf1bc022d283bd2ce5c7262d9e612c805d0f24d6a6385bea8eb50d26e1efca46075005eb7 languageName: node linkType: hard -"@storybook/react@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/react@npm:7.4.1" +"@storybook/react@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/react@npm:7.6.9" dependencies: - "@storybook/client-logger": 7.4.1 - "@storybook/core-client": 7.4.1 - "@storybook/docs-tools": 7.4.1 + "@storybook/client-logger": 7.6.9 + "@storybook/core-client": 7.6.9 + "@storybook/docs-tools": 7.6.9 "@storybook/global": ^5.0.0 - "@storybook/preview-api": 7.4.1 - "@storybook/react-dom-shim": 7.4.1 - "@storybook/types": 7.4.1 + "@storybook/preview-api": 7.6.9 + "@storybook/react-dom-shim": 7.6.9 + "@storybook/types": 7.6.9 "@types/escodegen": ^0.0.6 "@types/estree": ^0.0.51 - "@types/node": ^16.0.0 + "@types/node": ^18.0.0 acorn: ^7.4.1 acorn-jsx: ^5.3.1 acorn-walk: ^7.2.0 @@ -16401,7 +17585,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: ea709b24b38d60b91132c5a66bc652a67fdf79f0f803178b62b2678e8d4f1176c42b0ed9a14941ecb8b591beb9542722fba794be46a0751ed29786a666fbb9e1 + checksum: 0edfbf407054068f8d18065d20fb1dc4655e68d01b84180c2c034a74b79aa2f07b39b8e2820911f7dfff622c06eab07fa69630120c7b1d9b591408d0063348e8 languageName: node linkType: hard @@ -16419,17 +17603,14 @@ __metadata: languageName: node linkType: hard -"@storybook/router@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/router@npm:7.4.1" +"@storybook/router@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/router@npm:7.6.9" dependencies: - "@storybook/client-logger": 7.4.1 + "@storybook/client-logger": 7.6.9 memoizerific: ^1.11.3 qs: ^6.10.0 - peerDependencies: - react: ^16.8.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: 6fad92d4f898cc03ea7afae596e37212568dd7ef165aa86254e720b15746abaeff691dfe3186ce25283f353b3d8243bde2b3bdedf04de68c7f0f1a383ac552c3 + checksum: 8d1addb64cfe4cc4e95fb1242907a1ecc05a082876a98a7b131ca4b17a04068072769289aa25e6b89d1d34979a39e0443640eab912da42a531d07fd0cb171bb6 languageName: node linkType: hard @@ -16449,16 +17630,6 @@ __metadata: languageName: node linkType: hard -"@storybook/store@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/store@npm:7.4.1" - dependencies: - "@storybook/client-logger": 7.4.1 - "@storybook/preview-api": 7.4.1 - checksum: e57e6e20846af147efad4e246daeb386f8dcfa88bd73c2df26f64b4858072de2e72fbe6a62bfd99f061106c123ed5f776dabdf6050fb0fc259a5f6752e6ff395 - languageName: node - linkType: hard - "@storybook/telemetry@npm:7.2.1": version: 7.2.1 resolution: "@storybook/telemetry@npm:7.2.1" @@ -16475,19 +17646,19 @@ __metadata: languageName: node linkType: hard -"@storybook/telemetry@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/telemetry@npm:7.4.1" +"@storybook/telemetry@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/telemetry@npm:7.6.9" dependencies: - "@storybook/client-logger": 7.4.1 - "@storybook/core-common": 7.4.1 - "@storybook/csf-tools": 7.4.1 + "@storybook/client-logger": 7.6.9 + "@storybook/core-common": 7.6.9 + "@storybook/csf-tools": 7.6.9 chalk: ^4.1.0 detect-package-manager: ^2.0.1 fetch-retry: ^5.0.2 fs-extra: ^11.1.0 read-pkg-up: ^7.0.1 - checksum: c449aa83465e39ae0018d02ca4e7ad4295ad82cc9ea50ab9e9e080099b3246fe9ab5575ee1edd9e9dca4489684aab5bebcf1dddcf5d28f6ffaf39299403b3151 + checksum: 132cf6ce9af146c3b3ca11653f73daa3a1f7350726297a9486943f049c982b4012926f9515fb81d8f48f5f9c053a4a986c079a8d4d89d3ba1f27b9e148c7362c languageName: node linkType: hard @@ -16521,18 +17692,18 @@ __metadata: languageName: node linkType: hard -"@storybook/theming@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/theming@npm:7.4.1" +"@storybook/theming@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/theming@npm:7.6.9" dependencies: "@emotion/use-insertion-effect-with-fallbacks": ^1.0.0 - "@storybook/client-logger": 7.4.1 + "@storybook/client-logger": 7.6.9 "@storybook/global": ^5.0.0 memoizerific: ^1.11.3 peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 - checksum: 685c6b535b7754b72fbca5a763a11b0208465ab368a8984c3943735e9e711e8f6fe34c6acc765eb64c761e7e9fa16e28f767d3c00d5e77702ec13c4a0c79462f + checksum: bad3fd399aa5abc86413113d34eb31a73f3cb5da7fb6f5962aca9a106f853c5cd12d91a84ae5912c4cff6808ce9d4290a117774af749dad9ab583bb4c061328d languageName: node linkType: hard @@ -16572,15 +17743,15 @@ __metadata: languageName: node linkType: hard -"@storybook/types@npm:7.4.1": - version: 7.4.1 - resolution: "@storybook/types@npm:7.4.1" +"@storybook/types@npm:7.6.9": + version: 7.6.9 + resolution: "@storybook/types@npm:7.6.9" dependencies: - "@storybook/channels": 7.4.1 + "@storybook/channels": 7.6.9 "@types/babel__core": ^7.0.0 "@types/express": ^4.7.0 file-system-cache: 2.3.0 - checksum: f9560ac07e05dcb2f87ea4730f42855bf993e40f7d931889a809909b4876692b66575a866fdf01654ff54a0deaea42b97816a826e50264b8c53430493c734262 + checksum: 4e197dadf1716b89e52070cc6abcee16e938584873195ba0820afafefe59068af129c0dfda3bc3a5d6d6b35d5d701ecda5b0d10272d4935a1fee880c77a210c6 languageName: node linkType: hard @@ -16794,9 +17965,9 @@ __metadata: languageName: node linkType: hard -"@swc/core-darwin-arm64@npm:1.3.83": - version: 1.3.83 - resolution: "@swc/core-darwin-arm64@npm:1.3.83" +"@swc/core-darwin-arm64@npm:1.5.25": + version: 1.5.25 + resolution: "@swc/core-darwin-arm64@npm:1.5.25" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard @@ -16808,9 +17979,9 @@ __metadata: languageName: node linkType: hard -"@swc/core-darwin-x64@npm:1.3.83": - version: 1.3.83 - resolution: "@swc/core-darwin-x64@npm:1.3.83" +"@swc/core-darwin-x64@npm:1.5.25": + version: 1.5.25 + resolution: "@swc/core-darwin-x64@npm:1.5.25" conditions: os=darwin & cpu=x64 languageName: node linkType: hard @@ -16829,9 +18000,9 @@ __metadata: languageName: node linkType: hard -"@swc/core-linux-arm-gnueabihf@npm:1.3.83": - version: 1.3.83 - resolution: "@swc/core-linux-arm-gnueabihf@npm:1.3.83" +"@swc/core-linux-arm-gnueabihf@npm:1.5.25": + version: 1.5.25 + resolution: "@swc/core-linux-arm-gnueabihf@npm:1.5.25" conditions: os=linux & cpu=arm languageName: node linkType: hard @@ -16843,9 +18014,9 @@ __metadata: languageName: node linkType: hard -"@swc/core-linux-arm64-gnu@npm:1.3.83": - version: 1.3.83 - resolution: "@swc/core-linux-arm64-gnu@npm:1.3.83" +"@swc/core-linux-arm64-gnu@npm:1.5.25": + version: 1.5.25 + resolution: "@swc/core-linux-arm64-gnu@npm:1.5.25" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard @@ -16857,9 +18028,9 @@ __metadata: languageName: node linkType: hard -"@swc/core-linux-arm64-musl@npm:1.3.83": - version: 1.3.83 - resolution: "@swc/core-linux-arm64-musl@npm:1.3.83" +"@swc/core-linux-arm64-musl@npm:1.5.25": + version: 1.5.25 + resolution: "@swc/core-linux-arm64-musl@npm:1.5.25" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard @@ -16871,9 +18042,9 @@ __metadata: languageName: node linkType: hard -"@swc/core-linux-x64-gnu@npm:1.3.83": - version: 1.3.83 - resolution: "@swc/core-linux-x64-gnu@npm:1.3.83" +"@swc/core-linux-x64-gnu@npm:1.5.25": + version: 1.5.25 + resolution: "@swc/core-linux-x64-gnu@npm:1.5.25" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard @@ -16885,9 +18056,9 @@ __metadata: languageName: node linkType: hard -"@swc/core-linux-x64-musl@npm:1.3.83": - version: 1.3.83 - resolution: "@swc/core-linux-x64-musl@npm:1.3.83" +"@swc/core-linux-x64-musl@npm:1.5.25": + version: 1.5.25 + resolution: "@swc/core-linux-x64-musl@npm:1.5.25" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard @@ -16899,9 +18070,9 @@ __metadata: languageName: node linkType: hard -"@swc/core-win32-arm64-msvc@npm:1.3.83": - version: 1.3.83 - resolution: "@swc/core-win32-arm64-msvc@npm:1.3.83" +"@swc/core-win32-arm64-msvc@npm:1.5.25": + version: 1.5.25 + resolution: "@swc/core-win32-arm64-msvc@npm:1.5.25" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard @@ -16913,9 +18084,9 @@ __metadata: languageName: node linkType: hard -"@swc/core-win32-ia32-msvc@npm:1.3.83": - version: 1.3.83 - resolution: "@swc/core-win32-ia32-msvc@npm:1.3.83" +"@swc/core-win32-ia32-msvc@npm:1.5.25": + version: 1.5.25 + resolution: "@swc/core-win32-ia32-msvc@npm:1.5.25" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard @@ -16927,9 +18098,9 @@ __metadata: languageName: node linkType: hard -"@swc/core-win32-x64-msvc@npm:1.3.83": - version: 1.3.83 - resolution: "@swc/core-win32-x64-msvc@npm:1.3.83" +"@swc/core-win32-x64-msvc@npm:1.5.25": + version: 1.5.25 + resolution: "@swc/core-win32-x64-msvc@npm:1.5.25" conditions: os=win32 & cpu=x64 languageName: node linkType: hard @@ -16984,23 +18155,24 @@ __metadata: languageName: node linkType: hard -"@swc/core@npm:^1.3.49": - version: 1.3.83 - resolution: "@swc/core@npm:1.3.83" +"@swc/core@npm:^1.3.82": + version: 1.5.25 + resolution: "@swc/core@npm:1.5.25" dependencies: - "@swc/core-darwin-arm64": 1.3.83 - "@swc/core-darwin-x64": 1.3.83 - "@swc/core-linux-arm-gnueabihf": 1.3.83 - "@swc/core-linux-arm64-gnu": 1.3.83 - "@swc/core-linux-arm64-musl": 1.3.83 - "@swc/core-linux-x64-gnu": 1.3.83 - "@swc/core-linux-x64-musl": 1.3.83 - "@swc/core-win32-arm64-msvc": 1.3.83 - "@swc/core-win32-ia32-msvc": 1.3.83 - "@swc/core-win32-x64-msvc": 1.3.83 - "@swc/types": ^0.1.4 + "@swc/core-darwin-arm64": 1.5.25 + "@swc/core-darwin-x64": 1.5.25 + "@swc/core-linux-arm-gnueabihf": 1.5.25 + "@swc/core-linux-arm64-gnu": 1.5.25 + "@swc/core-linux-arm64-musl": 1.5.25 + "@swc/core-linux-x64-gnu": 1.5.25 + "@swc/core-linux-x64-musl": 1.5.25 + "@swc/core-win32-arm64-msvc": 1.5.25 + "@swc/core-win32-ia32-msvc": 1.5.25 + "@swc/core-win32-x64-msvc": 1.5.25 + "@swc/counter": ^0.1.3 + "@swc/types": ^0.1.7 peerDependencies: - "@swc/helpers": ^0.5.0 + "@swc/helpers": "*" dependenciesMeta: "@swc/core-darwin-arm64": optional: true @@ -17025,16 +18197,24 @@ __metadata: peerDependenciesMeta: "@swc/helpers": optional: true - checksum: 39849d78f16e0aab168d3563245a0995164c07b195626f124651af00c922d166fc714467f85eed1e111377d68078fc726dbb13002516f64fecb729437538911b + checksum: 0f3dc4740ac3d168682cdae45620622d07c953914d867e5fecf45c65ab04e60e981aea0894d784c06f60ad214b381a0189bb2eb3955869ed44009af0c01617dd languageName: node linkType: hard -"@swc/helpers@npm:0.4.14, @swc/helpers@npm:^0.4.2, legacy-swc-helpers@npm:@swc/helpers@=0.4.14": - version: 0.4.14 - resolution: "@swc/helpers@npm:0.4.14" +"@swc/counter@npm:^0.1.3": + version: 0.1.3 + resolution: "@swc/counter@npm:0.1.3" + checksum: df8f9cfba9904d3d60f511664c70d23bb323b3a0803ec9890f60133954173047ba9bdeabce28cd70ba89ccd3fd6c71c7b0bd58be85f611e1ffbe5d5c18616598 + languageName: node + linkType: hard + +"@swc/helpers@npm:0.5.5": + version: 0.5.5 + resolution: "@swc/helpers@npm:0.5.5" dependencies: + "@swc/counter": ^0.1.3 tslib: ^2.4.0 - checksum: 273fd3f3fc461a92f3790cc551ea054745c6d6959afbe1232e6d7aa1c722bbc114d308aab96bef5c78fc0303c85c7b472ef00e2253251cc89737f3b1af56e5a5 + checksum: d4f207b191e54b29460804ddf2984ba6ece1d679a0b2f6a9c765dcf27bba92c5769e7965668a4546fb9f1021eaf0ff9be4bf5c235ce12adcd65acdfe77187d11 languageName: node linkType: hard @@ -17057,10 +18237,21 @@ __metadata: languageName: node linkType: hard -"@swc/types@npm:^0.1.4": - version: 0.1.4 - resolution: "@swc/types@npm:0.1.4" - checksum: 9b09de7dca8e4b19bfb43f9e332c771855158cb761d26000807fe858447ecbc5342a6c257b26d9aa5497f7138fc58913693e2bee222e5042e0e8f57c2979ae66 +"@swc/helpers@npm:^0.4.2, legacy-swc-helpers@npm:@swc/helpers@=0.4.14": + version: 0.4.14 + resolution: "@swc/helpers@npm:0.4.14" + dependencies: + tslib: ^2.4.0 + checksum: 273fd3f3fc461a92f3790cc551ea054745c6d6959afbe1232e6d7aa1c722bbc114d308aab96bef5c78fc0303c85c7b472ef00e2253251cc89737f3b1af56e5a5 + languageName: node + linkType: hard + +"@swc/types@npm:^0.1.7": + version: 0.1.7 + resolution: "@swc/types@npm:0.1.7" + dependencies: + "@swc/counter": ^0.1.3 + checksum: e251f6994de12a2a81ed79d902a521398feda346022e09567c758eee1cca606743c9bb296de74d6fbe339f953eaf69176202babc8ef9c911d5d538fc0790df28 languageName: node linkType: hard @@ -17111,35 +18302,35 @@ __metadata: languageName: node linkType: hard -"@testing-library/dom@npm:^8.1.0": - version: 8.16.0 - resolution: "@testing-library/dom@npm:8.16.0" +"@testing-library/dom@npm:^10.0.0": + version: 10.1.0 + resolution: "@testing-library/dom@npm:10.1.0" dependencies: "@babel/code-frame": ^7.10.4 "@babel/runtime": ^7.12.5 - "@types/aria-query": ^4.2.0 - aria-query: ^5.0.0 + "@types/aria-query": ^5.0.1 + aria-query: 5.3.0 chalk: ^4.1.0 dom-accessibility-api: ^0.5.9 - lz-string: ^1.4.4 + lz-string: ^1.5.0 pretty-format: ^27.0.2 - checksum: 37aabbec872522bcb51106ecb700d9be601293e75445084b6cc195921db4b2d06d6bd4c67ad834174c129f2199c39aa540b6d17c296fcbd701dc99fd800afe36 + checksum: 275f53e57914e13361aa01a9fe155a3919ec911b61abddc44a7cd077e49d24672cdd43c76d840f7cdacea2f42c4aae92321066e6ddaff039f413745797d1b390 languageName: node linkType: hard -"@testing-library/dom@npm:^9.0.0": - version: 9.3.0 - resolution: "@testing-library/dom@npm:9.3.0" +"@testing-library/dom@npm:^8.1.0": + version: 8.16.0 + resolution: "@testing-library/dom@npm:8.16.0" dependencies: "@babel/code-frame": ^7.10.4 "@babel/runtime": ^7.12.5 - "@types/aria-query": ^5.0.1 + "@types/aria-query": ^4.2.0 aria-query: ^5.0.0 chalk: ^4.1.0 dom-accessibility-api: ^0.5.9 - lz-string: ^1.5.0 + lz-string: ^1.4.4 pretty-format: ^27.0.2 - checksum: 790f4da6a8cbe7da8b7769e81e68caea1aed5b5f1973b808895692a945fb854fe8acdc66ffc34b6a57ec49bad9d76ccdd69b632ea8a82ad61d1e97d76cfdf9ec + checksum: 37aabbec872522bcb51106ecb700d9be601293e75445084b6cc195921db4b2d06d6bd4c67ad834174c129f2199c39aa540b6d17c296fcbd701dc99fd800afe36 languageName: node linkType: hard @@ -17160,17 +18351,21 @@ __metadata: languageName: node linkType: hard -"@testing-library/react@npm:14.0.0": - version: 14.0.0 - resolution: "@testing-library/react@npm:14.0.0" +"@testing-library/react@npm:15.0.6": + version: 15.0.6 + resolution: "@testing-library/react@npm:15.0.6" dependencies: "@babel/runtime": ^7.12.5 - "@testing-library/dom": ^9.0.0 + "@testing-library/dom": ^10.0.0 "@types/react-dom": ^18.0.0 peerDependencies: + "@types/react": ^18.0.0 react: ^18.0.0 react-dom: ^18.0.0 - checksum: 4a54c8f56cc4a39b50803205f84f06280bb76521d6d5d4b3b36651d760c7c7752ef142d857d52aaf4fad4848ed7a8be49afc793a5dda105955d2f8bef24901ac + peerDependenciesMeta: + "@types/react": + optional: true + checksum: bc9a839b352d748a0d5bcab81621e2e1d09ea58f245c4795cb8e69f97a4f71867a66115c9832f083b62abc357b510be396cd000eb751c85543b974e6a90caf7f languageName: node linkType: hard @@ -17345,6 +18540,19 @@ __metadata: languageName: node linkType: hard +"@types/babel__core@npm:^7.18.0": + version: 7.20.5 + resolution: "@types/babel__core@npm:7.20.5" + dependencies: + "@babel/parser": ^7.20.7 + "@babel/types": ^7.20.7 + "@types/babel__generator": "*" + "@types/babel__template": "*" + "@types/babel__traverse": "*" + checksum: a3226f7930b635ee7a5e72c8d51a357e799d19cbf9d445710fa39ab13804f79ab1a54b72ea7d8e504659c7dfc50675db974b526142c754398d7413aa4bc30845 + languageName: node + linkType: hard + "@types/babel__generator@npm:*": version: 7.6.2 resolution: "@types/babel__generator@npm:7.6.2" @@ -17382,6 +18590,15 @@ __metadata: languageName: node linkType: hard +"@types/babel__traverse@npm:^7.18.0": + version: 7.20.6 + resolution: "@types/babel__traverse@npm:7.20.6" + dependencies: + "@babel/types": ^7.20.7 + checksum: 2bdc65eb62232c2d5c1086adeb0c31e7980e6fd7e50a3483b4a724a1a1029c84d9cb59749cf8de612f9afa2bc14c85b8f50e64e21f8a4398fa77eb9059a4283c + languageName: node + linkType: hard + "@types/body-parser@npm:*": version: 1.19.0 resolution: "@types/body-parser@npm:1.19.0" @@ -17577,7 +18794,7 @@ __metadata: languageName: node linkType: hard -"@types/debug@npm:^4.1.5, @types/debug@npm:^4.1.7": +"@types/debug@npm:^4.1.5": version: 4.1.7 resolution: "@types/debug@npm:4.1.7" dependencies: @@ -17586,6 +18803,15 @@ __metadata: languageName: node linkType: hard +"@types/debug@npm:^4.1.8": + version: 4.1.12 + resolution: "@types/debug@npm:4.1.12" + dependencies: + "@types/ms": "*" + checksum: 47876a852de8240bfdaf7481357af2b88cb660d30c72e73789abf00c499d6bc7cd5e52f41c915d1b9cd8ec9fef5b05688d7b7aef17f7f272c2d04679508d1053 + languageName: node + linkType: hard + "@types/deep-equal@npm:1.0.1, @types/deep-equal@npm:^1.0.1": version: 1.0.1 resolution: "@types/deep-equal@npm:1.0.1" @@ -17627,6 +18853,13 @@ __metadata: languageName: node linkType: hard +"@types/doctrine@npm:^0.0.9": + version: 0.0.9 + resolution: "@types/doctrine@npm:0.0.9" + checksum: 3909eaca42e7386b2ab866f082b78da3e00718d2fa323597e254feb0556c678b41f2c490729067433630083ac9c806ec6ae1e146754f7f8ba7d3e43ed68d6500 + languageName: node + linkType: hard + "@types/domutils@npm:*": version: 1.7.3 resolution: "@types/domutils@npm:1.7.3" @@ -18300,10 +19533,10 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:18.14.2": - version: 18.14.2 - resolution: "@types/node@npm:18.14.2" - checksum: 53c07e721f6ae33de71306f6a0b75dae6066a4f55bd5484c93bd59ff25f0c5f004ceafeef509a4d0cb9e24a247efc34d50489bcc1b05a53ecc68e2fc088e65cb +"@types/node@npm:18.16.9": + version: 18.16.9 + resolution: "@types/node@npm:18.16.9" + checksum: 7fe0ef372ba8b157bd646efe29b0ece92ccb9f455171a7ceb4c92d6b490789ff0f14411b1dc6ad203351a0efa2b435072dfab5566fb6eaaaa5cd549e1fb22afa languageName: node linkType: hard @@ -18335,10 +19568,12 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:^16.18.39": - version: 16.18.50 - resolution: "@types/node@npm:16.18.50" - checksum: 8aec1eaf83407197ec2fe947182c238f49b82a7aace867cee1f81f72eb8a76c3c8b2adb1fd356e7443317cffb2546708da8934299a579edd25e3160bf7af30a1 +"@types/node@npm:^18.0.0": + version: 18.19.34 + resolution: "@types/node@npm:18.19.34" + dependencies: + undici-types: ~5.26.4 + checksum: ae6369baa1529ec3564da29611ec7eb8ccb219080d717292151b6b899820d25290243d01c9240f11a63d1a42e47198cd6310fab67b6d17bea723221fea07b644 languageName: node linkType: hard @@ -18520,12 +19755,12 @@ __metadata: languageName: node linkType: hard -"@types/react-dom@npm:18.2.6, @types/react-dom@npm:^18.0.0": - version: 18.2.6 - resolution: "@types/react-dom@npm:18.2.6" +"@types/react-dom@npm:18.3.0": + version: 18.3.0 + resolution: "@types/react-dom@npm:18.3.0" dependencies: "@types/react": "*" - checksum: b56e42efab121a3a8013d2eb8c1688e6028a25ea6d33c4362d2846f0af3760b164b4d7c34846614024cfb8956cca70dd1743487f152e32ff89a00fe6fbd2be54 + checksum: a0cd9b1b815a6abd2a367a9eabdd8df8dd8f13f95897b2f9e1359ea3ac6619f957c1432ece004af7d95e2a7caddbba19faa045f831f32d6263483fc5404a7596 languageName: node linkType: hard @@ -18538,6 +19773,15 @@ __metadata: languageName: node linkType: hard +"@types/react-dom@npm:^18.0.0": + version: 18.2.6 + resolution: "@types/react-dom@npm:18.2.6" + dependencies: + "@types/react": "*" + checksum: b56e42efab121a3a8013d2eb8c1688e6028a25ea6d33c4362d2846f0af3760b164b4d7c34846614024cfb8956cca70dd1743487f152e32ff89a00fe6fbd2be54 + languageName: node + linkType: hard + "@types/react-html-parser@npm:2.0.1": version: 2.0.1 resolution: "@types/react-html-parser@npm:2.0.1" @@ -18621,25 +19865,24 @@ __metadata: languageName: node linkType: hard -"@types/react@npm:*, @types/react@npm:>=16, @types/react@npm:^18.0.24": - version: 18.2.13 - resolution: "@types/react@npm:18.2.13" +"@types/react@npm:*, @types/react@npm:18.3.3, @types/react@npm:>=16, @types/react@npm:^18.0.24": + version: 18.3.3 + resolution: "@types/react@npm:18.3.3" dependencies: "@types/prop-types": "*" - "@types/scheduler": "*" csstype: ^3.0.2 - checksum: f7c15f19c164a29262993ea2aae2085fa38cddd9b8359fd8fefabfced91010b515a3abe2042b2b7f2f86e6b38a25b191415aa9313a9027175e3a000883c858cc + checksum: c63d6a78163244e2022b01ef79b0baec4fe4da3475dc4a90bb8accefad35ef0c43560fd0312e5974f92a0f1108aa4d669ac72d73d66396aa060ea03b5d2e3873 languageName: node linkType: hard "@types/react@npm:16 || 17": - version: 17.0.57 - resolution: "@types/react@npm:17.0.57" + version: 17.0.80 + resolution: "@types/react@npm:17.0.80" dependencies: "@types/prop-types": "*" - "@types/scheduler": "*" + "@types/scheduler": ^0.16 csstype: ^3.0.2 - checksum: c6cb8d6d261fbdc2650e00260efaf0c0a241ca72f22a43e96f32f7ab0379e5e1522f4936b6d8f97c0d8793a4fd949a90e863daa2449824f7586903cc4d299d92 + checksum: 1c27bfc42305d77ef0da55f8f6d4c4a3471aa02b294fcf29ea0f2cfb0bf02892e5a0a3bc7559fa4a5ba50697b2e31076cb5aa5987f69cfc2e880f6426edb8bdf languageName: node linkType: hard @@ -18654,25 +19897,14 @@ __metadata: languageName: node linkType: hard -"@types/react@npm:18.2.14": - version: 18.2.14 - resolution: "@types/react@npm:18.2.14" - dependencies: - "@types/prop-types": "*" - "@types/scheduler": "*" - csstype: ^3.0.2 - checksum: a6a5e8cc78f486b9020d1ad009aa6c56943c68c7c6376e0f8399e9cbcd950b7b8f5d73f00200f5379f5e58d31d57d8aed24357f301d8e86108cd438ce6c8b3dd - languageName: node - linkType: hard - "@types/react@npm:^16": - version: 16.14.35 - resolution: "@types/react@npm:16.14.35" + version: 16.14.60 + resolution: "@types/react@npm:16.14.60" dependencies: "@types/prop-types": "*" - "@types/scheduler": "*" + "@types/scheduler": ^0.16 csstype: ^3.0.2 - checksum: ed9c551a7d50d073a5fb0295c1d939536c66c3286d42b6c94c20749464492ed95a408e6d3694bf49df0012da69e22202065c8c2fac0406356972a7fcb4960dd3 + checksum: 75f7a88ace7fafd670b076ef0b2d490b18a8abb51271f7c04fb6141778ad03c83d741981f2809d430d8a205ba8b4153b31814efa5e8b505e29919c981c3a1889 languageName: node linkType: hard @@ -18728,9 +19960,16 @@ __metadata: linkType: hard "@types/scheduler@npm:*": - version: 0.16.2 - resolution: "@types/scheduler@npm:0.16.2" - checksum: b6b4dcfeae6deba2e06a70941860fb1435730576d3689225a421280b7742318d1548b3d22c1f66ab68e414f346a9542f29240bc955b6332c5b11e561077583bc + version: 0.23.0 + resolution: "@types/scheduler@npm:0.23.0" + checksum: 874d753aa65c17760dfc460a91e6df24009bde37bfd427a031577b30262f7770c1b8f71a21366c7dbc76111967384cf4090a31d65315155180ef14bd7acccb32 + languageName: node + linkType: hard + +"@types/scheduler@npm:^0.16": + version: 0.16.8 + resolution: "@types/scheduler@npm:0.16.8" + checksum: 6c091b096daa490093bf30dd7947cd28e5b2cd612ec93448432b33f724b162587fed9309a0acc104d97b69b1d49a0f3fc755a62282054d62975d53d7fd13472d languageName: node linkType: hard @@ -18965,7 +20204,14 @@ __metadata: languageName: node linkType: hard -"@types/validator@npm:13.7.2, @types/validator@npm:^13.7.1": +"@types/uuid@npm:^9.0.1": + version: 9.0.8 + resolution: "@types/uuid@npm:9.0.8" + checksum: b8c60b7ba8250356b5088302583d1704a4e1a13558d143c549c408bf8920535602ffc12394ede77f8a8083511b023704bc66d1345792714002bfa261b17c5275 + languageName: node + linkType: hard + +"@types/validator@npm:13.7.2": version: 13.7.2 resolution: "@types/validator@npm:13.7.2" checksum: e679261dd5392adfeb9b20ba2eaf7d668049ad03b24409a6921bb6a3ee4c3135d46cc536a0eafbbda7f642b196696a6e3e1e615b2d1194330d49b22f1f0acb59 @@ -18979,6 +20225,13 @@ __metadata: languageName: node linkType: hard +"@types/validator@npm:^13.7.17": + version: 13.12.0 + resolution: "@types/validator@npm:13.12.0" + checksum: 1d814a4a9f8fbd01f834bf45215aa8111879e71045391eec8e8fda6a7acf71d8b7839a0d312098c2b9c8285963203dfb3e3680a41484d1e9b3d576f95b6d71c0 + languageName: node + linkType: hard + "@types/ws@npm:^8.0.0": version: 8.5.3 resolution: "@types/ws@npm:8.5.3" @@ -19065,61 +20318,62 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:5.62.0": - version: 5.62.0 - resolution: "@typescript-eslint/eslint-plugin@npm:5.62.0" +"@typescript-eslint/eslint-plugin@npm:7.9.0": + version: 7.9.0 + resolution: "@typescript-eslint/eslint-plugin@npm:7.9.0" dependencies: - "@eslint-community/regexpp": ^4.4.0 - "@typescript-eslint/scope-manager": 5.62.0 - "@typescript-eslint/type-utils": 5.62.0 - "@typescript-eslint/utils": 5.62.0 - debug: ^4.3.4 + "@eslint-community/regexpp": ^4.10.0 + "@typescript-eslint/scope-manager": 7.9.0 + "@typescript-eslint/type-utils": 7.9.0 + "@typescript-eslint/utils": 7.9.0 + "@typescript-eslint/visitor-keys": 7.9.0 graphemer: ^1.4.0 - ignore: ^5.2.0 - natural-compare-lite: ^1.4.0 - semver: ^7.3.7 - tsutils: ^3.21.0 + ignore: ^5.3.1 + natural-compare: ^1.4.0 + ts-api-utils: ^1.3.0 peerDependencies: - "@typescript-eslint/parser": ^5.0.0 - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + "@typescript-eslint/parser": ^7.0.0 + eslint: ^8.56.0 peerDependenciesMeta: typescript: optional: true - checksum: fc104b389c768f9fa7d45a48c86d5c1ad522c1d0512943e782a56b1e3096b2cbcc1eea3fcc590647bf0658eef61aac35120a9c6daf979bf629ad2956deb516a1 + checksum: 0437d3d7a9adbd519e614a90633cd35fad4c9433d6b8902fd0f989907a3e0f05afc3a50ca35a8a02764e7333b92f5378088f657882f28c14a4d7e2433fea2766 languageName: node linkType: hard -"@typescript-eslint/parser@npm:5.62.0": - version: 5.62.0 - resolution: "@typescript-eslint/parser@npm:5.62.0" +"@typescript-eslint/parser@npm:7.9.0": + version: 7.9.0 + resolution: "@typescript-eslint/parser@npm:7.9.0" dependencies: - "@typescript-eslint/scope-manager": 5.62.0 - "@typescript-eslint/types": 5.62.0 - "@typescript-eslint/typescript-estree": 5.62.0 + "@typescript-eslint/scope-manager": 7.9.0 + "@typescript-eslint/types": 7.9.0 + "@typescript-eslint/typescript-estree": 7.9.0 + "@typescript-eslint/visitor-keys": 7.9.0 debug: ^4.3.4 peerDependencies: - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + eslint: ^8.56.0 peerDependenciesMeta: typescript: optional: true - checksum: d168f4c7f21a7a63f47002e2d319bcbb6173597af5c60c1cf2de046b46c76b4930a093619e69faf2d30214c29ab27b54dcf1efc7046a6a6bd6f37f59a990e752 + checksum: df80976afba65cf09583874a4330e7e275ff7b599863124ae911fa52f1f097948cc04bcea711da44688ee6beb2713f1c377604224a965869e527ad7e3f30ca72 languageName: node linkType: hard -"@typescript-eslint/parser@npm:^5.42.0": - version: 5.59.9 - resolution: "@typescript-eslint/parser@npm:5.59.9" +"@typescript-eslint/parser@npm:^5.4.2 || ^6.0.0 || 7.0.0 - 7.2.0": + version: 7.2.0 + resolution: "@typescript-eslint/parser@npm:7.2.0" dependencies: - "@typescript-eslint/scope-manager": 5.59.9 - "@typescript-eslint/types": 5.59.9 - "@typescript-eslint/typescript-estree": 5.59.9 + "@typescript-eslint/scope-manager": 7.2.0 + "@typescript-eslint/types": 7.2.0 + "@typescript-eslint/typescript-estree": 7.2.0 + "@typescript-eslint/visitor-keys": 7.2.0 debug: ^4.3.4 peerDependencies: - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 + eslint: ^8.56.0 peerDependenciesMeta: typescript: optional: true - checksum: 69b07d0a5bc6e1d24d23916c057ea9f2f53a0e7fb6dabadff92987c299640edee2c013fb93269322c7124e87b5c515529001397eae33006dfb40e1dcdf1902d7 + checksum: 21deb2e7ad1fc730f637af08f5c549f30ef5b50f424639f57f5bc01274e648db47c696bb994bb24e87424b593d4084e306447c9431a0c0e4807952996db306f4 languageName: node linkType: hard @@ -19133,57 +20387,67 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:5.61.0": - version: 5.61.0 - resolution: "@typescript-eslint/scope-manager@npm:5.61.0" +"@typescript-eslint/scope-manager@npm:7.12.0": + version: 7.12.0 + resolution: "@typescript-eslint/scope-manager@npm:7.12.0" dependencies: - "@typescript-eslint/types": 5.61.0 - "@typescript-eslint/visitor-keys": 5.61.0 - checksum: 6dfbb42c4b7d796ae3c395398bdfd2e5a4ae8aaf1448381278ecc39a1d1045af2cb452da5a00519d265bc1a5997523de22d5021acb4dbe1648502fe61512d3c6 + "@typescript-eslint/types": 7.12.0 + "@typescript-eslint/visitor-keys": 7.12.0 + checksum: 563de8a96b1c879e2cc84ea8e24a2a0f01aeafdc3ac477712f6e195f9f3639b978a8f86fd9841bd84d80e6d305b1c32cc5079baadd8fe24cd2603eba6ee792da languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:5.62.0": - version: 5.62.0 - resolution: "@typescript-eslint/scope-manager@npm:5.62.0" +"@typescript-eslint/scope-manager@npm:7.2.0": + version: 7.2.0 + resolution: "@typescript-eslint/scope-manager@npm:7.2.0" dependencies: - "@typescript-eslint/types": 5.62.0 - "@typescript-eslint/visitor-keys": 5.62.0 - checksum: 6062d6b797fe1ce4d275bb0d17204c827494af59b5eaf09d8a78cdd39dadddb31074dded4297aaf5d0f839016d601032857698b0e4516c86a41207de606e9573 + "@typescript-eslint/types": 7.2.0 + "@typescript-eslint/visitor-keys": 7.2.0 + checksum: b4ef8e35a56f590fa56cf769e111907828abb4793f482bf57e3fc8c987294ec119acb96359aa4b0150eea7416816e0b2d8635dccd1e4a5c2b02678b0f74def94 languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:5.62.0": - version: 5.62.0 - resolution: "@typescript-eslint/type-utils@npm:5.62.0" +"@typescript-eslint/scope-manager@npm:7.9.0": + version: 7.9.0 + resolution: "@typescript-eslint/scope-manager@npm:7.9.0" dependencies: - "@typescript-eslint/typescript-estree": 5.62.0 - "@typescript-eslint/utils": 5.62.0 + "@typescript-eslint/types": 7.9.0 + "@typescript-eslint/visitor-keys": 7.9.0 + checksum: d63f140e6112df6a4902b670c4c1ad02e9dcbe46c85c859f098e43f2543102138874bfc4a31c61a466e7e526d280c09d6fddc33dea84c946db43a24d52108724 + languageName: node + linkType: hard + +"@typescript-eslint/type-utils@npm:7.9.0": + version: 7.9.0 + resolution: "@typescript-eslint/type-utils@npm:7.9.0" + dependencies: + "@typescript-eslint/typescript-estree": 7.9.0 + "@typescript-eslint/utils": 7.9.0 debug: ^4.3.4 - tsutils: ^3.21.0 + ts-api-utils: ^1.3.0 peerDependencies: - eslint: "*" + eslint: ^8.56.0 peerDependenciesMeta: typescript: optional: true - checksum: fc41eece5f315dfda14320be0da78d3a971d650ea41300be7196934b9715f3fe1120a80207551eb71d39568275dbbcf359bde540d1ca1439d8be15e9885d2739 + checksum: 0e87d4d7ee38cf2f1fb899b6a466d9c6637a917bd7534dab9f58a709a5dbe72d98486187e900d553f2f9140799217d290402f4fdaf141253f56078019034ab3a languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:^5.60.1": - version: 5.61.0 - resolution: "@typescript-eslint/type-utils@npm:5.61.0" +"@typescript-eslint/type-utils@npm:^7.3.0": + version: 7.12.0 + resolution: "@typescript-eslint/type-utils@npm:7.12.0" dependencies: - "@typescript-eslint/typescript-estree": 5.61.0 - "@typescript-eslint/utils": 5.61.0 + "@typescript-eslint/typescript-estree": 7.12.0 + "@typescript-eslint/utils": 7.12.0 debug: ^4.3.4 - tsutils: ^3.21.0 + ts-api-utils: ^1.3.0 peerDependencies: - eslint: "*" + eslint: ^8.56.0 peerDependenciesMeta: typescript: optional: true - checksum: f0203fd48c6218f004dd73a9a71ba4cf97f015d0f13a7b3c821a3ba7ec814839bae270a1db589184ca7091fe54815a3171d1993e8a25200bf33e131bd6e855d4 + checksum: 26c3fe756b271aff94f6fc69c2ac69de471e5b0a4197bea575e4bebffce590f9fdd55f038e4e9c8ead87156386f9133c2c1324e4e5db2a4ebeb3c5014541a30e languageName: node linkType: hard @@ -19194,17 +20458,24 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/types@npm:5.61.0": - version: 5.61.0 - resolution: "@typescript-eslint/types@npm:5.61.0" - checksum: d311ca2141f6bcb5f0f8f97ddbc218c9911e0735aaa30f0f2e64d518fb33568410754e1b04bf157175f8783504f8ec62a7ab53a66a18507f43edb1e21fe69e90 +"@typescript-eslint/types@npm:7.12.0": + version: 7.12.0 + resolution: "@typescript-eslint/types@npm:7.12.0" + checksum: 56068abd1bf563fceb6ddea3d6b72893ae51fb527e5821e03aecc679f5dd6ff378f2adf445ccc404655163152f586bf04856a09b020635f57af4ce2fd9b5d40a languageName: node linkType: hard -"@typescript-eslint/types@npm:5.62.0": - version: 5.62.0 - resolution: "@typescript-eslint/types@npm:5.62.0" - checksum: 48c87117383d1864766486f24de34086155532b070f6264e09d0e6139449270f8a9559cfef3c56d16e3bcfb52d83d42105d61b36743626399c7c2b5e0ac3b670 +"@typescript-eslint/types@npm:7.2.0": + version: 7.2.0 + resolution: "@typescript-eslint/types@npm:7.2.0" + checksum: 237acd24aa55b762ee98904e4f422ba86579325200dcd058b3cbfe70775926e7f00ee0295788d81eb728f3a6326fe4401c648aee9eb1480d9030a441c17520e8 + languageName: node + linkType: hard + +"@typescript-eslint/types@npm:7.9.0": + version: 7.9.0 + resolution: "@typescript-eslint/types@npm:7.9.0" + checksum: 84c7e28b55a079dcd358aa6c20092819a20c20b167de4b04d86399e2ea1a0e28df92ee518c3b9236b7cd2cd72da81fc93e4bece48346e4a382723f4c857623ac languageName: node linkType: hard @@ -19226,75 +20497,88 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.61.0": - version: 5.61.0 - resolution: "@typescript-eslint/typescript-estree@npm:5.61.0" +"@typescript-eslint/typescript-estree@npm:7.12.0": + version: 7.12.0 + resolution: "@typescript-eslint/typescript-estree@npm:7.12.0" dependencies: - "@typescript-eslint/types": 5.61.0 - "@typescript-eslint/visitor-keys": 5.61.0 + "@typescript-eslint/types": 7.12.0 + "@typescript-eslint/visitor-keys": 7.12.0 debug: ^4.3.4 globby: ^11.1.0 is-glob: ^4.0.3 - semver: ^7.3.7 - tsutils: ^3.21.0 + minimatch: ^9.0.4 + semver: ^7.6.0 + ts-api-utils: ^1.3.0 peerDependenciesMeta: typescript: optional: true - checksum: efe25a1b2774939c02cb9b388cf72efa672811f1c39a87ddd617937f63c2320551ce459ba69c6d022e33322594d40b9f2d2c6bc9937387718adc40dc5e57ea8e + checksum: 16c75e117920432bc782da9efa0a2051ffa95c4b31b1f5cd613799aeeffd6de0f5ca5ff736ee2da5a8d3034d2ebb9c5240736d0737f118ed7c774b8b2ac87845 languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.62.0": - version: 5.62.0 - resolution: "@typescript-eslint/typescript-estree@npm:5.62.0" +"@typescript-eslint/typescript-estree@npm:7.2.0": + version: 7.2.0 + resolution: "@typescript-eslint/typescript-estree@npm:7.2.0" dependencies: - "@typescript-eslint/types": 5.62.0 - "@typescript-eslint/visitor-keys": 5.62.0 + "@typescript-eslint/types": 7.2.0 + "@typescript-eslint/visitor-keys": 7.2.0 debug: ^4.3.4 globby: ^11.1.0 is-glob: ^4.0.3 - semver: ^7.3.7 - tsutils: ^3.21.0 + minimatch: 9.0.3 + semver: ^7.5.4 + ts-api-utils: ^1.0.1 peerDependenciesMeta: typescript: optional: true - checksum: 3624520abb5807ed8f57b1197e61c7b1ed770c56dfcaca66372d584ff50175225798bccb701f7ef129d62c5989070e1ee3a0aa2d84e56d9524dcf011a2bb1a52 + checksum: fe882195cad45bb67e7e127efa9c31977348d0ca923ef26bb9fbd03a2ab64e6772e6e60954ba07a437684fae8e35897d71f0e6a1ef8fbf3f0025cd314960cd9d languageName: node linkType: hard -"@typescript-eslint/utils@npm:5.61.0, @typescript-eslint/utils@npm:^5.60.1": - version: 5.61.0 - resolution: "@typescript-eslint/utils@npm:5.61.0" +"@typescript-eslint/typescript-estree@npm:7.9.0": + version: 7.9.0 + resolution: "@typescript-eslint/typescript-estree@npm:7.9.0" dependencies: - "@eslint-community/eslint-utils": ^4.2.0 - "@types/json-schema": ^7.0.9 - "@types/semver": ^7.3.12 - "@typescript-eslint/scope-manager": 5.61.0 - "@typescript-eslint/types": 5.61.0 - "@typescript-eslint/typescript-estree": 5.61.0 - eslint-scope: ^5.1.1 - semver: ^7.3.7 + "@typescript-eslint/types": 7.9.0 + "@typescript-eslint/visitor-keys": 7.9.0 + debug: ^4.3.4 + globby: ^11.1.0 + is-glob: ^4.0.3 + minimatch: ^9.0.4 + semver: ^7.6.0 + ts-api-utils: ^1.3.0 + peerDependenciesMeta: + typescript: + optional: true + checksum: 45da640ca585bf89b896a06a71889be2cdf25e5efa5ebf1d3196bf7d3ce256f0432d4caa4a04a0d877f2db504c5c3a50a37310f56b2c84af49704cea3d0a596b + languageName: node + linkType: hard + +"@typescript-eslint/utils@npm:7.12.0, @typescript-eslint/utils@npm:^7.3.0": + version: 7.12.0 + resolution: "@typescript-eslint/utils@npm:7.12.0" + dependencies: + "@eslint-community/eslint-utils": ^4.4.0 + "@typescript-eslint/scope-manager": 7.12.0 + "@typescript-eslint/types": 7.12.0 + "@typescript-eslint/typescript-estree": 7.12.0 peerDependencies: - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: 24efc1964e6c92db96fe0d9a390550e4f27e8f353e51a9b46bda03e6692ea5d40f398d539235a4ff0894e9e45dfcfb51df953ade2ae9d17a1421449625ce6f5a + eslint: ^8.56.0 + checksum: f9b5afe9e70ff908f348de54d130b2157df8af0f9815cf7df0830bd85df249d3b34da8b03ad3bea84ed0c2ea1743caeae68355fbcca9a7da8df30bc76bc1506c languageName: node linkType: hard -"@typescript-eslint/utils@npm:5.62.0": - version: 5.62.0 - resolution: "@typescript-eslint/utils@npm:5.62.0" +"@typescript-eslint/utils@npm:7.9.0": + version: 7.9.0 + resolution: "@typescript-eslint/utils@npm:7.9.0" dependencies: - "@eslint-community/eslint-utils": ^4.2.0 - "@types/json-schema": ^7.0.9 - "@types/semver": ^7.3.12 - "@typescript-eslint/scope-manager": 5.62.0 - "@typescript-eslint/types": 5.62.0 - "@typescript-eslint/typescript-estree": 5.62.0 - eslint-scope: ^5.1.1 - semver: ^7.3.7 + "@eslint-community/eslint-utils": ^4.4.0 + "@typescript-eslint/scope-manager": 7.9.0 + "@typescript-eslint/types": 7.9.0 + "@typescript-eslint/typescript-estree": 7.9.0 peerDependencies: - eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: ee9398c8c5db6d1da09463ca7bf36ed134361e20131ea354b2da16a5fdb6df9ba70c62a388d19f6eebb421af1786dbbd79ba95ddd6ab287324fc171c3e28d931 + eslint: ^8.56.0 + checksum: bec0bb97ec430247534e0eb60f0ba86f739968351d73fda57a1e7b70417057f3eec438d3f1014336fcb35e2c18de1eb444a0cb59de78de0921d10d5066907356 languageName: node linkType: hard @@ -19326,23 +20610,33 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:5.61.0": - version: 5.61.0 - resolution: "@typescript-eslint/visitor-keys@npm:5.61.0" +"@typescript-eslint/visitor-keys@npm:7.12.0": + version: 7.12.0 + resolution: "@typescript-eslint/visitor-keys@npm:7.12.0" dependencies: - "@typescript-eslint/types": 5.61.0 - eslint-visitor-keys: ^3.3.0 - checksum: a8d589f61ddfc380787218da4d347e8f9aef0f82f4a93f1daee46786bda889a90961c7ec1b470db5e3261438a728fdfd956f5bda6ee2de22c4be2d2152d6e270 + "@typescript-eslint/types": 7.12.0 + eslint-visitor-keys: ^3.4.3 + checksum: 4352d910d87435457bb3fe2a6766fe702c31c0706789b4c478bd16c99bed7aa16654856e61ff14ecea2802030f96fa40d478bd57c205ac53f1f130577b7423b2 languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:5.62.0": - version: 5.62.0 - resolution: "@typescript-eslint/visitor-keys@npm:5.62.0" +"@typescript-eslint/visitor-keys@npm:7.2.0": + version: 7.2.0 + resolution: "@typescript-eslint/visitor-keys@npm:7.2.0" dependencies: - "@typescript-eslint/types": 5.62.0 - eslint-visitor-keys: ^3.3.0 - checksum: 976b05d103fe8335bef5c93ad3f76d781e3ce50329c0243ee0f00c0fcfb186c81df50e64bfdd34970148113f8ade90887f53e3c4938183afba830b4ba8e30a35 + "@typescript-eslint/types": 7.2.0 + eslint-visitor-keys: ^3.4.1 + checksum: d9b11b52737450f213cea5c6e07e4672684da48325905c096ee09302b6b261c0bb226e1e350011bdf127c0cbbdd9e6474c905befdfa0a2118fc89ece16770f2b + languageName: node + linkType: hard + +"@typescript-eslint/visitor-keys@npm:7.9.0": + version: 7.9.0 + resolution: "@typescript-eslint/visitor-keys@npm:7.9.0" + dependencies: + "@typescript-eslint/types": 7.9.0 + eslint-visitor-keys: ^3.4.3 + checksum: 29ed6af19f8e00110ccf2e0526ef8e4162ac18b2ca81a26f34b28719b2723faa028ff3485722bfa64864b23428e8d29453a7593f082d593326c21fd94f1499d9 languageName: node linkType: hard @@ -20300,14 +21594,14 @@ __metadata: languageName: node linkType: hard -"@zkochan/js-yaml@npm:0.0.6": - version: 0.0.6 - resolution: "@zkochan/js-yaml@npm:0.0.6" +"@zkochan/js-yaml@npm:0.0.7": + version: 0.0.7 + resolution: "@zkochan/js-yaml@npm:0.0.7" dependencies: argparse: ^2.0.1 bin: js-yaml: bin/js-yaml.js - checksum: 51b81597a1d1d79c778b8fae48317eaad78d75223d0b7477ad2b35f47cf63b19504da430bb7a03b326e668b282874242cc123e323e57293be038684cb5e755f8 + checksum: fc53174afc1373c834ba56108e625bf5c98f430fb0a52d3da8e868156e21c2f6a7cd5e649d126db84bba6280bbc82d4f314457846aaf2107022d043100256dd7 languageName: node linkType: hard @@ -20617,6 +21911,18 @@ __metadata: languageName: node linkType: hard +"ajv@npm:^8.12.0": + version: 8.16.0 + resolution: "ajv@npm:8.16.0" + dependencies: + fast-deep-equal: ^3.1.3 + json-schema-traverse: ^1.0.0 + require-from-string: ^2.0.2 + uri-js: ^4.4.1 + checksum: bdf3d4c9f1d11e220850051ef4cd89346e951cfb933d6d41be36d45053c1092af1523ee6c62525cce567355caf0a4f4c19a08a93851649c1fa32b4a39b7c4858 + languageName: node + linkType: hard + "amazon-s3-uri@npm:0.0.3": version: 0.0.3 resolution: "amazon-s3-uri@npm:0.0.3" @@ -20690,6 +21996,15 @@ __metadata: languageName: node linkType: hard +"ansi-html@npm:^0.0.9": + version: 0.0.9 + resolution: "ansi-html@npm:0.0.9" + bin: + ansi-html: bin/ansi-html + checksum: a03754d6f66bae33938ed8bb3dd98174b7f4895ebe45226185036ed4a1388a7aaf2f2b9581608f0626432ba7add92cfc590aa6475a78bbb90d9d1e1d1af8cbe6 + languageName: node + linkType: hard + "ansi-regex@npm:^2.0.0": version: 2.1.1 resolution: "ansi-regex@npm:2.1.1" @@ -21216,13 +22531,12 @@ __metadata: languageName: node linkType: hard -"aria-query@npm:^4.2.2": - version: 4.2.2 - resolution: "aria-query@npm:4.2.2" +"aria-query@npm:5.3.0, aria-query@npm:^5.3.0": + version: 5.3.0 + resolution: "aria-query@npm:5.3.0" dependencies: - "@babel/runtime": ^7.10.2 - "@babel/runtime-corejs3": ^7.10.2 - checksum: 38401a9a400f26f3dcc24b84997461a16b32869a9893d323602bed8da40a8bcc0243b8d2880e942249a1496cea7a7de769e93d21c0baa439f01e1ee936fed665 + dequal: ^2.0.3 + checksum: 305bd73c76756117b59aba121d08f413c7ff5e80fa1b98e217a3443fcddb9a232ee790e24e432b59ae7625aebcf4c47cb01c2cac872994f0b426f5bdfcd96ba9 languageName: node linkType: hard @@ -21273,6 +22587,16 @@ __metadata: languageName: node linkType: hard +"array-buffer-byte-length@npm:^1.0.1": + version: 1.0.1 + resolution: "array-buffer-byte-length@npm:1.0.1" + dependencies: + call-bind: ^1.0.5 + is-array-buffer: ^3.0.4 + checksum: 53524e08f40867f6a9f35318fafe467c32e45e9c682ba67b11943e167344d2febc0f6977a17e699b05699e805c3e8f073d876f8bbf1b559ed494ad2cd0fae09e + languageName: node + linkType: hard + "array-differ@npm:^1.0.0": version: 1.0.0 resolution: "array-differ@npm:1.0.0" @@ -21334,6 +22658,20 @@ __metadata: languageName: node linkType: hard +"array-includes@npm:^3.1.7, array-includes@npm:^3.1.8": + version: 3.1.8 + resolution: "array-includes@npm:3.1.8" + dependencies: + 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 + checksum: eb39ba5530f64e4d8acab39297c11c1c5be2a4ea188ab2b34aba5fb7224d918f77717a9d57a3e2900caaa8440e59431bdaf5c974d5212ef65d97f132e38e2d91 + languageName: node + linkType: hard + "array-timsort@npm:^1.0.3": version: 1.0.3 resolution: "array-timsort@npm:1.0.3" @@ -21378,15 +22716,31 @@ __metadata: languageName: node linkType: hard -"array.prototype.flat@npm:^1.2.5": - version: 1.3.0 - resolution: "array.prototype.flat@npm:1.3.0" +"array.prototype.findlast@npm:^1.2.5": + version: 1.2.5 + resolution: "array.prototype.findlast@npm:1.2.5" dependencies: - call-bind: ^1.0.2 - define-properties: ^1.1.3 - es-abstract: ^1.19.2 - es-shim-unscopables: ^1.0.0 - checksum: 2a652b3e8dc0bebb6117e42a5ab5738af0203a14c27341d7bb2431467bdb4b348e2c5dc555dfcda8af0a5e4075c400b85311ded73861c87290a71a17c3e0a257 + 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 + checksum: 83ce4ad95bae07f136d316f5a7c3a5b911ac3296c3476abe60225bc4a17938bf37541972fcc37dd5adbc99cbb9c928c70bbbfc1c1ce549d41a415144030bb446 + languageName: node + linkType: hard + +"array.prototype.findlastindex@npm:^1.2.3": + version: 1.2.5 + resolution: "array.prototype.findlastindex@npm:1.2.5" + 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 + checksum: 2c81cff2a75deb95bf1ed89b6f5f2bfbfb882211e3b7cc59c3d6b87df774cd9d6b36949a8ae39ac476e092c1d4a4905f5ee11a86a456abb10f35f8211ae4e710 languageName: node linkType: hard @@ -21402,6 +22756,18 @@ __metadata: languageName: node linkType: hard +"array.prototype.flat@npm:^1.3.2": + version: 1.3.2 + resolution: "array.prototype.flat@npm:1.3.2" + dependencies: + call-bind: ^1.0.2 + define-properties: ^1.2.0 + es-abstract: ^1.22.1 + es-shim-unscopables: ^1.0.0 + checksum: 5d6b4bf102065fb3f43764bfff6feb3295d372ce89591e6005df3d0ce388527a9f03c909af6f2a973969a4d178ab232ffc9236654149173e0e187ec3a1a6b87b + languageName: node + linkType: hard + "array.prototype.flatmap@npm:^1.3.1": version: 1.3.1 resolution: "array.prototype.flatmap@npm:1.3.1" @@ -21414,6 +22780,30 @@ __metadata: languageName: node linkType: hard +"array.prototype.flatmap@npm:^1.3.2": + version: 1.3.2 + resolution: "array.prototype.flatmap@npm:1.3.2" + dependencies: + call-bind: ^1.0.2 + define-properties: ^1.2.0 + es-abstract: ^1.22.1 + es-shim-unscopables: ^1.0.0 + checksum: ce09fe21dc0bcd4f30271f8144083aa8c13d4639074d6c8dc82054b847c7fc9a0c97f857491f4da19d4003e507172a78f4bcd12903098adac8b9cd374f734be3 + languageName: node + linkType: hard + +"array.prototype.toreversed@npm:^1.1.2": + version: 1.1.2 + resolution: "array.prototype.toreversed@npm:1.1.2" + dependencies: + call-bind: ^1.0.2 + define-properties: ^1.2.0 + es-abstract: ^1.22.1 + es-shim-unscopables: ^1.0.0 + checksum: 58598193426282155297bedf950dc8d464624a0d81659822fb73124286688644cb7e0e4927a07f3ab2daaeb6617b647736cc3a5e6ca7ade5bb8e573b284e6240 + languageName: node + linkType: hard + "array.prototype.tosorted@npm:^1.1.1": version: 1.1.1 resolution: "array.prototype.tosorted@npm:1.1.1" @@ -21427,6 +22817,35 @@ __metadata: languageName: node linkType: hard +"array.prototype.tosorted@npm:^1.1.3": + version: 1.1.4 + resolution: "array.prototype.tosorted@npm:1.1.4" + 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 + checksum: e4142d6f556bcbb4f393c02e7dbaea9af8f620c040450c2be137c9cbbd1a17f216b9c688c5f2c08fbb038ab83f55993fa6efdd9a05881d84693c7bcb5422127a + languageName: node + linkType: hard + +"arraybuffer.prototype.slice@npm:^1.0.3": + version: 1.0.3 + resolution: "arraybuffer.prototype.slice@npm:1.0.3" + 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 + checksum: 352259cba534dcdd969c92ab002efd2ba5025b2e3b9bead3973150edbdf0696c629d7f4b3f061c5931511e8207bdc2306da614703c820b45dabce39e3daf7e3e + languageName: node + linkType: hard + "arrify@npm:^1.0.0": version: 1.0.1 resolution: "arrify@npm:1.0.1" @@ -21498,6 +22917,19 @@ __metadata: languageName: node linkType: hard +"assert@npm:^2.1.0": + version: 2.1.0 + resolution: "assert@npm:2.1.0" + dependencies: + call-bind: ^1.0.2 + is-nan: ^1.3.2 + object-is: ^1.1.5 + object.assign: ^4.1.4 + util: ^0.12.5 + checksum: 1ed1cabba9abe55f4109b3f7292b4e4f3cf2953aad8dc148c0b3c3bd676675c31b1abb32ef563b7d5a19d1715bf90d1e5f09fad2a4ee655199468902da80f7c2 + languageName: node + linkType: hard + "assign-symbols@npm:^1.0.0": version: 1.0.0 resolution: "assign-symbols@npm:1.0.0" @@ -21512,6 +22944,13 @@ __metadata: languageName: node linkType: hard +"ast-types-flow@npm:^0.0.8": + version: 0.0.8 + resolution: "ast-types-flow@npm:0.0.8" + checksum: 0a64706609a179233aac23817837abab614f3548c252a2d3d79ea1e10c74aa28a0846e11f466cf72771b6ed8713abc094dcf8c40c3ec4207da163efa525a94a8 + languageName: node + linkType: hard + "ast-types@npm:0.14.2, ast-types@npm:^0.14.2": version: 0.14.2 resolution: "ast-types@npm:0.14.2" @@ -21670,6 +23109,15 @@ __metadata: languageName: node linkType: hard +"available-typed-arrays@npm:^1.0.7": + version: 1.0.7 + resolution: "available-typed-arrays@npm:1.0.7" + dependencies: + possible-typed-array-names: ^1.0.0 + checksum: 1aa3ffbfe6578276996de660848b6e95669d9a95ad149e3dd0c0cda77db6ee1dbd9d1dd723b65b6d277b882dd0c4b91a654ae9d3cf9e1254b7e93e4908d78fd3 + languageName: node + linkType: hard + "aws-elasticsearch-connector@npm:9.0.0": version: 9.0.0 resolution: "aws-elasticsearch-connector@npm:9.0.0" @@ -21730,7 +23178,14 @@ __metadata: languageName: node linkType: hard -"axe-core@npm:^4.2.0, axe-core@npm:^4.3.5": +"axe-core@npm:=4.7.0": + version: 4.7.0 + resolution: "axe-core@npm:4.7.0" + checksum: f086bcab42be1761ba2b0b127dec350087f4c3a853bba8dd58f69d898cefaac31a1561da23146f6f3c07954c76171d1f2ce460e555e052d2b02cd79af628fa4a + languageName: node + linkType: hard + +"axe-core@npm:^4.2.0": version: 4.4.1 resolution: "axe-core@npm:4.4.1" checksum: ad14c5b71059dc3d24ef2519b8cd96e98b4a572379396201ce449d1c4262181821d6ca9550df65b22371faf06d28bbe94d391fe5675f2a08e6550f7b5da8416d @@ -21754,14 +23209,14 @@ __metadata: languageName: node linkType: hard -"axios@npm:1.6.2": - version: 1.6.2 - resolution: "axios@npm:1.6.2" +"axios@npm:1.7.2, axios@npm:^1.6.0": + version: 1.7.2 + resolution: "axios@npm:1.7.2" dependencies: - follow-redirects: ^1.15.0 + follow-redirects: ^1.15.6 form-data: ^4.0.0 proxy-from-env: ^1.1.0 - checksum: 4a7429e2b784be0f2902ca2680964391eae7236faa3967715f30ea45464b98ae3f1c6f631303b13dfe721b17126b01f486c7644b9ef276bfc63112db9fd379f8 + checksum: e457e2b0ab748504621f6fa6609074ac08c824bf0881592209dfa15098ece7e88495300e02cd22ba50b3468fd712fe687e629dcb03d6a3f6a51989727405aedf languageName: node linkType: hard @@ -21784,17 +23239,6 @@ __metadata: languageName: node linkType: hard -"axios@npm:^1.0.0": - version: 1.4.0 - resolution: "axios@npm:1.4.0" - dependencies: - follow-redirects: ^1.15.0 - form-data: ^4.0.0 - proxy-from-env: ^1.1.0 - checksum: 7fb6a4313bae7f45e89d62c70a800913c303df653f19eafec88e56cea2e3821066b8409bc68be1930ecca80e861c52aa787659df0ffec6ad4d451c7816b9386b - languageName: node - linkType: hard - "axios@npm:^1.6.2": version: 1.6.8 resolution: "axios@npm:1.6.8" @@ -21806,13 +23250,6 @@ __metadata: languageName: node linkType: hard -"axobject-query@npm:^2.2.0": - version: 2.2.0 - resolution: "axobject-query@npm:2.2.0" - checksum: 96b8c7d807ca525f41ad9b286186e2089b561ba63a6d36c3e7d73dc08150714660995c7ad19cda05784458446a0793b45246db45894631e13853f48c1aa3117f - languageName: node - linkType: hard - "axobject-query@npm:^3.1.1": version: 3.1.1 resolution: "axobject-query@npm:3.1.1" @@ -21822,6 +23259,15 @@ __metadata: languageName: node linkType: hard +"axobject-query@npm:^3.2.1": + version: 3.2.1 + resolution: "axobject-query@npm:3.2.1" + dependencies: + dequal: ^2.0.3 + checksum: a94047e702b57c91680e6a952ec4a1aaa2cfd0d80ead76bc8c954202980d8c51968a6ea18b4d8010e8e2cf95676533d8022a8ebba9abc1dfe25686721df26fd2 + languageName: node + linkType: hard + "b4a@npm:^1.6.4": version: 1.6.4 resolution: "b4a@npm:1.6.4" @@ -22111,13 +23557,6 @@ __metadata: languageName: node linkType: hard -"babel-plugin-named-exports-order@npm:^0.0.2": - version: 0.0.2 - resolution: "babel-plugin-named-exports-order@npm:0.0.2" - checksum: d918390a09c0148893ea93bdc9c4fc6a03447c688eaf40bed0f0682d036e985ecee830b90fec2ab149b8dc0cb3220a2c0ac5054e42626bdfe0b436b505b7ef22 - languageName: node - linkType: hard - "babel-plugin-polyfill-corejs2@npm:^0.3.3": version: 0.3.3 resolution: "babel-plugin-polyfill-corejs2@npm:0.3.3" @@ -22131,6 +23570,19 @@ __metadata: languageName: node linkType: hard +"babel-plugin-polyfill-corejs2@npm:^0.4.10": + version: 0.4.11 + resolution: "babel-plugin-polyfill-corejs2@npm:0.4.11" + dependencies: + "@babel/compat-data": ^7.22.6 + "@babel/helper-define-polyfill-provider": ^0.6.2 + semver: ^6.3.1 + peerDependencies: + "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 + checksum: f098353ce7c7dde1a1d2710858e01b471e85689110c9e37813e009072347eb8c55d5f84d20d3bf1cab31755f20078ba90f8855fdc4686a9daa826a95ff280bd7 + languageName: node + linkType: hard + "babel-plugin-polyfill-corejs2@npm:^0.4.3": version: 0.4.3 resolution: "babel-plugin-polyfill-corejs2@npm:0.4.3" @@ -22157,6 +23609,18 @@ __metadata: languageName: node linkType: hard +"babel-plugin-polyfill-corejs3@npm:^0.10.1, babel-plugin-polyfill-corejs3@npm:^0.10.4": + version: 0.10.4 + resolution: "babel-plugin-polyfill-corejs3@npm:0.10.4" + dependencies: + "@babel/helper-define-polyfill-provider": ^0.6.1 + core-js-compat: ^3.36.1 + peerDependencies: + "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 + checksum: b96a54495f7cc8b3797251c8c15f5ed015edddc3110fc122f6b32c94bec33af1e8bc56fa99091808f500bde0cccaaa266889cdc5935d9e6e9cf09898214f02dd + languageName: node + linkType: hard + "babel-plugin-polyfill-corejs3@npm:^0.6.0": version: 0.6.0 resolution: "babel-plugin-polyfill-corejs3@npm:0.6.0" @@ -22226,14 +23690,14 @@ __metadata: languageName: node linkType: hard -"babel-plugin-react-docgen@npm:^4.2.1": - version: 4.2.1 - resolution: "babel-plugin-react-docgen@npm:4.2.1" +"babel-plugin-polyfill-regenerator@npm:^0.6.1": + version: 0.6.2 + resolution: "babel-plugin-polyfill-regenerator@npm:0.6.2" dependencies: - ast-types: ^0.14.2 - lodash: ^4.17.15 - react-docgen: ^5.0.0 - checksum: 6126d358ac2cb27a9a7f145ab586b7a28cb19ef09ca37c4f08a853246a101328ffe6c87813e95b1b4ba05beb627285199f7d0ba16abfb61b35cc4febb6d5eabd + "@babel/helper-define-polyfill-provider": ^0.6.2 + peerDependencies: + "@babel/core": ^7.4.0 || ^8.0.0-0 <8.0.0 + checksum: 150233571072b6b3dfe946242da39cba8587b7f908d1c006f7545fc88b0e3c3018d445739beb61e7a75835f0c2751dbe884a94ff9b245ec42369d9267e0e1b3f languageName: node linkType: hard @@ -23118,7 +24582,7 @@ __metadata: languageName: node linkType: hard -"buffer@npm:^5.5.0, buffer@npm:^5.6.0": +"buffer@npm:^5.5.0, buffer@npm:^5.7.1": version: 5.7.1 resolution: "buffer@npm:5.7.1" dependencies: @@ -23199,28 +24663,6 @@ __metadata: languageName: node linkType: hard -"c8@npm:^7.6.0": - version: 7.14.0 - resolution: "c8@npm:7.14.0" - dependencies: - "@bcoe/v8-coverage": ^0.2.3 - "@istanbuljs/schema": ^0.1.3 - find-up: ^5.0.0 - foreground-child: ^2.0.0 - istanbul-lib-coverage: ^3.2.0 - istanbul-lib-report: ^3.0.0 - istanbul-reports: ^3.1.4 - rimraf: ^3.0.2 - test-exclude: ^6.0.0 - v8-to-istanbul: ^9.0.0 - yargs: ^16.2.0 - yargs-parser: ^20.2.9 - bin: - c8: bin/c8.js - checksum: ca44bbd200b09dd5b7a3b8909b964c82eabbbb28ce4543873a313118e1ba24c924fdb6440ed09c636debdbd2dffec5529cca9657d408cba295367b715e131975 - languageName: node - linkType: hard - "cacache@npm:^15.2.0, cacache@npm:^15.3.0": version: 15.3.0 resolution: "cacache@npm:15.3.0" @@ -23370,7 +24812,7 @@ __metadata: languageName: node linkType: hard -"call-bind@npm:^1.0.7": +"call-bind@npm:^1.0.5, call-bind@npm:^1.0.6, call-bind@npm:^1.0.7": version: 1.0.7 resolution: "call-bind@npm:1.0.7" dependencies: @@ -23493,13 +24935,20 @@ __metadata: languageName: node linkType: hard -"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001219, caniuse-lite@npm:^1.0.30001406, caniuse-lite@npm:^1.0.30001464": +"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001219, caniuse-lite@npm:^1.0.30001464": version: 1.0.30001597 resolution: "caniuse-lite@npm:1.0.30001597" checksum: ec6a2cf0fd49f37d16732e6595939fc80a125dcd188a950bc936c61b4ad53becc0fe51bf2d9a625415de7b1cb23bd835f220e8b68d8ab951a940edeea65476fd languageName: node linkType: hard +"caniuse-lite@npm:^1.0.30001579": + version: 1.0.30001628 + resolution: "caniuse-lite@npm:1.0.30001628" + checksum: b5dcdaeb0117a02b3c42f5bc2922cad97546cb8eb3820f14fc7a1f566f6d477df89cf43ed9b43a354f6059ea4009eed89f7b7e741d17d2c8d3c21e0b7d56e31d + languageName: node + linkType: hard + "canvas@npm:^2.11.2": version: 2.11.2 resolution: "canvas@npm:2.11.2" @@ -23936,6 +25385,13 @@ __metadata: languageName: node linkType: hard +"cjs-module-lexer@npm:^1.2.3": + version: 1.3.1 + resolution: "cjs-module-lexer@npm:1.3.1" + checksum: 75f20ac264a397ea5c63f9c2343a51ab878043666468f275e94862f7180ec1d764a400ec0c09085dcf0db3193c74a8b571519abd2bf4be0d2be510d1377c8d4b + languageName: node + linkType: hard + "class-transformer@npm:0.5.1": version: 0.5.1 resolution: "class-transformer@npm:0.5.1" @@ -24550,13 +26006,6 @@ __metadata: languageName: node linkType: hard -"common-path-prefix@npm:^3.0.0": - version: 3.0.0 - resolution: "common-path-prefix@npm:3.0.0" - checksum: fdb3c4f54e51e70d417ccd950c07f757582de800c0678ca388aedefefc84982039f346f9fd9a1252d08d2da9e9ef4019f580a1d1d3a10da031e4bb3c924c5818 - languageName: node - linkType: hard - "common-tags@npm:1.8.2": version: 1.8.2 resolution: "common-tags@npm:1.8.2" @@ -25251,10 +26700,12 @@ __metadata: languageName: node linkType: hard -"core-js-pure@npm:^3.0.0": - version: 3.22.0 - resolution: "core-js-pure@npm:3.22.0" - checksum: 8c1fc4aa8b0f1e9cdd6f14548324ae8dd4083e56a4a8e414d9ab9ea42ba1680170212bb2276e7a0b7973d755a5c8bdac506e6e19685bd17922440bc490da4149 +"core-js-compat@npm:^3.36.1": + version: 3.37.1 + resolution: "core-js-compat@npm:3.37.1" + dependencies: + browserslist: ^4.23.0 + checksum: 5e7430329358bced08c30950512d2081aea0a5652b4c5892cbb3c4a6db05b0d3893a191a955162a07fdb5f4fe74e61b6429fdb503f54e062336d76e43c9555d9 languageName: node linkType: hard @@ -25265,10 +26716,10 @@ __metadata: languageName: node linkType: hard -"core-js@npm:3.6.5": - version: 3.6.5 - resolution: "core-js@npm:3.6.5" - checksum: b7fcf92f888bfe40f3f005e3f729e66aa49a3a9a797e8fb4d09d429c6abcd505781b2c03836858f0dc0159249d4b7a035fc763052c9c34adbc93b6f8a6a86305 +"core-js@npm:3.36.1": + version: 3.36.1 + resolution: "core-js@npm:3.36.1" + checksum: 6f6c152179bd0673da34e67a82c6a5c37f31f9fbe908e9caf93749dc62a25b6e07fbff2411de3b74bb2d0661b7f9fb247115ba8efabf9904f5fef26edead515e languageName: node linkType: hard @@ -26034,19 +27485,18 @@ __metadata: languageName: node linkType: hard -"cypress@npm:13.0.0": - version: 13.0.0 - resolution: "cypress@npm:13.0.0" +"cypress@npm:13.9.0": + version: 13.9.0 + resolution: "cypress@npm:13.9.0" dependencies: "@cypress/request": ^3.0.0 "@cypress/xvfb": ^1.2.4 - "@types/node": ^16.18.39 "@types/sinonjs__fake-timers": 8.1.1 "@types/sizzle": ^2.3.2 arch: ^2.2.0 blob-util: ^2.0.2 bluebird: ^3.7.2 - buffer: ^5.6.0 + buffer: ^5.7.1 cachedir: ^2.3.0 chalk: ^4.1.0 check-more-types: ^2.24.0 @@ -26064,7 +27514,7 @@ __metadata: figures: ^3.2.0 fs-extra: ^9.1.0 getos: ^3.2.1 - is-ci: ^3.0.0 + is-ci: ^3.0.1 is-installed-globally: ~0.4.0 lazy-ass: ^1.6.0 listr2: ^3.8.3 @@ -26083,7 +27533,7 @@ __metadata: yauzl: ^2.10.0 bin: cypress: bin/cypress - checksum: 223dddfd85dbde5e3a915e87b6cb176b99a9e5bcc24baa40cd5b9ca4a93315a95cf53c5c6ac3a6984f59be55ffc8b58b93a713c0ddcb63a5f4996229cce70329 + checksum: ec2e0237d2a38d53d4e5c05fe1c37f7fe0bb13de798045ba091b6a5cf0edd7b3a282f4d8f4c063e3988ee048d06dcf4fef91d83d63a56cee9f9ff68685f3946d languageName: node linkType: hard @@ -26183,7 +27633,7 @@ __metadata: languageName: node linkType: hard -"damerau-levenshtein@npm:^1.0.7, damerau-levenshtein@npm:^1.0.8": +"damerau-levenshtein@npm:^1.0.8": version: 1.0.8 resolution: "damerau-levenshtein@npm:1.0.8" checksum: d240b7757544460ae0586a341a53110ab0a61126570ef2d8c731e3eab3f0cb6e488e2609e6a69b46727635de49be20b071688698744417ff1b6c1d7ccd03e0de @@ -26235,6 +27685,39 @@ __metadata: languageName: node linkType: hard +"data-view-buffer@npm:^1.0.1": + version: 1.0.1 + resolution: "data-view-buffer@npm:1.0.1" + dependencies: + call-bind: ^1.0.6 + es-errors: ^1.3.0 + is-data-view: ^1.0.1 + checksum: ce24348f3c6231223b216da92e7e6a57a12b4af81a23f27eff8feabdf06acfb16c00639c8b705ca4d167f761cfc756e27e5f065d0a1f840c10b907fdaf8b988c + languageName: node + linkType: hard + +"data-view-byte-length@npm:^1.0.1": + version: 1.0.1 + resolution: "data-view-byte-length@npm:1.0.1" + dependencies: + call-bind: ^1.0.7 + es-errors: ^1.3.0 + is-data-view: ^1.0.1 + checksum: dbb3200edcb7c1ef0d68979834f81d64fd8cab2f7691b3a4c6b97e67f22182f3ec2c8602efd7b76997b55af6ff8bce485829c1feda4fa2165a6b71fb7baa4269 + languageName: node + linkType: hard + +"data-view-byte-offset@npm:^1.0.0": + version: 1.0.0 + resolution: "data-view-byte-offset@npm:1.0.0" + dependencies: + call-bind: ^1.0.6 + es-errors: ^1.3.0 + is-data-view: ^1.0.1 + checksum: 7f0bf8720b7414ca719eedf1846aeec392f2054d7af707c5dc9a753cc77eb8625f067fa901e0b5127e831f9da9056138d894b9c2be79c27a21f6db5824f009c2 + languageName: node + linkType: hard + "dataloader@npm:2.1.0": version: 2.1.0 resolution: "dataloader@npm:2.1.0" @@ -26759,7 +28242,7 @@ __metadata: languageName: node linkType: hard -"define-properties@npm:^1.2.0": +"define-properties@npm:^1.2.0, define-properties@npm:^1.2.1": version: 1.2.1 resolution: "define-properties@npm:1.2.1" dependencies: @@ -26911,7 +28394,7 @@ __metadata: languageName: node linkType: hard -"dequal@npm:2.0.3, dequal@npm:^2.0.0, dequal@npm:^2.0.2": +"dequal@npm:2.0.3, dequal@npm:^2.0.0, dequal@npm:^2.0.2, dequal@npm:^2.0.3": version: 2.0.3 resolution: "dequal@npm:2.0.3" checksum: 8679b850e1a3d0ebbc46ee780d5df7b478c23f335887464023a631d1b9af051ad4a6595a44220f9ff8ff95a8ddccf019b5ad778a976fd7bbf77383d36f412f90 @@ -27412,14 +28895,23 @@ __metadata: languageName: node linkType: hard -"dotenv-expand@npm:^10.0.0, dotenv-expand@npm:~10.0.0": +"dotenv-expand@npm:^10.0.0": version: 10.0.0 resolution: "dotenv-expand@npm:10.0.0" checksum: 2a38b470efe0abcb1ac8490421a55e1d764dc9440fd220942bce40965074f3fb00b585f4346020cb0f0f219966ee6b4ee5023458b3e2953fe5b3214de1b314ee languageName: node linkType: hard -"dotenv@npm:16.3.1, dotenv@npm:~16.3.1": +"dotenv-expand@npm:~11.0.6": + version: 11.0.6 + resolution: "dotenv-expand@npm:11.0.6" + dependencies: + dotenv: ^16.4.4 + checksum: dbbe1ecbdf17f4ba5556744b259801bdbc8c221c0d167f4f3ef079206ebf658f487fe96ea1fd504dc15172328d25f6c665581eb8d873298904a52d48a2004b49 + languageName: node + linkType: hard + +"dotenv@npm:16.3.1": version: 16.3.1 resolution: "dotenv@npm:16.3.1" checksum: 15d75e7279018f4bafd0ee9706593dd14455ddb71b3bcba9c52574460b7ccaf67d5cf8b2c08a5af1a9da6db36c956a04a1192b101ee102a3e0cf8817bbcf3dfd @@ -27440,6 +28932,13 @@ __metadata: languageName: node linkType: hard +"dotenv@npm:^16.4.4, dotenv@npm:~16.4.5": + version: 16.4.5 + resolution: "dotenv@npm:16.4.5" + checksum: 301a12c3d44fd49888b74eb9ccf9f07a1f5df43f489e7fcb89647a2edcd84c42d6bc349dc8df099cd18f07c35c7b04685c1a4f3e6a6a9e6b30f8d48c15b7f49c + languageName: node + linkType: hard + "dotenv@npm:^8.2.0": version: 8.6.0 resolution: "dotenv@npm:8.6.0" @@ -27937,7 +29436,7 @@ __metadata: languageName: node linkType: hard -"es-abstract@npm:^1.18.0-next.2, es-abstract@npm:^1.19.1, es-abstract@npm:^1.19.2": +"es-abstract@npm:^1.18.0-next.2, es-abstract@npm:^1.19.1": version: 1.19.5 resolution: "es-abstract@npm:1.19.5" dependencies: @@ -28030,6 +29529,60 @@ __metadata: languageName: node linkType: hard +"es-abstract@npm:^1.22.1, es-abstract@npm:^1.22.3, es-abstract@npm:^1.23.0, es-abstract@npm:^1.23.1, es-abstract@npm:^1.23.2, es-abstract@npm:^1.23.3": + version: 1.23.3 + resolution: "es-abstract@npm:1.23.3" + 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 + checksum: f840cf161224252512f9527306b57117192696571e07920f777cb893454e32999206198b4f075516112af6459daca282826d1735c450528470356d09eff3a9ae + languageName: node + linkType: hard + "es-define-property@npm:^1.0.0": version: 1.0.0 resolution: "es-define-property@npm:1.0.0" @@ -28039,7 +29592,7 @@ __metadata: languageName: node linkType: hard -"es-errors@npm:^1.3.0": +"es-errors@npm:^1.2.1, es-errors@npm:^1.3.0": version: 1.3.0 resolution: "es-errors@npm:1.3.0" checksum: ec1414527a0ccacd7f15f4a3bc66e215f04f595ba23ca75cdae0927af099b5ec865f9f4d33e9d7e86f512f252876ac77d4281a7871531a50678132429b1271b5 @@ -28079,6 +29632,28 @@ __metadata: languageName: node linkType: hard +"es-iterator-helpers@npm:^1.0.15, es-iterator-helpers@npm:^1.0.19": + version: 1.0.19 + resolution: "es-iterator-helpers@npm:1.0.19" + 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 + checksum: 7ae112b88359fbaf4b9d7d1d1358ae57c5138768c57ba3a8fb930393662653b0512bfd7917c15890d1471577fb012fee8b73b4465e59b331739e6ee94f961683 + languageName: node + linkType: hard + "es-module-lexer@npm:^1.2.1": version: 1.2.1 resolution: "es-module-lexer@npm:1.2.1" @@ -28086,6 +29661,33 @@ __metadata: languageName: node linkType: hard +"es-module-lexer@npm:^1.4.1": + version: 1.5.3 + resolution: "es-module-lexer@npm:1.5.3" + checksum: 2e0a0936fb49ca072d438128f588d5b46974035f7a1362bdb26447868016243cfd1c5ec8f12e80d273749e8c603f5aba5a828d5c2d95c07f61fbe77ab4fce4af + languageName: node + linkType: hard + +"es-object-atoms@npm:^1.0.0": + version: 1.0.0 + resolution: "es-object-atoms@npm:1.0.0" + dependencies: + es-errors: ^1.3.0 + checksum: 26f0ff78ab93b63394e8403c353842b2272836968de4eafe97656adfb8a7c84b9099bf0fe96ed58f4a4cddc860f6e34c77f91649a58a5daa4a9c40b902744e3c + languageName: node + linkType: hard + +"es-set-tostringtag@npm:^2.0.3": + version: 2.0.3 + resolution: "es-set-tostringtag@npm:2.0.3" + dependencies: + get-intrinsic: ^1.2.4 + has-tostringtag: ^1.0.2 + hasown: ^2.0.1 + checksum: 7227fa48a41c0ce83e0377b11130d324ac797390688135b8da5c28994c0165be8b252e15cd1de41e1325e5a5412511586960213e88f9ab4a5e7d028895db5129 + languageName: node + linkType: hard + "es-shim-unscopables@npm:^1.0.0": version: 1.0.0 resolution: "es-shim-unscopables@npm:1.0.0" @@ -28095,6 +29697,15 @@ __metadata: languageName: node linkType: hard +"es-shim-unscopables@npm:^1.0.2": + version: 1.0.2 + resolution: "es-shim-unscopables@npm:1.0.2" + dependencies: + hasown: ^2.0.0 + checksum: 432bd527c62065da09ed1d37a3f8e623c423683285e6188108286f4a1e8e164a5bcbfbc0051557c7d14633cd2a41ce24c7048e6bbb66a985413fd32f1be72626 + languageName: node + linkType: hard + "es-to-primitive@npm:^1.2.1": version: 1.2.1 resolution: "es-to-primitive@npm:1.2.1" @@ -28217,118 +29828,6 @@ __metadata: languageName: node linkType: hard -"esbuild-android-64@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-android-64@npm:0.15.7" - conditions: os=android & cpu=x64 - languageName: node - linkType: hard - -"esbuild-android-arm64@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-android-arm64@npm:0.15.7" - conditions: os=android & cpu=arm64 - languageName: node - linkType: hard - -"esbuild-darwin-64@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-darwin-64@npm:0.15.7" - conditions: os=darwin & cpu=x64 - languageName: node - linkType: hard - -"esbuild-darwin-arm64@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-darwin-arm64@npm:0.15.7" - conditions: os=darwin & cpu=arm64 - languageName: node - linkType: hard - -"esbuild-freebsd-64@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-freebsd-64@npm:0.15.7" - conditions: os=freebsd & cpu=x64 - languageName: node - linkType: hard - -"esbuild-freebsd-arm64@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-freebsd-arm64@npm:0.15.7" - conditions: os=freebsd & cpu=arm64 - languageName: node - linkType: hard - -"esbuild-linux-32@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-linux-32@npm:0.15.7" - conditions: os=linux & cpu=ia32 - languageName: node - linkType: hard - -"esbuild-linux-64@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-linux-64@npm:0.15.7" - conditions: os=linux & cpu=x64 - languageName: node - linkType: hard - -"esbuild-linux-arm64@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-linux-arm64@npm:0.15.7" - conditions: os=linux & cpu=arm64 - languageName: node - linkType: hard - -"esbuild-linux-arm@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-linux-arm@npm:0.15.7" - conditions: os=linux & cpu=arm - languageName: node - linkType: hard - -"esbuild-linux-mips64le@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-linux-mips64le@npm:0.15.7" - conditions: os=linux & cpu=mips64el - languageName: node - linkType: hard - -"esbuild-linux-ppc64le@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-linux-ppc64le@npm:0.15.7" - conditions: os=linux & cpu=ppc64 - languageName: node - linkType: hard - -"esbuild-linux-riscv64@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-linux-riscv64@npm:0.15.7" - conditions: os=linux & cpu=riscv64 - languageName: node - linkType: hard - -"esbuild-linux-s390x@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-linux-s390x@npm:0.15.7" - conditions: os=linux & cpu=s390x - languageName: node - linkType: hard - -"esbuild-netbsd-64@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-netbsd-64@npm:0.15.7" - conditions: os=netbsd & cpu=x64 - languageName: node - linkType: hard - -"esbuild-openbsd-64@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-openbsd-64@npm:0.15.7" - conditions: os=openbsd & cpu=x64 - languageName: node - linkType: hard - "esbuild-plugin-alias@npm:^0.2.1": version: 0.2.1 resolution: "esbuild-plugin-alias@npm:0.2.1" @@ -28347,114 +29846,100 @@ __metadata: languageName: node linkType: hard -"esbuild-sunos-64@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-sunos-64@npm:0.15.7" - conditions: os=sunos & cpu=x64 - languageName: node - linkType: hard - -"esbuild-windows-32@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-windows-32@npm:0.15.7" - conditions: os=win32 & cpu=ia32 - languageName: node - linkType: hard - -"esbuild-windows-64@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-windows-64@npm:0.15.7" - conditions: os=win32 & cpu=x64 +"esbuild-register@npm:^3.5.0": + version: 3.5.0 + resolution: "esbuild-register@npm:3.5.0" + dependencies: + debug: ^4.3.4 + peerDependencies: + esbuild: ">=0.12 <1" + checksum: f4307753c9672a2c901d04a1165031594a854f0a4c6f4c1db08aa393b68a193d38f2df483dc8ca0513e89f7b8998415e7e26fb9830989fb8cdccc5fb5f181c6b languageName: node linkType: hard -"esbuild-windows-arm64@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild-windows-arm64@npm:0.15.7" - conditions: os=win32 & cpu=arm64 +"esbuild@npm:^0.11.16": + version: 0.11.23 + resolution: "esbuild@npm:0.11.23" + bin: + esbuild: bin/esbuild + checksum: d55bea84f94e7854fa6fb013ffc63747f2286001b3d73c2a7beb605e6e4847c24ff2cde0660f03045d06d083695c8082423b007a9ee8687e70b52719458bfdd6 languageName: node linkType: hard -"esbuild@npm:0.15.7": - version: 0.15.7 - resolution: "esbuild@npm:0.15.7" - dependencies: - "@esbuild/linux-loong64": 0.15.7 - esbuild-android-64: 0.15.7 - esbuild-android-arm64: 0.15.7 - esbuild-darwin-64: 0.15.7 - esbuild-darwin-arm64: 0.15.7 - esbuild-freebsd-64: 0.15.7 - esbuild-freebsd-arm64: 0.15.7 - esbuild-linux-32: 0.15.7 - esbuild-linux-64: 0.15.7 - esbuild-linux-arm: 0.15.7 - esbuild-linux-arm64: 0.15.7 - esbuild-linux-mips64le: 0.15.7 - esbuild-linux-ppc64le: 0.15.7 - esbuild-linux-riscv64: 0.15.7 - esbuild-linux-s390x: 0.15.7 - esbuild-netbsd-64: 0.15.7 - esbuild-openbsd-64: 0.15.7 - esbuild-sunos-64: 0.15.7 - esbuild-windows-32: 0.15.7 - esbuild-windows-64: 0.15.7 - esbuild-windows-arm64: 0.15.7 +"esbuild@npm:^0.16.17": + version: 0.16.17 + resolution: "esbuild@npm:0.16.17" + dependencies: + "@esbuild/android-arm": 0.16.17 + "@esbuild/android-arm64": 0.16.17 + "@esbuild/android-x64": 0.16.17 + "@esbuild/darwin-arm64": 0.16.17 + "@esbuild/darwin-x64": 0.16.17 + "@esbuild/freebsd-arm64": 0.16.17 + "@esbuild/freebsd-x64": 0.16.17 + "@esbuild/linux-arm": 0.16.17 + "@esbuild/linux-arm64": 0.16.17 + "@esbuild/linux-ia32": 0.16.17 + "@esbuild/linux-loong64": 0.16.17 + "@esbuild/linux-mips64el": 0.16.17 + "@esbuild/linux-ppc64": 0.16.17 + "@esbuild/linux-riscv64": 0.16.17 + "@esbuild/linux-s390x": 0.16.17 + "@esbuild/linux-x64": 0.16.17 + "@esbuild/netbsd-x64": 0.16.17 + "@esbuild/openbsd-x64": 0.16.17 + "@esbuild/sunos-x64": 0.16.17 + "@esbuild/win32-arm64": 0.16.17 + "@esbuild/win32-ia32": 0.16.17 + "@esbuild/win32-x64": 0.16.17 dependenciesMeta: - "@esbuild/linux-loong64": + "@esbuild/android-arm": optional: true - esbuild-android-64: + "@esbuild/android-arm64": optional: true - esbuild-android-arm64: + "@esbuild/android-x64": optional: true - esbuild-darwin-64: + "@esbuild/darwin-arm64": optional: true - esbuild-darwin-arm64: + "@esbuild/darwin-x64": optional: true - esbuild-freebsd-64: + "@esbuild/freebsd-arm64": optional: true - esbuild-freebsd-arm64: + "@esbuild/freebsd-x64": optional: true - esbuild-linux-32: + "@esbuild/linux-arm": optional: true - esbuild-linux-64: + "@esbuild/linux-arm64": optional: true - esbuild-linux-arm: + "@esbuild/linux-ia32": optional: true - esbuild-linux-arm64: + "@esbuild/linux-loong64": optional: true - esbuild-linux-mips64le: + "@esbuild/linux-mips64el": optional: true - esbuild-linux-ppc64le: + "@esbuild/linux-ppc64": optional: true - esbuild-linux-riscv64: + "@esbuild/linux-riscv64": optional: true - esbuild-linux-s390x: + "@esbuild/linux-s390x": optional: true - esbuild-netbsd-64: + "@esbuild/linux-x64": optional: true - esbuild-openbsd-64: + "@esbuild/netbsd-x64": optional: true - esbuild-sunos-64: + "@esbuild/openbsd-x64": optional: true - esbuild-windows-32: + "@esbuild/sunos-x64": optional: true - esbuild-windows-64: + "@esbuild/win32-arm64": optional: true - esbuild-windows-arm64: + "@esbuild/win32-ia32": + optional: true + "@esbuild/win32-x64": optional: true bin: esbuild: bin/esbuild - checksum: 54ddaa6cf96798d817861b4f68cb8d176075dc09b6e0ed511c57e5db6fd86d2c673ac2ec631ad9b11678d58ad4a77cd6b7a3853b9c6eac29b7f5c6d38e42f92e - languageName: node - linkType: hard - -"esbuild@npm:^0.11.16": - version: 0.11.23 - resolution: "esbuild@npm:0.11.23" - bin: - esbuild: bin/esbuild - checksum: d55bea84f94e7854fa6fb013ffc63747f2286001b3d73c2a7beb605e6e4847c24ff2cde0660f03045d06d083695c8082423b007a9ee8687e70b52719458bfdd6 + checksum: 4c2cc609ecfb426554bc3f75beb92d89eb2d0c515cfceebaa36c7599d7dcaab7056b70f6d6b51e72b45951ddf9021ee28e356cf205f8e42cc055d522312ea30c languageName: node linkType: hard @@ -28640,37 +30125,37 @@ __metadata: languageName: node linkType: hard -"eslint-config-next@npm:13.1.1": - version: 13.1.1 - resolution: "eslint-config-next@npm:13.1.1" +"eslint-config-next@npm:14.2.3": + version: 14.2.3 + resolution: "eslint-config-next@npm:14.2.3" dependencies: - "@next/eslint-plugin-next": 13.1.1 - "@rushstack/eslint-patch": ^1.1.3 - "@typescript-eslint/parser": ^5.42.0 + "@next/eslint-plugin-next": 14.2.3 + "@rushstack/eslint-patch": ^1.3.3 + "@typescript-eslint/parser": ^5.4.2 || ^6.0.0 || 7.0.0 - 7.2.0 eslint-import-resolver-node: ^0.3.6 eslint-import-resolver-typescript: ^3.5.2 - eslint-plugin-import: ^2.26.0 - eslint-plugin-jsx-a11y: ^6.5.1 - eslint-plugin-react: ^7.31.7 - eslint-plugin-react-hooks: ^4.5.0 + eslint-plugin-import: ^2.28.1 + eslint-plugin-jsx-a11y: ^6.7.1 + eslint-plugin-react: ^7.33.2 + eslint-plugin-react-hooks: ^4.5.0 || 5.0.0-canary-7118f5dd7-20230705 peerDependencies: eslint: ^7.23.0 || ^8.0.0 typescript: ">=3.3.1" peerDependenciesMeta: typescript: optional: true - checksum: 098465b42e277433e4f815465b49ab655fc35a62ac016a47f60d7e44248f1b87a70b2dfd2ef090ffbb4cb1a694d409ff0811d2eb64028ce61f535403c7a0f27a + checksum: 512bc0c21c189d086a6aa1f01fbb3b1d4ee62c017670a5bbf6b0fa9b44ad2b61047364d9b0800ec25f6208364090d87a20b513e65902367e795f33327c09e023 languageName: node linkType: hard -"eslint-config-prettier@npm:8.1.0": - version: 8.1.0 - resolution: "eslint-config-prettier@npm:8.1.0" +"eslint-config-prettier@npm:9.1.0": + version: 9.1.0 + resolution: "eslint-config-prettier@npm:9.1.0" peerDependencies: eslint: ">=7.0.0" bin: eslint-config-prettier: bin/cli.js - checksum: 277b42e4d5b4a65dc8224a26b082373b846f7b2148dc342fd69f9f00ea36f58affacf7bbade3f2512295f371620b3d57380e27de32e492632b516c310ce51c04 + checksum: 9229b768c879f500ee54ca05925f31b0c0bafff3d9f5521f98ff05127356de78c81deb9365c86a5ec4efa990cb72b74df8612ae15965b14136044c73e1f6a907 languageName: node linkType: hard @@ -28695,6 +30180,17 @@ __metadata: languageName: node linkType: hard +"eslint-import-resolver-node@npm:^0.3.9": + version: 0.3.9 + resolution: "eslint-import-resolver-node@npm:0.3.9" + dependencies: + debug: ^3.2.7 + is-core-module: ^2.13.0 + resolve: ^1.22.4 + checksum: 439b91271236b452d478d0522a44482e8c8540bf9df9bd744062ebb89ab45727a3acd03366a6ba2bdbcde8f9f718bab7fe8db64688aca75acf37e04eafd25e22 + languageName: node + linkType: hard + "eslint-import-resolver-typescript@npm:^3.5.2": version: 3.5.5 resolution: "eslint-import-resolver-typescript@npm:3.5.5" @@ -28714,25 +30210,27 @@ __metadata: languageName: node linkType: hard -"eslint-module-utils@npm:^2.7.3": - version: 2.7.3 - resolution: "eslint-module-utils@npm:2.7.3" +"eslint-module-utils@npm:^2.7.4": + version: 2.8.0 + resolution: "eslint-module-utils@npm:2.8.0" dependencies: debug: ^3.2.7 - find-up: ^2.1.0 - checksum: 77048263f309167a1e6a1e1b896bfb5ddd1d3859b2e2abbd9c32c432aee13d610d46e6820b1ca81b37fba437cf423a404bc6649be64ace9148a3062d1886a678 + peerDependenciesMeta: + eslint: + optional: true + checksum: 74c6dfea7641ebcfe174be61168541a11a14aa8d72e515f5f09af55cd0d0862686104b0524aa4b8e0ce66418a44aa38a94d2588743db5fd07a6b49ffd16921d2 languageName: node linkType: hard -"eslint-module-utils@npm:^2.7.4": - version: 2.8.0 - resolution: "eslint-module-utils@npm:2.8.0" +"eslint-module-utils@npm:^2.8.0": + version: 2.8.1 + resolution: "eslint-module-utils@npm:2.8.1" dependencies: debug: ^3.2.7 peerDependenciesMeta: eslint: optional: true - checksum: 74c6dfea7641ebcfe174be61168541a11a14aa8d72e515f5f09af55cd0d0862686104b0524aa4b8e0ce66418a44aa38a94d2588743db5fd07a6b49ffd16921d2 + checksum: 3cecd99b6baf45ffc269167da0f95dcb75e5aa67b93d73a3bab63e2a7eedd9cdd6f188eed048e2f57c1b77db82c9cbf2adac20b512fa70e597d863dd3720170d languageName: node linkType: hard @@ -28772,26 +30270,30 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-import@npm:^2.26.0": - version: 2.26.0 - resolution: "eslint-plugin-import@npm:2.26.0" +"eslint-plugin-import@npm:^2.28.1": + version: 2.29.1 + resolution: "eslint-plugin-import@npm:2.29.1" dependencies: - array-includes: ^3.1.4 - array.prototype.flat: ^1.2.5 - debug: ^2.6.9 + array-includes: ^3.1.7 + array.prototype.findlastindex: ^1.2.3 + array.prototype.flat: ^1.3.2 + array.prototype.flatmap: ^1.3.2 + debug: ^3.2.7 doctrine: ^2.1.0 - eslint-import-resolver-node: ^0.3.6 - eslint-module-utils: ^2.7.3 - has: ^1.0.3 - is-core-module: ^2.8.1 + eslint-import-resolver-node: ^0.3.9 + eslint-module-utils: ^2.8.0 + hasown: ^2.0.0 + is-core-module: ^2.13.1 is-glob: ^4.0.3 minimatch: ^3.1.2 - object.values: ^1.1.5 - resolve: ^1.22.0 - tsconfig-paths: ^3.14.1 + object.fromentries: ^2.0.7 + object.groupby: ^1.0.1 + object.values: ^1.1.7 + semver: ^6.3.1 + tsconfig-paths: ^3.15.0 peerDependencies: eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 - checksum: 0bf77ad80339554481eafa2b1967449e1f816b94c7a6f9614ce33fb4083c4e6c050f10d241dd50b4975d47922880a34de1e42ea9d8e6fd663ebb768baa67e655 + checksum: e65159aef808136d26d029b71c8c6e4cb5c628e65e5de77f1eb4c13a379315ae55c9c3afa847f43f4ff9df7e54515c77ffc6489c6a6f81f7dd7359267577468c languageName: node linkType: hard @@ -28821,25 +30323,29 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-jsx-a11y@npm:^6.5.1": - version: 6.5.1 - resolution: "eslint-plugin-jsx-a11y@npm:6.5.1" +"eslint-plugin-jsx-a11y@npm:^6.7.1": + version: 6.8.0 + resolution: "eslint-plugin-jsx-a11y@npm:6.8.0" dependencies: - "@babel/runtime": ^7.16.3 - aria-query: ^4.2.2 - array-includes: ^3.1.4 - ast-types-flow: ^0.0.7 - axe-core: ^4.3.5 - axobject-query: ^2.2.0 - damerau-levenshtein: ^1.0.7 + "@babel/runtime": ^7.23.2 + aria-query: ^5.3.0 + array-includes: ^3.1.7 + array.prototype.flatmap: ^1.3.2 + ast-types-flow: ^0.0.8 + axe-core: =4.7.0 + axobject-query: ^3.2.1 + damerau-levenshtein: ^1.0.8 emoji-regex: ^9.2.2 - has: ^1.0.3 - jsx-ast-utils: ^3.2.1 - language-tags: ^1.0.5 - minimatch: ^3.0.4 + es-iterator-helpers: ^1.0.15 + hasown: ^2.0.0 + jsx-ast-utils: ^3.3.5 + language-tags: ^1.0.9 + minimatch: ^3.1.2 + object.entries: ^1.1.7 + object.fromentries: ^2.0.7 peerDependencies: eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 - checksum: 311ab993ed982d0cc7cb0ba02fbc4b36c4a94e9434f31e97f13c4d67e8ecb8aec36baecfd759ff70498846e7e11d7a197eb04c39ad64934baf3354712fd0bc9d + checksum: 3dec00e2a3089c4c61ac062e4196a70985fb7eda1fd67fe035363d92578debde92fdb8ed2e472321fc0d71e75f4a1e8888c6a3218c14dd93c8e8d19eb6f51554 languageName: node linkType: hard @@ -28850,7 +30356,7 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-react-hooks@npm:4.6.0, eslint-plugin-react-hooks@npm:^4.5.0": +"eslint-plugin-react-hooks@npm:4.6.0": version: 4.6.0 resolution: "eslint-plugin-react-hooks@npm:4.6.0" peerDependencies: @@ -28859,6 +30365,15 @@ __metadata: languageName: node linkType: hard +"eslint-plugin-react-hooks@npm:^4.5.0 || 5.0.0-canary-7118f5dd7-20230705": + version: 5.0.0-canary-7118f5dd7-20230705 + resolution: "eslint-plugin-react-hooks@npm:5.0.0-canary-7118f5dd7-20230705" + peerDependencies: + eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 + checksum: 20e334e60bf5e56cf9f760598411847525c3ff826e6ae7757c8efdc60b33d47a97ddbe1b94ce95956ea9f7bbef37995b19c716be50bd44e6a1e789cba08b6224 + languageName: node + linkType: hard + "eslint-plugin-react@npm:7.32.2": version: 7.32.2 resolution: "eslint-plugin-react@npm:7.32.2" @@ -28884,28 +30399,31 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-react@npm:^7.31.7": - version: 7.31.11 - resolution: "eslint-plugin-react@npm:7.31.11" +"eslint-plugin-react@npm:^7.33.2": + version: 7.34.2 + resolution: "eslint-plugin-react@npm:7.34.2" dependencies: - array-includes: ^3.1.6 - array.prototype.flatmap: ^1.3.1 - array.prototype.tosorted: ^1.1.1 + array-includes: ^3.1.8 + array.prototype.findlast: ^1.2.5 + array.prototype.flatmap: ^1.3.2 + array.prototype.toreversed: ^1.1.2 + array.prototype.tosorted: ^1.1.3 doctrine: ^2.1.0 + es-iterator-helpers: ^1.0.19 estraverse: ^5.3.0 jsx-ast-utils: ^2.4.1 || ^3.0.0 minimatch: ^3.1.2 - object.entries: ^1.1.6 - object.fromentries: ^2.0.6 - object.hasown: ^1.1.2 - object.values: ^1.1.6 + object.entries: ^1.1.8 + object.fromentries: ^2.0.8 + object.hasown: ^1.1.4 + object.values: ^1.2.0 prop-types: ^15.8.1 - resolve: ^2.0.0-next.3 - semver: ^6.3.0 - string.prototype.matchall: ^4.0.8 + resolve: ^2.0.0-next.5 + semver: ^6.3.1 + string.prototype.matchall: ^4.0.11 peerDependencies: eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 - checksum: a3d612f6647bef33cf2a67c81a6b37b42c075300ed079cffecf5fb475c0d6ab855c1de340d1cbf361a0126429fb906dda597527235d2d12c4404453dbc712fc6 + checksum: aed331239f3a64fcd884380534ece4b8716f1eca4899c8636d04306879e6b4e7339e28e427bdd571d372b78b713025e0767e5f5b5486a8d19bff82616ebe8959 languageName: node linkType: hard @@ -28966,24 +30484,25 @@ __metadata: languageName: node linkType: hard -"eslint-visitor-keys@npm:^3.4.2": +"eslint-visitor-keys@npm:^3.4.3": version: 3.4.3 resolution: "eslint-visitor-keys@npm:3.4.3" checksum: 36e9ef87fca698b6fd7ca5ca35d7b2b6eeaaf106572e2f7fd31c12d3bfdaccdb587bba6d3621067e5aece31c8c3a348b93922ab8f7b2cbc6aaab5e1d89040c60 languageName: node linkType: hard -"eslint@npm:8.46.0": - version: 8.46.0 - resolution: "eslint@npm:8.46.0" +"eslint@npm:8.57.0": + version: 8.57.0 + resolution: "eslint@npm:8.57.0" dependencies: "@eslint-community/eslint-utils": ^4.2.0 "@eslint-community/regexpp": ^4.6.1 - "@eslint/eslintrc": ^2.1.1 - "@eslint/js": ^8.46.0 - "@humanwhocodes/config-array": ^0.11.10 + "@eslint/eslintrc": ^2.1.4 + "@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 ajv: ^6.12.4 chalk: ^4.0.0 cross-spawn: ^7.0.2 @@ -28991,7 +30510,7 @@ __metadata: doctrine: ^3.0.0 escape-string-regexp: ^4.0.0 eslint-scope: ^7.2.2 - eslint-visitor-keys: ^3.4.2 + eslint-visitor-keys: ^3.4.3 espree: ^9.6.1 esquery: ^1.4.2 esutils: ^2.0.2 @@ -29016,7 +30535,7 @@ __metadata: text-table: ^0.2.0 bin: eslint: bin/eslint.js - checksum: 7a7d36b1a3bbc12e08fbb5bc36fd482a7a5a1797e62e762499dd45601b9e45aaa53a129f31ce0b4444551a9639b8b681ad535f379893dd1e3ae37b31dccd82aa + checksum: 3a48d7ff85ab420a8447e9810d8087aea5b1df9ef68c9151732b478de698389ee656fd895635b5f2871c89ee5a2652b3f343d11e9db6f8486880374ebc74a2d9 languageName: node linkType: hard @@ -29110,17 +30629,6 @@ __metadata: languageName: node linkType: hard -"estree-to-babel@npm:^3.1.0": - version: 3.2.1 - resolution: "estree-to-babel@npm:3.2.1" - dependencies: - "@babel/traverse": ^7.1.6 - "@babel/types": ^7.2.0 - c8: ^7.6.0 - checksum: a4584d0c60b80ce41abe91b11052f5d48635e811c67839942c4ebd51aa33d9f9b156ad615f71ceae2a8260b5e3054f36d73db6d0d2a3b9951483f4b6187495c8 - languageName: node - linkType: hard - "estree-walker@npm:^2.0.1": version: 2.0.2 resolution: "estree-walker@npm:2.0.2" @@ -30307,15 +31815,6 @@ __metadata: languageName: node linkType: hard -"find-up@npm:^2.1.0": - version: 2.1.0 - resolution: "find-up@npm:2.1.0" - dependencies: - locate-path: ^2.0.0 - checksum: 43284fe4da09f89011f08e3c32cd38401e786b19226ea440b75386c1b12a4cb738c94969808d53a84f564ede22f732c8409e3cfc3f7fb5b5c32378ad0bbf28bd - languageName: node - linkType: hard - "find-up@npm:^3.0.0": version: 3.0.0 resolution: "find-up@npm:3.0.0" @@ -30446,7 +31945,7 @@ __metadata: languageName: node linkType: hard -"follow-redirects@npm:^1.14.9, follow-redirects@npm:^1.15.0": +"follow-redirects@npm:^1.14.9": version: 1.15.2 resolution: "follow-redirects@npm:1.15.2" peerDependenciesMeta: @@ -30553,16 +32052,6 @@ __metadata: languageName: node linkType: hard -"foreground-child@npm:^2.0.0": - version: 2.0.0 - resolution: "foreground-child@npm:2.0.0" - dependencies: - cross-spawn: ^7.0.0 - signal-exit: ^3.0.2 - checksum: f77ec9aff621abd6b754cb59e690743e7639328301fbea6ff09df27d2befaf7dd5b77cec51c32323d73a81a7d91caaf9413990d305cbe3d873eec4fe58960956 - languageName: node - linkType: hard - "foreground-child@npm:^3.1.0": version: 3.1.1 resolution: "foreground-child@npm:3.1.1" @@ -30844,6 +32333,15 @@ __metadata: languageName: node linkType: hard +"front-matter@npm:^4.0.2": + version: 4.0.2 + resolution: "front-matter@npm:4.0.2" + dependencies: + js-yaml: ^3.13.1 + checksum: a5b4c36d75a820301ebf31db0f677332d189c4561903ab6853eaa0504b43634f98557dbf87752e09043dbd2c9dcc14b4bcf9151cb319c8ad7e26edb203c0cd23 + languageName: node + linkType: hard + "fs-constants@npm:^1.0.0": version: 1.0.0 resolution: "fs-constants@npm:1.0.0" @@ -30986,6 +32484,18 @@ __metadata: languageName: node linkType: hard +"function.prototype.name@npm:^1.1.6": + version: 1.1.6 + resolution: "function.prototype.name@npm:1.1.6" + dependencies: + call-bind: ^1.0.2 + define-properties: ^1.2.0 + es-abstract: ^1.22.1 + functions-have-names: ^1.2.3 + checksum: 7a3f9bd98adab09a07f6e1f03da03d3f7c26abbdeaeee15223f6c04a9fb5674792bdf5e689dac19b97ac71de6aad2027ba3048a9b883aa1b3173eed6ab07f479 + languageName: node + linkType: hard + "functional-red-black-tree@npm:^1.0.1": version: 1.0.1 resolution: "functional-red-black-tree@npm:1.0.1" @@ -31140,7 +32650,7 @@ __metadata: languageName: node linkType: hard -"get-intrinsic@npm:^1.2.4": +"get-intrinsic@npm:^1.2.3, get-intrinsic@npm:^1.2.4": version: 1.2.4 resolution: "get-intrinsic@npm:1.2.4" dependencies: @@ -31237,6 +32747,17 @@ __metadata: languageName: node linkType: hard +"get-symbol-description@npm:^1.0.2": + version: 1.0.2 + resolution: "get-symbol-description@npm:1.0.2" + dependencies: + call-bind: ^1.0.5 + es-errors: ^1.3.0 + get-intrinsic: ^1.2.4 + checksum: e1cb53bc211f9dbe9691a4f97a46837a553c4e7caadd0488dc24ac694db8a390b93edd412b48dcdd0b4bbb4c595de1709effc75fc87c0839deedc6968f5bd973 + languageName: node + linkType: hard + "get-tsconfig@npm:^4.5.0": version: 4.6.0 resolution: "get-tsconfig@npm:4.6.0" @@ -31334,6 +32855,21 @@ __metadata: languageName: node linkType: hard +"glob@npm:10.3.10": + version: 10.3.10 + resolution: "glob@npm:10.3.10" + dependencies: + foreground-child: ^3.1.0 + jackspeak: ^2.3.5 + minimatch: ^9.0.1 + minipass: ^5.0.0 || ^6.0.2 || ^7.0.0 + path-scurry: ^1.10.1 + bin: + glob: dist/esm/bin.mjs + checksum: 4f2fe2511e157b5a3f525a54092169a5f92405f24d2aed3142f4411df328baca13059f4182f1db1bf933e2c69c0bd89e57ae87edd8950cba8c7ccbe84f721cf3 + languageName: node + linkType: hard + "glob@npm:10.3.3": version: 10.3.3 resolution: "glob@npm:10.3.3" @@ -31377,20 +32913,6 @@ __metadata: languageName: node linkType: hard -"glob@npm:7.1.7": - version: 7.1.7 - resolution: "glob@npm:7.1.7" - dependencies: - fs.realpath: ^1.0.0 - inflight: ^1.0.4 - inherits: 2 - minimatch: ^3.0.4 - once: ^1.3.0 - path-is-absolute: ^1.0.0 - checksum: b61f48973bbdcf5159997b0874a2165db572b368b931135832599875919c237fc05c12984e38fe828e69aa8a921eb0e8a4997266211c517c9cfaae8a93988bb8 - languageName: node - linkType: hard - "glob@npm:7.2.0, glob@npm:^7.1.1, glob@npm:^7.1.2, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.2.0": version: 7.2.0 resolution: "glob@npm:7.2.0" @@ -31514,6 +33036,16 @@ __metadata: languageName: node linkType: hard +"globalthis@npm:^1.0.3": + version: 1.0.4 + resolution: "globalthis@npm:1.0.4" + dependencies: + define-properties: ^1.2.1 + gopd: ^1.0.1 + checksum: 39ad667ad9f01476474633a1834a70842041f70a55571e8dcef5fb957980a92da5022db5430fca8aecc5d47704ae30618c0bc877a579c70710c904e9ef06108a + languageName: node + linkType: hard + "globby@npm:^11.0.1, globby@npm:^11.0.2, globby@npm:^11.0.3, globby@npm:^11.1.0": version: 11.1.0 resolution: "globby@npm:11.1.0" @@ -31658,7 +33190,7 @@ __metadata: languageName: node linkType: hard -"graceful-fs@npm:^4.1.3": +"graceful-fs@npm:^4.1.3, graceful-fs@npm:^4.2.11": version: 4.2.11 resolution: "graceful-fs@npm:4.2.11" checksum: ac85f94da92d8eb6b7f5a8b20ce65e43d66761c55ce85ac96df6865308390da45a8d3f0296dd3a663de65d30ba497bd46c696cc1e248c72b13d6d567138a4fc7 @@ -31933,6 +33465,13 @@ __metadata: languageName: node linkType: hard +"has-proto@npm:^1.0.3": + version: 1.0.3 + resolution: "has-proto@npm:1.0.3" + checksum: fe7c3d50b33f50f3933a04413ed1f69441d21d2d2944f81036276d30635cad9279f6b43bc8f32036c31ebdfcf6e731150f46c1907ad90c669ffe9b066c3ba5c4 + languageName: node + linkType: hard + "has-symbols@npm:^1.0.1, has-symbols@npm:^1.0.2, has-symbols@npm:^1.0.3": version: 1.0.3 resolution: "has-symbols@npm:1.0.3" @@ -31949,6 +33488,15 @@ __metadata: languageName: node linkType: hard +"has-tostringtag@npm:^1.0.2": + version: 1.0.2 + resolution: "has-tostringtag@npm:1.0.2" + dependencies: + has-symbols: ^1.0.3 + checksum: 999d60bb753ad714356b2c6c87b7fb74f32463b8426e159397da4bde5bca7e598ab1073f4d8d4deafac297f2eb311484cd177af242776bf05f0d11565680468d + languageName: node + linkType: hard + "has-unicode@npm:^2.0.1": version: 2.0.1 resolution: "has-unicode@npm:2.0.1" @@ -32051,6 +33599,15 @@ __metadata: languageName: node linkType: hard +"hasown@npm:^2.0.1, hasown@npm:^2.0.2": + version: 2.0.2 + resolution: "hasown@npm:2.0.2" + dependencies: + function-bind: ^1.1.2 + checksum: e8516f776a15149ca6c6ed2ae3110c417a00b62260e222590e54aa367cbcd6ed99122020b37b7fbdf05748df57b265e70095d7bf35a47660587619b15ffb93db + languageName: node + linkType: hard + "hast-util-from-parse5@npm:^7.0.0": version: 7.1.2 resolution: "hast-util-from-parse5@npm:7.1.2" @@ -32826,6 +34383,13 @@ __metadata: languageName: node linkType: hard +"ignore@npm:^5.3.1": + version: 5.3.1 + resolution: "ignore@npm:5.3.1" + checksum: 71d7bb4c1dbe020f915fd881108cbe85a0db3d636a0ea3ba911393c53946711d13a9b1143c7e70db06d571a5822c0a324a6bcde5c9904e7ca5047f01f1bf8cd3 + languageName: node + linkType: hard + "image-size@npm:^0.6.0": version: 0.6.3 resolution: "image-size@npm:0.6.3" @@ -32984,10 +34548,10 @@ __metadata: languageName: node linkType: hard -"inflection@npm:^1.13.2": - version: 1.13.2 - resolution: "inflection@npm:1.13.2" - checksum: e7ad0559384ed7c526813404bde843f8f17941d47625ad60fc3b09e46efde873dd9840818007c6bd4dbe388e6248fa033d5a8c405c5fc62738c51b118a0e940f +"inflection@npm:^1.13.4": + version: 1.13.4 + resolution: "inflection@npm:1.13.4" + checksum: 6744feede9998ad8abd2b1db4af79f494a166e656a0aa949d90c8f4a945c1d07038a3756bf7af78c8f6fce368ba213a7ebf35da3edeffd39f1da0ff465eed6eb languageName: node linkType: hard @@ -33203,6 +34767,17 @@ __metadata: languageName: node linkType: hard +"internal-slot@npm:^1.0.7": + version: 1.0.7 + resolution: "internal-slot@npm:1.0.7" + dependencies: + es-errors: ^1.3.0 + hasown: ^2.0.0 + side-channel: ^1.0.4 + checksum: cadc5eea5d7d9bc2342e93aae9f31f04c196afebb11bde97448327049f492cd7081e18623ae71388aac9cd237b692ca3a105be9c68ac39c1dec679d7409e33eb + languageName: node + linkType: hard + "internmap@npm:^1.0.0": version: 1.0.1 resolution: "internmap@npm:1.0.1" @@ -33432,6 +35007,16 @@ __metadata: languageName: node linkType: hard +"is-array-buffer@npm:^3.0.4": + version: 3.0.4 + resolution: "is-array-buffer@npm:3.0.4" + dependencies: + call-bind: ^1.0.2 + get-intrinsic: ^1.2.1 + checksum: e4e3e6ef0ff2239e75371d221f74bc3c26a03564a22efb39f6bb02609b598917ddeecef4e8c877df2a25888f247a98198959842a5e73236bc7f22cabdf6351a7 + languageName: node + linkType: hard + "is-arrayish@npm:^0.2.1": version: 0.2.1 resolution: "is-arrayish@npm:0.2.1" @@ -33446,6 +35031,15 @@ __metadata: languageName: node linkType: hard +"is-async-function@npm:^2.0.0": + version: 2.0.0 + resolution: "is-async-function@npm:2.0.0" + dependencies: + has-tostringtag: ^1.0.0 + checksum: e3471d95e6c014bf37cad8a93f2f4b6aac962178e0a5041e8903147166964fdc1c5c1d2ef87e86d77322c370ca18f2ea004fa7420581fa747bcaf7c223069dbd + languageName: node + linkType: hard + "is-bigint@npm:^1.0.1": version: 1.0.1 resolution: "is-bigint@npm:1.0.1" @@ -33510,6 +35104,17 @@ __metadata: languageName: node linkType: hard +"is-ci@npm:^3.0.1": + version: 3.0.1 + resolution: "is-ci@npm:3.0.1" + dependencies: + ci-info: ^3.2.0 + bin: + is-ci: bin.js + checksum: 192c66dc7826d58f803ecae624860dccf1899fc1f3ac5505284c0a5cf5f889046ffeb958fa651e5725d5705c5bcb14f055b79150ea5fcad7456a9569de60260e + languageName: node + linkType: hard + "is-circular@npm:1.0.2": version: 1.0.2 resolution: "is-circular@npm:1.0.2" @@ -33544,7 +35149,16 @@ __metadata: languageName: node linkType: hard -"is-core-module@npm:^2.2.0, is-core-module@npm:^2.8.1": +"is-core-module@npm:^2.13.1": + version: 2.13.1 + resolution: "is-core-module@npm:2.13.1" + dependencies: + hasown: ^2.0.0 + checksum: 256559ee8a9488af90e4bad16f5583c6d59e92f0742e9e8bb4331e758521ee86b810b93bae44f390766ffbc518a0488b18d9dab7da9a5ff997d499efc9403f7c + languageName: node + linkType: hard + +"is-core-module@npm:^2.8.1": version: 2.9.0 resolution: "is-core-module@npm:2.9.0" dependencies: @@ -33571,6 +35185,15 @@ __metadata: languageName: node linkType: hard +"is-data-view@npm:^1.0.1": + version: 1.0.1 + resolution: "is-data-view@npm:1.0.1" + dependencies: + is-typed-array: ^1.1.13 + checksum: 4ba4562ac2b2ec005fefe48269d6bd0152785458cd253c746154ffb8a8ab506a29d0cfb3b74af87513843776a88e4981ae25c89457bf640a33748eab1a7216b5 + languageName: node + linkType: hard + "is-date-object@npm:^1.0.1": version: 1.0.2 resolution: "is-date-object@npm:1.0.2" @@ -33678,6 +35301,15 @@ __metadata: languageName: node linkType: hard +"is-finalizationregistry@npm:^1.0.2": + version: 1.0.2 + resolution: "is-finalizationregistry@npm:1.0.2" + dependencies: + call-bind: ^1.0.2 + checksum: 4f243a8e06228cd45bdab8608d2cb7abfc20f6f0189c8ac21ea8d603f1f196eabd531ce0bb8e08cbab047e9845ef2c191a3761c9a17ad5cabf8b35499c4ad35d + languageName: node + linkType: hard + "is-finite@npm:^1.0.0": version: 1.1.0 resolution: "is-finite@npm:1.1.0" @@ -33715,7 +35347,7 @@ __metadata: languageName: node linkType: hard -"is-generator-function@npm:^1.0.7": +"is-generator-function@npm:^1.0.10, is-generator-function@npm:^1.0.7": version: 1.0.10 resolution: "is-generator-function@npm:1.0.10" dependencies: @@ -33830,7 +35462,7 @@ __metadata: languageName: node linkType: hard -"is-nan@npm:^1.2.1": +"is-nan@npm:^1.2.1, is-nan@npm:^1.3.2": version: 1.3.2 resolution: "is-nan@npm:1.3.2" dependencies: @@ -33847,6 +35479,13 @@ __metadata: languageName: node linkType: hard +"is-negative-zero@npm:^2.0.3": + version: 2.0.3 + resolution: "is-negative-zero@npm:2.0.3" + checksum: c1e6b23d2070c0539d7b36022d5a94407132411d01aba39ec549af824231f3804b1aea90b5e4e58e807a65d23ceb538ed6e355ce76b267bdd86edb757ffcbdcd + languageName: node + linkType: hard + "is-number-object@npm:^1.0.4": version: 1.0.4 resolution: "is-number-object@npm:1.0.4" @@ -34000,6 +35639,15 @@ __metadata: languageName: node linkType: hard +"is-shared-array-buffer@npm:^1.0.3": + version: 1.0.3 + resolution: "is-shared-array-buffer@npm:1.0.3" + dependencies: + call-bind: ^1.0.7 + checksum: a4fff602c309e64ccaa83b859255a43bb011145a42d3f56f67d9268b55bc7e6d98a5981a1d834186ad3105d6739d21547083fe7259c76c0468483fc538e716d8 + languageName: node + linkType: hard + "is-stream-ended@npm:^0.1.4": version: 0.1.4 resolution: "is-stream-ended@npm:0.1.4" @@ -34062,6 +35710,15 @@ __metadata: languageName: node linkType: hard +"is-typed-array@npm:^1.1.13": + version: 1.1.13 + resolution: "is-typed-array@npm:1.1.13" + dependencies: + which-typed-array: ^1.1.14 + checksum: 150f9ada183a61554c91e1c4290086d2c100b0dff45f60b028519be72a8db964da403c48760723bf5253979b8dffe7b544246e0e5351dcd05c5fdb1dcc1dc0f0 + languageName: node + linkType: hard + "is-typed-array@npm:^1.1.3": version: 1.1.10 resolution: "is-typed-array@npm:1.1.10" @@ -34320,20 +35977,20 @@ __metadata: "@nestjs/swagger": 7.1.1 "@nestjs/terminus": 10.2.0 "@nestjs/testing": 10.0.5 - "@nx/cypress": 16.9.0 - "@nx/eslint-plugin": 16.9.0 - "@nx/express": 16.9.0 - "@nx/jest": 16.9.0 - "@nx/js": 16.9.0 - "@nx/linter": 16.9.0 - "@nx/nest": 16.9.0 - "@nx/next": 16.9.0 - "@nx/node": 16.9.0 - "@nx/react": 16.9.0 - "@nx/storybook": 16.9.0 - "@nx/web": 16.9.0 - "@nx/webpack": 16.9.0 - "@nx/workspace": 16.9.0 + "@nx/cypress": 19.4.0 + "@nx/eslint": 19.4.0 + "@nx/eslint-plugin": 19.4.0 + "@nx/express": 19.4.0 + "@nx/jest": 19.4.0 + "@nx/js": 19.4.0 + "@nx/nest": 19.4.0 + "@nx/next": 19.4.0 + "@nx/node": 19.4.0 + "@nx/react": 19.4.0 + "@nx/storybook": 19.4.0 + "@nx/web": 19.4.0 + "@nx/webpack": 19.4.0 + "@nx/workspace": 19.4.0 "@openapitools/openapi-generator-cli": 1.0.15-4.3.1 "@playwright/test": 1.29 "@react-pdf/renderer": ^3.1.9 @@ -34341,18 +35998,18 @@ __metadata: "@simplewebauthn/server": 10.0.0 "@sindresorhus/slugify": 1.0.0 "@statoscope/webpack-plugin": 5.20.1 - "@storybook/addon-a11y": 7.4.1 - "@storybook/addon-essentials": 7.4.1 - "@storybook/addon-mdx-gfm": 7.4.1 + "@storybook/addon-a11y": 7.6.9 + "@storybook/addon-essentials": 7.6.9 + "@storybook/addon-mdx-gfm": 7.6.9 "@storybook/addons": 7.0.20 - "@storybook/core-server": 7.4.1 - "@storybook/react": 7.4.1 - "@storybook/react-webpack5": 7.4.1 + "@storybook/core-server": 7.6.9 + "@storybook/react": 7.6.9 + "@storybook/react-webpack5": 7.6.9 "@storybook/source-loader": 7.0.20 "@storybook/theming": 7.0.20 "@testing-library/cypress": 8.0.3 "@testing-library/jest-dom": 5.16.5 - "@testing-library/react": 14.0.0 + "@testing-library/react": 15.0.6 "@testing-library/user-event": 14.4.3 "@types/aws-sdk": 2.7.0 "@types/aws4": 1.5.1 @@ -34377,7 +36034,7 @@ __metadata: "@types/lodash": 4.17.1 "@types/mailparser": 3.4.0 "@types/memoizee": 0.4.5 - "@types/node": 18.14.2 + "@types/node": 18.16.9 "@types/nodemailer": 6.4.1 "@types/opossum": 4.1.1 "@types/passport-jwt": 3.0.8 @@ -34385,10 +36042,10 @@ __metadata: "@types/pg": 8.6.4 "@types/prettier": 2.6.2 "@types/pubsub-js": 1.8.1 - "@types/react": 18.2.14 + "@types/react": 18.3.3 "@types/react-csv": 1.1.1 "@types/react-datepicker": 4.10.0 - "@types/react-dom": 18.2.6 + "@types/react-dom": 18.3.0 "@types/react-html-parser": 2.0.1 "@types/react-infinite-scroller": ^1.2.3 "@types/react-input-mask": 3.0.0 @@ -34406,8 +36063,8 @@ __metadata: "@types/xml2js": 0.4.9 "@types/yargs": 17.0.24 "@types/yup": 0.29.6 - "@typescript-eslint/eslint-plugin": 5.62.0 - "@typescript-eslint/parser": 5.62.0 + "@typescript-eslint/eslint-plugin": 7.9.0 + "@typescript-eslint/parser": 7.9.0 "@vanilla-extract/babel-plugin": 1.1.6 "@vanilla-extract/css": 1.7.0 "@vanilla-extract/next-plugin": 2.0.2 @@ -34423,7 +36080,7 @@ __metadata: aws-elasticsearch-connector: 9.0.0 aws-sdk: 2.814.0 aws4: 1.11.0 - axios: 1.6.2 + axios: 1.7.2 babel-jest: 29.4.3 babel-loader: 8.2.5 babel-plugin-transform-class-properties: 6.24.1 @@ -34445,7 +36102,7 @@ __metadata: contentful-ui-extensions-sdk: 3.32.0 cookie-parser: 1.4.5 copy-to-clipboard: 3.3.1 - core-js: 3.6.5 + core-js: 3.36.1 cross-env: 7.0.2 cross-spawn: 7.0.3 crypto-browserify: 3.12.0 @@ -34453,7 +36110,7 @@ __metadata: csstype: 2.6.13 csv-parse: 4.16.0 csv-stringify: 5.6.5 - cypress: 13.0.0 + cypress: 13.9.0 cypress-file-upload: 5.0.8 cypress-promise: 1.1.0 dataloader: 2.1.0 @@ -34464,11 +36121,11 @@ __metadata: dotenv: 16.3.1 downshift: 5.4.3 entropy-string: 4.2.0 - esbuild: 0.15.7 + esbuild: ^0.16.17 escape-html: 1.0.3 - eslint: 8.46.0 - eslint-config-next: 13.1.1 - eslint-config-prettier: 8.1.0 + eslint: 8.57.0 + eslint-config-next: 14.2.3 + eslint-config-prettier: 9.1.0 eslint-plugin-cypress: 2.14.0 eslint-plugin-import: 2.27.5 eslint-plugin-jsx-a11y: 6.7.1 @@ -34535,7 +36192,7 @@ __metadata: mobx: 6.3.7 msw: 0.21.3 nest-winston: 1.4.0 - next: 13.3.0 + next: 14.2.3 next-auth: 3.29.10 next-cookies: 2.0.3 next-secure-headers: 2.1.0 @@ -34544,7 +36201,7 @@ __metadata: node-gyp: 9.1.0 node-html-markdown: 1.3.0 nodemailer: 6.7.2 - nx: 16.9.0 + nx: 19.4.0 oidc-client-ts: 2.4.0 openapi3-ts: 2.0.0 opossum: 6.1.0 @@ -34559,12 +36216,12 @@ __metadata: prettier: 2.6.2 prom-client: 14.1.0 pubsub-js: 1.8.0 - react: 18.2.0 + react: 18.3.1 react-alice-carousel: 1.19.3 react-animate-height: 3.1.2 react-csv: 2.0.3 react-datepicker: 4.10.0 - react-dom: 18.2.0 + react-dom: 18.3.1 react-dropzone: 11.7.1 react-focus-lock: 2.9.4 react-hook-form: 7.43.3 @@ -34572,7 +36229,7 @@ __metadata: react-infinite-scroller: ^1.2.6 react-input-mask: 3.0.0-alpha.2 react-intl: 5.13.1 - react-is: 18.2.0 + react-is: 18.3.1 react-keyed-flatten-children: 1.2.0 react-modal: 3.15.1 react-number-format: 4.9.1 @@ -34594,7 +36251,7 @@ __metadata: rosetta: 1.0.0 rxjs: 7.8.1 sanitize-html: 2.10.0 - sequelize: 6.29.0 + sequelize: 6.37.3 sequelize-cli: 6.4.1 sequelize-replace-enum-postgres: 1.6.0 sequelize-typescript: 2.1.3 @@ -34626,7 +36283,7 @@ __metadata: ts-node: 10.9.2 tslib: 2.6.2 type-fest: 1.1.3 - typescript: 5.1.6 + typescript: 5.4.5 ua-parser-js: 1.0.33 unified: 9.2.0 uuidv4: 6.0.8 @@ -34774,16 +36431,6 @@ __metadata: languageName: node linkType: hard -"istanbul-reports@npm:^3.1.4": - version: 3.1.5 - resolution: "istanbul-reports@npm:3.1.5" - dependencies: - html-escaper: ^2.0.0 - istanbul-lib-report: ^3.0.0 - checksum: 7867228f83ed39477b188ea07e7ccb9b4f5320b6f73d1db93a0981b7414fa4ef72d3f80c4692c442f90fc250d9406e71d8d7ab65bb615cb334e6292b73192b89 - languageName: node - linkType: hard - "items@npm:2.x.x": version: 2.1.2 resolution: "items@npm:2.1.2" @@ -34812,6 +36459,19 @@ __metadata: languageName: node linkType: hard +"iterator.prototype@npm:^1.1.2": + version: 1.1.2 + resolution: "iterator.prototype@npm:1.1.2" + 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 + checksum: d8a507e2ccdc2ce762e8a1d3f4438c5669160ac72b88b648e59a688eec6bc4e64b22338e74000518418d9e693faf2a092d2af21b9ec7dbf7763b037a54701168 + languageName: node + linkType: hard + "jackspeak@npm:^2.0.3": version: 2.3.3 resolution: "jackspeak@npm:2.3.3" @@ -34825,6 +36485,19 @@ __metadata: languageName: node linkType: hard +"jackspeak@npm:^2.3.5": + version: 2.3.6 + resolution: "jackspeak@npm:2.3.6" + dependencies: + "@isaacs/cliui": ^8.0.2 + "@pkgjs/parseargs": ^0.11.0 + dependenciesMeta: + "@pkgjs/parseargs": + optional: true + checksum: 57d43ad11eadc98cdfe7496612f6bbb5255ea69fe51ea431162db302c2a11011642f50cfad57288bd0aea78384a0612b16e131944ad8ecd09d619041c8531b54 + languageName: node + linkType: hard + "jake@npm:^10.6.1": version: 10.8.2 resolution: "jake@npm:10.8.2" @@ -36332,6 +38005,17 @@ __metadata: languageName: node linkType: hard +"json5@npm:^1.0.2": + version: 1.0.2 + resolution: "json5@npm:1.0.2" + dependencies: + minimist: ^1.2.0 + bin: + json5: lib/cli.js + checksum: 866458a8c58a95a49bef3adba929c625e82532bcff1fe93f01d29cb02cac7c3fe1f4b79951b7792c2da9de0b32871a8401a6e3c5b36778ad852bf5b8a61165d7 + languageName: node + linkType: hard + "json5@npm:^2.1.2, json5@npm:^2.2.1": version: 2.2.1 resolution: "json5@npm:2.2.1" @@ -36471,7 +38155,7 @@ __metadata: languageName: node linkType: hard -"jsx-ast-utils@npm:^2.4.1 || ^3.0.0, jsx-ast-utils@npm:^3.2.1": +"jsx-ast-utils@npm:^2.4.1 || ^3.0.0": version: 3.2.2 resolution: "jsx-ast-utils@npm:3.2.2" dependencies: @@ -36491,6 +38175,18 @@ __metadata: languageName: node linkType: hard +"jsx-ast-utils@npm:^3.3.5": + version: 3.3.5 + resolution: "jsx-ast-utils@npm:3.3.5" + dependencies: + array-includes: ^3.1.6 + array.prototype.flat: ^1.3.1 + object.assign: ^4.1.4 + object.values: ^1.1.6 + checksum: f4b05fa4d7b5234230c905cfa88d36dc8a58a6666975a3891429b1a8cdc8a140bca76c297225cb7a499fad25a2c052ac93934449a2c31a44fc9edd06c773780a + languageName: node + linkType: hard + "juice@npm:8.0.0": version: 8.0.0 resolution: "juice@npm:8.0.0" @@ -36692,6 +38388,13 @@ __metadata: languageName: node linkType: hard +"language-subtag-registry@npm:^0.3.20": + version: 0.3.23 + resolution: "language-subtag-registry@npm:0.3.23" + checksum: 0b64c1a6c5431c8df648a6d25594ff280613c886f4a1a542d9b864e5472fb93e5c7856b9c41595c38fac31370328fc79fcc521712e89ea6d6866cbb8e0995d81 + languageName: node + linkType: hard + "language-subtag-registry@npm:~0.3.2": version: 0.3.21 resolution: "language-subtag-registry@npm:0.3.21" @@ -36699,7 +38402,7 @@ __metadata: languageName: node linkType: hard -"language-tags@npm:=1.0.5, language-tags@npm:^1.0.5": +"language-tags@npm:=1.0.5": version: 1.0.5 resolution: "language-tags@npm:1.0.5" dependencies: @@ -36708,6 +38411,15 @@ __metadata: languageName: node linkType: hard +"language-tags@npm:^1.0.9": + version: 1.0.9 + resolution: "language-tags@npm:1.0.9" + dependencies: + language-subtag-registry: ^0.3.20 + checksum: 57c530796dc7179914dee71bc94f3747fd694612480241d0453a063777265dfe3a951037f7acb48f456bf167d6eb419d4c00263745326b3ba1cdcf4657070e78 + languageName: node + linkType: hard + "launch-editor@npm:^2.6.0": version: 2.6.0 resolution: "launch-editor@npm:2.6.0" @@ -37166,16 +38878,6 @@ __metadata: languageName: node linkType: hard -"locate-path@npm:^2.0.0": - version: 2.0.0 - resolution: "locate-path@npm:2.0.0" - dependencies: - p-locate: ^2.0.0 - path-exists: ^3.0.0 - checksum: 02d581edbbbb0fa292e28d96b7de36b5b62c2fa8b5a7e82638ebb33afa74284acf022d3b1e9ae10e3ffb7658fbc49163fcd5e76e7d1baaa7801c3e05a81da755 - languageName: node - linkType: hard - "locate-path@npm:^3.0.0": version: 3.0.0 resolution: "locate-path@npm:3.0.0" @@ -37763,6 +39465,15 @@ __metadata: languageName: node linkType: hard +"magic-string@npm:^0.30.5": + version: 0.30.10 + resolution: "magic-string@npm:0.30.10" + dependencies: + "@jridgewell/sourcemap-codec": ^1.4.15 + checksum: 456fd47c39b296c47dff967e1965121ace35417eab7f45a99e681e725b8661b48e1573c366ee67a27715025b3740773c46b088f115421c7365ea4ea6fa10d399 + languageName: node + linkType: hard + "mailparser@npm:3.5.0": version: 3.5.0 resolution: "mailparser@npm:3.5.0" @@ -39566,7 +41277,7 @@ __metadata: languageName: node linkType: hard -"min-indent@npm:^1.0.0": +"min-indent@npm:^1.0.0, min-indent@npm:^1.0.1": version: 1.0.1 resolution: "min-indent@npm:1.0.1" checksum: bfc6dd03c5eaf623a4963ebd94d087f6f4bbbfd8c41329a7f09706b0cb66969c4ddd336abeb587bc44bc6f08e13bf90f0b374f9d71f9f01e04adc2cd6f083ef1 @@ -39616,15 +41327,6 @@ __metadata: languageName: node linkType: hard -"minimatch@npm:3.0.5": - version: 3.0.5 - resolution: "minimatch@npm:3.0.5" - dependencies: - brace-expansion: ^1.1.7 - checksum: a3b84b426eafca947741b864502cee02860c4e7b145de11ad98775cfcf3066fef422583bc0ffce0952ddf4750c1ccf4220b1556430d4ce10139f66247d87d69e - languageName: node - linkType: hard - "minimatch@npm:4.2.1": version: 4.2.1 resolution: "minimatch@npm:4.2.1" @@ -39634,6 +41336,15 @@ __metadata: languageName: node linkType: hard +"minimatch@npm:9.0.3, minimatch@npm:^9.0.1": + version: 9.0.3 + resolution: "minimatch@npm:9.0.3" + dependencies: + brace-expansion: ^2.0.1 + checksum: 253487976bf485b612f16bf57463520a14f512662e592e95c571afdab1442a6a6864b6c88f248ce6fc4ff0b6de04ac7aa6c8bb51e868e99d1d65eb0658a708b5 + languageName: node + linkType: hard + "minimatch@npm:^5.0.1, minimatch@npm:^5.1.0": version: 5.1.0 resolution: "minimatch@npm:5.1.0" @@ -39643,12 +41354,12 @@ __metadata: languageName: node linkType: hard -"minimatch@npm:^9.0.1": - version: 9.0.3 - resolution: "minimatch@npm:9.0.3" +"minimatch@npm:^9.0.4": + version: 9.0.4 + resolution: "minimatch@npm:9.0.4" dependencies: brace-expansion: ^2.0.1 - checksum: 253487976bf485b612f16bf57463520a14f512662e592e95c571afdab1442a6a6864b6c88f248ce6fc4ff0b6de04ac7aa6c8bb51e868e99d1d65eb0658a708b5 + checksum: cf717f597ec3eed7dabc33153482a2e8d49f4fd3c26e58fd9c71a94c5029a0838728841b93f46bf1263b65a8010e2ee800d0dc9b004ab8ba8b6d1ec07cc115b5 languageName: node linkType: hard @@ -39919,7 +41630,7 @@ __metadata: languageName: node linkType: hard -"moment-timezone@npm:^0.5.35": +"moment-timezone@npm:^0.5.43": version: 0.5.45 resolution: "moment-timezone@npm:0.5.45" dependencies: @@ -39928,7 +41639,7 @@ __metadata: languageName: node linkType: hard -"moment@npm:^2.18.1, moment@npm:^2.20.0, moment@npm:^2.22.2, moment@npm:^2.29.1": +"moment@npm:^2.18.1, moment@npm:^2.20.0, moment@npm:^2.22.2": version: 2.29.4 resolution: "moment@npm:2.29.4" checksum: 0ec3f9c2bcba38dc2451b1daed5daded747f17610b92427bebe1d08d48d8b7bdd8d9197500b072d14e326dd0ccf3e326b9e3d07c5895d3d49e39b6803b76e80e @@ -40179,7 +41890,7 @@ __metadata: languageName: node linkType: hard -"nanoid@npm:^3.1.3": +"nanoid@npm:^3.1.3, nanoid@npm:^3.3.7": version: 3.3.7 resolution: "nanoid@npm:3.3.7" bin: @@ -40197,7 +41908,7 @@ __metadata: languageName: node linkType: hard -"nanoid@npm:^3.3.4, nanoid@npm:^3.3.6": +"nanoid@npm:^3.3.6": version: 3.3.6 resolution: "nanoid@npm:3.3.6" bin: @@ -40225,13 +41936,6 @@ __metadata: languageName: node linkType: hard -"natural-compare-lite@npm:^1.4.0": - version: 1.4.0 - resolution: "natural-compare-lite@npm:1.4.0" - checksum: 5222ac3986a2b78dd6069ac62cbb52a7bf8ffc90d972ab76dfe7b01892485d229530ed20d0c62e79a6b363a663b273db3bde195a1358ce9e5f779d4453887225 - languageName: node - linkType: hard - "natural-compare@npm:^1.4.0": version: 1.4.0 resolution: "natural-compare@npm:1.4.0" @@ -40285,7 +41989,7 @@ __metadata: languageName: node linkType: hard -"neo-async@npm:^2.5.0, neo-async@npm:^2.6.0, neo-async@npm:^2.6.1, neo-async@npm:^2.6.2": +"neo-async@npm:^2.5.0, neo-async@npm:^2.6.0, neo-async@npm:^2.6.2": version: 2.6.2 resolution: "neo-async@npm:2.6.2" checksum: deac9f8d00eda7b2e5cd1b2549e26e10a0faa70adaa6fdadca701cc55f49ee9018e427f424bac0c790b7c7e2d3068db97f3093f1093975f2acb8f8818b936ed9 @@ -40376,29 +42080,29 @@ __metadata: languageName: node linkType: hard -"next@npm:13.3.0": - version: 13.3.0 - resolution: "next@npm:13.3.0" +"next@npm:14.2.3": + version: 14.2.3 + resolution: "next@npm:14.2.3" dependencies: - "@next/env": 13.3.0 - "@next/swc-darwin-arm64": 13.3.0 - "@next/swc-darwin-x64": 13.3.0 - "@next/swc-linux-arm64-gnu": 13.3.0 - "@next/swc-linux-arm64-musl": 13.3.0 - "@next/swc-linux-x64-gnu": 13.3.0 - "@next/swc-linux-x64-musl": 13.3.0 - "@next/swc-win32-arm64-msvc": 13.3.0 - "@next/swc-win32-ia32-msvc": 13.3.0 - "@next/swc-win32-x64-msvc": 13.3.0 - "@swc/helpers": 0.4.14 + "@next/env": 14.2.3 + "@next/swc-darwin-arm64": 14.2.3 + "@next/swc-darwin-x64": 14.2.3 + "@next/swc-linux-arm64-gnu": 14.2.3 + "@next/swc-linux-arm64-musl": 14.2.3 + "@next/swc-linux-x64-gnu": 14.2.3 + "@next/swc-linux-x64-musl": 14.2.3 + "@next/swc-win32-arm64-msvc": 14.2.3 + "@next/swc-win32-ia32-msvc": 14.2.3 + "@next/swc-win32-x64-msvc": 14.2.3 + "@swc/helpers": 0.5.5 busboy: 1.6.0 - caniuse-lite: ^1.0.30001406 - postcss: 8.4.14 + caniuse-lite: ^1.0.30001579 + graceful-fs: ^4.2.11 + postcss: 8.4.31 styled-jsx: 5.1.1 peerDependencies: "@opentelemetry/api": ^1.1.0 - fibers: ">= 3.1.0" - node-sass: ^6.0.0 || ^7.0.0 + "@playwright/test": ^1.41.2 react: ^18.2.0 react-dom: ^18.2.0 sass: ^1.3.0 @@ -40424,15 +42128,13 @@ __metadata: peerDependenciesMeta: "@opentelemetry/api": optional: true - fibers: - optional: true - node-sass: + "@playwright/test": optional: true sass: optional: true bin: next: dist/bin/next - checksum: 24e0e013e867a825ff7d1f49587e696147ea8f9ff42946121fe0dce25f9bcc9b1d5941425fa7cef3b8c0e6f1c3daa7f09f758ac5a8aa15aa66c3b31a07465081 + checksum: d34ea63adf23fe46efebe2a9c536c9127c0ee006d74c60d6d23aecbef650798c976b27c17910ca585f3bb1223b10924cb429b9ce930f3074aee1170d1519dccc languageName: node linkType: hard @@ -40510,7 +42212,7 @@ __metadata: languageName: node linkType: hard -"node-dir@npm:^0.1.10, node-dir@npm:^0.1.17": +"node-dir@npm:^0.1.17": version: 0.1.17 resolution: "node-dir@npm:0.1.17" dependencies: @@ -41071,58 +42773,56 @@ __metadata: languageName: node linkType: hard -"nx@npm:16.9.0": - version: 16.9.0 - resolution: "nx@npm:16.9.0" +"nx@npm:19.4.0": + version: 19.4.0 + resolution: "nx@npm:19.4.0" dependencies: - "@nrwl/tao": "*" - "@nx/nx-darwin-arm64": 16.9.0 - "@nx/nx-darwin-x64": 16.9.0 - "@nx/nx-freebsd-x64": 16.9.0 - "@nx/nx-linux-arm-gnueabihf": 16.9.0 - "@nx/nx-linux-arm64-gnu": 16.9.0 - "@nx/nx-linux-arm64-musl": 16.9.0 - "@nx/nx-linux-x64-gnu": 16.9.0 - "@nx/nx-linux-x64-musl": 16.9.0 - "@nx/nx-win32-arm64-msvc": 16.9.0 - "@nx/nx-win32-x64-msvc": 16.9.0 - "@parcel/watcher": 2.0.4 + "@nrwl/tao": 19.4.0 + "@nx/nx-darwin-arm64": 19.4.0 + "@nx/nx-darwin-x64": 19.4.0 + "@nx/nx-freebsd-x64": 19.4.0 + "@nx/nx-linux-arm-gnueabihf": 19.4.0 + "@nx/nx-linux-arm64-gnu": 19.4.0 + "@nx/nx-linux-arm64-musl": 19.4.0 + "@nx/nx-linux-x64-gnu": 19.4.0 + "@nx/nx-linux-x64-musl": 19.4.0 + "@nx/nx-win32-arm64-msvc": 19.4.0 + "@nx/nx-win32-x64-msvc": 19.4.0 "@yarnpkg/lockfile": ^1.1.0 "@yarnpkg/parsers": 3.0.0-rc.46 - "@zkochan/js-yaml": 0.0.6 - axios: ^1.0.0 + "@zkochan/js-yaml": 0.0.7 + axios: ^1.6.0 chalk: ^4.1.0 cli-cursor: 3.1.0 cli-spinners: 2.6.1 - cliui: ^7.0.2 - dotenv: ~16.3.1 - dotenv-expand: ~10.0.0 + cliui: ^8.0.1 + dotenv: ~16.4.5 + dotenv-expand: ~11.0.6 enquirer: ~2.3.6 figures: 3.2.0 flat: ^5.0.2 + front-matter: ^4.0.2 fs-extra: ^11.1.0 - glob: 7.1.4 ignore: ^5.0.4 jest-diff: ^29.4.1 - js-yaml: 4.1.0 jsonc-parser: 3.2.0 lines-and-columns: ~2.0.3 - minimatch: 3.0.5 + minimatch: 9.0.3 node-machine-id: 1.1.12 npm-run-path: ^4.0.1 open: ^8.4.0 - semver: 7.5.3 + ora: 5.3.0 + semver: ^7.5.3 string-width: ^4.2.3 strong-log-transformer: ^2.1.0 tar-stream: ~2.2.0 tmp: ~0.2.1 tsconfig-paths: ^4.1.2 tslib: ^2.3.0 - v8-compile-cache: 2.3.0 yargs: ^17.6.2 yargs-parser: 21.1.1 peerDependencies: - "@swc-node/register": ^1.6.7 + "@swc-node/register": ^1.8.0 "@swc/core": ^1.3.85 dependenciesMeta: "@nx/nx-darwin-arm64": @@ -41152,7 +42852,8 @@ __metadata: optional: true bin: nx: bin/nx.js - checksum: 765a5af68b8de7bb99f9a6e5ddf313f156591db848f779bc1c642f1f12476f249a1f8ff86886060cbd0305e357e5078ce366f8172eefb671229c3caffb604d6f + nx-cloud: bin/nx-cloud.js + checksum: 1b561ae120502708c649632d7fc8d24981cf15aa8cfcb6d22bcd15e501d1309333f9c219aed39794dc2faf20ca7e828a87b6266b8c74969e0ed7fc9a9498eee4 languageName: node linkType: hard @@ -41338,6 +43039,18 @@ __metadata: languageName: node linkType: hard +"object.assign@npm:^4.1.5": + version: 4.1.5 + resolution: "object.assign@npm:4.1.5" + dependencies: + call-bind: ^1.0.5 + define-properties: ^1.2.1 + has-symbols: ^1.0.3 + object-keys: ^1.1.1 + checksum: f9aeac0541661370a1fc86e6a8065eb1668d3e771f7dbb33ee54578201336c057b21ee61207a186dd42db0c62201d91aac703d20d12a79fc79c353eed44d4e25 + languageName: node + linkType: hard + "object.entries@npm:^1.1.6": version: 1.1.6 resolution: "object.entries@npm:1.1.6" @@ -41349,6 +43062,17 @@ __metadata: languageName: node linkType: hard +"object.entries@npm:^1.1.7, object.entries@npm:^1.1.8": + version: 1.1.8 + resolution: "object.entries@npm:1.1.8" + dependencies: + call-bind: ^1.0.7 + define-properties: ^1.2.1 + es-object-atoms: ^1.0.0 + checksum: 5314877cb637ef3437a30bba61d9bacdb3ce74bf73ac101518be0633c37840c8cc67407edb341f766e8093b3d7516d5c3358f25adfee4a2c697c0ec4c8491907 + languageName: node + linkType: hard + "object.fromentries@npm:^2.0.6": version: 2.0.6 resolution: "object.fromentries@npm:2.0.6" @@ -41360,6 +43084,18 @@ __metadata: languageName: node linkType: hard +"object.fromentries@npm:^2.0.7, object.fromentries@npm:^2.0.8": + version: 2.0.8 + resolution: "object.fromentries@npm:2.0.8" + dependencies: + call-bind: ^1.0.7 + define-properties: ^1.2.1 + es-abstract: ^1.23.2 + es-object-atoms: ^1.0.0 + checksum: 29b2207a2db2782d7ced83f93b3ff5d425f901945f3665ffda1821e30a7253cd1fd6b891a64279976098137ddfa883d748787a6fea53ecdb51f8df8b8cec0ae1 + languageName: node + linkType: hard + "object.getownpropertydescriptors@npm:^2.1.1": version: 2.1.2 resolution: "object.getownpropertydescriptors@npm:2.1.2" @@ -41371,6 +43107,17 @@ __metadata: languageName: node linkType: hard +"object.groupby@npm:^1.0.1": + version: 1.0.3 + resolution: "object.groupby@npm:1.0.3" + dependencies: + call-bind: ^1.0.7 + define-properties: ^1.2.1 + es-abstract: ^1.23.2 + checksum: 0d30693ca3ace29720bffd20b3130451dca7a56c612e1926c0a1a15e4306061d84410bdb1456be2656c5aca53c81b7a3661eceaa362db1bba6669c2c9b6d1982 + languageName: node + linkType: hard + "object.hasown@npm:^1.1.2": version: 1.1.2 resolution: "object.hasown@npm:1.1.2" @@ -41381,6 +43128,17 @@ __metadata: languageName: node linkType: hard +"object.hasown@npm:^1.1.4": + version: 1.1.4 + resolution: "object.hasown@npm:1.1.4" + dependencies: + define-properties: ^1.2.1 + es-abstract: ^1.23.2 + es-object-atoms: ^1.0.0 + checksum: bc46eb5ca22106fcd07aab1411508c2c68b7565fe8fb272f166fb9bf203972e8b5c86a5a4b2c86204beead0626a7a4119d32cefbaf7c5dd57b400bf9e6363cb6 + languageName: node + linkType: hard + "object.pick@npm:^1.3.0": version: 1.3.0 resolution: "object.pick@npm:1.3.0" @@ -41390,17 +43148,6 @@ __metadata: languageName: node linkType: hard -"object.values@npm:^1.1.5": - version: 1.1.5 - resolution: "object.values@npm:1.1.5" - dependencies: - call-bind: ^1.0.2 - define-properties: ^1.1.3 - es-abstract: ^1.19.1 - checksum: 0f17e99741ebfbd0fa55ce942f6184743d3070c61bd39221afc929c8422c4907618c8da694c6915bc04a83ab3224260c779ba37fc07bb668bdc5f33b66a902a4 - languageName: node - linkType: hard - "object.values@npm:^1.1.6": version: 1.1.6 resolution: "object.values@npm:1.1.6" @@ -41412,6 +43159,17 @@ __metadata: languageName: node linkType: hard +"object.values@npm:^1.1.7, object.values@npm:^1.2.0": + version: 1.2.0 + resolution: "object.values@npm:1.2.0" + dependencies: + call-bind: ^1.0.7 + define-properties: ^1.2.1 + es-object-atoms: ^1.0.0 + checksum: 51fef456c2a544275cb1766897f34ded968b22adfc13ba13b5e4815fdaf4304a90d42a3aee114b1f1ede048a4890381d47a5594d84296f2767c6a0364b9da8fa + languageName: node + linkType: hard + "objectorarray@npm:^1.0.5": version: 1.0.5 resolution: "objectorarray@npm:1.0.5" @@ -41777,15 +43535,6 @@ __metadata: languageName: node linkType: hard -"p-limit@npm:^1.1.0": - version: 1.3.0 - resolution: "p-limit@npm:1.3.0" - dependencies: - p-try: ^1.0.0 - checksum: 281c1c0b8c82e1ac9f81acd72a2e35d402bf572e09721ce5520164e9de07d8274451378a3470707179ad13240535558f4b277f02405ad752e08c7d5b0d54fbfd - languageName: node - linkType: hard - "p-limit@npm:^2.0.0, p-limit@npm:^2.2.0": version: 2.3.0 resolution: "p-limit@npm:2.3.0" @@ -41795,15 +43544,6 @@ __metadata: languageName: node linkType: hard -"p-locate@npm:^2.0.0": - version: 2.0.0 - resolution: "p-locate@npm:2.0.0" - dependencies: - p-limit: ^1.1.0 - checksum: e2dceb9b49b96d5513d90f715780f6f4972f46987dc32a0e18bc6c3fc74a1a5d73ec5f81b1398af5e58b99ea1ad03fd41e9181c01fa81b4af2833958696e3081 - languageName: node - linkType: hard - "p-locate@npm:^3.0.0": version: 3.0.0 resolution: "p-locate@npm:3.0.0" @@ -41873,13 +43613,6 @@ __metadata: languageName: node linkType: hard -"p-try@npm:^1.0.0": - version: 1.0.0 - resolution: "p-try@npm:1.0.0" - checksum: 3b5303f77eb7722144154288bfd96f799f8ff3e2b2b39330efe38db5dd359e4fb27012464cd85cb0a76e9b7edd1b443568cb3192c22e7cffc34989df0bafd605 - languageName: node - linkType: hard - "p-try@npm:^2.0.0": version: 2.2.0 resolution: "p-try@npm:2.2.0" @@ -42453,13 +44186,20 @@ __metadata: languageName: node linkType: hard -"pg-connection-string@npm:^2.2.2, pg-connection-string@npm:^2.5.0": +"pg-connection-string@npm:^2.2.2": version: 2.5.0 resolution: "pg-connection-string@npm:2.5.0" checksum: a6f3a068f7c9416a5b33a326811caf0dfaaee045c225b7c628b4c9b4e9a2b25bdd12a21e4c48940e1000ea223a4e608ca122d2ff3dd08c8b1db0fc9f5705133a languageName: node linkType: hard +"pg-connection-string@npm:^2.6.1": + version: 2.6.4 + resolution: "pg-connection-string@npm:2.6.4" + checksum: 2c1d2ac1add1f93076f1594d217a0980f79add05dc48de6363e1c550827c78a6ee3e3b5420da9c54858f6b678cdb348aed49732ee68158b6cdb70f1d1c748cf9 + languageName: node + linkType: hard + "pg-hstore@npm:2.3.4": version: 2.3.4 resolution: "pg-hstore@npm:2.3.4" @@ -42726,6 +44466,13 @@ __metadata: languageName: node linkType: hard +"possible-typed-array-names@npm:^1.0.0": + version: 1.0.0 + resolution: "possible-typed-array-names@npm:1.0.0" + checksum: b32d403ece71e042385cc7856385cecf1cd8e144fa74d2f1de40d1e16035dba097bc189715925e79b67bdd1472796ff168d3a90d296356c9c94d272d5b95f3ae + languageName: node + linkType: hard + "postcss-calc@npm:^9.0.0": version: 9.0.1 resolution: "postcss-calc@npm:9.0.1" @@ -43166,14 +44913,14 @@ __metadata: languageName: node linkType: hard -"postcss@npm:8.4.14": - version: 8.4.14 - resolution: "postcss@npm:8.4.14" +"postcss@npm:8.4.31": + version: 8.4.31 + resolution: "postcss@npm:8.4.31" dependencies: - nanoid: ^3.3.4 + nanoid: ^3.3.6 picocolors: ^1.0.0 source-map-js: ^1.0.2 - checksum: fe58766ff32e4becf65a7d57678995cfd239df6deed2fe0557f038b47c94e4132e7e5f68b5aa820c13adfec32e523b693efaeb65798efb995ce49ccd83953816 + checksum: 1d8611341b073143ad90486fcdfeab49edd243377b1f51834dc4f6d028e82ce5190e4f11bb2633276864503654fb7cab28e67abdc0fbf9d1f88cad4a0ff0beea languageName: node linkType: hard @@ -43188,7 +44935,7 @@ __metadata: languageName: node linkType: hard -"postcss@npm:^8.3.11, postcss@npm:^8.4.14, postcss@npm:^8.4.21, postcss@npm:^8.4.24": +"postcss@npm:^8.3.11, postcss@npm:^8.4.21, postcss@npm:^8.4.24": version: 8.4.24 resolution: "postcss@npm:8.4.24" dependencies: @@ -43199,6 +44946,17 @@ __metadata: languageName: node linkType: hard +"postcss@npm:^8.4.38": + version: 8.4.38 + resolution: "postcss@npm:8.4.38" + dependencies: + nanoid: ^3.3.7 + picocolors: ^1.0.0 + source-map-js: ^1.2.0 + checksum: 649f9e60a763ca4b5a7bbec446a069edf07f057f6d780a5a0070576b841538d1ecf7dd888f2fbfd1f76200e26c969e405aeeae66332e6927dbdc8bdcb90b9451 + languageName: node + linkType: hard + "postgres-array@npm:~2.0.0": version: 2.0.0 resolution: "postgres-array@npm:2.0.0" @@ -44214,23 +45972,21 @@ __metadata: languageName: node linkType: hard -"react-docgen@npm:^5.0.0": - version: 5.4.3 - resolution: "react-docgen@npm:5.4.3" +"react-docgen@npm:^7.0.0": + version: 7.0.3 + resolution: "react-docgen@npm:7.0.3" dependencies: - "@babel/core": ^7.7.5 - "@babel/generator": ^7.12.11 - "@babel/runtime": ^7.7.6 - ast-types: ^0.14.2 - commander: ^2.19.0 + "@babel/core": ^7.18.9 + "@babel/traverse": ^7.18.9 + "@babel/types": ^7.18.9 + "@types/babel__core": ^7.18.0 + "@types/babel__traverse": ^7.18.0 + "@types/doctrine": ^0.0.9 + "@types/resolve": ^1.20.2 doctrine: ^3.0.0 - estree-to-babel: ^3.1.0 - neo-async: ^2.6.1 - node-dir: ^0.1.10 - strip-indent: ^3.0.0 - bin: - react-docgen: bin/react-docgen.js - checksum: cef935ba948195eaeec9126c62f53bc015b9a5ad3a7eeb4a4604668d5b12bd5d0c9058c279eaf33ee6b47f2a24ccf01818b67af64d7f61265c4d3a5aa4ff0a3a + resolve: ^1.22.1 + strip-indent: ^4.0.0 + checksum: f5dbabd16a25b3c424c4962df4b4073d03ca124c3a5c99871f8436e30468854de115f959d0d5f03df77ad8dbe54f21e679fb48ba47bc125d61ae527bc5bcf0bf languageName: node linkType: hard @@ -44246,6 +46002,18 @@ __metadata: languageName: node linkType: hard +"react-dom@npm:18.3.1": + version: 18.3.1 + resolution: "react-dom@npm:18.3.1" + dependencies: + loose-envify: ^1.1.0 + scheduler: ^0.23.2 + peerDependencies: + react: ^18.3.1 + checksum: 298954ecd8f78288dcaece05e88b570014d8f6dce5db6f66e6ee91448debeb59dcd31561dddb354eee47e6c1bb234669459060deb238ed0213497146e555a0b9 + languageName: node + linkType: hard + "react-dropzone@npm:11.7.1": version: 11.7.1 resolution: "react-dropzone@npm:11.7.1" @@ -44362,15 +46130,6 @@ __metadata: languageName: node linkType: hard -"react-inspector@npm:^6.0.0": - version: 6.0.2 - resolution: "react-inspector@npm:6.0.2" - peerDependencies: - react: ^16.8.4 || ^17.0.0 || ^18.0.0 - checksum: dab7a7daf570c283fdc5d4e07ee8941ee8670af698ab5a27a704602b248e29ab911b117310d64c30a4af93931b2d6ee2a729369e3f5ab7f02df4651692e195a5 - languageName: node - linkType: hard - "react-intersection-observer@npm:9.4.0": version: 9.4.0 resolution: "react-intersection-observer@npm:9.4.0" @@ -44444,10 +46203,10 @@ __metadata: languageName: node linkType: hard -"react-is@npm:18.2.0, react-is@npm:^18.0.0, react-is@npm:^18.2.0": - version: 18.2.0 - resolution: "react-is@npm:18.2.0" - checksum: e72d0ba81b5922759e4aff17e0252bd29988f9642ed817f56b25a3e217e13eea8a7f2322af99a06edb779da12d5d636e9fda473d620df9a3da0df2a74141d53e +"react-is@npm:18.3.1": + version: 18.3.1 + resolution: "react-is@npm:18.3.1" + checksum: e20fe84c86ff172fc8d898251b7cc2c43645d108bf96d0b8edf39b98f9a2cae97b40520ee7ed8ee0085ccc94736c4886294456033304151c3f94978cec03df21 languageName: node linkType: hard @@ -44472,6 +46231,13 @@ __metadata: languageName: node linkType: hard +"react-is@npm:^18.0.0, react-is@npm:^18.2.0": + version: 18.2.0 + resolution: "react-is@npm:18.2.0" + checksum: e72d0ba81b5922759e4aff17e0252bd29988f9642ed817f56b25a3e217e13eea8a7f2322af99a06edb779da12d5d636e9fda473d620df9a3da0df2a74141d53e + languageName: node + linkType: hard + "react-keyed-flatten-children@npm:1.2.0": version: 1.2.0 resolution: "react-keyed-flatten-children@npm:1.2.0" @@ -44994,10 +46760,10 @@ __metadata: languageName: node linkType: hard -"react-refresh@npm:^0.11.0": - version: 0.11.0 - resolution: "react-refresh@npm:0.11.0" - checksum: 112178a05b1e0ffeaf5d9fb4e56b4410a34a73adeb04dbf13abdc50d9ac9df2ada83e81485156cca0b3fa296aa3612751b3d6cd13be4464642a43679b819cbc7 +"react-refresh@npm:^0.14.0": + version: 0.14.2 + resolution: "react-refresh@npm:0.14.2" + checksum: d80db4bd40a36dab79010dc8aa317a5b931f960c0d83c4f3b81f0552cbcf7f29e115b84bb7908ec6a1eb67720fff7023084eff73ece8a7ddc694882478464382 languageName: node linkType: hard @@ -45077,18 +46843,6 @@ __metadata: languageName: node linkType: hard -"react-resize-detector@npm:^7.1.2": - version: 7.1.2 - resolution: "react-resize-detector@npm:7.1.2" - dependencies: - lodash: ^4.17.21 - peerDependencies: - react: ^16.0.0 || ^17.0.0 || ^18.0.0 - react-dom: ^16.0.0 || ^17.0.0 || ^18.0.0 - checksum: 55f4abad7f7523d16b081b5ab20f75c539a54a08253ce7e9df473d48386f42ceca6c31584ba9fa26e3528b498ef6685ec77fb9a22cffc97df05fb326d0bf1b26 - languageName: node - linkType: hard - "react-router-dom@npm:6.11.2": version: 6.11.2 resolution: "react-router-dom@npm:6.11.2" @@ -45327,6 +47081,15 @@ __metadata: languageName: node linkType: hard +"react@npm:18.3.1": + version: 18.3.1 + resolution: "react@npm:18.3.1" + dependencies: + loose-envify: ^1.1.0 + checksum: a27bcfa8ff7c15a1e50244ad0d0c1cb2ad4375eeffefd266a64889beea6f6b64c4966c9b37d14ee32d6c9fcd5aa6ba183b6988167ab4d127d13e7cb5b386a376 + languageName: node + linkType: hard + "read-cache@npm:^1.0.0": version: 1.0.0 resolution: "read-cache@npm:1.0.0" @@ -45783,6 +47546,21 @@ __metadata: languageName: node linkType: hard +"reflect.getprototypeof@npm:^1.0.4": + version: 1.0.6 + resolution: "reflect.getprototypeof@npm:1.0.6" + 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 + checksum: 88e9e65a7eaa0bf8e9a8bbf8ac07571363bc333ba8b6769ed5e013e0042ed7c385e97fae9049510b3b5fe4b42472d8f32de9ce8ce84902bc4297d4bbe3777dba + languageName: node + linkType: hard + "reftools@npm:^1.1.9": version: 1.1.9 resolution: "reftools@npm:1.1.9" @@ -45900,6 +47678,18 @@ __metadata: languageName: node linkType: hard +"regexp.prototype.flags@npm:^1.5.2": + version: 1.5.2 + resolution: "regexp.prototype.flags@npm:1.5.2" + dependencies: + call-bind: ^1.0.6 + define-properties: ^1.2.1 + es-errors: ^1.3.0 + set-function-name: ^2.0.1 + checksum: d7f333667d5c564e2d7a97c56c3075d64c722c9bb51b2b4df6822b2e8096d623a5e63088fb4c83df919b6951ef8113841de8b47de7224872fa6838bc5d8a7d64 + languageName: node + linkType: hard + "regexpu-core@npm:^5.0.1": version: 5.0.1 resolution: "regexpu-core@npm:5.0.1" @@ -46333,7 +48123,7 @@ __metadata: languageName: node linkType: hard -"resolve@npm:^1.1.5, resolve@npm:^1.10.0, resolve@npm:^1.12.0, resolve@npm:^1.14.2, resolve@npm:^1.20.0, resolve@npm:^1.22.0": +"resolve@npm:^1.1.5, resolve@npm:^1.10.0, resolve@npm:^1.12.0, resolve@npm:^1.14.2, resolve@npm:^1.20.0": version: 1.22.0 resolution: "resolve@npm:1.22.0" dependencies: @@ -46385,13 +48175,16 @@ __metadata: languageName: node linkType: hard -"resolve@npm:^2.0.0-next.3": - version: 2.0.0-next.3 - resolution: "resolve@npm:2.0.0-next.3" +"resolve@npm:^1.22.4": + version: 1.22.8 + resolution: "resolve@npm:1.22.8" dependencies: - is-core-module: ^2.2.0 - path-parse: ^1.0.6 - checksum: f34b3b93ada77d64a6d590c06a83e198f3a827624c4ec972260905fa6c4d612164fbf0200d16d2beefea4ad1755b001f4a9a1293d8fc2322a8f7d6bf692c4ff5 + is-core-module: ^2.13.0 + path-parse: ^1.0.7 + supports-preserve-symlinks-flag: ^1.0.0 + bin: + resolve: bin/resolve + checksum: f8a26958aa572c9b064562750b52131a37c29d072478ea32e129063e2da7f83e31f7f11e7087a18225a8561cfe8d2f0df9dbea7c9d331a897571c0a2527dbb4c languageName: node linkType: hard @@ -46408,6 +48201,19 @@ __metadata: languageName: node linkType: hard +"resolve@npm:^2.0.0-next.5": + version: 2.0.0-next.5 + resolution: "resolve@npm:2.0.0-next.5" + dependencies: + is-core-module: ^2.13.0 + path-parse: ^1.0.7 + supports-preserve-symlinks-flag: ^1.0.0 + bin: + resolve: bin/resolve + checksum: a73ac69a1c4bd34c56b213d91f5b17ce390688fdb4a1a96ed3025cc7e08e7bfb90b3a06fcce461780cb0b589c958afcb0080ab802c71c01a7ecc8c64feafc89f + languageName: node + linkType: hard + "resolve@npm:~1.7.1": version: 1.7.1 resolution: "resolve@npm:1.7.1" @@ -46417,7 +48223,7 @@ __metadata: languageName: node linkType: hard -"resolve@patch:resolve@^1.1.5#~builtin, resolve@patch:resolve@^1.10.0#~builtin, resolve@patch:resolve@^1.12.0#~builtin, resolve@patch:resolve@^1.14.2#~builtin, resolve@patch:resolve@^1.20.0#~builtin, resolve@patch:resolve@^1.22.0#~builtin": +"resolve@patch:resolve@^1.1.5#~builtin, resolve@patch:resolve@^1.10.0#~builtin, resolve@patch:resolve@^1.12.0#~builtin, resolve@patch:resolve@^1.14.2#~builtin, resolve@patch:resolve@^1.20.0#~builtin": version: 1.22.0 resolution: "resolve@patch:resolve@npm%3A1.22.0#~builtin::version=1.22.0&hash=07638b" dependencies: @@ -46469,13 +48275,16 @@ __metadata: languageName: node linkType: hard -"resolve@patch:resolve@^2.0.0-next.3#~builtin": - version: 2.0.0-next.3 - resolution: "resolve@patch:resolve@npm%3A2.0.0-next.3#~builtin::version=2.0.0-next.3&hash=07638b" +"resolve@patch:resolve@^1.22.4#~builtin": + version: 1.22.8 + resolution: "resolve@patch:resolve@npm%3A1.22.8#~builtin::version=1.22.8&hash=07638b" dependencies: - is-core-module: ^2.2.0 - path-parse: ^1.0.6 - checksum: 21684b4d99a4877337cdbd5484311c811b3e8910edb5d868eec85c6e6550b0f570d911f9a384f9e176172d6713f2715bd0b0887fa512cb8c6aeece018de6a9f8 + is-core-module: ^2.13.0 + path-parse: ^1.0.7 + supports-preserve-symlinks-flag: ^1.0.0 + bin: + resolve: bin/resolve + checksum: 5479b7d431cacd5185f8db64bfcb7286ae5e31eb299f4c4f404ad8aa6098b77599563ac4257cb2c37a42f59dfc06a1bec2bcf283bb448f319e37f0feb9a09847 languageName: node linkType: hard @@ -46492,6 +48301,19 @@ __metadata: languageName: node linkType: hard +"resolve@patch:resolve@^2.0.0-next.5#~builtin": + version: 2.0.0-next.5 + resolution: "resolve@patch:resolve@npm%3A2.0.0-next.5#~builtin::version=2.0.0-next.5&hash=07638b" + dependencies: + is-core-module: ^2.13.0 + path-parse: ^1.0.7 + supports-preserve-symlinks-flag: ^1.0.0 + bin: + resolve: bin/resolve + checksum: 064d09c1808d0c51b3d90b5d27e198e6d0c5dad0eb57065fd40803d6a20553e5398b07f76739d69cbabc12547058bec6b32106ea66622375fb0d7e8fca6a846c + languageName: node + linkType: hard + "resolve@patch:resolve@~1.7.1#~builtin": version: 1.7.1 resolution: "resolve@patch:resolve@npm%3A1.7.1#~builtin::version=1.7.1&hash=07638b" @@ -46568,7 +48390,7 @@ __metadata: languageName: node linkType: hard -"retry-as-promised@npm:^7.0.3": +"retry-as-promised@npm:^7.0.4": version: 7.0.4 resolution: "retry-as-promised@npm:7.0.4" checksum: 2b0dcddb06649d42b1384ec1f933c7cb4461939c28004460b0c4be0c8ae16cabaed2411aa5d46e734a320f33f4a1d480078a19b97c743c754bd32e896b3f8ea2 @@ -46793,6 +48615,18 @@ __metadata: languageName: node linkType: hard +"safe-array-concat@npm:^1.1.2": + version: 1.1.2 + resolution: "safe-array-concat@npm:1.1.2" + dependencies: + call-bind: ^1.0.7 + get-intrinsic: ^1.2.4 + has-symbols: ^1.0.3 + isarray: ^2.0.5 + checksum: a3b259694754ddfb73ae0663829e396977b99ff21cbe8607f35a469655656da8e271753497e59da8a7575baa94d2e684bea3e10ddd74ba046c0c9b4418ffa0c4 + languageName: node + linkType: hard + "safe-buffer@npm:5.1.1": version: 5.1.1 resolution: "safe-buffer@npm:5.1.1" @@ -46832,6 +48666,17 @@ __metadata: languageName: node linkType: hard +"safe-regex-test@npm:^1.0.3": + version: 1.0.3 + resolution: "safe-regex-test@npm:1.0.3" + dependencies: + call-bind: ^1.0.6 + es-errors: ^1.3.0 + is-regex: ^1.1.4 + checksum: 6c7d392ff1ae7a3ae85273450ed02d1d131f1d2c76e177d6b03eb88e6df8fa062639070e7d311802c1615f351f18dc58f9454501c58e28d5ffd9b8f502ba6489 + languageName: node + linkType: hard + "safe-regex@npm:^1.1.0": version: 1.1.0 resolution: "safe-regex@npm:1.1.0" @@ -46958,6 +48803,15 @@ __metadata: languageName: node linkType: hard +"scheduler@npm:^0.23.2": + version: 0.23.2 + resolution: "scheduler@npm:0.23.2" + dependencies: + loose-envify: ^1.1.0 + checksum: 3e82d1f419e240ef6219d794ff29c7ee415fbdc19e038f680a10c067108e06284f1847450a210b29bbaf97b9d8a97ced5f624c31c681248ac84c80d56ad5a2c4 + languageName: node + linkType: hard + "schema-utils@npm:^2.6.5": version: 2.7.1 resolution: "schema-utils@npm:2.7.1" @@ -47003,7 +48857,7 @@ __metadata: languageName: node linkType: hard -"schema-utils@npm:^4.0.1": +"schema-utils@npm:^4.0.1, schema-utils@npm:^4.2.0": version: 4.2.0 resolution: "schema-utils@npm:4.2.0" dependencies: @@ -47146,17 +49000,6 @@ __metadata: languageName: node linkType: hard -"semver@npm:7.5.3": - version: 7.5.3 - resolution: "semver@npm:7.5.3" - dependencies: - lru-cache: ^6.0.0 - bin: - semver: bin/semver.js - checksum: 9d58db16525e9f749ad0a696a1f27deabaa51f66e91d2fa2b0db3de3e9644e8677de3b7d7a03f4c15bc81521e0c3916d7369e0572dbde250d9bedf5194e2a8a7 - languageName: node - linkType: hard - "semver@npm:7.x, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5": version: 7.3.5 resolution: "semver@npm:7.3.5" @@ -47208,6 +49051,15 @@ __metadata: languageName: node linkType: hard +"semver@npm:^7.6.0": + version: 7.6.2 + resolution: "semver@npm:7.6.2" + bin: + semver: bin/semver.js + checksum: 40f6a95101e8d854357a644da1b8dd9d93ce786d5c6a77227bc69dbb17bea83d0d1d1d7c4cd5920a6df909f48e8bd8a5909869535007f90278289f2451d0292d + languageName: node + linkType: hard + "semver@npm:~5.3.0": version: 5.3.0 resolution: "semver@npm:5.3.0" @@ -47295,25 +49147,25 @@ __metadata: languageName: node linkType: hard -"sequelize@npm:6.29.0": - version: 6.29.0 - resolution: "sequelize@npm:6.29.0" +"sequelize@npm:6.37.3": + version: 6.37.3 + resolution: "sequelize@npm:6.37.3" dependencies: - "@types/debug": ^4.1.7 - "@types/validator": ^13.7.1 - debug: ^4.3.3 - dottie: ^2.0.2 - inflection: ^1.13.2 + "@types/debug": ^4.1.8 + "@types/validator": ^13.7.17 + debug: ^4.3.4 + dottie: ^2.0.6 + inflection: ^1.13.4 lodash: ^4.17.21 - moment: ^2.29.1 - moment-timezone: ^0.5.35 - pg-connection-string: ^2.5.0 - retry-as-promised: ^7.0.3 - semver: ^7.3.5 + moment: ^2.29.4 + moment-timezone: ^0.5.43 + pg-connection-string: ^2.6.1 + retry-as-promised: ^7.0.4 + semver: ^7.5.4 sequelize-pool: ^7.1.0 toposort-class: ^1.0.1 uuid: ^8.3.2 - validator: ^13.7.0 + validator: ^13.9.0 wkx: ^0.5.0 peerDependenciesMeta: ibm_db: @@ -47334,7 +49186,7 @@ __metadata: optional: true tedious: optional: true - checksum: 3b25ef91cdf828f987deca28d5b46a5771b225687485b2f34c7a0e85269952fb7bf26cf689d1e32c94908238d6968fbab4694350407f56820f879769339c62b6 + checksum: e7a9343a3bf70d7609b8d312630738e55889b8f3cfbd24e29443f4d71a11697d5a38be81c8f0218d9e49f0c04680d85ced0b5c0a37c60ad85cdb20e72e5aab7d languageName: node linkType: hard @@ -47456,6 +49308,18 @@ __metadata: languageName: node linkType: hard +"set-function-name@npm:^2.0.1, set-function-name@npm:^2.0.2": + version: 2.0.2 + resolution: "set-function-name@npm:2.0.2" + dependencies: + define-data-property: ^1.1.4 + es-errors: ^1.3.0 + functions-have-names: ^1.2.3 + has-property-descriptors: ^1.0.2 + checksum: d6229a71527fd0404399fc6227e0ff0652800362510822a291925c9d7b48a1ca1a468b11b281471c34cd5a2da0db4f5d7ff315a61d26655e77f6e971e6d0c80f + languageName: node + linkType: hard + "set-harmonic-interval@npm:^1.0.1": version: 1.0.1 resolution: "set-harmonic-interval@npm:1.0.1" @@ -48137,16 +50001,22 @@ __metadata: languageName: node linkType: hard -"source-map-loader@npm:^3.0.0": - version: 3.0.2 - resolution: "source-map-loader@npm:3.0.2" +"source-map-js@npm:^1.2.0": + version: 1.2.0 + resolution: "source-map-js@npm:1.2.0" + checksum: 791a43306d9223792e84293b00458bf102a8946e7188f3db0e4e22d8d530b5f80a4ce468eb5ec0bf585443ad55ebbd630bf379c98db0b1f317fd902500217f97 + languageName: node + linkType: hard + +"source-map-loader@npm:^5.0.0": + version: 5.0.0 + resolution: "source-map-loader@npm:5.0.0" dependencies: - abab: ^2.0.5 iconv-lite: ^0.6.3 - source-map-js: ^1.0.1 + source-map-js: ^1.0.2 peerDependencies: - webpack: ^5.0.0 - checksum: d5a4e2ab190c93ae5cba68c247fbaa9fd560333c91060602b634c399a8a4b3205b8c07714c3bcdb0a11c6cc5476c06256bd8e824e71fbbb7981e8fad5cba4a00 + webpack: ^5.72.1 + checksum: 66d6fbaa87a14197647515f274b9a685a84d0ddb95c3d9801bfb1ce28fc24000954c73548fe09c52c0bad660eb10d963b0c60d5c5943ccf2c8292a8d957f2acb languageName: node linkType: hard @@ -48854,6 +50724,26 @@ __metadata: languageName: node linkType: hard +"string.prototype.matchall@npm:^4.0.11": + version: 4.0.11 + resolution: "string.prototype.matchall@npm:4.0.11" + 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 + 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 + checksum: 6ac6566ed065c0c8489c91156078ca077db8ff64d683fda97ae652d00c52dfa5f39aaab0a710d8243031a857fd2c7c511e38b45524796764d25472d10d7075ae + languageName: node + linkType: hard + "string.prototype.matchall@npm:^4.0.8": version: 4.0.8 resolution: "string.prototype.matchall@npm:4.0.8" @@ -48881,6 +50771,18 @@ __metadata: languageName: node linkType: hard +"string.prototype.trim@npm:^1.2.9": + version: 1.2.9 + resolution: "string.prototype.trim@npm:1.2.9" + dependencies: + call-bind: ^1.0.7 + define-properties: ^1.2.1 + es-abstract: ^1.23.0 + es-object-atoms: ^1.0.0 + checksum: ea2df6ec1e914c9d4e2dc856fa08228e8b1be59b59e50b17578c94a66a176888f417264bb763d4aac638ad3b3dad56e7a03d9317086a178078d131aa293ba193 + languageName: node + linkType: hard + "string.prototype.trimend@npm:^1.0.4": version: 1.0.4 resolution: "string.prototype.trimend@npm:1.0.4" @@ -48913,6 +50815,17 @@ __metadata: languageName: node linkType: hard +"string.prototype.trimend@npm:^1.0.8": + version: 1.0.8 + resolution: "string.prototype.trimend@npm:1.0.8" + dependencies: + call-bind: ^1.0.7 + define-properties: ^1.2.1 + es-object-atoms: ^1.0.0 + checksum: cc3bd2de08d8968a28787deba9a3cb3f17ca5f9f770c91e7e8fa3e7d47f079bad70fadce16f05dda9f261788be2c6e84a942f618c3bed31e42abc5c1084f8dfd + languageName: node + linkType: hard + "string.prototype.trimstart@npm:^1.0.4": version: 1.0.4 resolution: "string.prototype.trimstart@npm:1.0.4" @@ -48945,6 +50858,17 @@ __metadata: languageName: node linkType: hard +"string.prototype.trimstart@npm:^1.0.8": + version: 1.0.8 + resolution: "string.prototype.trimstart@npm:1.0.8" + dependencies: + call-bind: ^1.0.7 + define-properties: ^1.2.1 + es-object-atoms: ^1.0.0 + checksum: df1007a7f580a49d692375d996521dc14fd103acda7f3034b3c558a60b82beeed3a64fa91e494e164581793a8ab0ae2f59578a49896a7af6583c1f20472bce96 + languageName: node + linkType: hard + "string_decoder@npm:^1.1.1": version: 1.3.0 resolution: "string_decoder@npm:1.3.0" @@ -49088,6 +51012,15 @@ __metadata: languageName: node linkType: hard +"strip-indent@npm:^4.0.0": + version: 4.0.0 + resolution: "strip-indent@npm:4.0.0" + dependencies: + min-indent: ^1.0.1 + checksum: 06cbcd93da721c46bc13caeb1c00af93a9b18146a1c95927672d2decab6a25ad83662772417cea9317a2507fb143253ecc23c4415b64f5828cef9b638a744598 + languageName: node + linkType: hard + "strip-json-comments@npm:3.1.1, strip-json-comments@npm:^3.0.1, strip-json-comments@npm:^3.1.0, strip-json-comments@npm:^3.1.1": version: 3.1.1 resolution: "strip-json-comments@npm:3.1.1" @@ -50389,6 +52322,15 @@ __metadata: languageName: node linkType: hard +"ts-api-utils@npm:^1.0.1, ts-api-utils@npm:^1.3.0": + version: 1.3.0 + resolution: "ts-api-utils@npm:1.3.0" + peerDependencies: + typescript: ">=4.2.0" + checksum: c746ddabfdffbf16cb0b0db32bb287236a19e583057f8649ee7c49995bb776e1d3ef384685181c11a1a480369e022ca97512cb08c517b2d2bd82c83754c97012 + languageName: node + linkType: hard + "ts-dedent@npm:2.0.0, ts-dedent@npm:^2.0.0": version: 2.0.0 resolution: "ts-dedent@npm:2.0.0" @@ -50606,6 +52548,18 @@ __metadata: languageName: node linkType: hard +"tsconfig-paths@npm:^3.15.0": + version: 3.15.0 + resolution: "tsconfig-paths@npm:3.15.0" + dependencies: + "@types/json5": ^0.0.29 + json5: ^1.0.2 + minimist: ^1.2.6 + strip-bom: ^3.0.0 + checksum: 59f35407a390d9482b320451f52a411a256a130ff0e7543d18c6f20afab29ac19fbe55c360a93d6476213cc335a4d76ce90f67df54c4e9037f7d240920832201 + languageName: node + linkType: hard + "tsconfig-paths@npm:^4.0.0, tsconfig-paths@npm:^4.1.2": version: 4.2.0 resolution: "tsconfig-paths@npm:4.2.0" @@ -50847,6 +52801,58 @@ __metadata: languageName: node linkType: hard +"typed-array-buffer@npm:^1.0.2": + version: 1.0.2 + resolution: "typed-array-buffer@npm:1.0.2" + dependencies: + call-bind: ^1.0.7 + es-errors: ^1.3.0 + is-typed-array: ^1.1.13 + checksum: 02ffc185d29c6df07968272b15d5319a1610817916ec8d4cd670ded5d1efe72901541ff2202fcc622730d8a549c76e198a2f74e312eabbfb712ed907d45cbb0b + languageName: node + linkType: hard + +"typed-array-byte-length@npm:^1.0.1": + version: 1.0.1 + resolution: "typed-array-byte-length@npm:1.0.1" + 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 + checksum: f65e5ecd1cf76b1a2d0d6f631f3ea3cdb5e08da106c6703ffe687d583e49954d570cc80434816d3746e18be889ffe53c58bf3e538081ea4077c26a41055b216d + languageName: node + linkType: hard + +"typed-array-byte-offset@npm:^1.0.2": + version: 1.0.2 + resolution: "typed-array-byte-offset@npm:1.0.2" + 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 + checksum: c8645c8794a621a0adcc142e0e2c57b1823bbfa4d590ad2c76b266aa3823895cf7afb9a893bf6685e18454ab1b0241e1a8d885a2d1340948efa4b56add4b5f67 + languageName: node + linkType: hard + +"typed-array-length@npm:^1.0.6": + version: 1.0.6 + resolution: "typed-array-length@npm:1.0.6" + 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 + checksum: f0315e5b8f0168c29d390ff410ad13e4d511c78e6006df4a104576844812ee447fcc32daab1f3a76c9ef4f64eff808e134528b5b2439de335586b392e9750e5c + languageName: node + linkType: hard + "typed-assert@npm:^1.0.8": version: 1.0.9 resolution: "typed-assert@npm:1.0.9" @@ -50906,13 +52912,13 @@ __metadata: languageName: node linkType: hard -"typescript@npm:5.1.6, typescript@npm:~5.1.3": - version: 5.1.6 - resolution: "typescript@npm:5.1.6" +"typescript@npm:5.4.5, typescript@npm:~5.4.2": + version: 5.4.5 + resolution: "typescript@npm:5.4.5" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: b2f2c35096035fe1f5facd1e38922ccb8558996331405eb00a5111cc948b2e733163cc22fab5db46992aba7dd520fff637f2c1df4996ff0e134e77d3249a7350 + checksum: 53c879c6fa1e3bcb194b274d4501ba1985894b2c2692fa079db03c5a5a7140587a1e04e1ba03184605d35f439b40192d9e138eb3279ca8eee313c081c8bcd9b0 languageName: node linkType: hard @@ -50946,13 +52952,13 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@5.1.6#~builtin, typescript@patch:typescript@~5.1.3#~builtin": - version: 5.1.6 - resolution: "typescript@patch:typescript@npm%3A5.1.6#~builtin::version=5.1.6&hash=a1c5e5" +"typescript@patch:typescript@5.4.5#~builtin, typescript@patch:typescript@~5.4.2#~builtin": + version: 5.4.5 + resolution: "typescript@patch:typescript@npm%3A5.4.5#~builtin::version=5.4.5&hash=a1c5e5" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 21e88b0a0c0226f9cb9fd25b9626fb05b4c0f3fddac521844a13e1f30beb8f14e90bd409a9ac43c812c5946d714d6e0dee12d5d02dfc1c562c5aacfa1f49b606 + checksum: 2373c693f3b328f3b2387c3efafe6d257b057a142f9a79291854b14ff4d5367d3d730810aee981726b677ae0fd8329b23309da3b6aaab8263dbdccf1da07a3ba languageName: node linkType: hard @@ -51099,6 +53105,13 @@ __metadata: languageName: node linkType: hard +"undici-types@npm:~5.26.4": + version: 5.26.5 + resolution: "undici-types@npm:5.26.5" + checksum: 3192ef6f3fd5df652f2dc1cd782b49d6ff14dc98e5dced492aa8a8c65425227da5da6aafe22523c67f035a272c599bb89cfe803c1db6311e44bed3042fc25487 + languageName: node + linkType: hard + "undici@npm:^5.10.0, undici@npm:^5.8.0": version: 5.11.0 resolution: "undici@npm:5.11.0" @@ -51523,7 +53536,7 @@ __metadata: languageName: node linkType: hard -"uri-js@npm:^4.2.2": +"uri-js@npm:^4.2.2, uri-js@npm:^4.4.1": version: 4.4.1 resolution: "uri-js@npm:4.4.1" dependencies: @@ -51553,23 +53566,6 @@ __metadata: languageName: node linkType: hard -"url-loader@npm:^4.1.1": - version: 4.1.1 - resolution: "url-loader@npm:4.1.1" - dependencies: - loader-utils: ^2.0.0 - mime-types: ^2.1.27 - schema-utils: ^3.0.0 - peerDependencies: - file-loader: "*" - webpack: ^4.0.0 || ^5.0.0 - peerDependenciesMeta: - file-loader: - optional: true - checksum: c1122a992c6cff70a7e56dfc2b7474534d48eb40b2cc75467cde0c6972e7597faf8e43acb4f45f93c2473645dfd803bcbc20960b57544dd1e4c96e77f72ba6fd - languageName: node - linkType: hard - "url-parse@npm:1.5.2": version: 1.5.2 resolution: "url-parse@npm:1.5.2" @@ -51767,7 +53763,7 @@ __metadata: languageName: node linkType: hard -"util@npm:^0.12.0, util@npm:^0.12.4": +"util@npm:^0.12.0, util@npm:^0.12.4, util@npm:^0.12.5": version: 0.12.5 resolution: "util@npm:0.12.5" dependencies: @@ -51912,17 +53908,6 @@ __metadata: languageName: node linkType: hard -"v8-to-istanbul@npm:^9.0.0": - version: 9.1.0 - resolution: "v8-to-istanbul@npm:9.1.0" - dependencies: - "@jridgewell/trace-mapping": ^0.3.12 - "@types/istanbul-lib-coverage": ^2.0.1 - convert-source-map: ^1.6.0 - checksum: 2069d59ee46cf8d83b4adfd8a5c1a90834caffa9f675e4360f1157ffc8578ef0f763c8f32d128334424159bb6b01f3876acd39cd13297b2769405a9da241f8d1 - languageName: node - linkType: hard - "v8-to-istanbul@npm:^9.0.1": version: 9.0.1 resolution: "v8-to-istanbul@npm:9.0.1" @@ -52315,8 +54300,8 @@ __metadata: linkType: hard "webpack-dev-middleware@npm:^5.3.1": - version: 5.3.3 - resolution: "webpack-dev-middleware@npm:5.3.3" + version: 5.3.4 + resolution: "webpack-dev-middleware@npm:5.3.4" dependencies: colorette: ^2.0.10 memfs: ^3.4.3 @@ -52325,7 +54310,7 @@ __metadata: schema-utils: ^4.0.0 peerDependencies: webpack: ^4.0.0 || ^5.0.0 - checksum: dd332cc6da61222c43d25e5a2155e23147b777ff32fdf1f1a0a8777020c072fbcef7756360ce2a13939c3f534c06b4992a4d659318c4a7fe2c0530b52a8a6621 + checksum: 90cf3e27d0714c1a745454a1794f491b7076434939340605b9ee8718ba2b85385b120939754e9fdbd6569811e749dee53eec319e0d600e70e0b0baffd8e3fb13 languageName: node linkType: hard @@ -52601,6 +54586,26 @@ __metadata: languageName: node linkType: hard +"which-builtin-type@npm:^1.1.3": + version: 1.1.3 + resolution: "which-builtin-type@npm:1.1.3" + dependencies: + function.prototype.name: ^1.1.5 + has-tostringtag: ^1.0.0 + 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.1 + which-typed-array: ^1.1.9 + checksum: 43730f7d8660ff9e33d1d3f9f9451c4784265ee7bf222babc35e61674a11a08e1c2925019d6c03154fcaaca4541df43abe35d2720843b9b4cbcebdcc31408f36 + languageName: node + linkType: hard + "which-collection@npm:^1.0.1": version: 1.0.1 resolution: "which-collection@npm:1.0.1" @@ -52633,6 +54638,19 @@ __metadata: languageName: node linkType: hard +"which-typed-array@npm:^1.1.14, which-typed-array@npm:^1.1.15": + version: 1.1.15 + resolution: "which-typed-array@npm:1.1.15" + 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 + checksum: 65227dcbfadf5677aacc43ec84356d17b5500cb8b8753059bb4397de5cd0c2de681d24e1a7bd575633f976a95f88233abfd6549c2105ef4ebd58af8aa1807c75 + languageName: node + linkType: hard + "which-typed-array@npm:^1.1.2": version: 1.1.8 resolution: "which-typed-array@npm:1.1.8" @@ -53201,7 +55219,7 @@ __metadata: languageName: node linkType: hard -"yargs-parser@npm:^20.2.2, yargs-parser@npm:^20.2.9": +"yargs-parser@npm:^20.2.2": version: 20.2.9 resolution: "yargs-parser@npm:20.2.9" checksum: 8bb69015f2b0ff9e17b2c8e6bfe224ab463dd00ca211eece72a4cd8a906224d2703fb8a326d36fdd0e68701e201b2a60ed7cf81ce0fd9b3799f9fe7745977ae3