From b00a45cb83e7159ddf7d26392d65c08f28db5cc3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Dec 2024 09:02:44 +0000 Subject: [PATCH 1/2] Build(deps): bump ace-builds from 1.36.4 to 1.36.5 Bumps [ace-builds](https://github.com/ajaxorg/ace-builds) from 1.36.4 to 1.36.5. - [Release notes](https://github.com/ajaxorg/ace-builds/releases) - [Changelog](https://github.com/ajaxorg/ace-builds/blob/master/CHANGELOG.md) - [Commits](https://github.com/ajaxorg/ace-builds/compare/v1.36.4...v1.36.5) --- updated-dependencies: - dependency-name: ace-builds dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- pnpm-lock.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 3677b4bc..f85d5d1c 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "@ng-bootstrap/ng-bootstrap": "17.0.1", "@popperjs/core": "^2.11.8", "@prettier/plugin-xml": "^3.2.2", - "ace-builds": "^1.36.4", + "ace-builds": "^1.36.5", "angular-split": "^17.2.0", "bootstrap": "4", "bootstrap-icons": "^1.11.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 98eeb45a..345c3ffb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -54,8 +54,8 @@ importers: specifier: ^3.2.2 version: 3.4.1(prettier@3.3.3) ace-builds: - specifier: ^1.36.4 - version: 1.36.4 + specifier: ^1.36.5 + version: 1.36.5 angular-split: specifier: ^17.2.0 version: 17.2.0(@angular/common@18.1.1(@angular/core@18.1.1(rxjs@7.8.1)(zone.js@0.14.10))(rxjs@7.8.1))(@angular/core@18.1.1(rxjs@7.8.1)(zone.js@0.14.10))(rxjs@7.8.1) @@ -2365,8 +2365,8 @@ packages: resolution: {integrity: sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==} engines: {node: '>= 0.6'} - ace-builds@1.36.4: - resolution: {integrity: sha512-eE+iAsLRfNsq30yd34cezKSob6/N9mQatWs44Bp5LUDgKZ3rJtQds/YtcbnwbEWMTe7yCIxG/Cfezd4BsKIiFg==} + ace-builds@1.36.5: + resolution: {integrity: sha512-mZ5KVanRT6nLRDLqtG/1YQQLX/gZVC/v526cm1Ru/MTSlrbweSmqv2ZT0d2GaHpJq035MwCMIrj+LgDAUnDXrg==} acorn-import-attributes@1.9.5: resolution: {integrity: sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==} @@ -8583,7 +8583,7 @@ snapshots: mime-types: 2.1.35 negotiator: 0.6.3 - ace-builds@1.36.4: {} + ace-builds@1.36.5: {} acorn-import-attributes@1.9.5(acorn@8.12.0): dependencies: From 05b1ae4870dbd1732cdcffb39f7610867c652253 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Dec 2024 13:06:38 +0100 Subject: [PATCH 2/2] Build(deps): bump eslint-plugin-unicorn from 55.0.0 to 56.0.1 (#795) * Build(deps): bump eslint-plugin-unicorn from 55.0.0 to 56.0.1 Bumps [eslint-plugin-unicorn](https://github.com/sindresorhus/eslint-plugin-unicorn) from 55.0.0 to 56.0.1. - [Release notes](https://github.com/sindresorhus/eslint-plugin-unicorn/releases) - [Commits](https://github.com/sindresorhus/eslint-plugin-unicorn/compare/v55.0.0...v56.0.1) --- updated-dependencies: - dependency-name: eslint-plugin-unicorn dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * fix: linting issue --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Matthijs Smets --- package.json | 2 +- pnpm-lock.yaml | 69 ++++++++++++++++----- src/app/shared/services/settings.service.ts | 3 +- 3 files changed, 55 insertions(+), 19 deletions(-) diff --git a/package.json b/package.json index f85d5d1c..bd401521 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "diff-match-patch": "1.0.5", "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.2.1", - "eslint-plugin-unicorn": "^55.0.0", + "eslint-plugin-unicorn": "^56.0.1", "font-awesome": "^4.7.0", "monaco-editor": "0.48.0", "ng-simple-file-tree": "^0.1.28", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 345c3ffb..791ee897 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -81,8 +81,8 @@ importers: specifier: ^5.2.1 version: 5.2.1(@types/eslint@8.56.10)(eslint-config-prettier@9.1.0(eslint@8.57.1))(eslint@8.57.1)(prettier@3.3.3) eslint-plugin-unicorn: - specifier: ^55.0.0 - version: 55.0.0(eslint@8.57.1) + specifier: ^56.0.1 + version: 56.0.1(eslint@8.57.1) font-awesome: specifier: ^4.7.0 version: 4.7.0 @@ -640,10 +640,6 @@ packages: resolution: {integrity: sha512-CbkjYdsJNHFk8uqpEkpCvRs3YRp9tY6FmFY7wLMSYuGYkrdUi7r2lc4/wqsvlHoMznX3WJ9IP8giGPq68T/Y6g==} engines: {node: '>=6.9.0'} - '@babel/helper-validator-identifier@7.24.7': - resolution: {integrity: sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==} - engines: {node: '>=6.9.0'} - '@babel/helper-validator-identifier@7.25.7': resolution: {integrity: sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==} engines: {node: '>=6.9.0'} @@ -2632,6 +2628,11 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true + browserslist@4.24.2: + resolution: {integrity: sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==} + engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} + hasBin: true + buffer-crc32@0.2.13: resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==} @@ -2676,6 +2677,9 @@ packages: caniuse-lite@1.0.30001667: resolution: {integrity: sha512-7LTwJjcRkzKFmtqGsibMeuXmvFDfZq/nzIjnmgCGzKKRVzjD72selLDK1oPF/Oxzmt4fNcPvTDvGqSDG4tCALw==} + caniuse-lite@1.0.30001685: + resolution: {integrity: sha512-e/kJN1EMyHQzgcMEEgoo+YTCO1NGCmIYHk5Qk8jT6AazWemS5QFKJ5ShCJlH3GZrNIdZofcNCEwZqbMjjKzmnA==} + caseless@0.12.0: resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==} @@ -2860,6 +2864,9 @@ packages: core-js-compat@3.37.1: resolution: {integrity: sha512-9TNiImhKvQqSUkOvk/mMRZzOANTiEVC7WaBNhHcKM7x+/5E1l5NvsysR19zuDQScE8k+kfQXWRN3AtS/eOSHpg==} + core-js-compat@3.39.0: + resolution: {integrity: sha512-VgEUx3VwlExr5no0tXlBt+silBvhTryPwCXRI2Id1PN8WTKu7MreethvddqOubrYxkFdv/RnYrqlv1sFNAUelw==} + core-util-is@1.0.2: resolution: {integrity: sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==} @@ -3072,6 +3079,9 @@ packages: electron-to-chromium@1.5.32: resolution: {integrity: sha512-M+7ph0VGBQqqpTT2YrabjNKSQ2fEl9PVx6AK3N558gDH9NO8O6XN9SXXFWRo9u9PbEg/bWq+tjXQr+eXmxubCw==} + electron-to-chromium@1.5.67: + resolution: {integrity: sha512-nz88NNBsD7kQSAGGJyp8hS6xSPtWwqNogA0mjtc2nUYeEf3nURK9qpV18TuBdDmEDgVWotS8Wkzf+V52dSQ/LQ==} + emoji-regex@10.3.0: resolution: {integrity: sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==} @@ -3212,8 +3222,8 @@ packages: peerDependencies: eslint: ^5.0.0 || ^6.0.0 || ^7.0.0|| ^8.0.0 - eslint-plugin-unicorn@55.0.0: - resolution: {integrity: sha512-n3AKiVpY2/uDcGrS3+QsYDkjPfaOrNrsfQxU9nt5nitd9KuvVXrfAvgCO9DYPSfap+Gqjw9EOrXIsBp5tlHZjA==} + eslint-plugin-unicorn@56.0.1: + resolution: {integrity: sha512-FwVV0Uwf8XPfVnKSGpMg7NtlZh0G0gBarCaFcMUOoqPxXryxdYxTRRv4kH6B9TFCVIrjRXG+emcxIk2ayZilog==} engines: {node: '>=18.18'} peerDependencies: eslint: '>=8.56.0' @@ -3248,6 +3258,10 @@ packages: resolution: {integrity: sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==} engines: {node: '>=0.10'} + esquery@1.6.0: + resolution: {integrity: sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==} + engines: {node: '>=0.10'} + esrecurse@4.3.0: resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==} engines: {node: '>=4.0'} @@ -6296,7 +6310,7 @@ snapshots: '@babel/helper-module-imports': 7.24.7 '@babel/helper-simple-access': 7.24.7 '@babel/helper-split-export-declaration': 7.24.7 - '@babel/helper-validator-identifier': 7.24.7 + '@babel/helper-validator-identifier': 7.25.7 transitivePeerDependencies: - supports-color @@ -6363,8 +6377,6 @@ snapshots: '@babel/helper-string-parser@7.25.7': {} - '@babel/helper-validator-identifier@7.24.7': {} - '@babel/helper-validator-identifier@7.25.7': {} '@babel/helper-validator-option@7.25.7': {} @@ -7022,7 +7034,7 @@ snapshots: '@babel/types@7.24.7': dependencies: '@babel/helper-string-parser': 7.24.7 - '@babel/helper-validator-identifier': 7.24.7 + '@babel/helper-validator-identifier': 7.25.7 to-fast-properties: 2.0.0 '@babel/types@7.25.7': @@ -8844,6 +8856,13 @@ snapshots: node-releases: 2.0.18 update-browserslist-db: 1.1.1(browserslist@4.24.0) + browserslist@4.24.2: + dependencies: + caniuse-lite: 1.0.30001685 + electron-to-chromium: 1.5.67 + node-releases: 2.0.18 + update-browserslist-db: 1.1.1(browserslist@4.24.2) + buffer-crc32@0.2.13: {} buffer-from@1.1.2: {} @@ -8892,6 +8911,8 @@ snapshots: caniuse-lite@1.0.30001667: {} + caniuse-lite@1.0.30001685: {} + caseless@0.12.0: {} chai-colors@1.0.1: @@ -9080,6 +9101,10 @@ snapshots: dependencies: browserslist: 4.24.0 + core-js-compat@3.39.0: + dependencies: + browserslist: 4.24.2 + core-util-is@1.0.2: {} core-util-is@1.0.3: {} @@ -9312,6 +9337,8 @@ snapshots: electron-to-chromium@1.5.32: {} + electron-to-chromium@1.5.67: {} + emoji-regex@10.3.0: {} emoji-regex@8.0.0: {} @@ -9474,15 +9501,15 @@ snapshots: dependencies: eslint: 8.57.1 - eslint-plugin-unicorn@55.0.0(eslint@8.57.1): + eslint-plugin-unicorn@56.0.1(eslint@8.57.1): dependencies: - '@babel/helper-validator-identifier': 7.24.7 + '@babel/helper-validator-identifier': 7.25.7 '@eslint-community/eslint-utils': 4.4.0(eslint@8.57.1) ci-info: 4.0.0 clean-regexp: 1.0.0 - core-js-compat: 3.37.1 + core-js-compat: 3.39.0 eslint: 8.57.1 - esquery: 1.5.0 + esquery: 1.6.0 globals: 15.9.0 indent-string: 4.0.0 is-builtin-module: 3.2.1 @@ -9564,6 +9591,10 @@ snapshots: dependencies: estraverse: 5.3.0 + esquery@1.6.0: + dependencies: + estraverse: 5.3.0 + esrecurse@4.3.0: dependencies: estraverse: 5.3.0 @@ -11874,6 +11905,12 @@ snapshots: escalade: 3.2.0 picocolors: 1.1.0 + update-browserslist-db@1.1.1(browserslist@4.24.2): + dependencies: + browserslist: 4.24.2 + escalade: 3.2.0 + picocolors: 1.1.0 + uri-js@4.4.1: dependencies: punycode: 2.3.1 diff --git a/src/app/shared/services/settings.service.ts b/src/app/shared/services/settings.service.ts index 21b8e60e..6b59cfff 100644 --- a/src/app/shared/services/settings.service.ts +++ b/src/app/shared/services/settings.service.ts @@ -13,8 +13,7 @@ export class SettingsService { this.setShowMultipleAtATime(localStorage.getItem(this.showMultipleAtATimeKey) === 'true'); const MAX_ALLOWED_DROPDOWN_VALUE: number = 8; const tempTableSpacing: number = +(localStorage.getItem(this.tableSpacingKey) ?? 1); - const cappedTableSpacing: number = - tempTableSpacing < MAX_ALLOWED_DROPDOWN_VALUE ? tempTableSpacing : MAX_ALLOWED_DROPDOWN_VALUE; + const cappedTableSpacing: number = Math.min(tempTableSpacing, MAX_ALLOWED_DROPDOWN_VALUE); this.setTableSpacing(cappedTableSpacing); this.setShowSearchWindowOnLoad(localStorage.getItem(this.showSearchWindowOnLoadKey) === 'true'); this.setPrettifyOnLoad(localStorage.getItem(this.prettifyOnLoadKey) === 'true');