From b8f4cde3a225f58f28fafbdbf9cf20635ff550c2 Mon Sep 17 00:00:00 2001
From: Dorine Lambinet <dorine.lambinet@assemblee-nationale.fr>
Date: Wed, 26 Feb 2025 14:34:41 +0100
Subject: [PATCH] Organise composant parameters
---
.../parameters/inflation_view}/InflationLawButton.svelte | 0
.../parameters/inflation_view}/InflationLawDetails.svelte | 0
.../inflation_view}/InflationLawInfoModal.svelte | 6 +++---
.../LegislationReferenceExternalLink.svelte} | 4 ++--
.../LegislationReferenceModal.svelte} | 4 ++--
.../LegislationReferenceView.svelte} | 4 ++--
.../{ => technical_details_view}/ParameterView.svelte | 2 +-
.../{ => technical_details_view}/ReferencesView.svelte | 0
.../{ => technical_details_view}/ScaleView.svelte | 0
.../contribution_view}/NodeEdit.svelte | 2 +-
.../contribution_view}/ReferenceEdit.svelte | 0
.../contribution_view}/ReferencesEdit.svelte | 2 +-
.../contribution_view}/ScaleEdit.svelte | 2 +-
.../contribution_view}/ValueEdit.svelte | 2 +-
.../variables/VariableReferredScaleParameter.svelte | 8 ++++----
.../variables/VariableReferredValueParameter.svelte | 8 ++++----
src/routes/parameters/[parameter]/+page.svelte | 2 +-
src/routes/parameters/[parameter]/edit/+page.svelte | 6 +++---
18 files changed, 26 insertions(+), 26 deletions(-)
rename src/lib/components/{variables => legislation_view/parameters/inflation_view}/InflationLawButton.svelte (100%)
rename src/lib/components/{variables => legislation_view/parameters/inflation_view}/InflationLawDetails.svelte (100%)
rename src/lib/components/{variables => legislation_view/parameters/inflation_view}/InflationLawInfoModal.svelte (94%)
rename src/lib/components/legislation_view/{legifrance/LienView.svelte => parameters/legislation_reference_view/LegislationReferenceExternalLink.svelte} (94%)
rename src/lib/components/legislation_view/parameters/{ArticleModal.svelte => legislation_reference_view/LegislationReferenceModal.svelte} (93%)
rename src/lib/components/legislation_view/{legifrance/ArticleView.svelte => parameters/legislation_reference_view/LegislationReferenceView.svelte} (97%)
rename src/lib/components/legislation_view/parameters/{ => technical_details_view}/ParameterView.svelte (99%)
rename src/lib/components/legislation_view/parameters/{ => technical_details_view}/ReferencesView.svelte (100%)
rename src/lib/components/legislation_view/parameters/{ => technical_details_view}/ScaleView.svelte (100%)
rename src/lib/components/legislation_view/parameters/{ => technical_details_view/contribution_view}/NodeEdit.svelte (99%)
rename src/lib/components/legislation_view/parameters/{ => technical_details_view/contribution_view}/ReferenceEdit.svelte (100%)
rename src/lib/components/legislation_view/parameters/{ => technical_details_view/contribution_view}/ReferencesEdit.svelte (97%)
rename src/lib/components/legislation_view/parameters/{ => technical_details_view/contribution_view}/ScaleEdit.svelte (99%)
rename src/lib/components/legislation_view/parameters/{ => technical_details_view/contribution_view}/ValueEdit.svelte (99%)
diff --git a/src/lib/components/variables/InflationLawButton.svelte b/src/lib/components/legislation_view/parameters/inflation_view/InflationLawButton.svelte
similarity index 100%
rename from src/lib/components/variables/InflationLawButton.svelte
rename to src/lib/components/legislation_view/parameters/inflation_view/InflationLawButton.svelte
diff --git a/src/lib/components/variables/InflationLawDetails.svelte b/src/lib/components/legislation_view/parameters/inflation_view/InflationLawDetails.svelte
similarity index 100%
rename from src/lib/components/variables/InflationLawDetails.svelte
rename to src/lib/components/legislation_view/parameters/inflation_view/InflationLawDetails.svelte
diff --git a/src/lib/components/variables/InflationLawInfoModal.svelte b/src/lib/components/legislation_view/parameters/inflation_view/InflationLawInfoModal.svelte
similarity index 94%
rename from src/lib/components/variables/InflationLawInfoModal.svelte
rename to src/lib/components/legislation_view/parameters/inflation_view/InflationLawInfoModal.svelte
index df8d8a1c0..3ec338650 100644
--- a/src/lib/components/variables/InflationLawInfoModal.svelte
+++ b/src/lib/components/legislation_view/parameters/inflation_view/InflationLawInfoModal.svelte
@@ -8,8 +8,8 @@
import DialogContent from "$lib/components/ui_transverse_components/DialogContent.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 LegislationReferenceModal from "$lib/components/legislation_view/parameters/legislation_reference_view/LegislationReferenceModal.svelte"
+ import InflationLawDetails from "$lib/components/legislation_view/parameters/inflation_view/InflationLawDetails.svelte"
import { billName, yearPLF } from "$lib/shared.svelte"
interface Props {
@@ -113,7 +113,7 @@
</ol>
</div>
- <ArticleModal
+ <LegislationReferenceModal
on:close={() => (openReferenceUrl = null)}
parameter={lawParameter ?? billParameter}
referenceUrl={openReferenceUrl ?? null}
diff --git a/src/lib/components/legislation_view/legifrance/LienView.svelte b/src/lib/components/legislation_view/parameters/legislation_reference_view/LegislationReferenceExternalLink.svelte
similarity index 94%
rename from src/lib/components/legislation_view/legifrance/LienView.svelte
rename to src/lib/components/legislation_view/parameters/legislation_reference_view/LegislationReferenceExternalLink.svelte
index 79c53e254..d664dd53c 100644
--- a/src/lib/components/legislation_view/legifrance/LienView.svelte
+++ b/src/lib/components/legislation_view/parameters/legislation_reference_view/LegislationReferenceExternalLink.svelte
@@ -10,7 +10,7 @@
rootTypeFromLegalId,
} from "@tricoteuses/legal-explorer"
- import ArticleView from "$lib/components/legislation_view/legifrance/ArticleView.svelte"
+ import LegislationReferenceView from "$lib/components/legislation_view/parameters/legislation_reference_view/LegislationReferenceView.svelte"
import publicConfig from "$lib/public_config"
interface Props {
@@ -36,7 +36,7 @@
return undefined
}
return {
- component: ArticleView,
+ component: LegislationReferenceView,
properties: { article, level },
}
}
diff --git a/src/lib/components/legislation_view/parameters/ArticleModal.svelte b/src/lib/components/legislation_view/parameters/legislation_reference_view/LegislationReferenceModal.svelte
similarity index 93%
rename from src/lib/components/legislation_view/parameters/ArticleModal.svelte
rename to src/lib/components/legislation_view/parameters/legislation_reference_view/LegislationReferenceModal.svelte
index 2b127fd24..befb78c35 100644
--- a/src/lib/components/legislation_view/parameters/ArticleModal.svelte
+++ b/src/lib/components/legislation_view/parameters/legislation_reference_view/LegislationReferenceModal.svelte
@@ -5,7 +5,7 @@
import DialogContent from "$lib/components/ui_transverse_components/DialogContent.svelte"
import DialogOverlay from "$lib/components/ui_transverse_components/DialogOverlay.svelte"
- import ArticleView from "$lib/components/legislation_view/legifrance/ArticleView.svelte"
+ import LegislationReferenceView from "$lib/components/legislation_view/parameters/legislation_reference_view/LegislationReferenceView.svelte"
import publicConfig from "$lib/public_config"
interface Props {
@@ -73,7 +73,7 @@
</p>
{:else}
<div class="overflow-y-auto">
- <ArticleView {article} {parameter} />
+ <LegislationReferenceView {article} {parameter} />
</div>
{/if}
{/await}
diff --git a/src/lib/components/legislation_view/legifrance/ArticleView.svelte b/src/lib/components/legislation_view/parameters/legislation_reference_view/LegislationReferenceView.svelte
similarity index 97%
rename from src/lib/components/legislation_view/legifrance/ArticleView.svelte
rename to src/lib/components/legislation_view/parameters/legislation_reference_view/LegislationReferenceView.svelte
index c73a5e121..af2b33a14 100644
--- a/src/lib/components/legislation_view/legifrance/ArticleView.svelte
+++ b/src/lib/components/legislation_view/parameters/legislation_reference_view/LegislationReferenceView.svelte
@@ -24,7 +24,7 @@
} from "@tricoteuses/legal-explorer"
import { ToWords } from "to-words"
- import LienView from "$lib/components/legislation_view/legifrance/LienView.svelte"
+ import LegislationReferenceExternalLink from "$lib/components/legislation_view/parameters/legislation_reference_view/LegislationReferenceExternalLink.svelte"
import { getUnitAtDate } from "$lib/units"
interface Props {
@@ -318,7 +318,7 @@
<ul>
{#each liens as lien}
<li class="font-serif">
- <LienView level={level + 1} {lien} />
+ <LegislationReferenceExternalLink level={level + 1} {lien} />
</li>
{/each}
</ul>
diff --git a/src/lib/components/legislation_view/parameters/ParameterView.svelte b/src/lib/components/legislation_view/parameters/technical_details_view/ParameterView.svelte
similarity index 99%
rename from src/lib/components/legislation_view/parameters/ParameterView.svelte
rename to src/lib/components/legislation_view/parameters/technical_details_view/ParameterView.svelte
index 616231049..9dfbe4880 100644
--- a/src/lib/components/legislation_view/parameters/ParameterView.svelte
+++ b/src/lib/components/legislation_view/parameters/technical_details_view/ParameterView.svelte
@@ -10,7 +10,7 @@
import { getContext } from "svelte"
import { goto } from "$app/navigation"
- import ScaleView from "$lib/components/legislation_view/parameters/ScaleView.svelte"
+ import ScaleView from "$lib/components/legislation_view/parameters/technical_details_view/ScaleView.svelte"
import { metadata } from "$lib/metadata"
import {
asAmountScaleParameter,
diff --git a/src/lib/components/legislation_view/parameters/ReferencesView.svelte b/src/lib/components/legislation_view/parameters/technical_details_view/ReferencesView.svelte
similarity index 100%
rename from src/lib/components/legislation_view/parameters/ReferencesView.svelte
rename to src/lib/components/legislation_view/parameters/technical_details_view/ReferencesView.svelte
diff --git a/src/lib/components/legislation_view/parameters/ScaleView.svelte b/src/lib/components/legislation_view/parameters/technical_details_view/ScaleView.svelte
similarity index 100%
rename from src/lib/components/legislation_view/parameters/ScaleView.svelte
rename to src/lib/components/legislation_view/parameters/technical_details_view/ScaleView.svelte
diff --git a/src/lib/components/legislation_view/parameters/NodeEdit.svelte b/src/lib/components/legislation_view/parameters/technical_details_view/contribution_view/NodeEdit.svelte
similarity index 99%
rename from src/lib/components/legislation_view/parameters/NodeEdit.svelte
rename to src/lib/components/legislation_view/parameters/technical_details_view/contribution_view/NodeEdit.svelte
index 201dfcdb6..b0c931253 100644
--- a/src/lib/components/legislation_view/parameters/NodeEdit.svelte
+++ b/src/lib/components/legislation_view/parameters/technical_details_view/contribution_view/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/legislation_view/parameters/ReferencesEdit.svelte"
+ import ReferencesEdit from "$lib/components/legislation_view/parameters/technical_details_view/contribution_view/ReferencesEdit.svelte"
import { errorAsKeyValueDictionary, iterArrayWithErrors } from "$lib/errors"
import { getUnitLabel, units } from "$lib/units"
diff --git a/src/lib/components/legislation_view/parameters/ReferenceEdit.svelte b/src/lib/components/legislation_view/parameters/technical_details_view/contribution_view/ReferenceEdit.svelte
similarity index 100%
rename from src/lib/components/legislation_view/parameters/ReferenceEdit.svelte
rename to src/lib/components/legislation_view/parameters/technical_details_view/contribution_view/ReferenceEdit.svelte
diff --git a/src/lib/components/legislation_view/parameters/ReferencesEdit.svelte b/src/lib/components/legislation_view/parameters/technical_details_view/contribution_view/ReferencesEdit.svelte
similarity index 97%
rename from src/lib/components/legislation_view/parameters/ReferencesEdit.svelte
rename to src/lib/components/legislation_view/parameters/technical_details_view/contribution_view/ReferencesEdit.svelte
index 834d22c6c..e3ff5422a 100644
--- a/src/lib/components/legislation_view/parameters/ReferencesEdit.svelte
+++ b/src/lib/components/legislation_view/parameters/technical_details_view/contribution_view/ReferencesEdit.svelte
@@ -2,7 +2,7 @@
import type { Reference } from "@openfisca/json-model"
import { createEventDispatcher } from "svelte"
- import ReferenceEdit from "$lib/components/legislation_view/parameters/ReferenceEdit.svelte"
+ import ReferenceEdit from "$lib/components/legislation_view/parameters/technical_details_view/contribution_view/ReferenceEdit.svelte"
import { errorAsKeyValueDictionary, iterArrayWithErrors } from "$lib/errors"
interface Props {
diff --git a/src/lib/components/legislation_view/parameters/ScaleEdit.svelte b/src/lib/components/legislation_view/parameters/technical_details_view/contribution_view/ScaleEdit.svelte
similarity index 99%
rename from src/lib/components/legislation_view/parameters/ScaleEdit.svelte
rename to src/lib/components/legislation_view/parameters/technical_details_view/contribution_view/ScaleEdit.svelte
index 9cd770628..b524baebb 100644
--- a/src/lib/components/legislation_view/parameters/ScaleEdit.svelte
+++ b/src/lib/components/legislation_view/parameters/technical_details_view/contribution_view/ScaleEdit.svelte
@@ -10,7 +10,7 @@
type ScaleParameter,
} from "@openfisca/json-model"
- import ReferencesEdit from "$lib/components/legislation_view/parameters/ReferencesEdit.svelte"
+ import ReferencesEdit from "$lib/components/legislation_view/parameters/technical_details_view/contribution_view/ReferencesEdit.svelte"
import ScaleAtInstantEdit from "$lib/components/legislation_view/parameters/ScaleAtInstantEdit.svelte"
import { errorAsKeyValueDictionary, iterArrayWithErrors } from "$lib/errors"
import { iterToLimit } from "$lib/iterators"
diff --git a/src/lib/components/legislation_view/parameters/ValueEdit.svelte b/src/lib/components/legislation_view/parameters/technical_details_view/contribution_view/ValueEdit.svelte
similarity index 99%
rename from src/lib/components/legislation_view/parameters/ValueEdit.svelte
rename to src/lib/components/legislation_view/parameters/technical_details_view/contribution_view/ValueEdit.svelte
index c46632420..4e7374e9a 100644
--- a/src/lib/components/legislation_view/parameters/ValueEdit.svelte
+++ b/src/lib/components/legislation_view/parameters/technical_details_view/contribution_view/ValueEdit.svelte
@@ -7,7 +7,7 @@
} from "@openfisca/json-model"
import { ValueType } from "@openfisca/json-model"
- import ReferencesEdit from "$lib/components/legislation_view/parameters/ReferencesEdit.svelte"
+ import ReferencesEdit from "$lib/components/legislation_view/parameters/technical_details_view/contribution_view/ReferencesEdit.svelte"
import ValueAtInstantEdit from "$lib/components/legislation_view/parameters/ValueAtInstantEdit.svelte"
import { errorAsKeyValueDictionary, iterArrayWithErrors } from "$lib/errors"
import { iterToLimit } from "$lib/iterators"
diff --git a/src/lib/components/variables/VariableReferredScaleParameter.svelte b/src/lib/components/variables/VariableReferredScaleParameter.svelte
index d62df1202..23f692d2c 100644
--- a/src/lib/components/variables/VariableReferredScaleParameter.svelte
+++ b/src/lib/components/variables/VariableReferredScaleParameter.svelte
@@ -15,9 +15,9 @@
requestBudgetCalculation,
requestTestCasesCalculation,
} from "$lib/calculations.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 LegislationReferenceModal from "$lib/components/legislation_view/parameters/legislation_reference_view/LegislationReferenceModal.svelte"
+ import InflationLawButton from "$lib/components/legislation_view/parameters/inflation_view/InflationLawButton.svelte"
+ import InflationLawInfoModal from "$lib/components/legislation_view/parameters/inflation_view/InflationLawInfoModal.svelte"
import VariableReferredParameterHeader from "$lib/components/variables/VariableReferredParameterHeader.svelte"
import VariableReferredScaleAtInstant from "$lib/components/variables/VariableReferredScaleAtInstant.svelte"
import type { DisplayMode } from "$lib/displays"
@@ -392,7 +392,7 @@
</li>
{/each}
</ul>
- <ArticleModal
+ <LegislationReferenceModal
on:close={() => (openReferenceUrl = null)}
parameter={lawParameter ?? billParameter}
referenceUrl={openReferenceUrl ?? null}
diff --git a/src/lib/components/variables/VariableReferredValueParameter.svelte b/src/lib/components/variables/VariableReferredValueParameter.svelte
index 92460e339..df94cac05 100644
--- a/src/lib/components/variables/VariableReferredValueParameter.svelte
+++ b/src/lib/components/variables/VariableReferredValueParameter.svelte
@@ -23,9 +23,9 @@
requestBudgetCalculation,
requestTestCasesCalculation,
} from "$lib/calculations.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 LegislationReferenceModal from "$lib/components/legislation_view/parameters/legislation_reference_view/LegislationReferenceModal.svelte"
+ import InflationLawButton from "$lib/components/legislation_view/parameters/inflation_view/InflationLawButton.svelte"
+ import InflationLawInfoModal from "$lib/components/legislation_view/parameters/inflation_view/InflationLawInfoModal.svelte"
import VariableReferredParameterHeader from "$lib/components/variables/VariableReferredParameterHeader.svelte"
import VariableReferredValueEdit from "$lib/components/variables/VariableReferredValueEdit.svelte"
import VariableReferredValueView from "$lib/components/variables/VariableReferredValueView.svelte"
@@ -437,7 +437,7 @@
</li>
{/each}
</ul>
- <ArticleModal
+ <LegislationReferenceModal
on:close={() => (openReferenceUrl = null)}
parameter={lawParameter ?? billParameter}
referenceUrl={openReferenceUrl}
diff --git a/src/routes/parameters/[parameter]/+page.svelte b/src/routes/parameters/[parameter]/+page.svelte
index b3421411d..006865eac 100644
--- a/src/routes/parameters/[parameter]/+page.svelte
+++ b/src/routes/parameters/[parameter]/+page.svelte
@@ -3,7 +3,7 @@
import type { PageData } from "./$types"
- import ParameterView from "$lib/components/parameters/ParameterView.svelte"
+ import ParameterView from "$lib/components/legislation_view/parameters/technical_details_view/ParameterView.svelte"
import publicConfig from "$lib/public_config"
import { date } from "$lib/shared.svelte"
import { newSelfTargetAProps } from "$lib/urls"
diff --git a/src/routes/parameters/[parameter]/edit/+page.svelte b/src/routes/parameters/[parameter]/edit/+page.svelte
index 7e0a51d6f..0f48eb20d 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/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 NodeEdit from "$lib/components/legislation_view/parameters/technical_details_view/contribution_view/NodeEdit.svelte"
+ import ScaleEdit from "$lib/components/legislation_view/parameters/technical_details_view/contribution_view/ScaleEdit.svelte"
+ import ValueEdit from "$lib/components/legislation_view/parameters/technical_details_view/contribution_view/ValueEdit.svelte"
import { labelFromParameterClass } from "$lib/parameters"
import publicConfig from "$lib/public_config"
import { units } from "$lib/units"
--
GitLab