diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/arenaforvalter/utils/ArenaStatusUtil.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/arenaforvalter/utils/ArenaStatusUtil.java index ca822ca3b6e..8ac7f4a1d9c 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/arenaforvalter/utils/ArenaStatusUtil.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/arenaforvalter/utils/ArenaStatusUtil.java @@ -79,7 +79,7 @@ public static Mono getAapStatus(AapResponse response, ErrorStatusDecoder public static String fmtResponse(String miljoe, String system, String status) { - return encodeStatus(String.format(MILJOE_FMT, miljoe, system, status)); + return String.format(MILJOE_FMT, miljoe, system, encodeStatus(status)); } public static String getMessage(String jsonFeilmelding) { diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/PersonGetCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/PersonGetCommand.java index d79bc072565..fe30d60d4e6 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/PersonGetCommand.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/command/PersonGetCommand.java @@ -35,6 +35,10 @@ public Flux call() { .header(HttpHeaders.AUTHORIZATION, "Bearer " + token) .retrieve() .bodyToFlux(PersonMiljoeDTO.class) + .map(resultat -> { + resultat.setIdent(ident); + return resultat; + }) .onErrorResume(throwable -> Mono.just(PersonMiljoeDTO.builder() .status("FEIL") .melding(WebClientFilter.getStatus(throwable).getReasonPhrase()) diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/service/TpsPersonService.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/service/TpsPersonService.java index efc5f323d1e..c641ace82f9 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/service/TpsPersonService.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/tpsmessagingservice/service/TpsPersonService.java @@ -4,6 +4,9 @@ import lombok.extern.slf4j.Slf4j; import no.nav.dolly.bestilling.ClientFuture; import no.nav.dolly.bestilling.tpsmessagingservice.TpsMessagingConsumer; +import no.nav.dolly.consumer.pdlperson.PdlPersonConsumer; +import no.nav.dolly.domain.PdlPerson; +import no.nav.dolly.domain.PdlPersonBolk; import no.nav.dolly.domain.jpa.BestillingProgress; import no.nav.dolly.domain.resultset.RsDollyUtvidetBestilling; import no.nav.dolly.domain.resultset.SystemTyper; @@ -20,6 +23,7 @@ import java.time.Duration; import java.util.Collections; import java.util.List; +import java.util.Objects; import java.util.Set; import java.util.function.Function; import java.util.stream.Collectors; @@ -41,21 +45,46 @@ public class TpsPersonService { private final TpsMessagingConsumer tpsMessagingConsumer; private final TransactionHelperService transactionHelperService; private final TransaksjonMappingService transaksjonMappingService; + private final PdlPersonConsumer pdlPersonConsumer; public Flux syncPerson(DollyPerson dollyPerson, RsDollyUtvidetBestilling bestilling, BestillingProgress progress, boolean isOpprettEndre) { long startTime = System.currentTimeMillis(); - return Flux.from(Flux.fromIterable(bestilling.getEnvironments()) + return Flux.fromIterable(bestilling.getEnvironments()) .filter(PENSJON_MILJOER::contains) .collectList() .filter(penMiljoer -> !penMiljoer.isEmpty()) .filter(penMiljoer -> isRelevantBestilling(bestilling) && (isOpprettEndre || !isTransaksjonMapping(dollyPerson.getIdent(), bestilling, penMiljoer))) - .flatMap(penMiljoer -> getTpsPerson(startTime, dollyPerson.getIdent(), - penMiljoer, Collections.emptyList(), progress)) - .map(status -> prepareResult(dollyPerson.getIdent(), status, bestilling.getEnvironments(), startTime)) - .map(status -> futurePersist(progress, status))); + .flatMapMany(penMiljoer -> + getRelasjoner(dollyPerson.getIdent()) + .flatMap(relasjon -> Flux.from(getTpsPerson(startTime, dollyPerson.getIdent(), + penMiljoer, Collections.emptyList(), progress) + .map(status -> prepareResult(relasjon, status, bestilling.getEnvironments(), startTime))))) + .collectList() + .flatMapIterable(list -> list) + .map(status -> futurePersist(progress, dollyPerson.getIdent(), status)); + } + + private Flux getRelasjoner(String ident) { + + return pdlPersonConsumer.getPdlPersoner(List.of(ident)) + .filter(pdlPersonBolk -> nonNull(pdlPersonBolk.getData())) + .map(PdlPersonBolk::getData) + .map(PdlPersonBolk.Data::getHentPersonBolk) + .flatMap(Flux::fromIterable) + .filter(personBolk -> nonNull(personBolk.getPerson())) + .flatMap(person -> Flux.fromStream(Stream.of( + Stream.of(ident), + person.getPerson().getSivilstand().stream() + .map(PdlPerson.Sivilstand::getRelatertVedSivilstand) + .filter(Objects::nonNull), + person.getPerson().getForelderBarnRelasjon().stream() + .map(PdlPerson.ForelderBarnRelasjon::getRelatertPersonsIdent) + .filter(Objects::nonNull)) + .flatMap(Function.identity()))) + .distinct(); } private boolean isRelevantBestilling(RsDollyUtvidetBestilling bestilling) { @@ -120,6 +149,7 @@ private List prepareResult(String ident, List miljoer.stream() .filter(miljoe -> status.stream().noneMatch(status1 -> miljoe.equals(status1.getMiljoe()))) .map(miljoe -> PersonMiljoeDTO.builder() + .ident(ident) .miljoe(miljoe) .status("NOK") .utfyllendeMelding(String.format("Feil: Synkronisering mot TPS gitt opp etter %d sekunder.", MAX_MILLIES / 1000)) @@ -128,17 +158,19 @@ private List prepareResult(String ident, List .toList(); } - private ClientFuture futurePersist(BestillingProgress progress, List status) { + private ClientFuture futurePersist(BestillingProgress progress, String ident, List status) { return () -> { progress.setIsTpsSyncEnv(status.stream() + .filter(status1 -> ident.equals(status1.getIdent())) .filter(PersonMiljoeDTO::isOk) .map(PersonMiljoeDTO::getMiljoe) .toList()); transactionHelperService.persister(progress, BestillingProgress::setTpsSyncStatus, status.stream() + .filter(detalj -> ident.equals(detalj.getIdent())) .map(detalj -> String.format("%s:%s", detalj.getMiljoe(), ErrorStatusDecoder.encodeStatus(detalj.isOk() ? detalj.getStatus() : StringUtils.trimToEmpty(String.format("FEIL: %s", detalj.getUtfyllendeMelding()))))) diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/errorhandling/ErrorStatusDecoder.java b/apps/dolly-backend/src/main/java/no/nav/dolly/errorhandling/ErrorStatusDecoder.java index 444bd3c4ccb..4ca2995e69f 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/errorhandling/ErrorStatusDecoder.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/errorhandling/ErrorStatusDecoder.java @@ -46,7 +46,8 @@ public static String encodeStatus(String toBeEncoded) { .replace("]", "") .replace(',', ';') .replace(':', '=') - .replace("\"", ""): ""; + .replace("\"", "") + .replace("$", "§") : ""; } public String getErrorText(HttpStatus errorStatus, String errorMsg) { diff --git a/apps/dolly-backend/src/main/resources/db/migration/V1.7.21__AlterTableTransactionId.sql b/apps/dolly-backend/src/main/resources/db/migration/V1.7.21__AlterTableTransactionId.sql new file mode 100644 index 00000000000..06bf4c6b072 --- /dev/null +++ b/apps/dolly-backend/src/main/resources/db/migration/V1.7.21__AlterTableTransactionId.sql @@ -0,0 +1,6 @@ +----------------------------- +-- A L T E R T A B L E S -- +----------------------------- + +alter table transaksjon_mapping +alter column transaksjon_id type varchar(2000); \ No newline at end of file diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java index 7e73f8d2e85..ff042a6a6c7 100644 --- a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java +++ b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java @@ -158,4 +158,4 @@ private Function> createRoute(String segment, St .filters(filter, addUserJwtHeaderFilter()) ).uri(host); } -} \ No newline at end of file +} diff --git a/apps/dolly-frontend/src/main/js/cypress.config.ts b/apps/dolly-frontend/src/main/js/cypress.config.ts index 3f726abaa58..d71635df7f9 100644 --- a/apps/dolly-frontend/src/main/js/cypress.config.ts +++ b/apps/dolly-frontend/src/main/js/cypress.config.ts @@ -3,15 +3,24 @@ import { defineConfig } from 'cypress' export default defineConfig({ pageLoadTimeout: 120000, defaultCommandTimeout: 25000, + env: { 'cypress-react-selector': { root: '#root', }, }, + e2e: { setupNodeEvents() {}, experimentalRunAllSpecs: true, specPattern: 'cypress/e2e/**/*.cy.{js,ts,jsx,tsx}', excludeSpecPattern: ['**/__snapshots__/*', '**/__image_snapshots__/*'], }, + + component: { + devServer: { + framework: 'react', + bundler: 'vite', + }, + }, }) diff --git a/apps/dolly-frontend/src/main/js/cypress/support/component-index.html b/apps/dolly-frontend/src/main/js/cypress/support/component-index.html new file mode 100644 index 00000000000..ac6e79fd83d --- /dev/null +++ b/apps/dolly-frontend/src/main/js/cypress/support/component-index.html @@ -0,0 +1,12 @@ + + + + + + + Components App + + +
+ + \ No newline at end of file diff --git a/apps/dolly-frontend/src/main/js/cypress/support/component.ts b/apps/dolly-frontend/src/main/js/cypress/support/component.ts new file mode 100644 index 00000000000..b1e1df4692b --- /dev/null +++ b/apps/dolly-frontend/src/main/js/cypress/support/component.ts @@ -0,0 +1,31 @@ +// *********************************************************** +// This example support/component.ts is processed and +// loaded automatically before your test files. +// +// This is a great place to put global configuration and +// behavior that modifies Cypress. +// +// You can change the location of this file or turn off +// automatically serving support files with the +// 'supportFile' configuration option. +// +// You can read more here: +// https://on.cypress.io/configuration +// *********************************************************** + +import './commands' + +import { mount } from 'cypress/react18' + +declare global { + namespace Cypress { + interface Chainable { + mount: typeof mount + } + } +} + +Cypress.Commands.add('mount', mount) + +// Example use: +// cy.mount() diff --git a/apps/dolly-frontend/src/main/js/package-lock.json b/apps/dolly-frontend/src/main/js/package-lock.json index 37484dc70e4..669431b61df 100644 --- a/apps/dolly-frontend/src/main/js/package-lock.json +++ b/apps/dolly-frontend/src/main/js/package-lock.json @@ -1,12 +1,12 @@ { "name": "dolly", - "version": "2.5.16", + "version": "2.5.18", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "dolly", - "version": "2.5.16", + "version": "2.5.18", "license": "ISC", "dependencies": { "@babel/preset-flow": "^7.18.6", @@ -32,7 +32,6 @@ "rc-progress": "^3.4.0", "rc-tooltip": "^6.0.1", "react": "^18.2.0", - "react-copy-to-clipboard": "^5.1.0", "react-datepicker": "^4.8.0", "react-day-picker": "^8.1.0", "react-dom": "^18.2.0", @@ -87,7 +86,7 @@ "babel-plugin-styled-components": "^2.1.1", "cpx2": "^5.0.0", "cross-env": "^7.0.3", - "cypress": "^13.1.0", + "cypress": "^13.0.0", "cypress-react-selector": "^3.0.0", "dot-prop": "^8.0.0", "eslint": "^8.29.0", @@ -114,7 +113,7 @@ "typescript": "^5.0.2", "vite": "^4.0.3", "vite-plugin-environment": "^1.1.3", - "vite-plugin-svgr": "^3.2.0", + "vite-plugin-svgr": "^4.0.0", "vite-tsconfig-paths": "^4.0.0" } }, @@ -195,28 +194,28 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz", - "integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.20.tgz", + "integrity": "sha512-BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw==", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.15.tgz", - "integrity": "sha512-PtZqMmgRrvj8ruoEOIwVA3yoF91O+Hgw9o7DAUTNBA6Mo2jpu31clx9a7Nz/9JznqetTR6zwfC4L3LAjKQXUwA==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.20.tgz", + "integrity": "sha512-Y6jd1ahLubuYweD/zJH+vvOY141v4f9igNQAQ+MBgq9JlHS2iTsZKn1aMsb3vGccZsXI16VzTBw52Xx0DWmtnA==", "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.22.13", "@babel/generator": "^7.22.15", "@babel/helper-compilation-targets": "^7.22.15", - "@babel/helper-module-transforms": "^7.22.15", + "@babel/helper-module-transforms": "^7.22.20", "@babel/helpers": "^7.22.15", - "@babel/parser": "^7.22.15", + "@babel/parser": "^7.22.16", "@babel/template": "^7.22.15", - "@babel/traverse": "^7.22.15", - "@babel/types": "^7.22.15", + "@babel/traverse": "^7.22.20", + "@babel/types": "^7.22.19", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -336,9 +335,9 @@ } }, "node_modules/@babel/helper-environment-visitor": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz", - "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", + "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==", "engines": { "node": ">=6.9.0" } @@ -389,15 +388,15 @@ } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.15.tgz", - "integrity": "sha512-l1UiX4UyHSFsYt17iQ3Se5pQQZZHa22zyIXURmvkmLCD4t/aU+dvNWHatKac/D9Vm9UES7nvIqHs4jZqKviUmQ==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.20.tgz", + "integrity": "sha512-dLT7JVWIUUxKOs1UnJUBR3S70YK+pKX6AbJgB2vMIvEkZkrfJDbYDJesnPshtKV4LhDOR3Oc5YULeDizRek+5A==", "dependencies": { - "@babel/helper-environment-visitor": "^7.22.5", + "@babel/helper-environment-visitor": "^7.22.20", "@babel/helper-module-imports": "^7.22.15", "@babel/helper-simple-access": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/helper-validator-identifier": "^7.22.15" + "@babel/helper-validator-identifier": "^7.22.20" }, "engines": { "node": ">=6.9.0" @@ -426,13 +425,13 @@ } }, "node_modules/@babel/helper-remap-async-to-generator": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.9.tgz", - "integrity": "sha512-8WWC4oR4Px+tr+Fp0X3RHDVfINGpF3ad1HIbrc8A77epiR6eMMc6jsgozkzT2uDiOOdoS9cLIQ+XD2XvI2WSmQ==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz", + "integrity": "sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==", "dependencies": { "@babel/helper-annotate-as-pure": "^7.22.5", - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-wrap-function": "^7.22.9" + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-wrap-function": "^7.22.20" }, "engines": { "node": ">=6.9.0" @@ -442,12 +441,12 @@ } }, "node_modules/@babel/helper-replace-supers": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz", - "integrity": "sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz", + "integrity": "sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==", "dependencies": { - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-member-expression-to-functions": "^7.22.5", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-member-expression-to-functions": "^7.22.15", "@babel/helper-optimise-call-expression": "^7.22.5" }, "engines": { @@ -499,9 +498,9 @@ } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.15.tgz", - "integrity": "sha512-4E/F9IIEi8WR94324mbDUMo074YTheJmd7eZF5vITTeYchqAi6sYXRLHUVsmkdmY4QjfKTcB2jB7dVP3NaBElQ==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", + "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", "engines": { "node": ">=6.9.0" } @@ -515,13 +514,13 @@ } }, "node_modules/@babel/helper-wrap-function": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.10.tgz", - "integrity": "sha512-OnMhjWjuGYtdoO3FmsEFWvBStBAe2QOgwOLsLNDjN+aaiMD8InJk1/O3HSD8lkqTjCgg5YI34Tz15KNNA3p+nQ==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz", + "integrity": "sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==", "dependencies": { "@babel/helper-function-name": "^7.22.5", - "@babel/template": "^7.22.5", - "@babel/types": "^7.22.10" + "@babel/template": "^7.22.15", + "@babel/types": "^7.22.19" }, "engines": { "node": ">=6.9.0" @@ -541,11 +540,11 @@ } }, "node_modules/@babel/highlight": { - "version": "7.22.13", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.13.tgz", - "integrity": "sha512-C/BaXcnnvBCmHTpz/VGZ8jgtE2aYlW4hxDhseJAWZb7gqGM/qtCK6iZUb0TyKFf7BOUsBH7Q7fkRsDRhg1XklQ==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz", + "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==", "dependencies": { - "@babel/helper-validator-identifier": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.20", "chalk": "^2.4.2", "js-tokens": "^4.0.0" }, @@ -1761,11 +1760,11 @@ } }, "node_modules/@babel/preset-env": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.15.tgz", - "integrity": "sha512-tZFHr54GBkHk6hQuVA8w4Fmq+MSPsfvMG0vPnOYyTnJpyfMqybL8/MbNCPRT9zc2KBO2pe4tq15g6Uno4Jpoag==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.20.tgz", + "integrity": "sha512-11MY04gGC4kSzlPHRfvVkNAZhUxOvm7DCJ37hPDnUENwe06npjIRAfInEMTGSb4LZK5ZgDFkv5hw0lGebHeTyg==", "dependencies": { - "@babel/compat-data": "^7.22.9", + "@babel/compat-data": "^7.22.20", "@babel/helper-compilation-targets": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5", "@babel/helper-validator-option": "^7.22.15", @@ -1839,7 +1838,7 @@ "@babel/plugin-transform-unicode-regex": "^7.22.5", "@babel/plugin-transform-unicode-sets-regex": "^7.22.5", "@babel/preset-modules": "0.1.6-no-external-plugins", - "@babel/types": "^7.22.15", + "@babel/types": "^7.22.19", "babel-plugin-polyfill-corejs2": "^0.4.5", "babel-plugin-polyfill-corejs3": "^0.8.3", "babel-plugin-polyfill-regenerator": "^0.5.2", @@ -1949,18 +1948,18 @@ } }, "node_modules/@babel/traverse": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.15.tgz", - "integrity": "sha512-DdHPwvJY0sEeN4xJU5uRLmZjgMMDIvMPniLuYzUVXj/GGzysPl0/fwt44JBkyUIzGJPV8QgHMcQdQ34XFuKTYQ==", + "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.20.tgz", + "integrity": "sha512-eU260mPZbU7mZ0N+X10pxXhQFMGTeLb9eFS0mxehS8HZp9o1uSnFeWQuG1UPrlxgA7QoUzFhOnilHDp0AXCyHw==", "dependencies": { "@babel/code-frame": "^7.22.13", "@babel/generator": "^7.22.15", - "@babel/helper-environment-visitor": "^7.22.5", + "@babel/helper-environment-visitor": "^7.22.20", "@babel/helper-function-name": "^7.22.5", "@babel/helper-hoist-variables": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.22.15", - "@babel/types": "^7.22.15", + "@babel/parser": "^7.22.16", + "@babel/types": "^7.22.19", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -1969,12 +1968,12 @@ } }, "node_modules/@babel/types": { - "version": "7.22.15", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.15.tgz", - "integrity": "sha512-X+NLXr0N8XXmN5ZsaQdm9U2SSC3UbIYq/doL++sueHOTisgZHoKaQtZxGuV2cUPQHMfjKEfg/g6oy7Hm6SKFtA==", + "version": "7.22.19", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.19.tgz", + "integrity": "sha512-P7LAw/LbojPzkgp5oznjE6tQEIWbp4PkkfrZDINTro9zgBRtI324/EYsiSI7lhPbpIQ+DCeR2NNmMWANGGfZsg==", "dependencies": { "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.15", + "@babel/helper-validator-identifier": "^7.22.19", "to-fast-properties": "^2.0.0" }, "engines": { @@ -2581,9 +2580,9 @@ } }, "node_modules/@eslint-community/regexpp": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.8.0.tgz", - "integrity": "sha512-JylOEEzDiOryeUnFbQz+oViCXS0KsvR1mvHkoMiu5+UiBvy+RYX7tzlIIIEstF/gVa2tj9AQXk3dgnxv6KxhFg==", + "version": "4.8.1", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.8.1.tgz", + "integrity": "sha512-PWiOzLIUAjN/w5K17PoF4n6sKBw0gqLHPhywmYHP4t1VFQQVYeb1yWsJwnMVEMl3tUHME7X/SJPZLmtG7XBDxQ==", "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } @@ -2656,28 +2655,28 @@ } }, "node_modules/@eslint/js": { - "version": "8.48.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.48.0.tgz", - "integrity": "sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw==", + "version": "8.49.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.49.0.tgz", + "integrity": "sha512-1S8uAY/MTJqVx0SC4epBq+N2yhuwtNwLbJYNZyhL2pO1ZVKn5HFXav5T41Ryzy9K9V7ZId2JB2oy/W4aCd9/2w==", "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, "node_modules/@floating-ui/core": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.4.1.tgz", - "integrity": "sha512-jk3WqquEJRlcyu7997NtR5PibI+y5bi+LS3hPmguVClypenMsCY3CBa3LAQnozRCtCrYWSEtAdiskpamuJRFOQ==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.5.0.tgz", + "integrity": "sha512-kK1h4m36DQ0UHGj5Ah4db7R0rHemTqqO0QLvUqi1/mUUp3LuAWbWxdxSIf/XsnH9VS6rRVPLJCncjRzUvyCLXg==", "dependencies": { - "@floating-ui/utils": "^0.1.1" + "@floating-ui/utils": "^0.1.3" } }, "node_modules/@floating-ui/dom": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.5.1.tgz", - "integrity": "sha512-KwvVcPSXg6mQygvA1TjbN/gh///36kKtllIF8SUm0qpFj8+rvYrpvlYdL1JoA71SHpDqgSSdGOSoQ0Mp3uY5aw==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.5.3.tgz", + "integrity": "sha512-ClAbQnEqJAKCJOEbbLo5IUlZHkNszqhuxS4fHAVxRPXPya6Ysf2G8KypnYcOTpx6I8xcgF9bbHb6g/2KpbV8qA==", "dependencies": { - "@floating-ui/core": "^1.4.1", - "@floating-ui/utils": "^0.1.1" + "@floating-ui/core": "^1.4.2", + "@floating-ui/utils": "^0.1.3" } }, "node_modules/@floating-ui/react": { @@ -2707,14 +2706,14 @@ } }, "node_modules/@floating-ui/utils": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.1.1.tgz", - "integrity": "sha512-m0G6wlnhm/AX0H12IOWtK8gASEMffnX08RtKkCgTdHb9JpHKGloI7icFfLg9ZmQeavcvR0PKmzxClyuFPSjKWw==" + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.1.4.tgz", + "integrity": "sha512-qprfWkn82Iw821mcKofJ5Pk9wgioHicxcQMxx+5zt5GSKoqdWvgG5AxVmpmUUjzTLPVSH5auBrhI93Deayn/DA==" }, "node_modules/@grafana/faro-core": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@grafana/faro-core/-/faro-core-1.1.4.tgz", - "integrity": "sha512-JpxtCXHsjkvuWE4gZ/EmsXAXY/buPtLaB3kWQsVMnlNglxoyFM+FXS0VB48Ip66cDmYZcdtxAW1NW3SqaW2O+g==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@grafana/faro-core/-/faro-core-1.2.1.tgz", + "integrity": "sha512-gI8CpyhAKRsMbPHom3sAa0qCgiQAXZrlv43Tv2q30PgMgNsV4iWI6UKHN/7NPJyvUFd+h0B/plukYDGZxO1kew==", "dependencies": { "@opentelemetry/api": "^1.4.1", "@opentelemetry/api-metrics": "^0.33.0", @@ -2723,12 +2722,12 @@ } }, "node_modules/@grafana/faro-react": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@grafana/faro-react/-/faro-react-1.1.4.tgz", - "integrity": "sha512-P9FkdSYivUGD9blLCFrfBecANcUN2O9XD02zsHRrXvqbmW8hpIK/gj0JlU4F1Ba15t/Aoqz+nXpiQ0/NWV6p3w==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@grafana/faro-react/-/faro-react-1.2.1.tgz", + "integrity": "sha512-pWdYxKnQXyVaTLXYUQ+ju/PJGen9WUy0VQkHi79pwat/cbMpC3UsOWDjHyau7vt2HdLXl9yxinZ0QQzyTbiiVw==", "dependencies": { - "@grafana/faro-web-sdk": "^1.1.4", - "@grafana/faro-web-tracing": "^1.1.4", + "@grafana/faro-web-sdk": "^1.2.1", + "@grafana/faro-web-tracing": "^1.2.1", "hoist-non-react-statics": "^3.3.2" }, "peerDependencies": { @@ -2737,21 +2736,21 @@ } }, "node_modules/@grafana/faro-web-sdk": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@grafana/faro-web-sdk/-/faro-web-sdk-1.1.4.tgz", - "integrity": "sha512-eyrwi01VWkoaBZVYo3fbyakW/nN6Dhz/dYgaWHOx3Mt0pH+q8IrIAF5oNoy9QGNCsdmld/sbIL+jV6yoyojYDA==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@grafana/faro-web-sdk/-/faro-web-sdk-1.2.1.tgz", + "integrity": "sha512-86Bk3IjVNdV/WufkdPJVUvjx7PYKjPV5n2Szpn+dOewZqEDd1lIqhyFYqVVM9kdjT+ARbSzY5BZvb+r0Kh8tuQ==", "dependencies": { - "@grafana/faro-core": "^1.1.4", + "@grafana/faro-core": "^1.2.1", "ua-parser-js": "^1.0.32", "web-vitals": "^3.1.1" } }, "node_modules/@grafana/faro-web-tracing": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@grafana/faro-web-tracing/-/faro-web-tracing-1.1.4.tgz", - "integrity": "sha512-JtAfnR/vBORMnyrsrKWnlxGIB+7qZYj3envV7nSCrYaXiVCErLhb2k6feyKBIMif14kX/H/FHw4maDWo2RW4hQ==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@grafana/faro-web-tracing/-/faro-web-tracing-1.2.1.tgz", + "integrity": "sha512-2GWXL0fhI+uaq0IO3RRTV2kJZaVLWGjYHIeNMcHnx2f46QETR8A73F3tLpVxyxtudJPGipK+lZ9ROtOznyu7fQ==", "dependencies": { - "@grafana/faro-web-sdk": "^1.1.4", + "@grafana/faro-web-sdk": "^1.2.1", "@opentelemetry/api": "^1.4.1", "@opentelemetry/context-zone": "^1.15.2", "@opentelemetry/core": "^1.15.2", @@ -2963,16 +2962,16 @@ "optional": true }, "node_modules/@navikt/aksel-icons": { - "version": "5.4.0", - "resolved": "https://npm.pkg.github.com/download/@navikt/aksel-icons/5.4.0/0d0096c7f57e1edb0c2f009aecdb77b1185ad89c", - "integrity": "sha512-PblayoRxJ5PdTDl5j2ahYKqHKgFVmGIPxR6DSGUuN4Cx2TX/rB69S6OPZIVNbzqme/Veuuh3uxRz5pe+5vO8xw==", + "version": "5.5.0", + "resolved": "https://npm.pkg.github.com/download/@navikt/aksel-icons/5.5.0/b382aa387897f3f4850fbc16c3b95d6a57b7ef38", + "integrity": "sha512-KKq28Ed4lYwnrESIyyOxnBGr7ef1RqTPZoLAJE1YXNGHfVMN/TEZCoZQlPialhZK8g36ngNgvtsZeEm5oCxoxQ==", "dev": true, "license": "MIT" }, "node_modules/@navikt/ds-css": { - "version": "5.4.0", - "resolved": "https://npm.pkg.github.com/download/@navikt/ds-css/5.4.0/76a0b7beb365998b3120b9570d86e0fadbd0dbb8", - "integrity": "sha512-6SK53ZwDIrHMTM8Sl7EJVSp/O+0b0bH8/zCDm385Ea1Sd/LlEuWmMizJDyf80Rfemh3lgjYp7MtBgVRhcXJq6g==", + "version": "5.5.0", + "resolved": "https://npm.pkg.github.com/download/@navikt/ds-css/5.5.0/1802dd367f4fc83a892bbc250068efc6f5f5c205", + "integrity": "sha512-8QFCSyBY1B49L7w65xf+eBHSVjGHPFmhq5vrIijyeq7CbFGxH5ZQNkGZuQr5WE+cKhHk/ViOmA/FJUR++VWBCA==", "dev": true, "license": "MIT" }, @@ -2994,14 +2993,15 @@ } }, "node_modules/@navikt/ds-react": { - "version": "5.4.0", - "resolved": "https://npm.pkg.github.com/download/@navikt/ds-react/5.4.0/d3b4dba40957c7544e84900aa8cf14fc9a4a6302", - "integrity": "sha512-A1hzsPnhuDPchSUosW1L/dGc3KUsM4xjDk6HFkF20tvuGDArGPyEnpM1sVcaT98XYIrNKDZUForlBDNlK066Fg==", + "version": "5.5.0", + "resolved": "https://npm.pkg.github.com/download/@navikt/ds-react/5.5.0/9dd060472b85eaaf0f7cf344a93d20bb0bbd9d42", + "integrity": "sha512-sBX0q7MjkAVBYvE8mrNkb2YwF0Cx/TNLIjN96bnLOnqfHRB8CV2+lkYNR6u+c/8qOuPZXgyH25dqye9kMC4VdQ==", "dev": true, "license": "MIT", "dependencies": { "@floating-ui/react": "0.24.1", - "@navikt/aksel-icons": "^5.4.0", + "@navikt/aksel-icons": "^5.5.0", + "@navikt/ds-tokens": "^5.5.0", "@radix-ui/react-tabs": "1.0.0", "@radix-ui/react-toggle-group": "1.0.0", "clsx": "^1.2.1", @@ -3126,6 +3126,13 @@ "react": "^16.8.0 || ^17.0.0 || ^18.0.0" } }, + "node_modules/@navikt/ds-tokens": { + "version": "5.5.0", + "resolved": "https://npm.pkg.github.com/download/@navikt/ds-tokens/5.5.0/f963d7872d9b6eb74198f19f107b6073bfa8c6a5", + "integrity": "sha512-zV9TfGNjiRgpX1Ec11gK8BtgkiR+HN+qwjVbWt5NA6ux8xIQYdaFqLJWQa585vLl6DEOhwrlzb0FhT+KDvG3Rg==", + "dev": true, + "license": "MIT" + }, "node_modules/@navikt/fnrvalidator": { "version": "1.3.3", "resolved": "https://npm.pkg.github.com/download/@navikt/fnrvalidator/1.3.3/8414963a30e59e3056c9befea7bb022498a2a742", @@ -3202,11 +3209,11 @@ } }, "node_modules/@opentelemetry/context-zone": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-zone/-/context-zone-1.15.2.tgz", - "integrity": "sha512-VdzdaETT7Tm7OXRGLe+I01L0MERR+eMcKK7KLbIyLQFA4ThVWK5TUW+A28jQQ1P0UfHRPw/kub7162yUui5YKw==", + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/context-zone/-/context-zone-1.17.0.tgz", + "integrity": "sha512-J/bnE7StSPVV3yJKOsW7ndvB5nx4lP8ElsbdTD+exGRsOjdFURhLsTlDokFhRP6Ek1k/3uKJ6xn7seLpVBCSpA==", "dependencies": { - "@opentelemetry/context-zone-peer-dep": "1.15.2", + "@opentelemetry/context-zone-peer-dep": "1.17.0", "zone.js": "^0.11.0" }, "engines": { @@ -3214,29 +3221,29 @@ } }, "node_modules/@opentelemetry/context-zone-peer-dep": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/@opentelemetry/context-zone-peer-dep/-/context-zone-peer-dep-1.15.2.tgz", - "integrity": "sha512-AEi2rTyLCL6y8jjD33lSQ6tEUMOT4QJH6Ep1RpT56UdkrPQbf60uUSuSx5Ufpms0DNZt2AnFZYShzfYUZmvOJQ==", + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/context-zone-peer-dep/-/context-zone-peer-dep-1.17.0.tgz", + "integrity": "sha512-wY6uicvDRaTi/hI9HQk6KbuI01gh0m6aMokSAOxlB+pWGyvBlITxy05zl9sC/Y94GRwRVrab4aYNWrlgdSoHbQ==", "engines": { "node": ">=14" }, "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.5.0", + "@opentelemetry/api": ">=1.0.0 <1.7.0", "zone.js": "^0.10.2 || ^0.11.0" } }, "node_modules/@opentelemetry/core": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.15.2.tgz", - "integrity": "sha512-+gBv15ta96WqkHZaPpcDHiaz0utiiHZVfm2YOYSqFGrUaJpPkMoSuLBB58YFQGi6Rsb9EHos84X6X5+9JspmLw==", + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.17.0.tgz", + "integrity": "sha512-tfnl3h+UefCgx1aeN2xtrmr6BmdWGKXypk0pflQR0urFS40aE88trnkOMc2HTJZbMrqEEl4HsaBeFhwLVXsrJg==", "dependencies": { - "@opentelemetry/semantic-conventions": "1.15.2" + "@opentelemetry/semantic-conventions": "1.17.0" }, "engines": { "node": ">=14" }, "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.5.0" + "@opentelemetry/api": ">=1.0.0 <1.7.0" } }, "node_modules/@opentelemetry/exporter-trace-otlp-http": { @@ -3257,6 +3264,59 @@ "@opentelemetry/api": "^1.0.0" } }, + "node_modules/@opentelemetry/exporter-trace-otlp-http/node_modules/@opentelemetry/core": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.15.2.tgz", + "integrity": "sha512-+gBv15ta96WqkHZaPpcDHiaz0utiiHZVfm2YOYSqFGrUaJpPkMoSuLBB58YFQGi6Rsb9EHos84X6X5+9JspmLw==", + "dependencies": { + "@opentelemetry/semantic-conventions": "1.15.2" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.5.0" + } + }, + "node_modules/@opentelemetry/exporter-trace-otlp-http/node_modules/@opentelemetry/resources": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.15.2.tgz", + "integrity": "sha512-xmMRLenT9CXmm5HMbzpZ1hWhaUowQf8UB4jMjFlAxx1QzQcsD3KFNAVX/CAWzFPtllTyTplrA4JrQ7sCH3qmYw==", + "dependencies": { + "@opentelemetry/core": "1.15.2", + "@opentelemetry/semantic-conventions": "1.15.2" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.5.0" + } + }, + "node_modules/@opentelemetry/exporter-trace-otlp-http/node_modules/@opentelemetry/sdk-trace-base": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.15.2.tgz", + "integrity": "sha512-BEaxGZbWtvnSPchV98qqqqa96AOcb41pjgvhfzDij10tkBhIu9m0Jd6tZ1tJB5ZHfHbTffqYVYE0AOGobec/EQ==", + "dependencies": { + "@opentelemetry/core": "1.15.2", + "@opentelemetry/resources": "1.15.2", + "@opentelemetry/semantic-conventions": "1.15.2" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.5.0" + } + }, + "node_modules/@opentelemetry/exporter-trace-otlp-http/node_modules/@opentelemetry/semantic-conventions": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.15.2.tgz", + "integrity": "sha512-CjbOKwk2s+3xPIMcd5UNYQzsf+v94RczbdNix9/kQh38WiQkM90sUOi3if8eyHFgiBjBjhwXrA7W3ydiSQP9mw==", + "engines": { + "node": ">=14" + } + }, "node_modules/@opentelemetry/instrumentation": { "version": "0.41.2", "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.41.2.tgz", @@ -3310,6 +3370,75 @@ "@opentelemetry/api": "^1.0.0" } }, + "node_modules/@opentelemetry/instrumentation-fetch/node_modules/@opentelemetry/core": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.15.2.tgz", + "integrity": "sha512-+gBv15ta96WqkHZaPpcDHiaz0utiiHZVfm2YOYSqFGrUaJpPkMoSuLBB58YFQGi6Rsb9EHos84X6X5+9JspmLw==", + "dependencies": { + "@opentelemetry/semantic-conventions": "1.15.2" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.5.0" + } + }, + "node_modules/@opentelemetry/instrumentation-fetch/node_modules/@opentelemetry/resources": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.15.2.tgz", + "integrity": "sha512-xmMRLenT9CXmm5HMbzpZ1hWhaUowQf8UB4jMjFlAxx1QzQcsD3KFNAVX/CAWzFPtllTyTplrA4JrQ7sCH3qmYw==", + "dependencies": { + "@opentelemetry/core": "1.15.2", + "@opentelemetry/semantic-conventions": "1.15.2" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.5.0" + } + }, + "node_modules/@opentelemetry/instrumentation-fetch/node_modules/@opentelemetry/sdk-trace-base": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.15.2.tgz", + "integrity": "sha512-BEaxGZbWtvnSPchV98qqqqa96AOcb41pjgvhfzDij10tkBhIu9m0Jd6tZ1tJB5ZHfHbTffqYVYE0AOGobec/EQ==", + "dependencies": { + "@opentelemetry/core": "1.15.2", + "@opentelemetry/resources": "1.15.2", + "@opentelemetry/semantic-conventions": "1.15.2" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.5.0" + } + }, + "node_modules/@opentelemetry/instrumentation-fetch/node_modules/@opentelemetry/sdk-trace-web": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-web/-/sdk-trace-web-1.15.2.tgz", + "integrity": "sha512-OjCrwtu4b+cAt540wyIr7d0lCA/cY9y42lmYDFUfJ8Ixj2bByIUJ4yyd9M7mXHpQHdiR/Kq2vzsgS14Uj+RU0Q==", + "dependencies": { + "@opentelemetry/core": "1.15.2", + "@opentelemetry/sdk-trace-base": "1.15.2", + "@opentelemetry/semantic-conventions": "1.15.2" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.5.0" + } + }, + "node_modules/@opentelemetry/instrumentation-fetch/node_modules/@opentelemetry/semantic-conventions": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.15.2.tgz", + "integrity": "sha512-CjbOKwk2s+3xPIMcd5UNYQzsf+v94RczbdNix9/kQh38WiQkM90sUOi3if8eyHFgiBjBjhwXrA7W3ydiSQP9mw==", + "engines": { + "node": ">=14" + } + }, "node_modules/@opentelemetry/instrumentation-xml-http-request": { "version": "0.41.2", "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-xml-http-request/-/instrumentation-xml-http-request-0.41.2.tgz", @@ -3327,6 +3456,75 @@ "@opentelemetry/api": "^1.0.0" } }, + "node_modules/@opentelemetry/instrumentation-xml-http-request/node_modules/@opentelemetry/core": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.15.2.tgz", + "integrity": "sha512-+gBv15ta96WqkHZaPpcDHiaz0utiiHZVfm2YOYSqFGrUaJpPkMoSuLBB58YFQGi6Rsb9EHos84X6X5+9JspmLw==", + "dependencies": { + "@opentelemetry/semantic-conventions": "1.15.2" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.5.0" + } + }, + "node_modules/@opentelemetry/instrumentation-xml-http-request/node_modules/@opentelemetry/resources": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.15.2.tgz", + "integrity": "sha512-xmMRLenT9CXmm5HMbzpZ1hWhaUowQf8UB4jMjFlAxx1QzQcsD3KFNAVX/CAWzFPtllTyTplrA4JrQ7sCH3qmYw==", + "dependencies": { + "@opentelemetry/core": "1.15.2", + "@opentelemetry/semantic-conventions": "1.15.2" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.5.0" + } + }, + "node_modules/@opentelemetry/instrumentation-xml-http-request/node_modules/@opentelemetry/sdk-trace-base": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.15.2.tgz", + "integrity": "sha512-BEaxGZbWtvnSPchV98qqqqa96AOcb41pjgvhfzDij10tkBhIu9m0Jd6tZ1tJB5ZHfHbTffqYVYE0AOGobec/EQ==", + "dependencies": { + "@opentelemetry/core": "1.15.2", + "@opentelemetry/resources": "1.15.2", + "@opentelemetry/semantic-conventions": "1.15.2" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.5.0" + } + }, + "node_modules/@opentelemetry/instrumentation-xml-http-request/node_modules/@opentelemetry/sdk-trace-web": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-web/-/sdk-trace-web-1.15.2.tgz", + "integrity": "sha512-OjCrwtu4b+cAt540wyIr7d0lCA/cY9y42lmYDFUfJ8Ixj2bByIUJ4yyd9M7mXHpQHdiR/Kq2vzsgS14Uj+RU0Q==", + "dependencies": { + "@opentelemetry/core": "1.15.2", + "@opentelemetry/sdk-trace-base": "1.15.2", + "@opentelemetry/semantic-conventions": "1.15.2" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.5.0" + } + }, + "node_modules/@opentelemetry/instrumentation-xml-http-request/node_modules/@opentelemetry/semantic-conventions": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.15.2.tgz", + "integrity": "sha512-CjbOKwk2s+3xPIMcd5UNYQzsf+v94RczbdNix9/kQh38WiQkM90sUOi3if8eyHFgiBjBjhwXrA7W3ydiSQP9mw==", + "engines": { + "node": ">=14" + } + }, "node_modules/@opentelemetry/instrumentation/node_modules/lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -3371,6 +3569,28 @@ "@opentelemetry/api": "^1.0.0" } }, + "node_modules/@opentelemetry/otlp-exporter-base/node_modules/@opentelemetry/core": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.15.2.tgz", + "integrity": "sha512-+gBv15ta96WqkHZaPpcDHiaz0utiiHZVfm2YOYSqFGrUaJpPkMoSuLBB58YFQGi6Rsb9EHos84X6X5+9JspmLw==", + "dependencies": { + "@opentelemetry/semantic-conventions": "1.15.2" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.5.0" + } + }, + "node_modules/@opentelemetry/otlp-exporter-base/node_modules/@opentelemetry/semantic-conventions": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.15.2.tgz", + "integrity": "sha512-CjbOKwk2s+3xPIMcd5UNYQzsf+v94RczbdNix9/kQh38WiQkM90sUOi3if8eyHFgiBjBjhwXrA7W3ydiSQP9mw==", + "engines": { + "node": ">=14" + } + }, "node_modules/@opentelemetry/otlp-transformer": { "version": "0.41.2", "resolved": "https://registry.npmjs.org/@opentelemetry/otlp-transformer/-/otlp-transformer-0.41.2.tgz", @@ -3390,7 +3610,21 @@ "@opentelemetry/api": ">=1.3.0 <1.5.0" } }, - "node_modules/@opentelemetry/resources": { + "node_modules/@opentelemetry/otlp-transformer/node_modules/@opentelemetry/core": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.15.2.tgz", + "integrity": "sha512-+gBv15ta96WqkHZaPpcDHiaz0utiiHZVfm2YOYSqFGrUaJpPkMoSuLBB58YFQGi6Rsb9EHos84X6X5+9JspmLw==", + "dependencies": { + "@opentelemetry/semantic-conventions": "1.15.2" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.5.0" + } + }, + "node_modules/@opentelemetry/otlp-transformer/node_modules/@opentelemetry/resources": { "version": "1.15.2", "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.15.2.tgz", "integrity": "sha512-xmMRLenT9CXmm5HMbzpZ1hWhaUowQf8UB4jMjFlAxx1QzQcsD3KFNAVX/CAWzFPtllTyTplrA4JrQ7sCH3qmYw==", @@ -3405,6 +3639,45 @@ "@opentelemetry/api": ">=1.0.0 <1.5.0" } }, + "node_modules/@opentelemetry/otlp-transformer/node_modules/@opentelemetry/sdk-trace-base": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.15.2.tgz", + "integrity": "sha512-BEaxGZbWtvnSPchV98qqqqa96AOcb41pjgvhfzDij10tkBhIu9m0Jd6tZ1tJB5ZHfHbTffqYVYE0AOGobec/EQ==", + "dependencies": { + "@opentelemetry/core": "1.15.2", + "@opentelemetry/resources": "1.15.2", + "@opentelemetry/semantic-conventions": "1.15.2" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.5.0" + } + }, + "node_modules/@opentelemetry/otlp-transformer/node_modules/@opentelemetry/semantic-conventions": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.15.2.tgz", + "integrity": "sha512-CjbOKwk2s+3xPIMcd5UNYQzsf+v94RczbdNix9/kQh38WiQkM90sUOi3if8eyHFgiBjBjhwXrA7W3ydiSQP9mw==", + "engines": { + "node": ">=14" + } + }, + "node_modules/@opentelemetry/resources": { + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.17.0.tgz", + "integrity": "sha512-+u0ciVnj8lhuL/qGRBPeVYvk7fL+H/vOddfvmOeJaA1KC+5/3UED1c9KoZQlRsNT5Kw1FaK8LkY2NVLYfOVZQw==", + "dependencies": { + "@opentelemetry/core": "1.17.0", + "@opentelemetry/semantic-conventions": "1.17.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.7.0" + } + }, "node_modules/@opentelemetry/sdk-logs": { "version": "0.41.2", "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-logs/-/sdk-logs-0.41.2.tgz", @@ -3421,6 +3694,43 @@ "@opentelemetry/api-logs": ">=0.39.1" } }, + "node_modules/@opentelemetry/sdk-logs/node_modules/@opentelemetry/core": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.15.2.tgz", + "integrity": "sha512-+gBv15ta96WqkHZaPpcDHiaz0utiiHZVfm2YOYSqFGrUaJpPkMoSuLBB58YFQGi6Rsb9EHos84X6X5+9JspmLw==", + "dependencies": { + "@opentelemetry/semantic-conventions": "1.15.2" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.5.0" + } + }, + "node_modules/@opentelemetry/sdk-logs/node_modules/@opentelemetry/resources": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.15.2.tgz", + "integrity": "sha512-xmMRLenT9CXmm5HMbzpZ1hWhaUowQf8UB4jMjFlAxx1QzQcsD3KFNAVX/CAWzFPtllTyTplrA4JrQ7sCH3qmYw==", + "dependencies": { + "@opentelemetry/core": "1.15.2", + "@opentelemetry/semantic-conventions": "1.15.2" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.5.0" + } + }, + "node_modules/@opentelemetry/sdk-logs/node_modules/@opentelemetry/semantic-conventions": { + "version": "1.15.2", + "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.15.2.tgz", + "integrity": "sha512-CjbOKwk2s+3xPIMcd5UNYQzsf+v94RczbdNix9/kQh38WiQkM90sUOi3if8eyHFgiBjBjhwXrA7W3ydiSQP9mw==", + "engines": { + "node": ">=14" + } + }, "node_modules/@opentelemetry/sdk-metrics": { "version": "1.15.2", "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-metrics/-/sdk-metrics-1.15.2.tgz", @@ -3437,13 +3747,11 @@ "@opentelemetry/api": ">=1.3.0 <1.5.0" } }, - "node_modules/@opentelemetry/sdk-trace-base": { + "node_modules/@opentelemetry/sdk-metrics/node_modules/@opentelemetry/core": { "version": "1.15.2", - "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.15.2.tgz", - "integrity": "sha512-BEaxGZbWtvnSPchV98qqqqa96AOcb41pjgvhfzDij10tkBhIu9m0Jd6tZ1tJB5ZHfHbTffqYVYE0AOGobec/EQ==", + "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.15.2.tgz", + "integrity": "sha512-+gBv15ta96WqkHZaPpcDHiaz0utiiHZVfm2YOYSqFGrUaJpPkMoSuLBB58YFQGi6Rsb9EHos84X6X5+9JspmLw==", "dependencies": { - "@opentelemetry/core": "1.15.2", - "@opentelemetry/resources": "1.15.2", "@opentelemetry/semantic-conventions": "1.15.2" }, "engines": { @@ -3453,13 +3761,12 @@ "@opentelemetry/api": ">=1.0.0 <1.5.0" } }, - "node_modules/@opentelemetry/sdk-trace-web": { + "node_modules/@opentelemetry/sdk-metrics/node_modules/@opentelemetry/resources": { "version": "1.15.2", - "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-web/-/sdk-trace-web-1.15.2.tgz", - "integrity": "sha512-OjCrwtu4b+cAt540wyIr7d0lCA/cY9y42lmYDFUfJ8Ixj2bByIUJ4yyd9M7mXHpQHdiR/Kq2vzsgS14Uj+RU0Q==", + "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.15.2.tgz", + "integrity": "sha512-xmMRLenT9CXmm5HMbzpZ1hWhaUowQf8UB4jMjFlAxx1QzQcsD3KFNAVX/CAWzFPtllTyTplrA4JrQ7sCH3qmYw==", "dependencies": { "@opentelemetry/core": "1.15.2", - "@opentelemetry/sdk-trace-base": "1.15.2", "@opentelemetry/semantic-conventions": "1.15.2" }, "engines": { @@ -3469,7 +3776,7 @@ "@opentelemetry/api": ">=1.0.0 <1.5.0" } }, - "node_modules/@opentelemetry/semantic-conventions": { + "node_modules/@opentelemetry/sdk-metrics/node_modules/@opentelemetry/semantic-conventions": { "version": "1.15.2", "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.15.2.tgz", "integrity": "sha512-CjbOKwk2s+3xPIMcd5UNYQzsf+v94RczbdNix9/kQh38WiQkM90sUOi3if8eyHFgiBjBjhwXrA7W3ydiSQP9mw==", @@ -3477,6 +3784,46 @@ "node": ">=14" } }, + "node_modules/@opentelemetry/sdk-trace-base": { + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.17.0.tgz", + "integrity": "sha512-2T5HA1/1iE36Q9eg6D4zYlC4Y4GcycI1J6NsHPKZY9oWfAxWsoYnRlkPfUqyY5XVtocCo/xHpnJvGNHwzT70oQ==", + "dependencies": { + "@opentelemetry/core": "1.17.0", + "@opentelemetry/resources": "1.17.0", + "@opentelemetry/semantic-conventions": "1.17.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.7.0" + } + }, + "node_modules/@opentelemetry/sdk-trace-web": { + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-web/-/sdk-trace-web-1.17.0.tgz", + "integrity": "sha512-vvE0zcco5tuOi16PsG6QkLOfEuzGAdzSLQPQgzRa6OGOo6ZeCpQ2JP+1U5a0pliAhmWYpVsW9u8T0qAYrHh3Bw==", + "dependencies": { + "@opentelemetry/core": "1.17.0", + "@opentelemetry/sdk-trace-base": "1.17.0", + "@opentelemetry/semantic-conventions": "1.17.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "@opentelemetry/api": ">=1.0.0 <1.7.0" + } + }, + "node_modules/@opentelemetry/semantic-conventions": { + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.17.0.tgz", + "integrity": "sha512-+fguCd2d8d2qruk0H0DsCEy2CTK3t0Tugg7MhZ/UQMvmewbZLNnJ6heSYyzIZWG5IPfAXzoj4f4F/qpM7l4VBA==", + "engines": { + "node": ">=14" + } + }, "node_modules/@pkgr/utils": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/@pkgr/utils/-/utils-2.4.2.tgz", @@ -3839,9 +4186,9 @@ } }, "node_modules/@remix-run/router": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.8.0.tgz", - "integrity": "sha512-mrfKqIHnSZRyIzBcanNJmVQELTnX+qagEDlcKO90RgRBVOZGSGvZKeDihTRfWcqoDn5N/NkUcwWTccnpN18Tfg==", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.9.0.tgz", + "integrity": "sha512-bV63itrKBC0zdT27qYm6SDZHlkXwFL1xMBuhkn+X7l0+IIhNaH5wuuvZKp6eKhCD4KFhujhfhCT1YxXW6esUIA==", "engines": { "node": ">=14.0.0" } @@ -3938,9 +4285,9 @@ "dev": true }, "node_modules/@svgr/babel-plugin-add-jsx-attribute": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-7.0.0.tgz", - "integrity": "sha512-khWbXesWIP9v8HuKCl2NU2HNAyqpSQ/vkIl36Nbn4HIwEYSRWL0H7Gs6idJdha2DkpFDWlsqMELvoCE8lfFY6Q==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-8.0.0.tgz", + "integrity": "sha512-b9MIk7yhdS1pMCZM8VeNfUlSKVRhsHZNMl5O9SfaX0l0t5wjdgu4IDzGB8bpnGBBOjGST3rRFVsaaEtI4W6f7g==", "dev": true, "engines": { "node": ">=14" @@ -3954,9 +4301,9 @@ } }, "node_modules/@svgr/babel-plugin-remove-jsx-attribute": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-7.0.0.tgz", - "integrity": "sha512-iiZaIvb3H/c7d3TH2HBeK91uI2rMhZNwnsIrvd7ZwGLkFw6mmunOCoVnjdYua662MqGFxlN9xTq4fv9hgR4VXQ==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-8.0.0.tgz", + "integrity": "sha512-BcCkm/STipKvbCl6b7QFrMh/vx00vIP63k2eM66MfHJzPr6O2U0jYEViXkHJWqXqQYjdeA9cuCl5KWmlwjDvbA==", "dev": true, "engines": { "node": ">=14" @@ -3970,9 +4317,9 @@ } }, "node_modules/@svgr/babel-plugin-remove-jsx-empty-expression": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-7.0.0.tgz", - "integrity": "sha512-sQQmyo+qegBx8DfFc04PFmIO1FP1MHI1/QEpzcIcclo5OAISsOJPW76ZIs0bDyO/DBSJEa/tDa1W26pVtt0FRw==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-8.0.0.tgz", + "integrity": "sha512-5BcGCBfBxB5+XSDSWnhTThfI9jcO5f0Ai2V24gZpG+wXF14BzwxxdDb4g6trdOux0rhibGs385BeFMSmxtS3uA==", "dev": true, "engines": { "node": ">=14" @@ -3986,9 +4333,9 @@ } }, "node_modules/@svgr/babel-plugin-replace-jsx-attribute-value": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-7.0.0.tgz", - "integrity": "sha512-i6MaAqIZXDOJeikJuzocByBf8zO+meLwfQ/qMHIjCcvpnfvWf82PFvredEZElErB5glQFJa2KVKk8N2xV6tRRA==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-8.0.0.tgz", + "integrity": "sha512-KVQ+PtIjb1BuYT3ht8M5KbzWBhdAjjUPdlMtpuw/VjT8coTrItWX6Qafl9+ji831JaJcu6PJNKCV0bp01lBNzQ==", "dev": true, "engines": { "node": ">=14" @@ -4002,9 +4349,9 @@ } }, "node_modules/@svgr/babel-plugin-svg-dynamic-title": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-7.0.0.tgz", - "integrity": "sha512-BoVSh6ge3SLLpKC0pmmN9DFlqgFy4NxNgdZNLPNJWBUU7TQpDWeBuyVuDW88iXydb5Cv0ReC+ffa5h3VrKfk1w==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-8.0.0.tgz", + "integrity": "sha512-omNiKqwjNmOQJ2v6ge4SErBbkooV2aAWwaPFs2vUY7p7GhVkzRkJ00kILXQvRhA6miHnNpXv7MRnnSjdRjK8og==", "dev": true, "engines": { "node": ">=14" @@ -4018,9 +4365,9 @@ } }, "node_modules/@svgr/babel-plugin-svg-em-dimensions": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-7.0.0.tgz", - "integrity": "sha512-tNDcBa+hYn0gO+GkP/AuNKdVtMufVhU9fdzu+vUQsR18RIJ9RWe7h/pSBY338RO08wArntwbDk5WhQBmhf2PaA==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-8.0.0.tgz", + "integrity": "sha512-mURHYnu6Iw3UBTbhGwE/vsngtCIbHE43xCRK7kCw4t01xyGqb2Pd+WXekRRoFOBIY29ZoOhUCTEweDMdrjfi9g==", "dev": true, "engines": { "node": ">=14" @@ -4034,9 +4381,9 @@ } }, "node_modules/@svgr/babel-plugin-transform-react-native-svg": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-7.0.0.tgz", - "integrity": "sha512-qw54u8ljCJYL2KtBOjI5z7Nzg8LnSvQOP5hPKj77H4VQL4+HdKbAT5pnkkZLmHKYwzsIHSYKXxHouD8zZamCFQ==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-8.1.0.tgz", + "integrity": "sha512-Tx8T58CHo+7nwJ+EhUwx3LfdNSG9R2OKfaIXXs5soiy5HtgoAEkDay9LIimLOcG8dJQH1wPZp/cnAv6S9CrR1Q==", "dev": true, "engines": { "node": ">=14" @@ -4050,9 +4397,9 @@ } }, "node_modules/@svgr/babel-plugin-transform-svg-component": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-7.0.0.tgz", - "integrity": "sha512-CcFECkDj98daOg9jE3Bh3uyD9kzevCAnZ+UtzG6+BQG/jOQ2OA3jHnX6iG4G1MCJkUQFnUvEv33NvQfqrb/F3A==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-8.0.0.tgz", + "integrity": "sha512-DFx8xa3cZXTdb/k3kfPeaixecQLgKh5NVBMwD0AQxOzcZawK4oo1Jh9LbrcACUivsCA7TLG8eeWgrDXjTMhRmw==", "dev": true, "engines": { "node": ">=12" @@ -4066,19 +4413,19 @@ } }, "node_modules/@svgr/babel-preset": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-7.0.0.tgz", - "integrity": "sha512-EX/NHeFa30j5UjldQGVQikuuQNHUdGmbh9kEpBKofGUtF0GUPJ4T4rhoYiqDAOmBOxojyot36JIFiDUHUK1ilQ==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@svgr/babel-preset/-/babel-preset-8.1.0.tgz", + "integrity": "sha512-7EYDbHE7MxHpv4sxvnVPngw5fuR6pw79SkcrILHJ/iMpuKySNCl5W1qcwPEpU+LgyRXOaAFgH0KhwD18wwg6ug==", "dev": true, "dependencies": { - "@svgr/babel-plugin-add-jsx-attribute": "^7.0.0", - "@svgr/babel-plugin-remove-jsx-attribute": "^7.0.0", - "@svgr/babel-plugin-remove-jsx-empty-expression": "^7.0.0", - "@svgr/babel-plugin-replace-jsx-attribute-value": "^7.0.0", - "@svgr/babel-plugin-svg-dynamic-title": "^7.0.0", - "@svgr/babel-plugin-svg-em-dimensions": "^7.0.0", - "@svgr/babel-plugin-transform-react-native-svg": "^7.0.0", - "@svgr/babel-plugin-transform-svg-component": "^7.0.0" + "@svgr/babel-plugin-add-jsx-attribute": "8.0.0", + "@svgr/babel-plugin-remove-jsx-attribute": "8.0.0", + "@svgr/babel-plugin-remove-jsx-empty-expression": "8.0.0", + "@svgr/babel-plugin-replace-jsx-attribute-value": "8.0.0", + "@svgr/babel-plugin-svg-dynamic-title": "8.0.0", + "@svgr/babel-plugin-svg-em-dimensions": "8.0.0", + "@svgr/babel-plugin-transform-react-native-svg": "8.1.0", + "@svgr/babel-plugin-transform-svg-component": "8.0.0" }, "engines": { "node": ">=14" @@ -4092,15 +4439,16 @@ } }, "node_modules/@svgr/core": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@svgr/core/-/core-7.0.0.tgz", - "integrity": "sha512-ztAoxkaKhRVloa3XydohgQQCb0/8x9T63yXovpmHzKMkHO6pkjdsIAWKOS4bE95P/2quVh1NtjSKlMRNzSBffw==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@svgr/core/-/core-8.1.0.tgz", + "integrity": "sha512-8QqtOQT5ACVlmsvKOJNEaWmRPmcojMOzCz4Hs2BGG/toAp/K38LcsMRyLp349glq5AzJbCEeimEoxaX6v/fLrA==", "dev": true, "dependencies": { "@babel/core": "^7.21.3", - "@svgr/babel-preset": "^7.0.0", + "@svgr/babel-preset": "8.1.0", "camelcase": "^6.2.0", - "cosmiconfig": "^8.1.3" + "cosmiconfig": "^8.1.3", + "snake-case": "^3.0.4" }, "engines": { "node": ">=14" @@ -4111,9 +4459,9 @@ } }, "node_modules/@svgr/core/node_modules/cosmiconfig": { - "version": "8.3.4", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.4.tgz", - "integrity": "sha512-SF+2P8+o/PTV05rgsAjDzL4OFdVXAulSfC/L19VaeVT7+tpOOSscCt2QLxDZ+CLxF2WOiq6y1K5asvs8qUJT/Q==", + "version": "8.3.6", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz", + "integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==", "dev": true, "dependencies": { "import-fresh": "^3.3.0", @@ -4137,9 +4485,9 @@ } }, "node_modules/@svgr/hast-util-to-babel-ast": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-7.0.0.tgz", - "integrity": "sha512-42Ej9sDDEmsJKjrfQ1PHmiDiHagh/u9AHO9QWbeNx4KmD9yS5d1XHmXUNINfUcykAU+4431Cn+k6Vn5mWBYimQ==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-8.0.0.tgz", + "integrity": "sha512-EbDKwO9GpfWP4jN9sGdYwPBU0kdomaPIL2Eu4YwmgP+sJeXT+L7bMwJUBnhzfH8Q2qMBqZ4fJwpCyYsAN3mt2Q==", "dev": true, "dependencies": { "@babel/types": "^7.21.3", @@ -4154,14 +4502,14 @@ } }, "node_modules/@svgr/plugin-jsx": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-7.0.0.tgz", - "integrity": "sha512-SWlTpPQmBUtLKxXWgpv8syzqIU8XgFRvyhfkam2So8b3BE0OS0HPe5UfmlJ2KIC+a7dpuuYovPR2WAQuSyMoPw==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@svgr/plugin-jsx/-/plugin-jsx-8.1.0.tgz", + "integrity": "sha512-0xiIyBsLlr8quN+WyuxooNW9RJ0Dpr8uOnH/xrCVO8GLUcwHISwj1AG0k+LFzteTkAA0GbX0kj9q6Dk70PTiPA==", "dev": true, "dependencies": { "@babel/core": "^7.21.3", - "@svgr/babel-preset": "^7.0.0", - "@svgr/hast-util-to-babel-ast": "^7.0.0", + "@svgr/babel-preset": "8.1.0", + "@svgr/hast-util-to-babel-ast": "8.0.0", "svg-parser": "^2.0.4" }, "engines": { @@ -4170,6 +4518,9 @@ "funding": { "type": "github", "url": "https://github.com/sponsors/gregberge" + }, + "peerDependencies": { + "@svgr/core": "*" } }, "node_modules/@tsconfig/node10": { @@ -4203,9 +4554,9 @@ "dev": true }, "node_modules/@types/hast": { - "version": "2.3.5", - "resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.5.tgz", - "integrity": "sha512-SvQi0L/lNpThgPoleH53cdjB3y9zpLlVjRbqB3rH8hx1jiRSBGAhyjV3H+URFjNVRqt2EdYNrbZE5IsGlNfpRg==", + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/@types/hast/-/hast-2.3.6.tgz", + "integrity": "sha512-47rJE80oqPmFdVDCD7IheXBrVdwuBgsYwoczFvKmwfo2Mzsnt+V9OONsYauFmICb6lQPpCuXYJWejBNs4pDJRg==", "dependencies": { "@types/unist": "^2" } @@ -4217,10 +4568,9 @@ "dev": true }, "node_modules/@types/hoist-non-react-statics": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz", - "integrity": "sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==", - "dev": true, + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz", + "integrity": "sha512-YIQtIg4PKr7ZyqNPZObpxfHsHEmuB8dXCxd6qVcGuQVDK2bpsF7bYNnBJ4Nn7giuACZg+WewExgrtAJ3XnA4Xw==", "dependencies": { "@types/react": "*", "hoist-non-react-statics": "^3.3.0" @@ -4232,9 +4582,9 @@ "integrity": "sha512-aLkWa0C0vO5b4Sr798E26QgOkss68Un0bLjs7u9qxzPT5CG+8DuNTffWES58YzJs3hrVAOs1wonycqEBqNJubA==" }, "node_modules/@types/json-schema": { - "version": "7.0.12", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz", - "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==", + "version": "7.0.13", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.13.tgz", + "integrity": "sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ==", "dev": true }, "node_modules/@types/json5": { @@ -4258,9 +4608,9 @@ } }, "node_modules/@types/node": { - "version": "20.5.9", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.9.tgz", - "integrity": "sha512-PcGNd//40kHAS3sTlzKB9C9XL4K0sTup8nbG5lC14kzEteTNuAFh9u5nA0o5TWnSG2r/JNPRXFVcHJIIeRlmqQ==", + "version": "20.6.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.6.3.tgz", + "integrity": "sha512-HksnYH4Ljr4VQgEy2lTStbCKv/P590tmPe5HqOnv9Gprffgv5WXAY+Y5Gqniu0GGqeTCUdBnzC3QSrzPkBkAMA==", "dev": true }, "node_modules/@types/parse-json": { @@ -4269,14 +4619,14 @@ "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==" }, "node_modules/@types/prop-types": { - "version": "15.7.5", - "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz", - "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==" + "version": "15.7.6", + "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.6.tgz", + "integrity": "sha512-RK/kBbYOQQHLYj9Z95eh7S6t7gq4Ojt/NT8HTk8bWVhA5DaF+5SMnxHKkP4gPNN3wAZkKP+VjAf0ebtYzf+fxg==" }, "node_modules/@types/react": { - "version": "18.2.21", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.21.tgz", - "integrity": "sha512-neFKG/sBAwGxHgXiIxnbm3/AAVQ/cMRS93hvBpg8xYRbeQSPVABp9U2bRnPf0iI4+Ucdv3plSxKK+3CW2ENJxA==", + "version": "18.2.22", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.22.tgz", + "integrity": "sha512-60fLTOLqzarLED2O3UQImc/lsNRgG0jE/a1mPW9KjMemY0LMITWEsbS4VvZ4p6rorEHd5YKxxmMKSDK505GHpA==", "dependencies": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -4384,9 +4734,9 @@ "integrity": "sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ==" }, "node_modules/@types/semver": { - "version": "7.5.1", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.1.tgz", - "integrity": "sha512-cJRQXpObxfNKkFAZbJl2yjWtJCqELQIdShsogr1d2MilP8dKD9TE/nEKHkJgUNHdGKCQaf9HbIynuV2csLGVLg==", + "version": "7.5.2", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.2.tgz", + "integrity": "sha512-7aqorHYgdNO4DM36stTiGO3DvKoex9TQRwsJU6vMaFGyqpBA1MNZkz+PG3gaNUPpTAOYhT1WR7M1JyA3fbS9Cw==", "dev": true }, "node_modules/@types/shimmer": { @@ -4433,16 +4783,16 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.6.0.tgz", - "integrity": "sha512-CW9YDGTQnNYMIo5lMeuiIG08p4E0cXrXTbcZ2saT/ETE7dWUrNxlijsQeU04qAAKkILiLzdQz+cGFxCJjaZUmA==", + "version": "6.7.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.7.2.tgz", + "integrity": "sha512-ooaHxlmSgZTM6CHYAFRlifqh1OAr3PAQEwi7lhYhaegbnXrnh7CDcHmc3+ihhbQC7H0i4JF0psI5ehzkF6Yl6Q==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.5.1", - "@typescript-eslint/scope-manager": "6.6.0", - "@typescript-eslint/type-utils": "6.6.0", - "@typescript-eslint/utils": "6.6.0", - "@typescript-eslint/visitor-keys": "6.6.0", + "@typescript-eslint/scope-manager": "6.7.2", + "@typescript-eslint/type-utils": "6.7.2", + "@typescript-eslint/utils": "6.7.2", + "@typescript-eslint/visitor-keys": "6.7.2", "debug": "^4.3.4", "graphemer": "^1.4.0", "ignore": "^5.2.4", @@ -4501,15 +4851,15 @@ "dev": true }, "node_modules/@typescript-eslint/parser": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.6.0.tgz", - "integrity": "sha512-setq5aJgUwtzGrhW177/i+DMLqBaJbdwGj2CPIVFFLE0NCliy5ujIdLHd2D1ysmlmsjdL2GWW+hR85neEfc12w==", + "version": "6.7.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.7.2.tgz", + "integrity": "sha512-KA3E4ox0ws+SPyxQf9iSI25R6b4Ne78ORhNHeVKrPQnoYsb9UhieoiRoJgrzgEeKGOXhcY1i8YtOeCHHTDa6Fw==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "6.6.0", - "@typescript-eslint/types": "6.6.0", - "@typescript-eslint/typescript-estree": "6.6.0", - "@typescript-eslint/visitor-keys": "6.6.0", + "@typescript-eslint/scope-manager": "6.7.2", + "@typescript-eslint/types": "6.7.2", + "@typescript-eslint/typescript-estree": "6.7.2", + "@typescript-eslint/visitor-keys": "6.7.2", "debug": "^4.3.4" }, "engines": { @@ -4529,13 +4879,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.6.0.tgz", - "integrity": "sha512-pT08u5W/GT4KjPUmEtc2kSYvrH8x89cVzkA0Sy2aaOUIw6YxOIjA8ilwLr/1fLjOedX1QAuBpG9XggWqIIfERw==", + "version": "6.7.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.7.2.tgz", + "integrity": "sha512-bgi6plgyZjEqapr7u2mhxGR6E8WCzKNUFWNh6fkpVe9+yzRZeYtDTbsIBzKbcxI+r1qVWt6VIoMSNZ4r2A+6Yw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.6.0", - "@typescript-eslint/visitor-keys": "6.6.0" + "@typescript-eslint/types": "6.7.2", + "@typescript-eslint/visitor-keys": "6.7.2" }, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -4546,13 +4896,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.6.0.tgz", - "integrity": "sha512-8m16fwAcEnQc69IpeDyokNO+D5spo0w1jepWWY2Q6y5ZKNuj5EhVQXjtVAeDDqvW6Yg7dhclbsz6rTtOvcwpHg==", + "version": "6.7.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.7.2.tgz", + "integrity": "sha512-36F4fOYIROYRl0qj95dYKx6kybddLtsbmPIYNK0OBeXv2j9L5nZ17j9jmfy+bIDHKQgn2EZX+cofsqi8NPATBQ==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "6.6.0", - "@typescript-eslint/utils": "6.6.0", + "@typescript-eslint/typescript-estree": "6.7.2", + "@typescript-eslint/utils": "6.7.2", "debug": "^4.3.4", "ts-api-utils": "^1.0.1" }, @@ -4573,9 +4923,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.6.0.tgz", - "integrity": "sha512-CB6QpJQ6BAHlJXdwUmiaXDBmTqIE2bzGTDLADgvqtHWuhfNP3rAOK7kAgRMAET5rDRr9Utt+qAzRBdu3AhR3sg==", + "version": "6.7.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.7.2.tgz", + "integrity": "sha512-flJYwMYgnUNDAN9/GAI3l8+wTmvTYdv64fcH8aoJK76Y+1FCZ08RtI5zDerM/FYT5DMkAc+19E4aLmd5KqdFyg==", "dev": true, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -4586,13 +4936,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.6.0.tgz", - "integrity": "sha512-hMcTQ6Al8MP2E6JKBAaSxSVw5bDhdmbCEhGW/V8QXkb9oNsFkA4SBuOMYVPxD3jbtQ4R/vSODBsr76R6fP3tbA==", + "version": "6.7.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.2.tgz", + "integrity": "sha512-kiJKVMLkoSciGyFU0TOY0fRxnp9qq1AzVOHNeN1+B9erKFCJ4Z8WdjAkKQPP+b1pWStGFqezMLltxO+308dJTQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.6.0", - "@typescript-eslint/visitor-keys": "6.6.0", + "@typescript-eslint/types": "6.7.2", + "@typescript-eslint/visitor-keys": "6.7.2", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -4646,17 +4996,17 @@ "dev": true }, "node_modules/@typescript-eslint/utils": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.6.0.tgz", - "integrity": "sha512-mPHFoNa2bPIWWglWYdR0QfY9GN0CfvvXX1Sv6DlSTive3jlMTUy+an67//Gysc+0Me9pjitrq0LJp0nGtLgftw==", + "version": "6.7.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.7.2.tgz", + "integrity": "sha512-ZCcBJug/TS6fXRTsoTkgnsvyWSiXwMNiPzBUani7hDidBdj1779qwM1FIAmpH4lvlOZNF3EScsxxuGifjpLSWQ==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@types/json-schema": "^7.0.12", "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "6.6.0", - "@typescript-eslint/types": "6.6.0", - "@typescript-eslint/typescript-estree": "6.6.0", + "@typescript-eslint/scope-manager": "6.7.2", + "@typescript-eslint/types": "6.7.2", + "@typescript-eslint/typescript-estree": "6.7.2", "semver": "^7.5.4" }, "engines": { @@ -4704,12 +5054,12 @@ "dev": true }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.6.0.tgz", - "integrity": "sha512-L61uJT26cMOfFQ+lMZKoJNbAEckLe539VhTxiGHrWl5XSKQgA0RTBZJW2HFPy5T0ZvPVSD93QsrTKDkfNwJGyQ==", + "version": "6.7.2", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.2.tgz", + "integrity": "sha512-uVw9VIMFBUTz8rIeaUT3fFe8xIUx8r4ywAdlQv1ifH+6acn/XF8Y6rwJ7XNmkNMDrTW+7+vxFFPIF40nJCVsMQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.6.0", + "@typescript-eslint/types": "6.7.2", "eslint-visitor-keys": "^3.4.1" }, "engines": { @@ -5183,9 +5533,9 @@ "dev": true }, "node_modules/axe-core": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.8.0.tgz", - "integrity": "sha512-ZtlVZobOeDQhb/y2lMK6mznDw7TJHDNcKx5/bbBkFvArIQ5CVFhSI6hWWQnMx9I8cNmNmZ30wpDyOC2E2nvgbQ==", + "version": "4.8.1", + "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.8.1.tgz", + "integrity": "sha512-9l850jDDPnKq48nbad8SiEelCv4OrUWrKab/cPj0GScVg6cb6NbCCt/Ulk26QEq5jP9NnGr04Bit1BHyV6r5CQ==", "engines": { "node": ">=4" } @@ -5505,9 +5855,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001529", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001529.tgz", - "integrity": "sha512-n2pUQYGAkrLG4QYj2desAh+NqsJpHbNmVZz87imptDdxLAtjxary7Df/psdfyDGmskJK/9Dt9cPnx5RZ3CU4Og==", + "version": "1.0.30001538", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001538.tgz", + "integrity": "sha512-HWJnhnID+0YMtGlzcp3T9drmBJUVDchPJ08tpUGFLs9CYlwWPH2uLgpHn8fND5pCgXVtnGS3H4QR9XLMHVNkHw==", "funding": [ { "type": "opencollective", @@ -5989,15 +6339,15 @@ "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==" }, "node_modules/cypress": { - "version": "13.1.0", - "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.1.0.tgz", - "integrity": "sha512-LUKxCYlB973QBFls1Up4FAE9QIYobT+2I8NvvAwMfQS2YwsWbr6yx7y9hmsk97iqbHkKwZW3MRjoK1RToBFVdQ==", + "version": "13.2.0", + "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.2.0.tgz", + "integrity": "sha512-AvDQxBydE771GTq0TR4ZUBvv9m9ffXuB/ueEtpDF/6gOcvFR96amgwSJP16Yhqw6VhmwqspT5nAGzoxxB+D89g==", "dev": true, "hasInstallScript": true, "dependencies": { "@cypress/request": "^3.0.0", "@cypress/xvfb": "^1.2.4", - "@types/node": "^16.18.39", + "@types/node": "^18.17.5", "@types/sinonjs__fake-timers": "8.1.1", "@types/sizzle": "^2.3.2", "arch": "^2.2.0", @@ -6071,9 +6421,9 @@ } }, "node_modules/cypress/node_modules/@types/node": { - "version": "16.18.48", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.48.tgz", - "integrity": "sha512-mlaecDKQ7rIZrYD7iiKNdzFb6e/qD5I9U1rAhq+Fd+DWvYVs+G2kv74UFHmSOlg5+i/vF3XxuR522V4u8BqO+Q==", + "version": "18.17.18", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.18.tgz", + "integrity": "sha512-/4QOuy3ZpV7Ya1GTRz5CYSz3DgkKpyUptXuQ5PPce7uuyJAOR7r9FhkmxJfvcNUXyklbC63a+YvB3jxy7s9ngw==", "dev": true }, "node_modules/cypress/node_modules/ansi-styles": { @@ -6248,9 +6598,9 @@ } }, "node_modules/dayjs": { - "version": "1.11.9", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.9.tgz", - "integrity": "sha512-QvzAURSbQ0pKdIye2txOzNaHmxtUBXerpY0FJsFXUMKbIZeFm5ht1LS/jFsrncjnmtv8HsG0W2g6c0zUjZWmpA==", + "version": "1.11.10", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz", + "integrity": "sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==", "dev": true }, "node_modules/debounce": { @@ -6456,6 +6806,19 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/define-data-property": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.0.tgz", + "integrity": "sha512-UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g==", + "dependencies": { + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/define-lazy-prop": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", @@ -6466,10 +6829,11 @@ } }, "node_modules/define-properties": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz", - "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", + "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", "dependencies": { + "define-data-property": "^1.0.1", "has-property-descriptors": "^1.0.0", "object-keys": "^1.1.1" }, @@ -6557,6 +6921,16 @@ "csstype": "^3.0.2" } }, + "node_modules/dot-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz", + "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==", + "dev": true, + "dependencies": { + "no-case": "^3.0.4", + "tslib": "^2.0.3" + } + }, "node_modules/dot-prop": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-8.0.2.tgz", @@ -6589,9 +6963,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.512", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.512.tgz", - "integrity": "sha512-1W8wRbYlQE4ph7eoj3TJ+uqwO6+xvAE/L+KGU7WTQQvX3tnSIGZAb90MTsMoJqzntamiwJhBAj4WZmygXhsOUg==" + "version": "1.4.525", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.525.tgz", + "integrity": "sha512-GIZ620hDK4YmIqAWkscG4W6RwY6gOx1y5J6f4JUQwctiJrqH2oxZYU4mXHi35oV32tr630UcepBzSBGJ/WYcZA==" }, "node_modules/emoji-regex": { "version": "9.2.2", @@ -6674,17 +7048,17 @@ } }, "node_modules/es-abstract": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz", - "integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==", + "version": "1.22.2", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.2.tgz", + "integrity": "sha512-YoxfFcDmhjOgWPWsV13+2RNjq1F6UQnfs+8TftwNqtzlmFzEXvlUwdrNrYeaizfjQzRMxkZ6ElWMOJIFKdVqwA==", "dependencies": { "array-buffer-byte-length": "^1.0.0", - "arraybuffer.prototype.slice": "^1.0.1", + "arraybuffer.prototype.slice": "^1.0.2", "available-typed-arrays": "^1.0.5", "call-bind": "^1.0.2", "es-set-tostringtag": "^2.0.1", "es-to-primitive": "^1.2.1", - "function.prototype.name": "^1.1.5", + "function.prototype.name": "^1.1.6", "get-intrinsic": "^1.2.1", "get-symbol-description": "^1.0.0", "globalthis": "^1.0.3", @@ -6700,23 +7074,23 @@ "is-regex": "^1.1.4", "is-shared-array-buffer": "^1.0.2", "is-string": "^1.0.7", - "is-typed-array": "^1.1.10", + "is-typed-array": "^1.1.12", "is-weakref": "^1.0.2", "object-inspect": "^1.12.3", "object-keys": "^1.1.1", "object.assign": "^4.1.4", - "regexp.prototype.flags": "^1.5.0", - "safe-array-concat": "^1.0.0", + "regexp.prototype.flags": "^1.5.1", + "safe-array-concat": "^1.0.1", "safe-regex-test": "^1.0.0", - "string.prototype.trim": "^1.2.7", - "string.prototype.trimend": "^1.0.6", - "string.prototype.trimstart": "^1.0.6", + "string.prototype.trim": "^1.2.8", + "string.prototype.trimend": "^1.0.7", + "string.prototype.trimstart": "^1.0.7", "typed-array-buffer": "^1.0.0", "typed-array-byte-length": "^1.0.0", "typed-array-byte-offset": "^1.0.0", "typed-array-length": "^1.0.4", "unbox-primitive": "^1.0.2", - "which-typed-array": "^1.1.10" + "which-typed-array": "^1.1.11" }, "engines": { "node": ">= 0.4" @@ -6726,14 +7100,14 @@ } }, "node_modules/es-iterator-helpers": { - "version": "1.0.14", - "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.14.tgz", - "integrity": "sha512-JgtVnwiuoRuzLvqelrvN3Xu7H9bu2ap/kQ2CrM62iidP8SKuD99rWU3CJy++s7IVL2qb/AjXPGR/E7i9ngd/Cw==", + "version": "1.0.15", + "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.15.tgz", + "integrity": "sha512-GhoY8uYqd6iwUl2kgjTm4CZAf6oo5mHK7BPqx3rKgx893YSsy0LGHV6gfqqQvZt/8xM8xeOnfXBCfqclMKkJ5g==", "dev": true, "dependencies": { "asynciterator.prototype": "^1.0.0", "call-bind": "^1.0.2", - "define-properties": "^1.2.0", + "define-properties": "^1.2.1", "es-abstract": "^1.22.1", "es-set-tostringtag": "^2.0.1", "function-bind": "^1.1.1", @@ -6743,8 +7117,8 @@ "has-proto": "^1.0.1", "has-symbols": "^1.0.3", "internal-slot": "^1.0.5", - "iterator.prototype": "^1.1.0", - "safe-array-concat": "^1.0.0" + "iterator.prototype": "^1.1.2", + "safe-array-concat": "^1.0.1" } }, "node_modules/es-set-tostringtag": { @@ -6838,15 +7212,15 @@ } }, "node_modules/eslint": { - "version": "8.48.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.48.0.tgz", - "integrity": "sha512-sb6DLeIuRXxeM1YljSe1KEx9/YYeZFQWcV8Rq9HfigmdDEugjLEVEa1ozDjL6YDjBpQHPJxJzze+alxi4T3OLg==", + "version": "8.49.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.49.0.tgz", + "integrity": "sha512-jw03ENfm6VJI0jA9U+8H5zfl5b+FvuU3YYvZRdZHOlU2ggJkxrlkJH4HcDrZpj6YwD8kuYqvQM8LyesoazrSOQ==", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", "@eslint/eslintrc": "^2.1.2", - "@eslint/js": "8.48.0", - "@humanwhocodes/config-array": "^0.11.10", + "@eslint/js": "8.49.0", + "@humanwhocodes/config-array": "^0.11.11", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", "ajv": "^6.12.4", @@ -7689,14 +8063,14 @@ } }, "node_modules/flatted": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz", - "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==" + "version": "3.2.9", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", + "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==" }, "node_modules/follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "version": "1.15.3", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz", + "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==", "funding": [ { "type": "individual", @@ -7751,9 +8125,9 @@ } }, "node_modules/formik": { - "version": "2.4.4", - "resolved": "https://registry.npmjs.org/formik/-/formik-2.4.4.tgz", - "integrity": "sha512-MV99upag7fCC3JfsI60WcxhymwNZnJUcMcnGuoz6mDf78SUfBbKjmfcA9LzHx4lEmjzmOflhP7oqz+ZQv5eStg==", + "version": "2.4.5", + "resolved": "https://registry.npmjs.org/formik/-/formik-2.4.5.tgz", + "integrity": "sha512-Gxlht0TD3vVdzMDHwkiNZqJ7Mvg77xQNfmBRrNtvzcHZs72TJppSTDKHpImCMJZwcWPBJ8jSQQ95GJzXFf1nAQ==", "funding": [ { "type": "individual", @@ -7761,6 +8135,7 @@ } ], "dependencies": { + "@types/hoist-non-react-statics": "^3.3.1", "deepmerge": "^2.1.1", "hoist-non-react-statics": "^3.3.0", "lodash": "^4.17.21", @@ -9000,21 +9375,22 @@ "dev": true }, "node_modules/iterator.prototype": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.1.tgz", - "integrity": "sha512-9E+nePc8C9cnQldmNl6bgpTY6zI4OPRZd97fhJ/iVZ1GifIUDVV5F6x1nEDqpe8KaMEZGT4xgrwKQDxXnjOIZQ==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.2.tgz", + "integrity": "sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==", "dev": true, "dependencies": { - "define-properties": "^1.2.0", + "define-properties": "^1.2.1", "get-intrinsic": "^1.2.1", "has-symbols": "^1.0.3", - "reflect.getprototypeof": "^1.0.3" + "reflect.getprototypeof": "^1.0.4", + "set-function-name": "^2.0.1" } }, "node_modules/joi": { - "version": "17.10.1", - "resolved": "https://registry.npmjs.org/joi/-/joi-17.10.1.tgz", - "integrity": "sha512-vIiDxQKmRidUVp8KngT8MZSOcmRVm2zV7jbMjNYWuHcJWI0bUck3nRTGQjhpPlQenIQIBC5Vp9AhcnHbWQqafw==", + "version": "17.10.2", + "resolved": "https://registry.npmjs.org/joi/-/joi-17.10.2.tgz", + "integrity": "sha512-hcVhjBxRNW/is3nNLdGLIjkgXetkeGc2wyhydhz8KumG23Aerk4HPjU5zaPAMRqXQFc0xNqXTC7+zQjxr0GlKA==", "dev": true, "dependencies": { "@hapi/hoek": "^9.0.0", @@ -9502,6 +9878,15 @@ "loose-envify": "cli.js" } }, + "node_modules/lower-case": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", + "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==", + "dev": true, + "dependencies": { + "tslib": "^2.0.3" + } + }, "node_modules/lowlight": { "version": "1.20.0", "resolved": "https://registry.npmjs.org/lowlight/-/lowlight-1.20.0.tgz", @@ -9782,9 +10167,9 @@ "integrity": "sha512-TvmkNhkv8yct0SVBSy+o8wYzXjE4Zz3PCesbfs8HiCXXdcTuocApFv11UWlNFWKYsP2okqrhb7JNlSm9InBhIw==" }, "node_modules/nan": { - "version": "2.17.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz", - "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==", + "version": "2.18.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz", + "integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==", "optional": true }, "node_modules/nano-css": { @@ -9856,6 +10241,16 @@ "ms": "^2.1.1" } }, + "node_modules/no-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz", + "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==", + "dev": true, + "dependencies": { + "lower-case": "^2.0.2", + "tslib": "^2.0.3" + } + }, "node_modules/node-fetch": { "version": "2.7.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", @@ -10309,9 +10704,9 @@ } }, "node_modules/postcss": { - "version": "8.4.29", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.29.tgz", - "integrity": "sha512-cbI+jaqIeu/VGqXEarWkRCCffhjgXc0qjBtXpqJhTBohMUjUQnbBr0xqX3vEKudc4iviTewcJo5ajcec5+wdJw==", + "version": "8.4.30", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.30.tgz", + "integrity": "sha512-7ZEao1g4kd68l97aWG/etQKPKq07us0ieSZ2TnFDk11i0ZfDW2AwKHYU8qv4MZKqN2fdBfg+7q0ES06UA73C1g==", "funding": [ { "type": "opencollective", @@ -10638,28 +11033,16 @@ "node": ">=0.10.0" } }, - "node_modules/react-copy-to-clipboard": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-5.1.0.tgz", - "integrity": "sha512-k61RsNgAayIJNoy9yDsYzDe/yAZAzEbEgcz3DZMhF686LEyukcE1hzurxe85JandPUG+yTfGVFzuEw3xt8WP/A==", - "dependencies": { - "copy-to-clipboard": "^3.3.1", - "prop-types": "^15.8.1" - }, - "peerDependencies": { - "react": "^15.3.0 || 16 || 17 || 18" - } - }, "node_modules/react-datepicker": { - "version": "4.16.0", - "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-4.16.0.tgz", - "integrity": "sha512-hNQ0PAg/LQoVbDUO/RWAdm/RYmPhN3cz7LuQ3hqbs24OSp69QCiKOJRrQ4jk1gv1jNR5oYu8SjjgfDh8q6Q1yw==", + "version": "4.18.0", + "resolved": "https://registry.npmjs.org/react-datepicker/-/react-datepicker-4.18.0.tgz", + "integrity": "sha512-0MYt3HmLbHVk1sw4v+RCbLAVg5TA3jWP7RyjZbo53PC+SEi+pjdgc92lB53ai/ENZaTOhbXmgni9GzvMrorMAw==", "dependencies": { "@popperjs/core": "^2.11.8", "classnames": "^2.2.6", "date-fns": "^2.30.0", "prop-types": "^15.7.2", - "react-onclickoutside": "^6.12.2", + "react-onclickoutside": "^6.13.0", "react-popper": "^2.3.0" }, "peerDependencies": { @@ -10668,9 +11051,9 @@ } }, "node_modules/react-day-picker": { - "version": "8.8.1", - "resolved": "https://registry.npmjs.org/react-day-picker/-/react-day-picker-8.8.1.tgz", - "integrity": "sha512-U7RsRoRI5pyMXhKq54hS9yM11WEGkPf8hIdrxIM/sefgmQjuxazqgwcZFMiPZW/K9vtmzLZFf9bLW0wVsGYd5w==", + "version": "8.8.2", + "resolved": "https://registry.npmjs.org/react-day-picker/-/react-day-picker-8.8.2.tgz", + "integrity": "sha512-sK5M5PNZaLiszmACUKUpVu1eX3eFDVV+WLdWQ3BxTPbEC9jhuawmlgpbSXX5dIIQQwJpZ4wwP5+vsMVOwa1IRw==", "funding": { "type": "individual", "url": "https://github.com/sponsors/gpbl" @@ -10749,9 +11132,9 @@ } }, "node_modules/react-inlinesvg": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/react-inlinesvg/-/react-inlinesvg-4.0.3.tgz", - "integrity": "sha512-qPSqksbgDc6uVX6w256XY6JmdkLpzA4RiajvHi8u2qszXrhjDl6JwhW8x3VMkO4BxL9ll+/IeKR9ZxgM8wLcKQ==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/react-inlinesvg/-/react-inlinesvg-4.0.4.tgz", + "integrity": "sha512-OnXi+IHoY2zj6rt+kLmXQth9HZ3rS1TDtDwjFbELcCZngAJC32nXp2ZzLp4FpijzISDe7YfHI3SFs9qALWv+xw==", "dependencies": { "react-from-dom": "^0.6.2" }, @@ -10933,11 +11316,11 @@ } }, "node_modules/react-router": { - "version": "6.15.0", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.15.0.tgz", - "integrity": "sha512-NIytlzvzLwJkCQj2HLefmeakxxWHWAP+02EGqWEZy+DgfHHKQMUoBBjUQLOtFInBMhWtb3hiUy6MfFgwLjXhqg==", + "version": "6.16.0", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.16.0.tgz", + "integrity": "sha512-VT4Mmc4jj5YyjpOi5jOf0I+TYzGpvzERy4ckNSvSh2RArv8LLoCxlsZ2D+tc7zgjxcY34oTz2hZaeX5RVprKqA==", "dependencies": { - "@remix-run/router": "1.8.0" + "@remix-run/router": "1.9.0" }, "engines": { "node": ">=14.0.0" @@ -10947,12 +11330,12 @@ } }, "node_modules/react-router-dom": { - "version": "6.15.0", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.15.0.tgz", - "integrity": "sha512-aR42t0fs7brintwBGAv2+mGlCtgtFQeOzK0BM1/OiqEzRejOZtpMZepvgkscpMUnKb8YO84G7s3LsHnnDNonbQ==", + "version": "6.16.0", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.16.0.tgz", + "integrity": "sha512-aTfBLv3mk/gaKLxgRDUPbPw+s4Y/O+ma3rEN1u8EgEpLpPe6gNjIsWt9rxushMHHMb7mSwxRGdGlGdvmFsyPIg==", "dependencies": { - "@remix-run/router": "1.8.0", - "react-router": "6.15.0" + "@remix-run/router": "1.9.0", + "react-router": "6.16.0" }, "engines": { "node": ">=14.0.0" @@ -11213,9 +11596,9 @@ "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==" }, "node_modules/regenerate-unicode-properties": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz", - "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==", + "version": "10.1.1", + "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz", + "integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==", "dependencies": { "regenerate": "^1.4.2" }, @@ -11237,13 +11620,13 @@ } }, "node_modules/regexp.prototype.flags": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz", - "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==", + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz", + "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==", "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", - "functions-have-names": "^1.2.3" + "set-function-name": "^2.0.0" }, "engines": { "node": ">= 0.4" @@ -11335,9 +11718,9 @@ "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==" }, "node_modules/resolve": { - "version": "1.22.4", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz", - "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==", + "version": "1.22.6", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.6.tgz", + "integrity": "sha512-njhxM7mV12JfufShqGy3Rz8j11RPdLy4xi15UurGJeoHLfJpVXKdh3ueuOqbYUcDZnffr6X739JBo5LzyahEsw==", "dependencies": { "is-core-module": "^2.13.0", "path-parse": "^1.0.7", @@ -11424,9 +11807,9 @@ } }, "node_modules/rollup": { - "version": "3.29.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.0.tgz", - "integrity": "sha512-nszM8DINnx1vSS+TpbWKMkxem0CDWk3cSit/WWCBVs9/JZ1I/XLwOsiUglYuYReaeWWSsW9kge5zE5NZtf/a4w==", + "version": "3.29.2", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.2.tgz", + "integrity": "sha512-CJouHoZ27v6siztc21eEQGo0kIcE5D1gVPA571ez0mMYb25LGYGKnVNXpEj5MGlepmDWGXNjDB5q7uNiPHC11A==", "dev": true, "bin": { "rollup": "dist/bin/rollup" @@ -11641,9 +12024,9 @@ "dev": true }, "node_modules/sass": { - "version": "1.66.1", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.66.1.tgz", - "integrity": "sha512-50c+zTsZOJVgFfTgwwEzkjA3/QACgdNsKueWPyAR0mRINIvLAStVQBbPg14iuqEQ74NPDbXzJARJ/O4SI1zftA==", + "version": "1.67.0", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.67.0.tgz", + "integrity": "sha512-SVrO9ZeX/QQyEGtuZYCVxoeAL5vGlYjJ9p4i4HFuekWl8y/LtJ7tJc10Z+ck1c8xOuoBm2MYzcLfTAffD0pl/A==", "dev": true, "dependencies": { "chokidar": ">=3.0.0 <4.0.0", @@ -11718,6 +12101,19 @@ "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", "optional": true }, + "node_modules/set-function-name": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz", + "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==", + "dependencies": { + "define-data-property": "^1.0.1", + "functions-have-names": "^1.2.3", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/set-harmonic-interval": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/set-harmonic-interval/-/set-harmonic-interval-1.0.1.tgz", @@ -11871,11 +12267,21 @@ "dev": true }, "node_modules/smob": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/smob/-/smob-1.4.0.tgz", - "integrity": "sha512-MqR3fVulhjWuRNSMydnTlweu38UhQ0HXM4buStD/S3mc/BzX3CuM9OmhyQpmtYCvoYdl5ris6TI0ZqH355Ymqg==", + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/smob/-/smob-1.4.1.tgz", + "integrity": "sha512-9LK+E7Hv5R9u4g4C3p+jjLstaLe11MDsL21UpYaCNmapvMkYhqCV4A/f/3gyH8QjMyh6l68q9xC85vihY9ahMQ==", "dev": true }, + "node_modules/snake-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/snake-case/-/snake-case-3.0.4.tgz", + "integrity": "sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==", + "dev": true, + "dependencies": { + "dot-case": "^3.0.4", + "tslib": "^2.0.3" + } + }, "node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -12101,9 +12507,9 @@ "devOptional": true }, "node_modules/string.prototype.matchall": { - "version": "4.0.9", - "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.9.tgz", - "integrity": "sha512-6i5hL3MqG/K2G43mWXWgP+qizFW/QH/7kCNN13JrJS5q48FN5IKksLDscexKP3dnmB6cdm9jlNgAsWNLpSykmA==", + "version": "4.0.10", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.10.tgz", + "integrity": "sha512-rGXbGmOEosIQi6Qva94HUjgPs9vKW+dkG7Y8Q5O2OYkWL6wFaTRZO8zM4mhP94uX55wgyrXzfS2aGtGzUL7EJQ==", "dev": true, "dependencies": { "call-bind": "^1.0.2", @@ -12113,6 +12519,7 @@ "has-symbols": "^1.0.3", "internal-slot": "^1.0.5", "regexp.prototype.flags": "^1.5.0", + "set-function-name": "^2.0.0", "side-channel": "^1.0.4" }, "funding": { @@ -12201,9 +12608,9 @@ } }, "node_modules/styled-components": { - "version": "6.0.7", - "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.0.7.tgz", - "integrity": "sha512-xIwWuiRMYR43mskVsW9MGTRjSo7ol4bcVjT595fGUp3OLBJOlOgaiKaxsHdC4a2HqWKqKnh0CmcRbk5ogyDjTg==", + "version": "6.0.8", + "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.0.8.tgz", + "integrity": "sha512-AwI02MTWZwqjzfXgR5QcbmcSn5xVjY4N2TLjSuYnmuBGF3y7GicHz3ysbpUq2EMJP5M8/Nc22vcmF3V3WNZDFA==", "dependencies": { "@babel/cli": "^7.21.0", "@babel/core": "^7.21.0", @@ -12732,9 +13139,9 @@ } }, "node_modules/ua-parser-js": { - "version": "1.0.35", - "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.35.tgz", - "integrity": "sha512-fKnGuqmTBnIE+/KXSzCn4db8RTigUzw1AN0DmdU6hJovUTbYJKyqj+8Mt1c4VfRDnOVJnENmfYkIPZ946UrSAA==", + "version": "1.0.36", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.36.tgz", + "integrity": "sha512-znuyCIXzl8ciS3+y3fHJI/2OhQIXbXw9MWC/o3qwyR+RGppjZHrM27CGFSKCJXi2Kctiz537iOu2KnXs1lMQhw==", "funding": [ { "type": "opencollective", @@ -12743,6 +13150,10 @@ { "type": "paypal", "url": "https://paypal.me/faisalman" + }, + { + "type": "github", + "url": "https://github.com/sponsors/faisalman" } ], "engines": { @@ -12911,9 +13322,13 @@ } }, "node_modules/uuid": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz", - "integrity": "sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==", + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], "bin": { "uuid": "dist/bin/uuid" } @@ -13003,23 +13418,23 @@ } }, "node_modules/vite-plugin-svgr": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/vite-plugin-svgr/-/vite-plugin-svgr-3.2.0.tgz", - "integrity": "sha512-Uvq6niTvhqJU6ga78qLKBFJSDvxWhOnyfQSoKpDPMAGxJPo5S3+9hyjExE5YDj6Lpa4uaLkGc1cBgxXov+LjSw==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/vite-plugin-svgr/-/vite-plugin-svgr-4.0.0.tgz", + "integrity": "sha512-ingW8FEJ4vz9mQumnMDhNysE+YleiaThYmgflhUIVI4iIjVsVA1SswYIKprWVmyFsiIk1DqcwUeTFCnUJA3Vvg==", "dev": true, "dependencies": { - "@rollup/pluginutils": "^5.0.2", - "@svgr/core": "^7.0.0", - "@svgr/plugin-jsx": "^7.0.0" + "@rollup/pluginutils": "^5.0.4", + "@svgr/core": "^8.1.0", + "@svgr/plugin-jsx": "^8.1.0" }, "peerDependencies": { "vite": "^2.6.0 || 3 || 4" } }, "node_modules/vite-tsconfig-paths": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-4.2.0.tgz", - "integrity": "sha512-jGpus0eUy5qbbMVGiTxCL1iB9ZGN6Bd37VGLJU39kTDD6ZfULTTb1bcc5IeTWqWJKiWV5YihCaibeASPiGi8kw==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/vite-tsconfig-paths/-/vite-tsconfig-paths-4.2.1.tgz", + "integrity": "sha512-GNUI6ZgPqT3oervkvzU+qtys83+75N/OuDaQl7HmOqFTb0pjZsuARrRipsyJhJ3enqV8beI1xhGbToR4o78nSQ==", "dev": true, "dependencies": { "debug": "^4.1.1", @@ -13093,9 +13508,9 @@ "devOptional": true }, "node_modules/whatwg-fetch": { - "version": "3.6.18", - "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.18.tgz", - "integrity": "sha512-ltN7j66EneWn5TFDO4L9inYC1D+Czsxlrw2SalgjMmEMkLfA5SIZxEFdE6QtHFiiM6Q7WL32c7AkI3w6yxM84Q==" + "version": "3.6.19", + "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.19.tgz", + "integrity": "sha512-d67JP4dHSbm2TrpFj8AbO8DnL1JXL5J9u0Kq2xW6d0TFDbCA3Muhdt8orXC22utleTVj7Prqt82baN6RBvnEgw==" }, "node_modules/whatwg-url": { "version": "5.0.0", diff --git a/apps/dolly-frontend/src/main/js/package.json b/apps/dolly-frontend/src/main/js/package.json index 804e69a01f0..66a264e23a3 100644 --- a/apps/dolly-frontend/src/main/js/package.json +++ b/apps/dolly-frontend/src/main/js/package.json @@ -1,6 +1,6 @@ { "name": "dolly", - "version": "2.5.16", + "version": "2.5.18", "description": "", "main": "index.js", "scripts": { @@ -39,7 +39,6 @@ "rc-progress": "^3.4.0", "rc-tooltip": "^6.0.1", "react": "^18.2.0", - "react-copy-to-clipboard": "^5.1.0", "react-datepicker": "^4.8.0", "react-day-picker": "^8.1.0", "react-dom": "^18.2.0", @@ -94,7 +93,7 @@ "babel-plugin-styled-components": "^2.1.1", "cpx2": "^5.0.0", "cross-env": "^7.0.3", - "cypress": "^13.1.0", + "cypress": "^13.0.0", "cypress-react-selector": "^3.0.0", "dot-prop": "^8.0.0", "eslint": "^8.29.0", @@ -121,7 +120,7 @@ "typescript": "^5.0.2", "vite": "^4.0.3", "vite-plugin-environment": "^1.1.3", - "vite-plugin-svgr": "^3.2.0", + "vite-plugin-svgr": "^4.0.0", "vite-tsconfig-paths": "^4.0.0" }, "prettier": { diff --git a/apps/dolly-frontend/src/main/js/src/app/App.less b/apps/dolly-frontend/src/main/js/src/app/App.less index 252ebb259ad..1caad91b7c4 100644 --- a/apps/dolly-frontend/src/main/js/src/app/App.less +++ b/apps/dolly-frontend/src/main/js/src/app/App.less @@ -3,7 +3,16 @@ main { width: 100%; padding: @page-padding; - max-width: @page-max-width; + max-width: 960px; + + @media screen and (min-width: 2000px) { + max-width: 1400px; + } + + @media screen and (min-width: 3000px) { + max-width: 2000px; + } + margin: 0 auto; } diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/custom/Baby.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/custom/Baby.svg deleted file mode 100644 index 2804d301451..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/custom/Baby.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/custom/Brreg_logo.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/custom/Brreg_logo.svg deleted file mode 100644 index d266a5679fc..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/custom/Brreg_logo.svg +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/custom/ChildHalo.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/custom/ChildHalo.svg deleted file mode 100644 index b10f6a218b3..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/custom/ChildHalo.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/custom/ChildHalo2.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/custom/ChildHalo2.svg deleted file mode 100644 index c0509421906..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/custom/ChildHalo2.svg +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/custom/Details.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/custom/Details.svg deleted file mode 100644 index 0487e2fbdf6..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/custom/Details.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/custom/Flytt.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/custom/Flytt.svg deleted file mode 100644 index 655dfb52d8f..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/custom/Flytt.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/custom/LockedGroup.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/custom/LockedGroup.svg deleted file mode 100644 index d13d6c84391..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/custom/LockedGroup.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - Layer 1 - - - - - - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/custom/Love.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/custom/Love.svg deleted file mode 100644 index 6be6b5c033c..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/custom/Love.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/custom/Man.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/custom/Man.svg deleted file mode 100644 index 24bad938ff6..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/custom/Man.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/custom/Man2.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/custom/Man2.svg deleted file mode 100644 index 983c37b2a2e..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/custom/Man2.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/custom/Man2Light.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/custom/Man2Light.svg deleted file mode 100644 index 794327352c0..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/custom/Man2Light.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/custom/ManLight.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/custom/ManLight.svg deleted file mode 100644 index 01ea262e73e..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/custom/ManLight.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/custom/Person.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/custom/Person.svg deleted file mode 100644 index 4dae93039c6..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/custom/Person.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/custom/RIP.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/custom/RIP.svg deleted file mode 100644 index 3c91168ff56..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/custom/RIP.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/custom/Woman.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/custom/Woman.svg deleted file mode 100644 index e424571767a..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/custom/Woman.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/01-edition/link-2.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/01-edition/link-2.svg deleted file mode 100644 index 23493be74e6..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/01-edition/link-2.svg +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/01-edition/link-broken-1.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/01-edition/link-broken-1.svg deleted file mode 100644 index 0ba862590ab..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/01-edition/link-broken-1.svg +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/11-users/account-circle.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/11-users/account-circle.svg deleted file mode 100644 index 07f6618ae03..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/11-users/account-circle.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/17-files/file-add.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/17-files/file-add.svg deleted file mode 100644 index 493f8a651bc..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/17-files/file-add.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/19-interface/kryss.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/19-interface/kryss.svg deleted file mode 100644 index 7e085c6ac6e..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/19-interface/kryss.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/19-interface/synchronize-3.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/19-interface/synchronize-3.svg deleted file mode 100644 index 4727c91507d..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/19-interface/synchronize-3.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/36-text/eraser.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/36-text/eraser.svg deleted file mode 100644 index 9a69a98f495..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/36-text/eraser.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/46-arrows/arrow-down-8.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/46-arrows/arrow-down-8.svg deleted file mode 100644 index 7a4e45d844a..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/46-arrows/arrow-down-8.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/46-arrows/arrow-left-10.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/46-arrows/arrow-left-10.svg deleted file mode 100644 index 8d34fa3480e..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/46-arrows/arrow-left-10.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/46-arrows/arrow-left-8.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/46-arrows/arrow-left-8.svg deleted file mode 100644 index a54dfc081e3..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/46-arrows/arrow-left-8.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/46-arrows/arrow-right-10.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/46-arrows/arrow-right-10.svg deleted file mode 100644 index 8b061c2b6f5..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/46-arrows/arrow-right-10.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/46-arrows/arrow-right-8.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/46-arrows/arrow-right-8.svg deleted file mode 100644 index 78589f4e9f3..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/46-arrows/arrow-right-8.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/46-arrows/arrow-up-8.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/46-arrows/arrow-up-8.svg deleted file mode 100644 index a9bdbfce4ab..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/filled/SVG/46-arrows/arrow-up-8.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/01-edition/bin-1.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/01-edition/bin-1.svg deleted file mode 100644 index 299a87d7c41..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/01-edition/bin-1.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/01-edition/line-version-lock-close-2.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/01-edition/line-version-lock-close-2.svg deleted file mode 100644 index b1120624623..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/01-edition/line-version-lock-close-2.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/01-edition/lock-black.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/01-edition/lock-black.svg deleted file mode 100644 index ede23372e59..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/01-edition/lock-black.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/01-edition/pencil-2.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/01-edition/pencil-2.svg deleted file mode 100644 index 09ac6316b15..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/01-edition/pencil-2.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/01-edition/search.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/01-edition/search.svg deleted file mode 100644 index 29222654a24..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/01-edition/search.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/01-edition/skull-1.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/01-edition/skull-1.svg deleted file mode 100644 index 376b805b68b..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/01-edition/skull-1.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/05-votes-rewards/filled-version-thumbs-down-2.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/05-votes-rewards/filled-version-thumbs-down-2.svg deleted file mode 100644 index 0e6f08be44d..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/05-votes-rewards/filled-version-thumbs-down-2.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/05-votes-rewards/filled-version-thumbs-up-2.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/05-votes-rewards/filled-version-thumbs-up-2.svg deleted file mode 100644 index 5a57975a180..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/05-votes-rewards/filled-version-thumbs-up-2.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/05-votes-rewards/flag-1.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/05-votes-rewards/flag-1.svg deleted file mode 100644 index c11ab4bda2d..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/05-votes-rewards/flag-1.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/05-votes-rewards/rank-army-star-1-black.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/05-votes-rewards/rank-army-star-1-black.svg deleted file mode 100644 index 6b212a67041..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/05-votes-rewards/rank-army-star-1-black.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/05-votes-rewards/rank-army-star-1-white.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/05-votes-rewards/rank-army-star-1-white.svg deleted file mode 100644 index 0a981644ff8..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/05-votes-rewards/rank-army-star-1-white.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/05-votes-rewards/rank-army-star-1.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/05-votes-rewards/rank-army-star-1.svg deleted file mode 100644 index bc7bf20e383..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/05-votes-rewards/rank-army-star-1.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/06-comment-chat/Telephone.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/06-comment-chat/Telephone.svg deleted file mode 100644 index 2c858cc4719..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/06-comment-chat/Telephone.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/06-comment-chat/bubble-chat-1.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/06-comment-chat/bubble-chat-1.svg deleted file mode 100644 index 872e277a658..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/06-comment-chat/bubble-chat-1.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/10-email/email-1.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/10-email/email-1.svg deleted file mode 100644 index 90afc361d4a..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/10-email/email-1.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/10-email/email-text.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/10-email/email-text.svg deleted file mode 100644 index 4642295bb66..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/10-email/email-text.svg +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/11-users/account-find-2.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/11-users/account-find-2.svg deleted file mode 100644 index c6db3f2e0f8..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/11-users/account-find-2.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/11-users/account-group-1.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/11-users/account-group-1.svg deleted file mode 100644 index 22d3185a26a..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/11-users/account-group-1.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/11-users/account-group-2.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/11-users/account-group-2.svg deleted file mode 100644 index 4b0f03914fb..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/11-users/account-group-2.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/11-users/account-group-4.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/11-users/account-group-4.svg deleted file mode 100644 index d8d38d9a74f..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/11-users/account-group-4.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/11-users/account-group-4Dark.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/11-users/account-group-4Dark.svg deleted file mode 100644 index f47d7849fec..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/11-users/account-group-4Dark.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/11-users/account-group-4Light.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/11-users/account-group-4Light.svg deleted file mode 100644 index ed1918842df..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/11-users/account-group-4Light.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/11-users/account-group-5.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/11-users/account-group-5.svg deleted file mode 100644 index 0798583b538..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/11-users/account-group-5.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/11-users/id-card-double.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/11-users/id-card-double.svg deleted file mode 100644 index a0de7765c3f..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/11-users/id-card-double.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/11-users/lady-2.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/11-users/lady-2.svg deleted file mode 100644 index 7141e82c2ef..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/11-users/lady-2.svg +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/11-users/man.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/11-users/man.svg deleted file mode 100644 index 9e4221664a7..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/11-users/man.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/17-files/copy-1.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/17-files/copy-1.svg deleted file mode 100644 index 656e996cfd0..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/17-files/copy-1.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/17-files/file-add.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/17-files/file-add.svg deleted file mode 100644 index c1d2baa2a63..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/17-files/file-add.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/17-files/file-checklist.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/17-files/file-checklist.svg deleted file mode 100644 index 8e212189eaf..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/17-files/file-checklist.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/17-files/file-checklistLight.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/17-files/file-checklistLight.svg deleted file mode 100644 index e9597f80dbd..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/17-files/file-checklistLight.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/17-files/file-code.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/17-files/file-code.svg deleted file mode 100644 index ac48b4c3349..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/17-files/file-code.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/17-files/file-new-1.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/17-files/file-new-1.svg deleted file mode 100644 index fdc4d74abd1..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/17-files/file-new-1.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/17-files/file-new-2.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/17-files/file-new-2.svg deleted file mode 100644 index c2d03cdf730..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/17-files/file-new-2.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/17-files/file-refresh.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/17-files/file-refresh.svg deleted file mode 100644 index cdc2d14e01d..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/17-files/file-refresh.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/17-files/file-table.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/17-files/file-table.svg deleted file mode 100644 index a2dd5c108ea..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/17-files/file-table.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/17-files/files-3.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/17-files/files-3.svg deleted file mode 100644 index dc7376e7068..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/17-files/files-3.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/19-interface/add-circle.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/19-interface/add-circle.svg deleted file mode 100644 index 91d95d9f623..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/19-interface/add-circle.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/19-interface/logout.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/19-interface/logout.svg deleted file mode 100644 index 19bdc2289e1..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/19-interface/logout.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/19-interface/remove-circle.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/19-interface/remove-circle.svg deleted file mode 100644 index 9ca583bd7a4..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/19-interface/remove-circle.svg +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/20-status/check-circle-2.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/20-status/check-circle-2.svg deleted file mode 100644 index b441b0a15a9..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/20-status/check-circle-2.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/21-settings/wrench.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/21-settings/wrench.svg deleted file mode 100644 index 98629e6222a..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/21-settings/wrench.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/22-time/calendar-2.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/22-time/calendar-2.svg deleted file mode 100644 index ce44c6d2637..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/22-time/calendar-2.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/22-time/calendar-3.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/22-time/calendar-3.svg deleted file mode 100644 index e939b853f6f..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/22-time/calendar-3.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/22-time/hourglass-1.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/22-time/hourglass-1.svg deleted file mode 100644 index c7d28d382a2..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/22-time/hourglass-1.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/23-alerts-informations/information-circle.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/23-alerts-informations/information-circle.svg deleted file mode 100644 index afa5ecf2cde..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/23-alerts-informations/information-circle.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/24-business-finance/bank-notes-3.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/24-business-finance/bank-notes-3.svg deleted file mode 100644 index c18e616ff4f..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/24-business-finance/bank-notes-3.svg +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/24-business-finance/coin-bank-note.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/24-business-finance/coin-bank-note.svg deleted file mode 100644 index 6de5203f389..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/24-business-finance/coin-bank-note.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/24-business-finance/money-bag-dollar.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/24-business-finance/money-bag-dollar.svg deleted file mode 100644 index 81c5e19fd74..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/24-business-finance/money-bag-dollar.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/24-business-finance/piggy-bank.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/24-business-finance/piggy-bank.svg deleted file mode 100644 index c68166434d6..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/24-business-finance/piggy-bank.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/26-places/building-2.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/26-places/building-2.svg deleted file mode 100644 index ba938502cf2..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/26-places/building-2.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/26-places/globe-1.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/26-places/globe-1.svg deleted file mode 100644 index 1121dc45eea..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/26-places/globe-1.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/26-places/globe-2.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/26-places/globe-2.svg deleted file mode 100644 index 5c161eb70e4..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/26-places/globe-2.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/26-places/home-1.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/26-places/home-1.svg deleted file mode 100644 index 0a31a270915..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/26-places/home-1.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/33-hierarchy/hierarchy-3.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/33-hierarchy/hierarchy-3.svg deleted file mode 100644 index 221bc5e5fe8..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/33-hierarchy/hierarchy-3.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/33-hierarchy/hierarchy-3Light.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/33-hierarchy/hierarchy-3Light.svg deleted file mode 100644 index 9a7e3d0920c..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/33-hierarchy/hierarchy-3Light.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/40-health/first-aid-plaster.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/40-health/first-aid-plaster.svg deleted file mode 100644 index 0d5c8f82a37..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/40-health/first-aid-plaster.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/46-arrows/arrow-down-12.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/46-arrows/arrow-down-12.svg deleted file mode 100644 index b0fe865bf15..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/46-arrows/arrow-down-12.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/46-arrows/arrow-left-12.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/46-arrows/arrow-left-12.svg deleted file mode 100644 index 7e3bdc11dc1..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/46-arrows/arrow-left-12.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/46-arrows/arrow-right-12.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/46-arrows/arrow-right-12.svg deleted file mode 100644 index 23afdb78c77..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/46-arrows/arrow-right-12.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/46-arrows/arrow-up-12.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/46-arrows/arrow-up-12.svg deleted file mode 100644 index 5a696e17b58..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/46-arrows/arrow-up-12.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/people/Infants.svg b/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/people/Infants.svg deleted file mode 100644 index 65c048da5fc..00000000000 --- a/apps/dolly-frontend/src/main/js/src/assets/icons/nav-ikoner/line/SVG/people/Infants.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/apps/dolly-frontend/src/main/js/src/components/beskrivelse/Beskrivelse.tsx b/apps/dolly-frontend/src/main/js/src/components/beskrivelse/Beskrivelse.tsx index a0ecad80814..1171f41dff6 100644 --- a/apps/dolly-frontend/src/main/js/src/components/beskrivelse/Beskrivelse.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/beskrivelse/Beskrivelse.tsx @@ -22,7 +22,7 @@ export const Beskrivelse = ({ if (isUpdatingBeskrivelse) { closeModal && closeModal() - return + return } const handleSubmit = (value: string) => { @@ -36,7 +36,7 @@ export const Beskrivelse = ({ ) diff --git a/apps/dolly-frontend/src/main/js/src/components/bestilling/sammendrag/kriterier/BestillingKriterieMapper.tsx b/apps/dolly-frontend/src/main/js/src/components/bestilling/sammendrag/kriterier/BestillingKriterieMapper.tsx index 05313d2fe5e..2d615db1a50 100644 --- a/apps/dolly-frontend/src/main/js/src/components/bestilling/sammendrag/kriterier/BestillingKriterieMapper.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/bestilling/sammendrag/kriterier/BestillingKriterieMapper.tsx @@ -9,14 +9,14 @@ import { omraaderArrayToString, oversettBoolean, showLabel, - uppercaseAndUnderscoreToCapitalized, + uppercaseAndUnderscoreToCapitalized } from '@/utils/DataFormatter' import { AdresseKodeverk, ArbeidKodeverk, PersoninformasjonKodeverk, SigrunKodeverk, - VergemaalKodeverk, + VergemaalKodeverk } from '@/config/kodeverk' import { isEmpty } from '@/components/fagsystem/pdlf/form/partials/utils' import { SelectOptionsManager as Options } from '@/service/SelectOptions' @@ -1073,11 +1073,11 @@ const mapAareg = (bestillingData, data) => { obj('F.o.m. kalendermåned', formatDate(aaregKriterier[0]?.genererPeriode?.fom)), obj('T.o.m. kalendermåned', formatDate(aaregKriterier[0]?.genererPeriode?.tom)), ) - aaregKriterier[0]?.amelding.forEach((maaned) => { + aaregKriterier[0]?.amelding?.forEach((maaned) => { const maanedData = { itemRows: [], } - maaned.arbeidsforhold.forEach((arbeidsforhold, i) => { + maaned.arbeidsforhold?.forEach((arbeidsforhold, i) => { maanedData.itemRows.push( arbeidsforholdVisning(arbeidsforhold, i, harAmelding, aaregKriterier), ) @@ -1086,7 +1086,7 @@ const mapAareg = (bestillingData, data) => { aareg.paginering.push(maanedData) }) } else if (aaregKriterier[0]?.arbeidsgiver) { - aaregKriterier.forEach((arbeidsforhold, i) => { + aaregKriterier?.forEach((arbeidsforhold, i) => { aareg.itemRows.push(arbeidsforholdVisning(arbeidsforhold, i, harAmelding, aaregKriterier)) }) } diff --git a/apps/dolly-frontend/src/main/js/src/components/bestilling/sammendrag/kriterier/Bestillingskriterier.tsx b/apps/dolly-frontend/src/main/js/src/components/bestilling/sammendrag/kriterier/Bestillingskriterier.tsx index acdd136cc08..a2ea75c4c7a 100644 --- a/apps/dolly-frontend/src/main/js/src/components/bestilling/sammendrag/kriterier/Bestillingskriterier.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/bestilling/sammendrag/kriterier/Bestillingskriterier.tsx @@ -101,7 +101,7 @@ const RenderExpandablePanel = ({ attributt }) => {
diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/Navigation/Navigation.less b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/Navigation/Navigation.less index 3cb24d97bba..f5be0ee7107 100644 --- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/Navigation/Navigation.less +++ b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/Navigation/Navigation.less @@ -1,31 +1,34 @@ @import (reference) '@/styles/variables.less'; .step-navknapper-wrapper { - background-color: @color-bg-grey; - border-top: 1px solid @color-bg-grey-border; - position: fixed; - bottom: 0; - left: 0; - right: 0; - z-index: 2; + background-color: @color-bg-grey; + border-top: 1px solid @color-bg-grey-border; + position: fixed; + bottom: 0; + left: 0; + right: 0; + z-index: 2; } .step-navknapper { - max-width: @page-max-width; - margin: 0 auto; - display: flex; - flex-direction: row; - padding: 10px 20px; + max-width: 960px; + @media screen and (min-width: 2000px) { + max-width: 65vh; + } + margin: 0 auto; + display: flex; + flex-direction: row; + padding: 10px 20px; - > button { - margin-right: 10px; - } + > button { + margin-right: 10px; + } - &--right { - margin-left: auto; + &--right { + margin-left: auto; - :not(:last-child) { - margin-right: 5px; - } - } + :not(:last-child) { + margin-right: 5px; + } + } } diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/ArbeidInntekt.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/ArbeidInntekt.tsx index 6181b788690..6f1044d85d7 100644 --- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/ArbeidInntekt.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/ArbeidInntekt.tsx @@ -6,20 +6,9 @@ import { aaregAttributt } from '@/components/fagsystem/aareg/form/Form' import { sigrunAttributt } from '@/components/fagsystem/sigrunstub/form/Form' import { inntektstubAttributt } from '@/components/fagsystem/inntektstub/form/Form' import { inntektsmeldingAttributt } from '@/components/fagsystem/inntektsmelding/form/Form' -import { useContext } from 'react' -import { BestillingsveilederContext } from '@/components/bestillingsveileder/BestillingsveilederContext' export const ArbeidInntektPanel = ({ stateModifier, formikBag }) => { const sm = stateModifier(ArbeidInntektPanel.initialValues) - const opts = useContext(BestillingsveilederContext) - - const harGyldigInntektsmeldingBestilling = opts?.tidligereBestillinger?.some( - (bestilling) => - bestilling.status?.some( - (status) => - status.id === 'INNTKMELD' && status.statuser?.some((item) => item?.melding === 'OK'), - ), - ) const infoTekst = 'Arbeidsforhold: \nDataene her blir lagt til AAREG. \n\nInntekt: \nSkatte- og inntektsgrunnlag. Inntektene blir lagt i Sigrun-stub.' + @@ -29,9 +18,7 @@ export const ArbeidInntektPanel = ({ stateModifier, formikBag }) => { - sm.batchAdd(harGyldigInntektsmeldingBestilling ? ['inntektsmelding'] : []) - } + checkAttributeArray={sm.batchAdd} uncheckAttributeArray={sm.batchRemove} iconType="arbeid" startOpen={harValgtAttributt(formikBag.values, [ @@ -51,14 +38,7 @@ export const ArbeidInntektPanel = ({ stateModifier, formikBag }) => { - + ) diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Arbeidsplassen.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Arbeidsplassen.tsx index 5dfb26ce9d6..68c75a1bd58 100644 --- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Arbeidsplassen.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Arbeidsplassen.tsx @@ -85,7 +85,7 @@ ArbeidsplassenPanel.initialValues = ({ setMulti, del, has, initial, opts }) => { add() { setMulti( ['arbeidsplassenCV.jobboensker', initialJobboenskerVerdier], - ['arbeidsplassenCV.harHjemmel', hjemmel()] + ['arbeidsplassenCV.harHjemmel', hjemmel()], ) }, remove() { @@ -98,7 +98,7 @@ ArbeidsplassenPanel.initialValues = ({ setMulti, del, has, initial, opts }) => { add() { setMulti( ['arbeidsplassenCV.utdanning', [initialUtdanningVerdier]], - ['arbeidsplassenCV.harHjemmel', hjemmel()] + ['arbeidsplassenCV.harHjemmel', hjemmel()], ) }, remove() { @@ -111,7 +111,7 @@ ArbeidsplassenPanel.initialValues = ({ setMulti, del, has, initial, opts }) => { add() { setMulti( ['arbeidsplassenCV.fagbrev', [initialFagbrevVerdier]], - ['arbeidsplassenCV.harHjemmel', hjemmel()] + ['arbeidsplassenCV.harHjemmel', hjemmel()], ) }, remove() { @@ -124,7 +124,7 @@ ArbeidsplassenPanel.initialValues = ({ setMulti, del, has, initial, opts }) => { add() { setMulti( ['arbeidsplassenCV.arbeidserfaring', [initialArbeidserfaringVerdier]], - ['arbeidsplassenCV.harHjemmel', hjemmel()] + ['arbeidsplassenCV.harHjemmel', hjemmel()], ) }, remove() { @@ -137,7 +137,7 @@ ArbeidsplassenPanel.initialValues = ({ setMulti, del, has, initial, opts }) => { add() { setMulti( ['arbeidsplassenCV.annenErfaring', [initialAnnenErfaringVerdier]], - ['arbeidsplassenCV.harHjemmel', hjemmel()] + ['arbeidsplassenCV.harHjemmel', hjemmel()], ) }, remove() { @@ -150,7 +150,7 @@ ArbeidsplassenPanel.initialValues = ({ setMulti, del, has, initial, opts }) => { add() { setMulti( ['arbeidsplassenCV.kompetanser', [initialKompetanserVerdier]], - ['arbeidsplassenCV.harHjemmel', hjemmel()] + ['arbeidsplassenCV.harHjemmel', hjemmel()], ) }, remove() { @@ -163,7 +163,7 @@ ArbeidsplassenPanel.initialValues = ({ setMulti, del, has, initial, opts }) => { add() { setMulti( ['arbeidsplassenCV.offentligeGodkjenninger', [initialOffentligeGodkjenningerVerdier]], - ['arbeidsplassenCV.harHjemmel', hjemmel()] + ['arbeidsplassenCV.harHjemmel', hjemmel()], ) }, remove() { @@ -176,7 +176,7 @@ ArbeidsplassenPanel.initialValues = ({ setMulti, del, has, initial, opts }) => { add() { setMulti( ['arbeidsplassenCV.andreGodkjenninger', [initialAndreGodkjenningerVerdier]], - ['arbeidsplassenCV.harHjemmel', hjemmel()] + ['arbeidsplassenCV.harHjemmel', hjemmel()], ) }, remove() { @@ -189,7 +189,7 @@ ArbeidsplassenPanel.initialValues = ({ setMulti, del, has, initial, opts }) => { add() { setMulti( ['arbeidsplassenCV.spraak', [initialSpraakVerdier]], - ['arbeidsplassenCV.harHjemmel', hjemmel()] + ['arbeidsplassenCV.harHjemmel', hjemmel()], ) }, remove() { @@ -202,7 +202,7 @@ ArbeidsplassenPanel.initialValues = ({ setMulti, del, has, initial, opts }) => { add() { setMulti( ['arbeidsplassenCV.foererkort', [initialFoererkortVerdier]], - ['arbeidsplassenCV.harHjemmel', hjemmel()] + ['arbeidsplassenCV.harHjemmel', hjemmel()], ) }, remove() { @@ -215,7 +215,7 @@ ArbeidsplassenPanel.initialValues = ({ setMulti, del, has, initial, opts }) => { add() { setMulti( ['arbeidsplassenCV.kurs', [initialKursVerdier]], - ['arbeidsplassenCV.harHjemmel', hjemmel()] + ['arbeidsplassenCV.harHjemmel', hjemmel()], ) }, remove() { @@ -228,7 +228,7 @@ ArbeidsplassenPanel.initialValues = ({ setMulti, del, has, initial, opts }) => { add() { setMulti( ['arbeidsplassenCV.sammendrag', initialSammendragVerdi], - ['arbeidsplassenCV.harHjemmel', hjemmel()] + ['arbeidsplassenCV.harHjemmel', hjemmel()], ) }, remove() { diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Medl.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Medl.tsx index 7ab8d4d9976..c560f0878ad 100644 --- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Medl.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Medl.tsx @@ -12,7 +12,7 @@ export const MedlPanel = ({ stateModifier, formikBag }: any) => { heading={MedlPanel.heading} checkAttributeArray={sm.batchAdd} uncheckAttributeArray={sm.batchRemove} - iconType="calendar-days" + iconType="calendar" startOpen={harValgtAttributt(formikBag.values, [MedlAttributt])} > diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Personinformasjon.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Personinformasjon.tsx index 542e107f929..e2511f2dd87 100644 --- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Personinformasjon.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Personinformasjon.tsx @@ -278,7 +278,7 @@ PersoninformasjonPanel.initialValues = ({ set, setMulti, del, has, opts }) => { _.get(personFoerLeggTil, paths.egenAnsattDatoFom.tpsM) || new Date(), ], - [paths.egenAnsattDatoTom.skjerming, undefined] + [paths.egenAnsattDatoTom.skjerming, undefined], ) }, remove() { @@ -292,7 +292,7 @@ PersoninformasjonPanel.initialValues = ({ set, setMulti, del, has, opts }) => { _.has(personFoerLeggTil, 'pdlforvalter[0].person.telefonnummer') ? setMulti( [paths.telefonnummer.pdl, fjernIdFoerLeggTil('telefonnummer')], - [paths.telefonnummer.tpsM, _.get(personFoerLeggTil, 'tpsMessaging.telefonnumre')] + [paths.telefonnummer.tpsM, _.get(personFoerLeggTil, 'tpsMessaging.telefonnumre')], ) : setMulti( [ @@ -316,7 +316,7 @@ PersoninformasjonPanel.initialValues = ({ set, setMulti, del, has, opts }) => { telefontype: 'MOBI', }, ], - ] + ], ) }, remove() { @@ -341,7 +341,7 @@ PersoninformasjonPanel.initialValues = ({ set, setMulti, del, has, opts }) => { add: () => setMulti( [paths.sikkerhetstiltak.pdl, [initialSikkerhetstiltak]], - [paths.sikkerhetstiltak.tpsM, [initialTpsSikkerhetstiltak]] + [paths.sikkerhetstiltak.tpsM, [initialTpsSikkerhetstiltak]], ), remove: () => del([paths.sikkerhetstiltak.pdl, paths.sikkerhetstiltak.tpsM]), }, diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg3/OppsummeringKommentarForm.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg3/OppsummeringKommentarForm.tsx index ba616823de6..d2823e03f28 100644 --- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg3/OppsummeringKommentarForm.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg3/OppsummeringKommentarForm.tsx @@ -10,7 +10,9 @@ export const OppsummeringKommentarForm = ({ formikBag }) => { formikBag.setFieldValue('beskrivelse', value)} - placeholder={eksisterendeBeskrivelse ? eksisterendeBeskrivelse : 'Skriv inn kommentar'} + placeholder={ + eksisterendeBeskrivelse ? eksisterendeBeskrivelse : 'Skriv inn kommentar (notat)' + } /> ) diff --git a/apps/dolly-frontend/src/main/js/src/components/dollyKjede/KjedeIcon.tsx b/apps/dolly-frontend/src/main/js/src/components/dollyKjede/KjedeIcon.tsx index 4626237e369..1c6ece1e7b5 100644 --- a/apps/dolly-frontend/src/main/js/src/components/dollyKjede/KjedeIcon.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/dollyKjede/KjedeIcon.tsx @@ -19,7 +19,7 @@ const KjedeIcon = styled.div` export default ({ locked, onClick }: KjedeIconProps) => { return ( onClick()} className={'background-color-lightblue'}> - + ) } diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/alderspensjon/form/Form.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/alderspensjon/form/Form.tsx index bdc06c9e75e..87f5d5b75c7 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/alderspensjon/form/Form.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/alderspensjon/form/Form.tsx @@ -17,6 +17,7 @@ import { FormikTextInput } from '@/components/ui/form/inputs/textInput/TextInput const StyledAlert = styled(Alert)` margin-bottom: 20px; + &&& { .navds-alert__wrapper { max-width: 60rem; @@ -40,10 +41,10 @@ export const AlderspensjonForm = ({ formikBag }) => { (isDate(foedtFoer) && add(foedtFoer, { years: 62 }) > new Date()) const alderLeggTilPerson = getAlder( - _get(opts, 'personFoerLeggTil.pdl.hentPerson.foedsel[0].foedselsdato') + _get(opts, 'personFoerLeggTil.pdl.hentPerson.foedsel[0].foedselsdato'), ) const alderImportertPerson = opts?.importPersoner?.map((person) => - getAlder(_get(person, 'data.hentPerson.foedsel[0].foedselsdato')) + getAlder(_get(person, 'data.hentPerson.foedsel[0].foedselsdato')), ) const harUgyldigFoedselsaar = () => { @@ -55,14 +56,14 @@ export const AlderspensjonForm = ({ formikBag }) => { } else if (leggTil) { if ( opts?.personFoerLeggTil?.pdl?.foedsel?.some( - (f) => f.foedselsaar < 1944 && !f.metadata?.historisk + (f) => f.foedselsaar < 1944 && !f.metadata?.historisk, ) ) { ugyldigFoedselsaar = true } } else if (importTestnorge) { const foedselListe = opts?.importPersoner?.flatMap( - (person) => person?.data?.hentPerson?.foedsel + (person) => person?.data?.hentPerson?.foedsel, ) if (foedselListe?.some((f) => f.foedselsaar < 1944 && !f.metadata?.historisk)) { ugyldigFoedselsaar = true @@ -94,16 +95,16 @@ export const AlderspensjonForm = ({ formikBag }) => { const harPartner = _get(formikBag.values, 'pdldata.person.sivilstand')?.some((siv) => - gyldigSivilstand.includes(siv?.type) + gyldigSivilstand.includes(siv?.type), ) || _get(opts, 'personFoerLeggTil.pdl.hentPerson.sivilstand')?.some((siv) => - gyldigSivilstand.includes(siv?.type) + gyldigSivilstand.includes(siv?.type), ) const harPartnerImportertPerson = () => { const personerMedPartner = opts?.importPersoner?.filter((person) => { return person?.data?.hentPerson?.sivilstand?.some((siv) => - gyldigSivilstand.includes(siv?.type) + gyldigSivilstand.includes(siv?.type), ) }) return personerMedPartner?.length > 0 @@ -115,7 +116,7 @@ export const AlderspensjonForm = ({ formikBag }) => { } const valgtAdresseType = () => { const adresseUtenTilDato = _get(formikBag.values, 'pdldata.person.bostedsadresse')?.find( - (adresse) => adresse.gyldigFraOgMed && !adresse.gyldigTilOgMed + (adresse) => adresse.gyldigFraOgMed && !adresse.gyldigTilOgMed, ) const gjeldendeAdresse = adresseUtenTilDato || @@ -141,7 +142,7 @@ export const AlderspensjonForm = ({ formikBag }) => { if (opts?.importPersoner) { const personerMedNorskAdresse = opts?.importPersoner.filter((person) => { return person.data?.hentPerson?.bostedsadresse?.some( - (adresse) => adresse.vegadresse && !adresse.metadata?.historisk + (adresse) => adresse.vegadresse && !adresse.metadata?.historisk, ) }) return personerMedNorskAdresse?.length > 0 diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/visning/Visning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/visning/Visning.tsx index 78708da0667..c15515a3240 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/visning/Visning.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/arbeidsplassen/visning/Visning.tsx @@ -26,6 +26,7 @@ const StyledCVVisning = styled.div` const ForbiddenVisning = styled.div` align-items: center; margin-bottom: 20px; + && { p { margin-left: 10px; diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/brregstub/form/Form.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/brregstub/form/Form.tsx index f9ffe425c2b..84f13c9e249 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/brregstub/form/Form.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/brregstub/form/Form.tsx @@ -54,10 +54,10 @@ BrregstubForm.validation = { egenskap: requiredString, fratraadt: Yup.boolean(), registreringsdato: Yup.date(), - }) + }), ), - }) + }), ), - }) + }), ), } diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/form/DokarkivForm.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/form/DokarkivForm.tsx index 5009dcbe502..7195f63c842 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/form/DokarkivForm.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/form/DokarkivForm.tsx @@ -13,13 +13,13 @@ import { FormikCheckbox } from '@/components/ui/form/inputs/checbox/Checkbox' import { SelectOptionsManager as Options } from '@/service/SelectOptions' const Digitalinnsending = React.lazy( - () => import('@/components/fagsystem/dokarkiv/form/partials/Digitalinnsending') + () => import('@/components/fagsystem/dokarkiv/form/partials/Digitalinnsending'), ) const FileUploader = React.lazy(() => import('@/utils/FileUploader/FileUploader')) const DokumentInfoListe = React.lazy( - () => import('@/components/fagsystem/dokarkiv/modal/DokumentInfoListe') + () => import('@/components/fagsystem/dokarkiv/modal/DokumentInfoListe'), ) interface DokarkivFormProps { @@ -144,7 +144,7 @@ export const DokarkivForm = ({ formikBag }: DokarkivFormProps) => { onChange={(event: BaseSyntheticEvent) => { formikBag.setFieldValue( 'dokarkiv.journalfoerendeEnhet', - event.target.value === '' ? undefined : event.target.value + event.target.value === '' ? undefined : event.target.value, ) }} feil={ @@ -202,22 +202,20 @@ DokarkivForm.validation = { .test( 'len', 'Journalfoerende enhet må enten være blank eller et tall med 4 sifre', - (val) => !val || (val && val.length === 4) + (val) => !val || (val && val.length === 4), ), sak: Yup.object({ sakstype: requiredString, - fagsaksystem: Yup.string() - .when('sakstype', { - is: 'FAGSAK', - then: () => requiredString, - otherwise: () => Yup.mixed().notRequired() - }), - fagsakId: Yup.string() - .when('sakstype', { - is: 'FAGSAK', - then: () => requiredString, - otherwise: () => Yup.mixed().notRequired() - }) + fagsaksystem: Yup.string().when('sakstype', { + is: 'FAGSAK', + then: () => requiredString, + otherwise: () => Yup.mixed().notRequired(), + }), + fagsakId: Yup.string().when('sakstype', { + is: 'FAGSAK', + then: () => requiredString, + otherwise: () => Yup.mixed().notRequired(), + }), }), avsenderMottaker: Yup.object({ idType: Yup.string().optional().nullable(), @@ -230,7 +228,7 @@ DokarkivForm.validation = { .test( 'len', 'Orgnummer må være et tall med 9 sifre', - (val) => val && val.length === 9 + (val) => val && val.length === 9, ), }) .when('idType', { @@ -241,7 +239,7 @@ DokarkivForm.validation = { .test( 'len', 'Ident må være et tall med 11 sifre', - (val) => val && val.length === 11 + (val) => val && val.length === 11, ), }), navn: Yup.string().optional(), @@ -256,10 +254,10 @@ DokarkivForm.validation = { const values = this.options.context const brevkode = _.get(values, 'dokarkiv.dokumenter[0].brevkode') return brevkode !== '' - } + }, ), - }) + }), ), - }) + }), ), } diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/modal/DokumentInfoListe.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/modal/DokumentInfoListe.tsx index 4da28c9e522..c63dd766b1d 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/modal/DokumentInfoListe.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/modal/DokumentInfoListe.tsx @@ -41,8 +41,8 @@ export default ({ filer, handleChange, isMultiple = true }: Data) => { ...fil, dokNavn: filnavn, } - : fil - ) + : fil, + ), ) } diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/visning/DokarkivVisning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/visning/DokarkivVisning.tsx index a8e3d4b2ccd..c8ffd4da977 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/visning/DokarkivVisning.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/visning/DokarkivVisning.tsx @@ -53,7 +53,7 @@ export default ({ journalpost, miljoe }: Props) => ( JoarkDokumentService.hentPDF( journalpost.journalpostId, dokument.dokumentInfoId, - miljoe + miljoe, ) } > diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/form/HistarkForm.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/form/HistarkForm.tsx index 7dcff0bc827..e3111698fb0 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/form/HistarkForm.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/form/HistarkForm.tsx @@ -19,7 +19,7 @@ import { Yearpicker } from '@/components/ui/form/inputs/yearpicker/Yearpicker' import { testDatoFom } from '@/components/fagsystem/utils' const DokumentInfoListe = React.lazy( - () => import('@/components/fagsystem/dokarkiv/modal/DokumentInfoListe') + () => import('@/components/fagsystem/dokarkiv/modal/DokumentInfoListe'), ) const FileUploader = React.lazy(() => import('@/utils/FileUploader/FileUploader')) @@ -50,7 +50,7 @@ export const HistarkForm = ({ formikBag }: HistarkFormProps) => { const [startAar, setStartAar] = useState(new Date()) const [sluttAar, setSluttAar] = useState(new Date()) const [selectedNavEnhet, setSelectedNavEnhet] = useState( - _.get(formikBag.values, 'histark.dokumenter.0.enhetsnummer') + _.get(formikBag.values, 'histark.dokumenter.0.enhetsnummer'), ) const { navEnheter = [] } = useNavEnheter() @@ -208,8 +208,8 @@ HistarkForm.validation = { skanningsTidspunkt: requiredDate.nullable(), startAar: testDatoFom(requiredDate.nullable(), 'sluttAar', 'Startår må være før sluttår'), sluttAar: requiredDate.nullable(), - }) + }), ), - }) + }), ), } diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/InntektsmeldingTypes.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/InntektsmeldingTypes.tsx index f2af5fd2b60..77a69702a57 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/InntektsmeldingTypes.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/InntektsmeldingTypes.tsx @@ -132,8 +132,12 @@ export type Dokument = { export type TransaksjonId = { miljoe: string transaksjonId: { - journalpostId: number - dokumentInfoId: number + journalpostId?: number + dokumentInfoId?: number + dokument?: { + journalpostId?: number + dokumentInfoId?: number + } } bestillingId: string } @@ -156,4 +160,4 @@ export type BestillingData = { export type Bestilling = { inntektsmelding?: Array -} \ No newline at end of file +} diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/form/Form.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/form/Form.tsx index 5525d21a20b..060cd6f99b6 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/form/Form.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/form/Form.tsx @@ -81,7 +81,7 @@ export const InntektsmeldingForm = ({ formikBag }: InntektsmeldingFormProps) => const [typeArbeidsgiver, setTypeArbeidsgiver] = useState( _.get(formikBag.values, 'inntektsmelding.inntekter[0].arbeidsgiverPrivat') ? TypeArbeidsgiver.PRIVATPERSON - : TypeArbeidsgiver.VIRKSOMHET + : TypeArbeidsgiver.VIRKSOMHET, ) const { personFoerLeggTil, leggTilPaaGruppe } = useContext(BestillingsveilederContext) @@ -94,17 +94,17 @@ export const InntektsmeldingForm = ({ formikBag }: InntektsmeldingFormProps) => if (type === TypeArbeidsgiver.VIRKSOMHET) { formikBag.setFieldValue( `inntektsmelding.inntekter[${idx}].arbeidsgiver.virksomhetsnummer`, - '' + '', ) formikBag.setFieldValue(`inntektsmelding.inntekter[${idx}].arbeidsgiverPrivat`, undefined) } else if (type === TypeArbeidsgiver.PRIVATPERSON) { formikBag.setFieldValue(`inntektsmelding.inntekter[${idx}].arbeidsgiver`, undefined) formikBag.setFieldValue( `inntektsmelding.inntekter[${idx}].arbeidsgiverPrivat.arbeidsgiverFnr`, - '' + '', ) } - } + }, ) } @@ -241,13 +241,13 @@ InntektsmeldingForm.validation = { arbeidsgiver: Yup.object({ virksomhetsnummer: ifPresent( '$inntektsmelding.inntekter[0].arbeidsgiver.virksomhetsnummer', - requiredString.matches(/^\d{9}$/, 'Orgnummer må være et tall med 9 siffer') + requiredString.matches(/^\d{9}$/, 'Orgnummer må være et tall med 9 siffer'), ), }), arbeidsgiverPrivat: Yup.object({ arbeidsgiverFnr: ifPresent( '$inntektsmelding.inntekter[0].arbeidsgiverPrivat.arbeidsgiverFnr', - requiredString.matches(/^\d{11}$/, 'Ident må være et tall med 11 siffer') + requiredString.matches(/^\d{11}$/, 'Ident må være et tall med 11 siffer'), ), }), arbeidsforhold: Yup.object({ @@ -258,14 +258,14 @@ InntektsmeldingForm.validation = { Yup.object({ fom: testDatoFom(Yup.string(), 'tom'), tom: testDatoTom(Yup.string(), 'fom'), - }) + }), ), }), avsendersystem: Yup.object({ innsendingstidspunkt: requiredDate.nullable(), }), ytelse: requiredString, - }) + }), ), }), } diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/Visning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/Visning.tsx index 0145804d30f..32e9163ed9d 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/Visning.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/Visning.tsx @@ -29,25 +29,26 @@ export const InntektsmeldingVisning = ({ liste, ident }: InntektsmeldingVisningP } const getDokumenter = (bestilling: TransaksjonId): Promise => { - return JoarkDokumentService.hentJournalpost( - bestilling.transaksjonId.dokument.journalpostId, - bestilling.miljoe, - ).then((journalpost: Journalpost) => { - return Promise.all( - journalpost.dokumenter.map((document: Dokument) => - JoarkDokumentService.hentDokument( - bestilling.transaksjonId.dokument.journalpostId, - document.dokumentInfoId, - bestilling.miljoe, - 'ORIGINAL', - ).then((dokument: string) => ({ - journalpostId: bestilling.transaksjonId.dokument.journalpostId, - dokumentInfoId: document.dokumentInfoId, - dokument, - })), - ), - ) - }) + const journalpostId = + bestilling.transaksjonId.dokument?.journalpostId || bestilling.transaksjonId.journalpostId + return JoarkDokumentService.hentJournalpost(journalpostId, bestilling.miljoe).then( + (journalpost: Journalpost) => { + return Promise.all( + journalpost.dokumenter.map((document: Dokument) => + JoarkDokumentService.hentDokument( + journalpostId, + document.dokumentInfoId, + bestilling.miljoe, + 'ORIGINAL', + ).then((dokument: string) => ({ + journalpostId, + dokumentInfoId: document.dokumentInfoId, + dokument, + })), + ), + ) + }, + ) } return ( diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/krrstub/visning/KrrVisning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/krrstub/visning/KrrVisning.tsx index 554d0b3f47a..2f11e89cfc6 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/krrstub/visning/KrrVisning.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/krrstub/visning/KrrVisning.tsx @@ -157,7 +157,7 @@ export const KrrVisning = ({ data, loading }: KrrVisningProps) => { const antallKrr = sortedData?.length const antallFremtidige = sortedData?.filter( - (krr) => krr.gyldigFra && new Date(krr.gyldigFra) > new Date() + (krr) => krr.gyldigFra && new Date(krr.gyldigFra) > new Date(), ).length const gyldigeData = diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/medl/form/MedlForm.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/medl/form/MedlForm.tsx index 9f6b2bfff71..91cf54b7ff3 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/medl/form/MedlForm.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/medl/form/MedlForm.tsx @@ -25,7 +25,7 @@ interface MedlFormProps { export const MedlForm = ({ formikBag }: MedlFormProps) => { const [aktivKilde, setAktivKilde] = useState( - _.get(formikBag.values, 'medl.kilde') || MEDL_KILDER.SRVMELOSYS + _.get(formikBag.values, 'medl.kilde') || MEDL_KILDER.SRVMELOSYS, ) if (!_.has(formikBag.values, MedlAttributt)) { @@ -51,7 +51,7 @@ export const MedlForm = ({ formikBag }: MedlFormProps) => { diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/medl/visning/Visning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/medl/visning/Visning.tsx index e2879fe6e2a..26ed2aedfcd 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/medl/visning/Visning.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/medl/visning/Visning.tsx @@ -32,7 +32,7 @@ export default ({ data }: MedlTypes) => { <> { return this.createError({ message: 'Feltet er påkrevd', }) - } + }, ) } @@ -71,7 +71,7 @@ const organisasjon: any = Yup.object().shape({ '$organisasjon.underenheter', Yup.array() .transform((value) => Object.values(value)) - .of(Yup.lazy(() => organisasjon.default(undefined))) + .of(Yup.lazy(() => organisasjon.default(undefined))), ), }) diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/organisasjoner/visning/miljoevisning/OrganisasjonDataVisning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/organisasjoner/visning/miljoevisning/OrganisasjonDataVisning.tsx index 487659108cf..4e3e21b7f53 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/organisasjoner/visning/miljoevisning/OrganisasjonDataVisning.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/organisasjoner/visning/miljoevisning/OrganisasjonDataVisning.tsx @@ -41,11 +41,11 @@ export const OrganisasjonDataVisning = ({ data }) => { if (tilgjengeligMiljoe && tilgjengeligMiljoe !== miljoe) return null return ( } key={idx} overlayStyle={{ opacity: 1 }} > diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/organisasjoner/visning/miljoevisning/OrganisasjonMiljoeinfo.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/organisasjoner/visning/miljoevisning/OrganisasjonMiljoeinfo.tsx index 7a777caefb6..7610914e192 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/organisasjoner/visning/miljoevisning/OrganisasjonMiljoeinfo.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/organisasjoner/visning/miljoevisning/OrganisasjonMiljoeinfo.tsx @@ -17,7 +17,7 @@ export const OrganisasjonMiljoeinfo = (props: { orgnummer: string }) => { return (
- + {state.loading && } {/* @ts-ignore */} {state.value && } diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/partials/adresser/PdlKontaktadresse.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/partials/adresser/PdlKontaktadresse.tsx index 2d869d00e07..346b50bfc54 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/partials/adresser/PdlKontaktadresse.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/partials/adresser/PdlKontaktadresse.tsx @@ -27,7 +27,7 @@ export const PdlKontaktadresse = ({ data }: PdlKontaktadresseProps) => { const gyldigeAdresser = data.filter((adresse: KontaktadresseData) => !adresse.metadata?.historisk) const historiskeAdresser = data.filter( - (adresse: KontaktadresseData) => adresse.metadata?.historisk + (adresse: KontaktadresseData) => adresse.metadata?.historisk, ) return ( diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/partials/adresser/PdlOppholdsadresse.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/partials/adresser/PdlOppholdsadresse.tsx index e756acc3bdc..d278cb50cec 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/partials/adresser/PdlOppholdsadresse.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/partials/adresser/PdlOppholdsadresse.tsx @@ -26,10 +26,10 @@ export const PdlOppholdsadresse = ({ data }: PdlOppholdsadresseProps) => { } const gyldigeAdresser = data.filter( - (adresse: OppholdsadresseData) => !adresse.metadata?.historisk + (adresse: OppholdsadresseData) => !adresse.metadata?.historisk, ) const historiskeAdresser = data.filter( - (adresse: OppholdsadresseData) => adresse.metadata?.historisk + (adresse: OppholdsadresseData) => adresse.metadata?.historisk, ) return ( diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/partials/relasjoner/PdlForeldreansvar.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/partials/relasjoner/PdlForeldreansvar.tsx index 493ed6533e2..6371aa11cca 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/partials/relasjoner/PdlForeldreansvar.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/partials/relasjoner/PdlForeldreansvar.tsx @@ -53,10 +53,10 @@ export const PdlForeldreansvar = ({ data }: PdlForeldreansvarProps) => { } const gyldigeForeldreansvar = data.filter( - (foreldreansvar: Foreldreansvar) => !foreldreansvar.metadata?.historisk + (foreldreansvar: Foreldreansvar) => !foreldreansvar.metadata?.historisk, ) const historiskeForeldreansvar = data.filter( - (foreldreansvar: Foreldreansvar) => foreldreansvar.metadata?.historisk + (foreldreansvar: Foreldreansvar) => foreldreansvar.metadata?.historisk, ) return ( diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/partials/vergemaal/PdlVergemaal.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/partials/vergemaal/PdlVergemaal.tsx index 0b7908f4f61..c20a263f28b 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/partials/vergemaal/PdlVergemaal.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/partials/vergemaal/PdlVergemaal.tsx @@ -52,7 +52,7 @@ export const PdlVergemaal = ({ data }: VergemaalProps) => { const gyldigeVergemaal = data.filter((vergemaal: VergemaalData) => !vergemaal.metadata?.historisk) const historiskeVergemaal = data.filter( - (vergemaal: VergemaalData) => vergemaal.metadata?.historisk + (vergemaal: VergemaalData) => vergemaal.metadata?.historisk, ) return ( diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/avansert/AvansertForm.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/avansert/AvansertForm.tsx index 73697b41712..bf745871df9 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/avansert/AvansertForm.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/avansert/AvansertForm.tsx @@ -15,11 +15,11 @@ export const AvansertForm = ({ path, kanVelgeMaster = true }: AvansertFormValues return (
{visAvansert ? ( - ) : ( - )} diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/kontaktinformasjonForDoedsbo/Adresse.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/kontaktinformasjonForDoedsbo/Adresse.tsx index af80185dcc4..967db46b6a5 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/kontaktinformasjonForDoedsbo/Adresse.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/kontaktinformasjonForDoedsbo/Adresse.tsx @@ -18,7 +18,7 @@ export const Adresse = ({ formikBag, path }) => { SKJUL ADRESSE-VALG ) : ( - )} diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/pdlPerson/PdlPersonExpander.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/pdlPerson/PdlPersonExpander.tsx index 54099a71876..319c374537c 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/pdlPerson/PdlPersonExpander.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/pdlPerson/PdlPersonExpander.tsx @@ -37,11 +37,11 @@ export const PdlPersonExpander = ({ return (
{visPersonValg ? ( - ) : ( - )} diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Adressebeskyttelse.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Adressebeskyttelse.tsx index e20660140b1..61b54908ac2 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Adressebeskyttelse.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Adressebeskyttelse.tsx @@ -60,7 +60,7 @@ const AdressebeskyttelseVisning = ({ const redigertAdressebeskyttelsePdlf = _.get( tmpPersoner, - `${ident}.person.adressebeskyttelse` + `${ident}.person.adressebeskyttelse`, )?.find((a: Person) => a.id === adressebeskyttelse.id) const slettetAdressebeskyttelsePdlf = tmpPersoner?.hasOwnProperty(ident) && !redigertAdressebeskyttelsePdlf @@ -75,7 +75,7 @@ const AdressebeskyttelseVisning = ({ ? { adressebeskyttelse: Object.assign( _.cloneDeep(initialAdressebeskyttelse), - redigertAdressebeskyttelsePdlf + redigertAdressebeskyttelsePdlf, ), } : null diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Boadresse.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Boadresse.tsx index 146ae8a3217..d69d8c4511f 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Boadresse.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Boadresse.tsx @@ -62,7 +62,7 @@ const BoadresseVisning = ({ const initialValues = { bostedsadresse: initBoadresse } const redigertBoadressePdlf = _.get(tmpPersoner, `${ident}.person.bostedsadresse`)?.find( - (a: BostedData) => a.id === boadresseData.id + (a: BostedData) => a.id === boadresseData.id, ) const slettetBoadressePdlf = tmpPersoner?.hasOwnProperty(ident) && !redigertBoadressePdlf if (slettetBoadressePdlf) { diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/DeltBosted.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/DeltBosted.tsx index 930f0157f6f..df6d2157921 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/DeltBosted.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/DeltBosted.tsx @@ -50,7 +50,7 @@ export const DeltBostedVisning = ({ _.set(initialValues, 'deltBosted.adresseIdentifikatorFraMatrikkelen', undefined) const redigertBostedPdlf = _.get(tmpPersoner, `${ident}.person.deltBosted`)?.find( - (a: DeltBostedValues) => a.id === adresseData.id + (a: DeltBostedValues) => a.id === adresseData.id, ) const redigertRelatertePersoner = _.get(tmpPersoner, `${ident}.relasjoner`) diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/DoedfoedtBarn.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/DoedfoedtBarn.tsx index 808a8385b34..2afbec45821 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/DoedfoedtBarn.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/DoedfoedtBarn.tsx @@ -50,7 +50,7 @@ export const DoedfoedtBarnVisning = ({ let initialValues = { doedfoedtBarn: initDoedfoedtBarn } const redigertDoedfoedtBarnPdlf = _.get(tmpPersoner, `${ident}.person.doedfoedtBarn`)?.find( - (a: DoedfoedtBarnData) => a.id === doedfoedtBarnData.id + (a: DoedfoedtBarnData) => a.id === doedfoedtBarnData.id, ) const slettetDoedfoedtBarnPdlf = tmpPersoner?.hasOwnProperty(ident) && !redigertDoedfoedtBarnPdlf diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Doedsfall.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Doedsfall.tsx index 146a89a9868..2f5ac6fe8d1 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Doedsfall.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Doedsfall.tsx @@ -51,7 +51,7 @@ const DoedsfallVisning = ({ const initialValues = { doedsfall: initDoedsfall } const redigertDoedsfallPdlf = _.get(tmpPersoner, `${ident}.person.doedsfall`)?.find( - (a: Person) => a.id === doedsfall.id + (a: Person) => a.id === doedsfall.id, ) const slettetDoedsfallPdlf = tmpPersoner?.hasOwnProperty(ident) && !redigertDoedsfallPdlf if (slettetDoedsfallPdlf) { diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Foedsel.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Foedsel.tsx index 29e65666336..c0eaac08a81 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Foedsel.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Foedsel.tsx @@ -73,7 +73,7 @@ const FoedselVisning = ({ const initialValues = { foedsel: initFoedsel } const redigertFoedselPdlf = _.get(tmpPersoner, `${ident}.person.foedsel`)?.find( - (a: Person) => a.id === foedsel.id + (a: Person) => a.id === foedsel.id, ) const slettetFoedselPdlf = tmpPersoner?.hasOwnProperty(ident) && !redigertFoedselPdlf if (slettetFoedselPdlf) { diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/ForelderBarnRelasjon.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/ForelderBarnRelasjon.tsx index 329cb4f4023..859f4fe7df7 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/ForelderBarnRelasjon.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/ForelderBarnRelasjon.tsx @@ -43,7 +43,7 @@ const ForelderBarnRelasjonLes = ({ forelderBarnData.relatertPerson || forelderBarnData.relatertPersonsIdent const relasjon = relasjoner?.find((item) => item.relatertPerson?.ident === relatertPersonIdent) const relasjonRedigert = redigertRelatertePersoner?.find( - (item) => item.relatertPerson?.ident === relatertPersonIdent + (item) => item.relatertPerson?.ident === relatertPersonIdent, ) const relatertPersonUtenId = forelderBarnData.relatertPersonUtenFolkeregisteridentifikator @@ -87,12 +87,12 @@ export const ForelderBarnRelasjonVisning = ({ const initForelderBarn = Object.assign( _.cloneDeep(data[idx]?.relatertPersonsRolle === 'BARN' ? initialBarn : initialForelder), - data[idx] + data[idx], ) let initialValues = { forelderBarnRelasjon: initForelderBarn } const redigertForelderBarnPdlf = _.get(tmpPersoner, `${ident}.person.forelderBarnRelasjon`)?.find( - (a: ForeldreBarnRelasjon) => a.id === forelderBarnRelasjonData.id + (a: ForeldreBarnRelasjon) => a.id === forelderBarnRelasjonData.id, ) const redigertRelatertePersoner = _.get(tmpPersoner, `${ident}.relasjoner`) @@ -109,9 +109,11 @@ export const ForelderBarnRelasjonVisning = ({ ? { forelderBarnRelasjon: Object.assign( _.cloneDeep( - redigertForelderBarnPdlf.relatertPersonsRolle === 'BARN' ? initialBarn : initialForelder + redigertForelderBarnPdlf.relatertPersonsRolle === 'BARN' + ? initialBarn + : initialForelder, ), - redigertForelderBarnPdlf + redigertForelderBarnPdlf, ), } : null @@ -138,7 +140,7 @@ export const ForelderBarnRelasjonVisning = ({ const relasjon = relasjoner?.find( (relasjon) => relasjon?.relatertPerson?.ident === forelderBarnValues?.relatertPerson && - relasjon?.relasjonType === 'FAMILIERELASJON_BARN' + relasjon?.relasjonType === 'FAMILIERELASJON_BARN', ) return relasjon?.relatertPerson?.foreldreansvar } @@ -156,7 +158,7 @@ export const ForelderBarnRelasjonVisning = ({ } const erIGruppe = gruppeIdenter?.some( - (person) => person.ident === initialValues?.forelderBarnRelasjon?.relatertPerson + (person) => person.ident === initialValues?.forelderBarnRelasjon?.relatertPerson, ) const relatertPersonInfo = erIGruppe ? { diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Foreldreansvar.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Foreldreansvar.tsx index 37796c52186..2bde8fb3268 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Foreldreansvar.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Foreldreansvar.tsx @@ -21,13 +21,13 @@ const ForeldreansvarLes = ({ foreldreansvarData, redigertRelatertePersoner, rela const ansvarlig = relasjoner?.find( (relasjon) => relasjon.relasjonType === 'FORELDREANSVAR_FORELDER' && - relasjon.relatertPerson?.ident === foreldreansvarData.ansvarlig + relasjon.relatertPerson?.ident === foreldreansvarData.ansvarlig, ) const ansvarligRedigert = redigertRelatertePersoner?.find( (relasjon) => relasjon.relasjonType === 'FORELDREANSVAR_FORELDER' && - relasjon.relatertPerson?.ident === foreldreansvarData.ansvarlig + relasjon.relatertPerson?.ident === foreldreansvarData.ansvarlig, ) return ( @@ -107,12 +107,12 @@ export const ForeldreansvarEnkeltvisning = ({ let initialValues = { foreldreansvar: initForeldreansvar } const redigertForeldreansvarPdlf = _.get(tmpPersoner, `${ident}.person.foreldreansvar`)?.find( - (a) => a.id === foreldreansvarData.id + (a) => a.id === foreldreansvarData.id, ) const redigertForelderBarnRelasjonPdlf = _.get( tmpPersoner, - `${ident}.person.forelderBarnRelasjon` + `${ident}.person.forelderBarnRelasjon`, ) const redigertRelatertePersoner = _.get(tmpPersoner, `${ident}.relasjoner`) @@ -132,7 +132,7 @@ export const ForeldreansvarEnkeltvisning = ({ ? { foreldreansvar: Object.assign( _.cloneDeep(initialForeldreansvar), - redigertForeldreansvarPdlf + redigertForeldreansvarPdlf, ), } : null @@ -151,7 +151,7 @@ export const ForeldreansvarEnkeltvisning = ({ } const erIGruppe = gruppeIdenter?.some( - (person) => person.ident === initialValues?.foreldreansvar?.ansvarlig + (person) => person.ident === initialValues?.foreldreansvar?.ansvarlig, ) const relatertPersonInfo = erIGruppe ? { diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Fullmakt.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Fullmakt.tsx index 0139c755c9b..ee06bd56434 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Fullmakt.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Fullmakt.tsx @@ -44,10 +44,10 @@ const FullmaktLes = ({ fullmaktData, relasjoner, redigertRelatertePersoner = nul const fullmektigIdent = fullmaktData.motpartsPersonident const fullmektig = relasjoner?.find( - (relasjon) => relasjon.relatertPerson?.ident === fullmektigIdent + (relasjon) => relasjon.relatertPerson?.ident === fullmektigIdent, ) const fullmektigRedigert = redigertRelatertePersoner?.find( - (item) => item.relatertPerson?.ident === fullmektigIdent + (item) => item.relatertPerson?.ident === fullmektigIdent, ) const omraader = fullmaktData.omraader @@ -94,7 +94,7 @@ export const FullmaktVisning = ({ let initialValues = { fullmakt: initFullmakt } const redigertFullmaktPdlf = _.get(tmpPersoner, `${ident}.person.fullmakt`)?.find( - (a: FullmaktValues) => a.id === fullmaktData.id + (a: FullmaktValues) => a.id === fullmaktData.id, ) const redigertRelatertePersoner = _.get(tmpPersoner, `${ident}.relasjoner`) @@ -148,7 +148,7 @@ export const Fullmakt = ({ data, tmpPersoner, ident, relasjoner }: DataListe) => return null } const fullmaktRelasjoner = relasjoner?.filter( - (relasjon) => relasjon.relasjonType === 'FULLMEKTIG' + (relasjon) => relasjon.relasjonType === 'FULLMEKTIG', ) return ( diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Identhistorikk.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Identhistorikk.tsx index 8c469af1485..819ce62d56b 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Identhistorikk.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Identhistorikk.tsx @@ -9,7 +9,7 @@ type IdenthistorikkData = { export const IdenthistorikkVisning = ({ relasjoner }: IdenthistorikkData) => { const historiskeIdenter = relasjoner?.filter( - (relasjon) => relasjon.relasjonType === 'GAMMEL_IDENTITET' + (relasjon) => relasjon.relasjonType === 'GAMMEL_IDENTITET', ) if (!historiskeIdenter || historiskeIdenter.length < 1) { return null diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Kontaktadresse.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Kontaktadresse.tsx index 74c0f24bb8a..08f4ccf4160 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Kontaktadresse.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Kontaktadresse.tsx @@ -171,12 +171,12 @@ const KontaktadresseVisning = ({ }: KontaktadresseVisningTypes) => { const initKontaktadresse = Object.assign( _.cloneDeep(initialKontaktadresse), - data?.[idx] || tmpData?.[idx] + data?.[idx] || tmpData?.[idx], ) const initialValues = { kontaktadresse: initKontaktadresse } const redigertKontaktadressePdlf = _.get(tmpPersoner, `${ident}.person.kontaktadresse`)?.find( - (a: KontaktadresseData) => a.id === kontaktadresseData.id + (a: KontaktadresseData) => a.id === kontaktadresseData.id, ) const slettetKontaktadressePdlf = tmpPersoner?.hasOwnProperty(ident) && !redigertKontaktadressePdlf @@ -191,7 +191,7 @@ const KontaktadresseVisning = ({ ? { kontaktadresse: Object.assign( _.cloneDeep(initialKontaktadresse), - redigertKontaktadressePdlf + redigertKontaktadressePdlf, ), } : null diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/KontaktinformasjonForDoedsbo.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/KontaktinformasjonForDoedsbo.tsx index b4b59aa8cda..d6547518265 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/KontaktinformasjonForDoedsbo.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/KontaktinformasjonForDoedsbo.tsx @@ -25,10 +25,10 @@ const KontaktinformasjonForDoedsboLes = ({ const kontaktpersonIdent = data.personSomKontakt?.identifikasjonsnummer const kontaktperson = relasjoner?.find( - (relasjon) => relasjon.relatertPerson?.ident === kontaktpersonIdent + (relasjon) => relasjon.relatertPerson?.ident === kontaktpersonIdent, ) const kontaktpersonRedigert = redigertRelatertePersoner?.find( - (item) => item.relatertPerson?.ident === kontaktpersonIdent + (item) => item.relatertPerson?.ident === kontaktpersonIdent, ) const { @@ -130,7 +130,7 @@ export const KontaktinformasjonForDoedsboVisning = ({ const redigertKontaktinfoPdlf = _.get( tmpPersoner, - `${ident}.person.kontaktinformasjonForDoedsbo` + `${ident}.person.kontaktinformasjonForDoedsbo`, )?.find((a) => a.id === kontaktinfoData.id) const redigertRelatertePersoner = _.get(tmpPersoner, `${ident}.relasjoner`) @@ -144,7 +144,7 @@ export const KontaktinformasjonForDoedsboVisning = ({ ? { kontaktinformasjonForDoedsbo: Object.assign( _.cloneDeep(initialKontaktinfoForDoedebo), - redigertKontaktinfoPdlf + redigertKontaktinfoPdlf, ), } : null @@ -153,19 +153,19 @@ export const KontaktinformasjonForDoedsboVisning = ({ ? getEksisterendeNyPerson( redigertRelatertePersoner, kontaktinfoValues?.personSomKontakt?.identifikasjonsnummer, - ['KONTAKT_FOR_DOEDSBO'] + ['KONTAKT_FOR_DOEDSBO'], ) : getEksisterendeNyPerson( relasjoner, kontaktinfoValues?.personSomKontakt?.identifikasjonsnummer, - ['KONTAKT_FOR_DOEDSBO'] + ['KONTAKT_FOR_DOEDSBO'], ) if (eksisterendeNyPerson && initialValues?.kontaktinformasjonForDoedsbo?.personSomKontakt) { const filteredPerson = Object.fromEntries( Object.entries(initialValues?.kontaktinformasjonForDoedsbo?.personSomKontakt).filter( - (item) => item[0] !== 'nyKontaktperson' - ) + (item) => item[0] !== 'nyKontaktperson', + ), ) initialValues.kontaktinformasjonForDoedsbo.personSomKontakt = filteredPerson } @@ -176,8 +176,8 @@ export const KontaktinformasjonForDoedsboVisning = ({ ) { const filteredPerson = Object.fromEntries( Object.entries( - redigertKontaktinfoValues?.kontaktinformasjonForDoedsbo?.personSomKontakt - ).filter((item) => item[0] !== 'nyKontaktperson') + redigertKontaktinfoValues?.kontaktinformasjonForDoedsbo?.personSomKontakt, + ).filter((item) => item[0] !== 'nyKontaktperson'), ) redigertKontaktinfoValues.kontaktinformasjonForDoedsbo.personSomKontakt = filteredPerson } @@ -215,7 +215,7 @@ export const KontaktinformasjonForDoedsbo = ({ } const kontaktpersonRelasjoner = relasjoner?.filter( - (relasjon) => relasjon.relasjonType === 'KONTAKT_FOR_DOEDSBO' + (relasjon) => relasjon.relasjonType === 'KONTAKT_FOR_DOEDSBO', ) return ( diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Oppholdsadresse.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Oppholdsadresse.tsx index 117bd4cb8cd..c5f92c28d13 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Oppholdsadresse.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Oppholdsadresse.tsx @@ -72,7 +72,7 @@ const OppholdsadresseVisning = ({ const initialValues = { oppholdsadresse: initOppholdsadresse } const redigertOppholdsadressePdlf = _.get(tmpPersoner, `${ident}.person.oppholdsadresse`)?.find( - (a: OppholdsadresseData) => a.id === oppholdsadresseData.id + (a: OppholdsadresseData) => a.id === oppholdsadresseData.id, ) const slettetOppholdsadressePdlf = tmpPersoner?.hasOwnProperty(ident) && !redigertOppholdsadressePdlf @@ -87,7 +87,7 @@ const OppholdsadresseVisning = ({ ? { oppholdsadresse: Object.assign( _.cloneDeep(initialOppholdsadresse), - redigertOppholdsadressePdlf + redigertOppholdsadressePdlf, ), } : null diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Persondetaljer.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Persondetaljer.tsx index 9b17886fbf2..f98ce55bcfb 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Persondetaljer.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Persondetaljer.tsx @@ -16,7 +16,7 @@ import { SkjermingVisning } from '@/components/fagsystem/skjermingsregister/visn import { Skjerming } from '@/components/fagsystem/skjermingsregister/SkjermingTypes' import { DollyFieldArray } from '@/components/ui/form/fieldArray/DollyFieldArray' import VisningRedigerbarConnector from '@/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarConnector' -import {OpplysningSlettet} from "@/components/fagsystem/pdlf/visning/visningRedigerbar/OpplysningSlettet"; +import { OpplysningSlettet } from '@/components/fagsystem/pdlf/visning/visningRedigerbar/OpplysningSlettet' type PersondetaljerTypes = { data: any @@ -175,7 +175,7 @@ export const Persondetaljer = ({ {(navn) => { const redigertNavn = _.get( tmpPersoner?.pdlforvalter, - `${ident}.person.navn` + `${ident}.person.navn`, )?.find((a) => a.id === navn.id) const slettetNavn = diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/UtenlandsId.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/UtenlandsId.tsx index 56a6728fe8a..0c5acdd2f6f 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/UtenlandsId.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/UtenlandsId.tsx @@ -33,7 +33,7 @@ export const UtenlandsIdVisning = ({ utenlandsIdData, idx, data, tmpPersoner, id const redigertUtenlandsIdPdlf = _.get( tmpPersoner, - `${ident}.person.utenlandskIdentifikasjonsnummer` + `${ident}.person.utenlandskIdentifikasjonsnummer`, )?.find((a) => a.id === utenlandsIdData.id) const slettetUtenlandsIdPdlf = tmpPersoner?.hasOwnProperty(ident) && !redigertUtenlandsIdPdlf @@ -46,7 +46,7 @@ export const UtenlandsIdVisning = ({ utenlandsIdData, idx, data, tmpPersoner, id let redigertUtenlandsIdValues = redigertUtenlandsIdPdlf && { utenlandskIdentifikasjonsnummer: Object.assign( _.cloneDeep(initUtenlandsId), - redigertUtenlandsIdPdlf + redigertUtenlandsIdPdlf, ), } diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Vergemaal.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Vergemaal.tsx index 818d1b901f6..24cf764fc1a 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Vergemaal.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Vergemaal.tsx @@ -67,7 +67,7 @@ const VergemaalLes = ({ const relatertPersonIdent = vergemaalData.vergeIdent const relasjon = relasjoner?.find((item) => item.relatertPerson?.ident === relatertPersonIdent) const relasjonRedigert = redigertRelatertePersoner?.find( - (item) => item.relatertPerson?.ident === relatertPersonIdent + (item) => item.relatertPerson?.ident === relatertPersonIdent, ) const harFullmektig = vergemaalData.sakType === 'FRE' @@ -125,7 +125,7 @@ const VergemaalVisning = ({ initialValues.vergemaal.nyVergeIdent = initialPdlPerson const redigertVergemaalPdlf = _.get(tmpPersoner, `${ident}.person.vergemaal`)?.find( - (a: VergemaalValues) => a.id === vergemaalData.id + (a: VergemaalValues) => a.id === vergemaalData.id, ) const redigertRelatertePersoner = _.get(tmpPersoner, `${ident}.relasjoner`) diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbar.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbar.tsx index 2791c7e7193..ac329b5a4db 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbar.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbar.tsx @@ -26,25 +26,25 @@ import { } from '@/components/fagsystem/pdlf/form/partials/adresser/adressebeskyttelse/Adressebeskyttelse' import { doedsfall, navn } from '@/components/fagsystem/pdlf/form/validation/validation' import { - innflytting, - statsborgerskap, - utflytting, adressebeskyttelse, bostedsadresse, + doedfoedtBarn, + forelderBarnRelasjon, + fullmakt, + innflytting, kontaktadresse, + kontaktDoedsbo, oppholdsadresse, - vergemaal, - fullmakt, sivilstand, - kontaktDoedsbo, - forelderBarnRelasjon, - doedfoedtBarn, + statsborgerskap, utenlandskId, + utflytting, + vergemaal, } from '@/components/fagsystem/pdlf/form/validation/partials' import { ifPresent, validate } from '@/utils/YupValidations' import { - RedigerLoading, Modus, + RedigerLoading, } from '@/components/fagsystem/pdlf/visning/visningRedigerbar/RedigerLoading' import { Option } from '@/service/SelectOptionsOppslag' import { KontaktinformasjonForDoedsboForm } from '@/components/fagsystem/pdlf/form/partials/kontaktinformasjonForDoedsbo/KontaktinformasjonForDoedsbo' @@ -357,7 +357,7 @@ export const VisningRedigerbar = ({ is: (foreldreansvar) => Array.isArray(foreldreansvar), then: () => Yup.array().of(foreldreansvarForBarn), otherwise: () => foreldreansvarForBarn, - }) + }), ), doedfoedtBarn: ifPresent('doedfoedtBarn', doedfoedtBarn), utenlandskIdentifikasjonsnummer: ifPresent('utenlandskIdentifikasjonsnummer', utenlandskId), @@ -381,7 +381,7 @@ export const VisningRedigerbar = ({ ['foreldreansvar', 'foreldreansvar'], ['doedfoedtBarn', 'doedfoedtBarn'], ['utenlandskIdentifikasjonsnummer', 'utenlandskIdentifikasjonsnummer'], - ] + ], ) const _validate = (values: any) => @@ -391,7 +391,7 @@ export const VisningRedigerbar = ({ personFoerLeggTil: personFoerLeggTil, personValues: personValues, }, - validationSchema + validationSchema, ) return ( @@ -404,6 +404,7 @@ export const VisningRedigerbar = ({ {isForbedringModalOpen && } diff --git a/apps/dolly-frontend/src/main/js/src/components/feedback/ForbedringModal.tsx b/apps/dolly-frontend/src/main/js/src/components/feedback/ForbedringModal.tsx index 11bffda0c38..4efe60f2602 100644 --- a/apps/dolly-frontend/src/main/js/src/components/feedback/ForbedringModal.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/feedback/ForbedringModal.tsx @@ -39,7 +39,9 @@ export const ForbedringModal = ({ closeModal }) => {
{isAnonym ? ( - +
+ +
) : ( Profilbilde )} diff --git a/apps/dolly-frontend/src/main/js/src/components/infostripe/InfoStripe.tsx b/apps/dolly-frontend/src/main/js/src/components/infostripe/InfoStripe.tsx index df36a0707fd..907ecbf9ce7 100644 --- a/apps/dolly-frontend/src/main/js/src/components/infostripe/InfoStripe.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/infostripe/InfoStripe.tsx @@ -121,7 +121,7 @@ export const InfoStripe = () => {
diff --git a/apps/dolly-frontend/src/main/js/src/components/layout/header/BrukerDropdown.tsx b/apps/dolly-frontend/src/main/js/src/components/layout/header/BrukerDropdown.tsx index 20a172886b6..a68906a5823 100644 --- a/apps/dolly-frontend/src/main/js/src/components/layout/header/BrukerDropdown.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/layout/header/BrukerDropdown.tsx @@ -18,7 +18,6 @@ const StyledIcon = styled(Icon)` stroke-width: 2; } } - margin-right: 10px; } ` @@ -60,11 +59,11 @@ export const BrukerDropdown = () => { style={{ color: '#212529' }} data-cy={CypressSelector.BUTTON_PROFIL_MINSIDE} > - + Min side logoutBruker()} style={{ color: '#212529' }}> - + Logg ut diff --git a/apps/dolly-frontend/src/main/js/src/components/layout/header/DokumentasjonDropdown.tsx b/apps/dolly-frontend/src/main/js/src/components/layout/header/DokumentasjonDropdown.tsx index 33b23920fff..313bb24718e 100644 --- a/apps/dolly-frontend/src/main/js/src/components/layout/header/DokumentasjonDropdown.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/layout/header/DokumentasjonDropdown.tsx @@ -49,11 +49,11 @@ export const DokumentasjonDropdown = () => { window.open( 'https://navikt.github.io/testnorge/applications/dolly/', '_blank', - 'noopener' + 'noopener', ) } > - + Brukerdokumentasjon {currentBruker?.brukertype === 'AZURE' && ( @@ -64,11 +64,11 @@ export const DokumentasjonDropdown = () => { ? 'https://dolly-backend-dev.intern.dev.nav.no/swagger' : 'https://dolly-backend.intern.dev.nav.no/swagger', '_blank', - 'noopener' + 'noopener', ) } > - + API-dokumentasjon )} diff --git a/apps/dolly-frontend/src/main/js/src/components/layout/header/Header.less b/apps/dolly-frontend/src/main/js/src/components/layout/header/Header.less index 0851adfc853..1cd9d0aca4d 100644 --- a/apps/dolly-frontend/src/main/js/src/components/layout/header/Header.less +++ b/apps/dolly-frontend/src/main/js/src/components/layout/header/Header.less @@ -39,7 +39,8 @@ header.app-header { color: white; } } - .dropdown-toggle{ + + .dropdown-toggle { margin: 0 !important; padding: 15px 0; border: none; @@ -47,7 +48,7 @@ header.app-header { height: 100%; display: flex; - &.active{ + &.active { background-color: lighten(@color-nav-black, 10%); } @@ -121,28 +122,32 @@ header.app-header { } } } - .navdsi-dropdown__item{ + + .navdsi-dropdown__item { color: @color-lightblue; padding: 10px 0 10px 15px; + &:hover { background-color: #ebfcff; } } } -.svg-icon-logout{ +.svg-icon-logout { g { stroke: #212529; stroke-width: 2; } + margin-right: 10px; } -.svg-icon-fileCode, .svg-icon-fileNew2{ +.svg-icon-file-code, .svg-icon-file-new { g { stroke: #212529; stroke-width: 2; } + margin: 0 10px 0 0; } diff --git a/apps/dolly-frontend/src/main/js/src/components/rating/ThumbsRating.less b/apps/dolly-frontend/src/main/js/src/components/rating/ThumbsRating.less index de2cceb3dbd..df72743a71e 100644 --- a/apps/dolly-frontend/src/main/js/src/components/rating/ThumbsRating.less +++ b/apps/dolly-frontend/src/main/js/src/components/rating/ThumbsRating.less @@ -8,16 +8,6 @@ } &__icon { - &__left { - padding-top: 3px; - position: relative; - bottom: 3px; - } - - &__right { - padding-top: 3px; - position: relative; - top: 4px; - } + padding-top: 3px; } } diff --git a/apps/dolly-frontend/src/main/js/src/components/rating/ThumbsRating.tsx b/apps/dolly-frontend/src/main/js/src/components/rating/ThumbsRating.tsx index b01b651d9a4..a7c4abb9b8e 100644 --- a/apps/dolly-frontend/src/main/js/src/components/rating/ThumbsRating.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/rating/ThumbsRating.tsx @@ -41,11 +41,11 @@ interface IconButton { const ThumpsUp = ({ className }: IconButton) => ( // @ts-ignore - + ) const ThumpsDown = ({ className }: IconButton) => ( // @ts-ignore - + ) export const ThumbsRating = ({ label, ratingFor, onClick, uuid, children }: ThumbsRatingProps) => { diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/appError/AppError.cy.tsx b/apps/dolly-frontend/src/main/js/src/components/ui/appError/AppError.cy.tsx new file mode 100644 index 00000000000..d0d7ff443dd --- /dev/null +++ b/apps/dolly-frontend/src/main/js/src/components/ui/appError/AppError.cy.tsx @@ -0,0 +1,10 @@ +import React from 'react' +import { AppError } from './AppError' + +describe('', () => { + it('renders', () => { + cy.mount( + , + ) + }) +}) diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/appError/AppError.tsx b/apps/dolly-frontend/src/main/js/src/components/ui/appError/AppError.tsx index a8c99cbe0a5..13bf5403d3d 100644 --- a/apps/dolly-frontend/src/main/js/src/components/ui/appError/AppError.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/ui/appError/AppError.tsx @@ -1,11 +1,16 @@ import Icon from '@/components/ui/icon/Icon' import './appError.less' -import { CopyToClipboard } from 'react-copy-to-clipboard' import 'rc-tooltip/assets/bootstrap.css' -import DollyTooltip from '@/components/ui/button/DollyTooltip' +import { DollyCopyButton } from '@/components/ui/button/CopyButton/DollyCopyButton' +import { CSSProperties } from 'react' -export const AppError = ({ error, stackTrace, style }) => ( +type Props = { + style?: CSSProperties | undefined + error: Error | string + stackTrace: string +} +export const AppError = ({ error, stackTrace, style }: Props) => (

@@ -17,21 +22,13 @@ export const AppError = ({ error, stackTrace, style }) => ( {error && (
- - -
{ - event.stopPropagation() - }} - > - -
- - + -
+
Detaljert Feilbeskrivelse


diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/appError/appError.less b/apps/dolly-frontend/src/main/js/src/components/ui/appError/appError.less index 9621de6a373..a5094f54a5d 100644 --- a/apps/dolly-frontend/src/main/js/src/components/ui/appError/appError.less +++ b/apps/dolly-frontend/src/main/js/src/components/ui/appError/appError.less @@ -19,6 +19,10 @@ } } + .navds-copybutton__icon { + margin-top: 10px; + } + h2 { margin: 20px 0 5px 0; font-size: 1rem; diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/button/Button.less b/apps/dolly-frontend/src/main/js/src/components/ui/button/Button.less index 74771a1c020..97c72889698 100644 --- a/apps/dolly-frontend/src/main/js/src/components/ui/button/Button.less +++ b/apps/dolly-frontend/src/main/js/src/components/ui/button/Button.less @@ -6,7 +6,7 @@ justify-content: center; font-weight: 600; font-size: 0.8rem; - line-height: 9px; // Center text + line-height: 12px; // Center text border: none; border-bottom: 1px solid transparent; background: none; @@ -15,7 +15,7 @@ padding: 5px 0; span { - padding: 0 5px; + padding: 0 4px; } &:hover { diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/button/Button.tsx b/apps/dolly-frontend/src/main/js/src/components/ui/button/Button.tsx index 87b0b61bcd1..eeb16ddc42f 100644 --- a/apps/dolly-frontend/src/main/js/src/components/ui/button/Button.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/ui/button/Button.tsx @@ -11,6 +11,7 @@ interface Button extends React.ButtonHTMLAttributes { kind?: string onClick?: () => void iconSize?: number + fontSize?: string loading?: boolean } @@ -20,6 +21,7 @@ const Button = ({ children, className, iconSize = 16, + fontSize = '1.15rem', loading = false, disabled, ...rest @@ -34,7 +36,7 @@ const Button = ({ const renderIcon = loading ? ( ) : kind ? ( - + ) : null return ( diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/button/CloseButton/CloseButton.tsx b/apps/dolly-frontend/src/main/js/src/components/ui/button/CloseButton/CloseButton.tsx index 1dfaddad88c..ff637639fe4 100644 --- a/apps/dolly-frontend/src/main/js/src/components/ui/button/CloseButton/CloseButton.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/ui/button/CloseButton/CloseButton.tsx @@ -8,7 +8,7 @@ const CloseButton = ({ ...props }) => ( style={{ position: 'absolute', top: 2, right: 2 }} {...props} > - + ) diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/button/CopyButton/CopyButton.less b/apps/dolly-frontend/src/main/js/src/components/ui/button/CopyButton/CopyButton.less deleted file mode 100644 index 9834fe2a846..00000000000 --- a/apps/dolly-frontend/src/main/js/src/components/ui/button/CopyButton/CopyButton.less +++ /dev/null @@ -1,9 +0,0 @@ -@import (reference) '@/styles/variables.less'; - -.copyContainer { - display: flex; - - .icon { - padding-left: 5px; - } -} diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/button/CopyButton/CopyButton.tsx b/apps/dolly-frontend/src/main/js/src/components/ui/button/CopyButton/CopyButton.tsx deleted file mode 100644 index da822d47c96..00000000000 --- a/apps/dolly-frontend/src/main/js/src/components/ui/button/CopyButton/CopyButton.tsx +++ /dev/null @@ -1,44 +0,0 @@ -import Tooltip from 'rc-tooltip' -import Icon from '@/components/ui/icon/Icon' -// @ts-ignore -import { CopyToClipboard } from 'react-copy-to-clipboard' -import './CopyButton.less' -import styled from 'styled-components' - -type Props = { - value: string -} - -const StyledTooltip = styled(Tooltip)` - cursor: pointer; -` - -export const CopyButton = ({ value }: Props) => { - return ( -

- {value} - - } - align={{ - offset: [0, -10], - }} - > -
{ - event.stopPropagation() - }} - > - -
- - -
- ) -} diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/button/CopyButton/DollyCopyButton.tsx b/apps/dolly-frontend/src/main/js/src/components/ui/button/CopyButton/DollyCopyButton.tsx new file mode 100644 index 00000000000..67f3db59468 --- /dev/null +++ b/apps/dolly-frontend/src/main/js/src/components/ui/button/CopyButton/DollyCopyButton.tsx @@ -0,0 +1,36 @@ +import { CopyButton, Tooltip } from '@navikt/ds-react' + +import styled from 'styled-components' +import { CSSProperties } from 'react' + +type Props = { + copyText: string + displayText?: string + tooltipText: string + style?: CSSProperties +} + +const StyledTooltip = styled(Tooltip)` + cursor: pointer; +` + +const StyledDiv = styled.div` + display: flex; + align-items: center; +` + +export const DollyCopyButton = ({ copyText, displayText, tooltipText, style }: Props) => { + return ( + + {displayText} + + event.stopPropagation()} + size={'xsmall'} + copyText={copyText} + variant={'action'} + /> + + + ) +} diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/button/DollyTooltip.tsx b/apps/dolly-frontend/src/main/js/src/components/ui/button/DollyTooltip.tsx index 59ec485299c..c5f62fcb776 100644 --- a/apps/dolly-frontend/src/main/js/src/components/ui/button/DollyTooltip.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/ui/button/DollyTooltip.tsx @@ -1,27 +1,41 @@ import * as React from 'react' -import Tooltip from 'rc-tooltip' -import { TooltipProps } from 'rc-tooltip/es/Tooltip' +import * as RcTooltip from 'rc-tooltip' import { CypressSelector } from '../../../../cypress/mocks/Selectors' +import { Tooltip, TooltipProps } from '@navikt/ds-react' + +type DollyTooltipProps = TooltipProps & { + useExternalTooltip?: boolean + dataCy?: string + align?: any + overlayStyle?: any +} const DollyTooltip = ({ - overlay, + useExternalTooltip = false, + content, children, dataCy = null as unknown as CypressSelector, ...rest -}: TooltipProps) => { - if (!overlay) { +}: DollyTooltipProps) => { + if (!content) { return <>{children} } - return ( + return useExternalTooltip ? ( - {children} + + + ) : ( + + + {children} ) diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/button/FlyttPersonButton/FlyttPersonButton.tsx b/apps/dolly-frontend/src/main/js/src/components/ui/button/FlyttPersonButton/FlyttPersonButton.tsx index 99b036b1932..dccf7acd4ea 100644 --- a/apps/dolly-frontend/src/main/js/src/components/ui/button/FlyttPersonButton/FlyttPersonButton.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/ui/button/FlyttPersonButton/FlyttPersonButton.tsx @@ -12,7 +12,6 @@ export const FlyttPersonButton = ({ gruppeId, disabled }) => { diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/button/RelatertPersonImportButton/RelatertPersonImportButton.tsx b/apps/dolly-frontend/src/main/js/src/components/ui/button/RelatertPersonImportButton/RelatertPersonImportButton.tsx index 81859298c71..218e2a1c96a 100644 --- a/apps/dolly-frontend/src/main/js/src/components/ui/button/RelatertPersonImportButton/RelatertPersonImportButton.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/ui/button/RelatertPersonImportButton/RelatertPersonImportButton.tsx @@ -63,7 +63,7 @@ export const RelatertPersonImportButton = ({ setFullfoert(false) setLoading(false) }) - }) + }), ) } diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/form/fieldArray/DollyFieldArray.tsx b/apps/dolly-frontend/src/main/js/src/components/ui/form/fieldArray/DollyFieldArray.tsx index f3170e95908..c27c465f03e 100644 --- a/apps/dolly-frontend/src/main/js/src/components/ui/form/fieldArray/DollyFieldArray.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/ui/form/fieldArray/DollyFieldArray.tsx @@ -30,15 +30,11 @@ export const FieldArrayAddButton = ({ ) -export const FieldArrayRemoveButton = ({ onClick }) => ( -
diff --git a/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrganisasjonListe.tsx b/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrganisasjonListe.tsx index 25dcfa7f415..5c07ce5c491 100644 --- a/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrganisasjonListe.tsx +++ b/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrganisasjonListe.tsx @@ -6,7 +6,7 @@ import { OrganisasjonItem } from '@/components/ui/icon/IconItem' import Icon from '@/components/ui/icon/Icon' import { OrganisasjonVisning } from '@/components/fagsystem/organisasjoner/visning/Visning' import { EnhetBestilling, EnhetData } from '@/components/fagsystem/organisasjoner/types' -import { CopyButton } from '@/components/ui/button/CopyButton/CopyButton' +import { DollyCopyButton } from '@/components/ui/button/CopyButton/DollyCopyButton' import { DollyTable } from '@/components/ui/dollyTable/DollyTable' import { useOrganisasjoner } from '@/utils/hooks/useOrganisasjoner' import Loading from '@/components/ui/loading/Loading' @@ -47,7 +47,7 @@ export default function OrganisasjonListe({ organisasjonsnummer: string status: string }[], - searchStr: string + searchStr: string, ) => { if (!items) { return [] @@ -58,13 +58,13 @@ export default function OrganisasjonListe({ const query = searchStr.toLowerCase() return items.filter((item) => - Object.values(item).some((v) => (v || '').toString().toLowerCase().includes(query)) + Object.values(item).some((v) => (v || '').toString().toLowerCase().includes(query)), ) } const hentOrgStatus = ( bestillingArray: Array, - bestillingId: string | number + bestillingId: string | number, ) => { if (!bestillingArray) { return null @@ -86,7 +86,7 @@ export default function OrganisasjonListe({ const getBestillingIdFromOrgnummer = ( bestillingListe: Array, - organisasjonsnummer: string + organisasjonsnummer: string, ) => bestillingListe .filter((org) => org?.organisasjonNummer === organisasjonsnummer) @@ -103,7 +103,7 @@ export default function OrganisasjonListe({ return orgListe.map((orgInfo) => { const bestillingId = getBestillingIdFromOrgnummer( bestillingListe, - orgInfo.organisasjonsnummer + orgInfo.organisasjonsnummer, ) return { orgInfo, @@ -137,7 +137,13 @@ export default function OrganisasjonListe({ dataField: 'organisasjonsnummer', unique: true, - formatter: (_cell: string, row: EnhetData) => , + formatter: (_cell: string, row: EnhetData) => ( + + ), }, { text: 'Navn', diff --git a/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/Organisasjoner.tsx b/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/Organisasjoner.tsx index 3e710942ae5..951a2b32933 100644 --- a/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/Organisasjoner.tsx +++ b/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/Organisasjoner.tsx @@ -115,16 +115,13 @@ export default ({ search, sidetall }: OrganisasjonerProps) => { style={{ backgroundColor: '#ffffff' }} > - + {`Organisasjoner (${antallOrg ? antallOrg : 0})`} {`Bestillinger (${antallBest ? antallBest : 0})`} diff --git a/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrgansisasjonHeader/OrganisasjonHeader.tsx b/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrgansisasjonHeader/OrganisasjonHeader.tsx index 1450ce6a7ef..04551af24a2 100644 --- a/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrgansisasjonHeader/OrganisasjonHeader.tsx +++ b/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrgansisasjonHeader/OrganisasjonHeader.tsx @@ -27,7 +27,7 @@ const OrganisasjonHeader = ({
- +
diff --git a/apps/dolly-frontend/src/main/js/src/pages/testnorgePage/search/SearchView.tsx b/apps/dolly-frontend/src/main/js/src/pages/testnorgePage/search/SearchView.tsx index 59f28d53b04..fe85236c92a 100644 --- a/apps/dolly-frontend/src/main/js/src/pages/testnorgePage/search/SearchView.tsx +++ b/apps/dolly-frontend/src/main/js/src/pages/testnorgePage/search/SearchView.tsx @@ -10,7 +10,7 @@ import { getAlder, getKjoenn } from '@/ducks/fagsystem' import { formatAlder } from '@/utils/DataFormatter' import { getPdlIdent } from '@/pages/testnorgePage/utils' import { PdlVisning } from '@/components/fagsystem/pdl/visning/PdlVisning' -import { CopyButton } from '@/components/ui/button/CopyButton/CopyButton' +import { DollyCopyButton } from '@/components/ui/button/CopyButton/DollyCopyButton' import { ImportModal } from '@/pages/testnorgePage/search/importModal/ImportModal' import { Gruppe } from '@/utils/hooks/useGruppe' import { ArenaVisning } from '@/components/fagsystem/arena/visning/ArenaVisning' @@ -25,7 +25,7 @@ type Props = { valgtePersoner: ImportPerson[], mal: any, navigate: Function, - gruppeId?: number + gruppeId?: number, ) => void gruppe?: Gruppe } @@ -87,7 +87,10 @@ export default ({ text: 'Ident', width: '25', formatter: (_cell: any, row: PdlData) => { - return + const fnr = getPdlIdent(row) + return ( + + ) }, }, { @@ -117,7 +120,7 @@ export default ({ formatter: (_cell: any, row: PdlData) => { const alder = getAlder( row.hentPerson?.foedsel[0]?.foedselsdato, - row.hentPerson?.doedsfall[0]?.doedsdato + row.hentPerson?.doedsfall[0]?.doedsdato, ) return <>{formatAlder(alder, row.hentPerson?.doedsfall[0]?.doedsdato)} }, @@ -133,7 +136,7 @@ export default ({ const alleValgtPaaSiden = data.every((person) => valgtePersoner .map((valgtPerson) => valgtPerson?.ident) - .includes(getPdlIdent(person)) + .includes(getPdlIdent(person)), ) alleValgtPaaSiden ? setValgtePersoner([]) diff --git a/apps/dolly-frontend/src/main/js/src/pages/testnorgePage/search/advancedOptions/AdvancedOptions.tsx b/apps/dolly-frontend/src/main/js/src/pages/testnorgePage/search/advancedOptions/AdvancedOptions.tsx index 28348fc4593..366d2bccd0b 100644 --- a/apps/dolly-frontend/src/main/js/src/pages/testnorgePage/search/advancedOptions/AdvancedOptions.tsx +++ b/apps/dolly-frontend/src/main/js/src/pages/testnorgePage/search/advancedOptions/AdvancedOptions.tsx @@ -15,11 +15,11 @@ export const AdvancedOptions = ({ startOpen = false, content, children }: Props) return (
{visAvansert ? ( - ) : ( - )} diff --git a/apps/dolly-frontend/src/main/js/src/pages/testnorgePage/search/partials/Identer.tsx b/apps/dolly-frontend/src/main/js/src/pages/testnorgePage/search/partials/Identer.tsx index 911f9794ec4..9681b1c5173 100644 --- a/apps/dolly-frontend/src/main/js/src/pages/testnorgePage/search/partials/Identer.tsx +++ b/apps/dolly-frontend/src/main/js/src/pages/testnorgePage/search/partials/Identer.tsx @@ -46,7 +46,8 @@ export const Identer: React.FC = ({ formikBag }: IdentSearchPr
diff --git a/apps/dolly-frontend/src/main/js/src/pages/testnorgePage/search/radioGroupOptions/RadioGroupOptions.tsx b/apps/dolly-frontend/src/main/js/src/pages/testnorgePage/search/radioGroupOptions/RadioGroupOptions.tsx index bb83a6d605d..250e46b4ea7 100644 --- a/apps/dolly-frontend/src/main/js/src/pages/testnorgePage/search/radioGroupOptions/RadioGroupOptions.tsx +++ b/apps/dolly-frontend/src/main/js/src/pages/testnorgePage/search/radioGroupOptions/RadioGroupOptions.tsx @@ -42,7 +42,7 @@ export const RadioGroupOptions = ({
{name}
{selected != null && ( setSelected('')}> - + )}
diff --git a/apps/dolly-frontend/src/main/js/src/service/services/pdl/PdlForvalterService.tsx b/apps/dolly-frontend/src/main/js/src/service/services/pdl/PdlForvalterService.tsx index bf358e68f8b..ee25d3016f2 100644 --- a/apps/dolly-frontend/src/main/js/src/service/services/pdl/PdlForvalterService.tsx +++ b/apps/dolly-frontend/src/main/js/src/service/services/pdl/PdlForvalterService.tsx @@ -45,5 +45,5 @@ export default { } const endpoint = `${getPdlUrl()}/identiteter/${ident}/standalone/${standalone}` return Request.putWithoutResponse(endpoint) - } + }, } diff --git a/apps/dolly-frontend/src/main/js/src/styles/main.less b/apps/dolly-frontend/src/main/js/src/styles/main.less index 713bc235ccd..1ee5f504f71 100644 --- a/apps/dolly-frontend/src/main/js/src/styles/main.less +++ b/apps/dolly-frontend/src/main/js/src/styles/main.less @@ -49,6 +49,13 @@ a { } +.navds-copybutton__icon { + + svg { + margin-left: 2px; + } +} + .navds-checkbox { margin-bottom: 6px; } diff --git a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/PersonMiljoeDTO.java b/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/PersonMiljoeDTO.java index 67afdb29b16..bd94df76d02 100644 --- a/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/PersonMiljoeDTO.java +++ b/libs/data-transfer-objects/src/main/java/no/nav/testnav/libs/dto/tpsmessagingservice/v1/PersonMiljoeDTO.java @@ -15,6 +15,7 @@ public class PersonMiljoeDTO { private String miljoe; + private String ident; private PersonDTO person;