From 8902d53aabe3e077a2728174ef997596e20bd345 Mon Sep 17 00:00:00 2001
From: Dorine Lambinet <dorine.lambinet@assemblee-nationale.fr>
Date: Wed, 26 Feb 2025 11:39:47 +0100
Subject: [PATCH] =?UTF-8?q?D=C3=A9place=20dossier=20parameters=20et=20legi?=
=?UTF-8?q?drance=20dans=20legislation=5Fview?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/lib/components/BudgetConnexionModal.svelte | 2 +-
src/lib/components/BudgetSimulationSharingModal.svelte | 2 +-
src/lib/components/TestCaseSimulationSharingModal.svelte | 2 +-
.../{ => legislation_view}/legifrance/ArticleView.svelte | 2 +-
.../{ => legislation_view}/legifrance/LienView.svelte | 2 +-
.../{ => legislation_view}/parameters/ArticleModal.svelte | 4 ++--
.../{ => legislation_view}/parameters/NodeEdit.svelte | 2 +-
.../{ => legislation_view}/parameters/ParameterView.svelte | 2 +-
.../{ => legislation_view}/parameters/ReferenceEdit.svelte | 0
.../{ => legislation_view}/parameters/ReferencesEdit.svelte | 2 +-
.../{ => legislation_view}/parameters/ReferencesView.svelte | 0
.../parameters/ScaleAtInstantEdit.svelte | 0
.../{ => legislation_view}/parameters/ScaleEdit.svelte | 4 ++--
.../{ => legislation_view}/parameters/ScaleView.svelte | 0
.../parameters/ValueAtInstantEdit.svelte | 0
.../{ => legislation_view}/parameters/ValueEdit.svelte | 4 ++--
src/lib/components/test_cases/TestCaseCompareModal.svelte | 2 +-
src/lib/components/test_cases/TestCaseSelectModal.svelte | 2 +-
src/lib/components/variables/InflationLawInfoModal.svelte | 4 ++--
.../variables/VariableReferredScaleParameter.svelte | 2 +-
.../variables/VariableReferredValueParameter.svelte | 2 +-
src/routes/parameters/[parameter]/edit/+page.svelte | 6 +++---
22 files changed, 23 insertions(+), 23 deletions(-)
rename src/lib/components/{ => legislation_view}/legifrance/ArticleView.svelte (99%)
rename src/lib/components/{ => legislation_view}/legifrance/LienView.svelte (97%)
rename src/lib/components/{ => legislation_view}/parameters/ArticleModal.svelte (94%)
rename src/lib/components/{ => legislation_view}/parameters/NodeEdit.svelte (98%)
rename src/lib/components/{ => legislation_view}/parameters/ParameterView.svelte (99%)
rename src/lib/components/{ => legislation_view}/parameters/ReferenceEdit.svelte (100%)
rename src/lib/components/{ => legislation_view}/parameters/ReferencesEdit.svelte (96%)
rename src/lib/components/{ => legislation_view}/parameters/ReferencesView.svelte (100%)
rename src/lib/components/{ => legislation_view}/parameters/ScaleAtInstantEdit.svelte (100%)
rename src/lib/components/{ => legislation_view}/parameters/ScaleEdit.svelte (98%)
rename src/lib/components/{ => legislation_view}/parameters/ScaleView.svelte (100%)
rename src/lib/components/{ => legislation_view}/parameters/ValueAtInstantEdit.svelte (100%)
rename src/lib/components/{ => legislation_view}/parameters/ValueEdit.svelte (98%)
diff --git a/src/lib/components/BudgetConnexionModal.svelte b/src/lib/components/BudgetConnexionModal.svelte
index f32987c1e..d24fc06f0 100644
--- a/src/lib/components/BudgetConnexionModal.svelte
+++ b/src/lib/components/BudgetConnexionModal.svelte
@@ -4,7 +4,7 @@
import { goto } from "$app/navigation"
import { page } from "$app/stores"
import DialogContent from "$lib/components/ui_transverse_components/DialogContent.svelte"
- import DialogOverlay from "$lib/components/DialogOverlay.svelte"
+ import DialogOverlay from "$lib/components/ui_transverse_components/DialogOverlay.svelte"
import {
trackBudgetPublicSimulation,
trackBudgetSignInButton,
diff --git a/src/lib/components/BudgetSimulationSharingModal.svelte b/src/lib/components/BudgetSimulationSharingModal.svelte
index 199f8e8cb..ef4768f30 100644
--- a/src/lib/components/BudgetSimulationSharingModal.svelte
+++ b/src/lib/components/BudgetSimulationSharingModal.svelte
@@ -3,7 +3,7 @@
import { copyToClipboard } from "$lib/clipboard"
import DialogContent from "$lib/components/ui_transverse_components/DialogContent.svelte"
- import DialogOverlay from "$lib/components/DialogOverlay.svelte"
+ import DialogOverlay from "$lib/components/ui_transverse_components/DialogOverlay.svelte"
import type { DisplayMode } from "$lib/displays"
import publicConfig from "$lib/public_config"
import { shared } from "$lib/shared.svelte"
diff --git a/src/lib/components/TestCaseSimulationSharingModal.svelte b/src/lib/components/TestCaseSimulationSharingModal.svelte
index a53fc983f..f6c557e96 100644
--- a/src/lib/components/TestCaseSimulationSharingModal.svelte
+++ b/src/lib/components/TestCaseSimulationSharingModal.svelte
@@ -3,7 +3,7 @@
import { copyToClipboard } from "$lib/clipboard"
import DialogContent from "$lib/components/ui_transverse_components/DialogContent.svelte"
- import DialogOverlay from "$lib/components/DialogOverlay.svelte"
+ import DialogOverlay from "$lib/components/ui_transverse_components/DialogOverlay.svelte"
import publicConfig from "$lib/public_config"
interface Props {
diff --git a/src/lib/components/legifrance/ArticleView.svelte b/src/lib/components/legislation_view/legifrance/ArticleView.svelte
similarity index 99%
rename from src/lib/components/legifrance/ArticleView.svelte
rename to src/lib/components/legislation_view/legifrance/ArticleView.svelte
index 9af9809d9..c73a5e121 100644
--- a/src/lib/components/legifrance/ArticleView.svelte
+++ b/src/lib/components/legislation_view/legifrance/ArticleView.svelte
@@ -24,7 +24,7 @@
} from "@tricoteuses/legal-explorer"
import { ToWords } from "to-words"
- import LienView from "$lib/components/legifrance/LienView.svelte"
+ import LienView from "$lib/components/legislation_view/legifrance/LienView.svelte"
import { getUnitAtDate } from "$lib/units"
interface Props {
diff --git a/src/lib/components/legifrance/LienView.svelte b/src/lib/components/legislation_view/legifrance/LienView.svelte
similarity index 97%
rename from src/lib/components/legifrance/LienView.svelte
rename to src/lib/components/legislation_view/legifrance/LienView.svelte
index 25f78daa8..79c53e254 100644
--- a/src/lib/components/legifrance/LienView.svelte
+++ b/src/lib/components/legislation_view/legifrance/LienView.svelte
@@ -10,7 +10,7 @@
rootTypeFromLegalId,
} from "@tricoteuses/legal-explorer"
- import ArticleView from "$lib/components/legifrance/ArticleView.svelte"
+ import ArticleView from "$lib/components/legislation_view/legifrance/ArticleView.svelte"
import publicConfig from "$lib/public_config"
interface Props {
diff --git a/src/lib/components/parameters/ArticleModal.svelte b/src/lib/components/legislation_view/parameters/ArticleModal.svelte
similarity index 94%
rename from src/lib/components/parameters/ArticleModal.svelte
rename to src/lib/components/legislation_view/parameters/ArticleModal.svelte
index 36ea683ee..2b127fd24 100644
--- a/src/lib/components/parameters/ArticleModal.svelte
+++ b/src/lib/components/legislation_view/parameters/ArticleModal.svelte
@@ -4,8 +4,8 @@
import { createEventDispatcher } from "svelte"
import DialogContent from "$lib/components/ui_transverse_components/DialogContent.svelte"
- import DialogOverlay from "$lib/components/DialogOverlay.svelte"
- import ArticleView from "$lib/components/legifrance/ArticleView.svelte"
+ import DialogOverlay from "$lib/components/ui_transverse_components/DialogOverlay.svelte"
+ import ArticleView from "$lib/components/legislation_view/legifrance/ArticleView.svelte"
import publicConfig from "$lib/public_config"
interface Props {
diff --git a/src/lib/components/parameters/NodeEdit.svelte b/src/lib/components/legislation_view/parameters/NodeEdit.svelte
similarity index 98%
rename from src/lib/components/parameters/NodeEdit.svelte
rename to src/lib/components/legislation_view/parameters/NodeEdit.svelte
index 80610cc95..201dfcdb6 100644
--- a/src/lib/components/parameters/NodeEdit.svelte
+++ b/src/lib/components/legislation_view/parameters/NodeEdit.svelte
@@ -2,7 +2,7 @@
import { auditDateIso8601String, laxAudit } from "@auditors/core"
import type { NodeParameter, Reference } from "@openfisca/json-model"
- import ReferencesEdit from "$lib/components/parameters/ReferencesEdit.svelte"
+ import ReferencesEdit from "$lib/components/legislation_view/parameters/ReferencesEdit.svelte"
import { errorAsKeyValueDictionary, iterArrayWithErrors } from "$lib/errors"
import { getUnitLabel, units } from "$lib/units"
diff --git a/src/lib/components/parameters/ParameterView.svelte b/src/lib/components/legislation_view/parameters/ParameterView.svelte
similarity index 99%
rename from src/lib/components/parameters/ParameterView.svelte
rename to src/lib/components/legislation_view/parameters/ParameterView.svelte
index 56837d882..616231049 100644
--- a/src/lib/components/parameters/ParameterView.svelte
+++ b/src/lib/components/legislation_view/parameters/ParameterView.svelte
@@ -10,7 +10,7 @@
import { getContext } from "svelte"
import { goto } from "$app/navigation"
- import ScaleView from "$lib/components/parameters/ScaleView.svelte"
+ import ScaleView from "$lib/components/legislation_view/parameters/ScaleView.svelte"
import { metadata } from "$lib/metadata"
import {
asAmountScaleParameter,
diff --git a/src/lib/components/parameters/ReferenceEdit.svelte b/src/lib/components/legislation_view/parameters/ReferenceEdit.svelte
similarity index 100%
rename from src/lib/components/parameters/ReferenceEdit.svelte
rename to src/lib/components/legislation_view/parameters/ReferenceEdit.svelte
diff --git a/src/lib/components/parameters/ReferencesEdit.svelte b/src/lib/components/legislation_view/parameters/ReferencesEdit.svelte
similarity index 96%
rename from src/lib/components/parameters/ReferencesEdit.svelte
rename to src/lib/components/legislation_view/parameters/ReferencesEdit.svelte
index 46a465755..834d22c6c 100644
--- a/src/lib/components/parameters/ReferencesEdit.svelte
+++ b/src/lib/components/legislation_view/parameters/ReferencesEdit.svelte
@@ -2,7 +2,7 @@
import type { Reference } from "@openfisca/json-model"
import { createEventDispatcher } from "svelte"
- import ReferenceEdit from "$lib/components/parameters/ReferenceEdit.svelte"
+ import ReferenceEdit from "$lib/components/legislation_view/parameters/ReferenceEdit.svelte"
import { errorAsKeyValueDictionary, iterArrayWithErrors } from "$lib/errors"
interface Props {
diff --git a/src/lib/components/parameters/ReferencesView.svelte b/src/lib/components/legislation_view/parameters/ReferencesView.svelte
similarity index 100%
rename from src/lib/components/parameters/ReferencesView.svelte
rename to src/lib/components/legislation_view/parameters/ReferencesView.svelte
diff --git a/src/lib/components/parameters/ScaleAtInstantEdit.svelte b/src/lib/components/legislation_view/parameters/ScaleAtInstantEdit.svelte
similarity index 100%
rename from src/lib/components/parameters/ScaleAtInstantEdit.svelte
rename to src/lib/components/legislation_view/parameters/ScaleAtInstantEdit.svelte
diff --git a/src/lib/components/parameters/ScaleEdit.svelte b/src/lib/components/legislation_view/parameters/ScaleEdit.svelte
similarity index 98%
rename from src/lib/components/parameters/ScaleEdit.svelte
rename to src/lib/components/legislation_view/parameters/ScaleEdit.svelte
index b09317997..9cd770628 100644
--- a/src/lib/components/parameters/ScaleEdit.svelte
+++ b/src/lib/components/legislation_view/parameters/ScaleEdit.svelte
@@ -10,8 +10,8 @@
type ScaleParameter,
} from "@openfisca/json-model"
- import ReferencesEdit from "$lib/components/parameters/ReferencesEdit.svelte"
- import ScaleAtInstantEdit from "$lib/components/parameters/ScaleAtInstantEdit.svelte"
+ import ReferencesEdit from "$lib/components/legislation_view/parameters/ReferencesEdit.svelte"
+ import ScaleAtInstantEdit from "$lib/components/legislation_view/parameters/ScaleAtInstantEdit.svelte"
import { errorAsKeyValueDictionary, iterArrayWithErrors } from "$lib/errors"
import { iterToLimit } from "$lib/iterators"
import {
diff --git a/src/lib/components/parameters/ScaleView.svelte b/src/lib/components/legislation_view/parameters/ScaleView.svelte
similarity index 100%
rename from src/lib/components/parameters/ScaleView.svelte
rename to src/lib/components/legislation_view/parameters/ScaleView.svelte
diff --git a/src/lib/components/parameters/ValueAtInstantEdit.svelte b/src/lib/components/legislation_view/parameters/ValueAtInstantEdit.svelte
similarity index 100%
rename from src/lib/components/parameters/ValueAtInstantEdit.svelte
rename to src/lib/components/legislation_view/parameters/ValueAtInstantEdit.svelte
diff --git a/src/lib/components/parameters/ValueEdit.svelte b/src/lib/components/legislation_view/parameters/ValueEdit.svelte
similarity index 98%
rename from src/lib/components/parameters/ValueEdit.svelte
rename to src/lib/components/legislation_view/parameters/ValueEdit.svelte
index 55015419c..c46632420 100644
--- a/src/lib/components/parameters/ValueEdit.svelte
+++ b/src/lib/components/legislation_view/parameters/ValueEdit.svelte
@@ -7,8 +7,8 @@
} from "@openfisca/json-model"
import { ValueType } from "@openfisca/json-model"
- import ReferencesEdit from "$lib/components/parameters/ReferencesEdit.svelte"
- import ValueAtInstantEdit from "$lib/components/parameters/ValueAtInstantEdit.svelte"
+ import ReferencesEdit from "$lib/components/legislation_view/parameters/ReferencesEdit.svelte"
+ import ValueAtInstantEdit from "$lib/components/legislation_view/parameters/ValueAtInstantEdit.svelte"
import { errorAsKeyValueDictionary, iterArrayWithErrors } from "$lib/errors"
import { iterToLimit } from "$lib/iterators"
import {
diff --git a/src/lib/components/test_cases/TestCaseCompareModal.svelte b/src/lib/components/test_cases/TestCaseCompareModal.svelte
index be1a19314..4491571d1 100644
--- a/src/lib/components/test_cases/TestCaseCompareModal.svelte
+++ b/src/lib/components/test_cases/TestCaseCompareModal.svelte
@@ -3,7 +3,7 @@
import { createEventDispatcher } from "svelte"
import DialogContent from "$lib/components/ui_transverse_components/DialogContent.svelte"
- import DialogOverlay from "$lib/components/DialogOverlay.svelte"
+ import DialogOverlay from "$lib/components/ui_transverse_components/DialogOverlay.svelte"
import { shared } from "$lib/shared.svelte"
interface Props {
diff --git a/src/lib/components/test_cases/TestCaseSelectModal.svelte b/src/lib/components/test_cases/TestCaseSelectModal.svelte
index f19e9bae7..eed47b805 100644
--- a/src/lib/components/test_cases/TestCaseSelectModal.svelte
+++ b/src/lib/components/test_cases/TestCaseSelectModal.svelte
@@ -4,7 +4,7 @@
import { goto } from "$app/navigation"
import DialogContent from "$lib/components/ui_transverse_components/DialogContent.svelte"
- import DialogOverlay from "$lib/components/DialogOverlay.svelte"
+ import DialogOverlay from "$lib/components/ui_transverse_components/DialogOverlay.svelte"
import TestCaseFilters from "$lib/components/test_cases/TestCaseFilters.svelte"
import type { DisplayMode } from "$lib/displays"
import { shared } from "$lib/shared.svelte"
diff --git a/src/lib/components/variables/InflationLawInfoModal.svelte b/src/lib/components/variables/InflationLawInfoModal.svelte
index 8bbca10d7..df8d8a1c0 100644
--- a/src/lib/components/variables/InflationLawInfoModal.svelte
+++ b/src/lib/components/variables/InflationLawInfoModal.svelte
@@ -7,8 +7,8 @@
import { Dialog } from "bits-ui"
import DialogContent from "$lib/components/ui_transverse_components/DialogContent.svelte"
- import DialogOverlay from "$lib/components/DialogOverlay.svelte"
- import ArticleModal from "$lib/components/parameters/ArticleModal.svelte"
+ import DialogOverlay from "$lib/components/ui_transverse_components/DialogOverlay.svelte"
+ import ArticleModal from "$lib/components/legislation_view/parameters/ArticleModal.svelte"
import InflationLawDetails from "$lib/components/variables/InflationLawDetails.svelte"
import { billName, yearPLF } from "$lib/shared.svelte"
diff --git a/src/lib/components/variables/VariableReferredScaleParameter.svelte b/src/lib/components/variables/VariableReferredScaleParameter.svelte
index 45ed9f7db..d62df1202 100644
--- a/src/lib/components/variables/VariableReferredScaleParameter.svelte
+++ b/src/lib/components/variables/VariableReferredScaleParameter.svelte
@@ -15,7 +15,7 @@
requestBudgetCalculation,
requestTestCasesCalculation,
} from "$lib/calculations.svelte"
- import ArticleModal from "$lib/components/parameters/ArticleModal.svelte"
+ import ArticleModal from "$lib/components/legislation_view/parameters/ArticleModal.svelte"
import InflationLawButton from "$lib/components/variables/InflationLawButton.svelte"
import InflationLawInfoModal from "$lib/components/variables/InflationLawInfoModal.svelte"
import VariableReferredParameterHeader from "$lib/components/variables/VariableReferredParameterHeader.svelte"
diff --git a/src/lib/components/variables/VariableReferredValueParameter.svelte b/src/lib/components/variables/VariableReferredValueParameter.svelte
index e01e3e49d..92460e339 100644
--- a/src/lib/components/variables/VariableReferredValueParameter.svelte
+++ b/src/lib/components/variables/VariableReferredValueParameter.svelte
@@ -23,7 +23,7 @@
requestBudgetCalculation,
requestTestCasesCalculation,
} from "$lib/calculations.svelte"
- import ArticleModal from "$lib/components/parameters/ArticleModal.svelte"
+ import ArticleModal from "$lib/components/legislation_view/parameters/ArticleModal.svelte"
import InflationLawButton from "$lib/components/variables/InflationLawButton.svelte"
import InflationLawInfoModal from "$lib/components/variables/InflationLawInfoModal.svelte"
import VariableReferredParameterHeader from "$lib/components/variables/VariableReferredParameterHeader.svelte"
diff --git a/src/routes/parameters/[parameter]/edit/+page.svelte b/src/routes/parameters/[parameter]/edit/+page.svelte
index 307fe7ca4..7e0a51d6f 100644
--- a/src/routes/parameters/[parameter]/edit/+page.svelte
+++ b/src/routes/parameters/[parameter]/edit/+page.svelte
@@ -16,9 +16,9 @@
import type { PageData } from "./$types"
import { goto } from "$app/navigation"
- import NodeEdit from "$lib/components/parameters/NodeEdit.svelte"
- import ScaleEdit from "$lib/components/parameters/ScaleEdit.svelte"
- import ValueEdit from "$lib/components/parameters/ValueEdit.svelte"
+ import NodeEdit from "$lib/components/legislation_view/parameters/NodeEdit.svelte"
+ import ScaleEdit from "$lib/components/legislation_view/parameters/ScaleEdit.svelte"
+ import ValueEdit from "$lib/components/legislation_view/parameters/ValueEdit.svelte"
import { labelFromParameterClass } from "$lib/parameters"
import publicConfig from "$lib/public_config"
import { units } from "$lib/units"
--
GitLab