From 3d5109a2f166e8ba312a09295d8b419a2c76cbf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grand?= <francois.grand@inrae.fr>
Date: Wed, 5 Apr 2023 10:53:41 +0200
Subject: [PATCH] refactor: remove useless StructureFieldsetContainerComponent
refs #616
---
src/app/app.module.ts | 2 --
.../calculator.component.html | 8 ++++----
.../structure-fieldset-container.component.ts | 20 -------------------
3 files changed, 4 insertions(+), 26 deletions(-)
delete mode 100644 src/app/components/structure-fieldset-container/structure-fieldset-container.component.ts
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 5c912764c..add5d9f10 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -121,7 +121,6 @@ import { ImmediateErrorStateMatcher } from "./formulaire/immediate-error-state-m
import { LoadSessionURLComponent } from "./components/load-session-url/load-session-url.component";
import { DialogShowMessageComponent } from "./components/dialog-show-message/dialog-show-message.component";
import { DialogConfirmLoadSessionURLComponent } from "./components/dialog-confirm-load-session-url/dialog-confirm-load-session-url.component";
-import { StructureFieldsetContainerComponent } from "./components/structure-fieldset-container/structure-fieldset-container.component";
import { BasinFieldsetContainerComponent } from "./components/basin-fieldset-container/basin-fieldset-container.component";
import { PrebarrageService } from "./services/prebarrage.service";
import { SelectSectionDetailsComponent } from "./components/select-section-details/select-section-details.component";
@@ -225,7 +224,6 @@ const appRoutes: Routes = [
DialogConfirmLoadSessionURLComponent,
FieldSetComponent,
FieldsetContainerComponent,
- StructureFieldsetContainerComponent,
BasinFieldsetContainerComponent,
FixedResultsComponent,
FixedVarResultsComponent,
diff --git a/src/app/components/generic-calculator/calculator.component.html b/src/app/components/generic-calculator/calculator.component.html
index 40cac6c06..a332794d6 100644
--- a/src/app/components/generic-calculator/calculator.component.html
+++ b/src/app/components/generic-calculator/calculator.component.html
@@ -105,11 +105,11 @@
(tabPressed)="onTabPressed($event)">
</field-set>
- <structure-fieldset-container *ngIf="isStructureFieldsetContainer(fe)"
+ <fieldset-container *ngIf="isStructureFieldsetContainer(fe)"
[style.display]="getElementStyleDisplay(fe.id)" [_container]=fe
(radio)=onRadioClick($event) (validChange)=onElementValid() (inputChange)=onInputChange($event)
(tabPressed)="onTabPressed($event)">
- </structure-fieldset-container>
+ </fieldset-container>
<basin-fieldset-container *ngIf="isBasinFieldsetContainer(fe)"
[style.display]="getElementStyleDisplay(fe.id)" [_container]=fe
@@ -138,12 +138,12 @@
fxFlex="1 0 auto">
</fieldset-container>
- <structure-fieldset-container *ngIf="isStructureFieldsetContainer(fe)"
+ <fieldset-container *ngIf="isStructureFieldsetContainer(fe)"
[style.display]="getElementStyleDisplay(fe.id)" [_container]=fe
(radio)=onRadioClick($event) (validChange)=onElementValid() (inputChange)=onInputChange($event)
(tabPressed)="onTabPressed($event)"
fxFlex="1 0 auto">
- </structure-fieldset-container>
+ </fieldset-container>
<pab-table *ngIf="isPabTable(fe)" [pabTable]=fe (radio)=onRadioClick($event)
(validChange)=onElementValid() (inputChange)=onInputChange($event)
diff --git a/src/app/components/structure-fieldset-container/structure-fieldset-container.component.ts b/src/app/components/structure-fieldset-container/structure-fieldset-container.component.ts
deleted file mode 100644
index 34b9a3bba..000000000
--- a/src/app/components/structure-fieldset-container/structure-fieldset-container.component.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { Component } from "@angular/core";
-
-import { FieldSet } from "../../formulaire/elements/fieldset";
-import { I18nService } from "../../services/internationalisation.service";
-import { ApplicationSetupService } from "../../services/app-setup.service";
-import { FieldsetContainerComponent } from "../fieldset-container/fieldset-container.component";
-
-@Component({
- selector: "structure-fieldset-container",
- templateUrl: "../fieldset-container/fieldset-container.component.html",
- styleUrls: [
- "../fieldset-container/fieldset-container.component.scss"
- ]
-})
-export class StructureFieldsetContainerComponent extends FieldsetContainerComponent {
-
- constructor(i18nService: I18nService, appSetupService: ApplicationSetupService) {
- super(i18nService, appSetupService);
- }
-}
--
GitLab