From 221cf773f43eade417b6470c2d6de4d62721d8e0 Mon Sep 17 00:00:00 2001
From: Mathias Chouet <mathias.chouet@irstea.fr>
Date: Tue, 5 May 2020 14:42:12 +0200
Subject: [PATCH] ts lint
---
src/app/app.component.ts | 2 +-
src/app/app.module.ts | 2 +-
.../calculator-results.component.ts | 32 +++++++++----------
.../dialog-edit-param-values.component.ts | 5 ++-
.../jet-results/jet-results.component.ts | 4 +--
.../modules-diagram.component.ts | 4 +--
.../section-results.component.ts | 8 +++--
.../verificateur-results.component.ts | 9 ++++--
.../formulaire/definition/form-definition.ts | 2 +-
.../formulaire/definition/form-fixedvar.ts | 2 +-
src/app/formulaire/elements/fieldset.ts | 2 +-
.../elements/select-field-custom.ts | 8 ++---
src/app/results/verificateur-results.ts | 2 +-
.../services/internationalisation.service.ts | 3 +-
src/app/util.ts | 10 +++---
15 files changed, 52 insertions(+), 43 deletions(-)
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 92170a313..e90029baf 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -24,7 +24,7 @@ import { DialogSaveSessionComponent } from "./components/dialog-save-session/dia
import { QuicknavComponent } from "./components/quicknav/quicknav.component";
import { NotificationsService } from "./services/notifications.service";
-import { decodeHtml } from './util';
+import { decodeHtml } from "./util";
import { HotkeysService, Hotkey } from "angular2-hotkeys";
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 5d9fd69fc..51dceda8d 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -82,7 +82,7 @@ import { FixedResultsComponent } from "./components/fixedvar-results/fixed-resul
import { VarResultsComponent } from "./components/fixedvar-results/var-results.component";
import { LogComponent } from "./components/log/log.component";
import { LogEntryComponent } from "./components/log-entry/log-entry.component";
-import { LogDrawerComponent } from './components/log-drawer/log-drawer.component';
+import { LogDrawerComponent } from "./components/log-drawer/log-drawer.component";
import { ParamLinkComponent } from "./components/param-link/param-link.component";
import { PabProfileChartComponent } from "./components/pab-profile-chart/pab-profile-chart.component";
import { PabTableComponent } from "./components/pab-table/pab-table.component";
diff --git a/src/app/components/calculator-results/calculator-results.component.ts b/src/app/components/calculator-results/calculator-results.component.ts
index 09df29e7e..900cf877a 100644
--- a/src/app/components/calculator-results/calculator-results.component.ts
+++ b/src/app/components/calculator-results/calculator-results.component.ts
@@ -10,7 +10,7 @@ import { JetResultsComponent } from "../jet-results/jet-results.component";
import { GenericCalculatorComponent } from "../generic-calculator/calculator.component";
import { VerificateurResultsComponent } from "../verificateur-results/verificateur-results.component";
-import { CalculatorType } from 'jalhyd';
+import { CalculatorType } from "jalhyd";
@Component({
selector: "calc-results",
@@ -84,24 +84,24 @@ export class CalculatorResultsComponent implements AfterViewChecked {
this.sectionResultsComponent.results = undefined;
this.verificateurResultsComponent.results = undefined;
} else {
- if (this.showGenericResults) this.fixedVarResultsComponent.results = f.results;
- if (this.isJet) this.jetResultsComponent.results = f.results;
- if (this.isMRC) this.mrcResultsComponent.results = f.results;
- if (this.isPAB) this.pabResultsComponent.results = f.results;
- if (this.isRemous) this.remousResultsComponent.results = f.results;
- if (this.isSP) this.sectionResultsComponent.results = f.results;
- if (this.isVerificateur) this.verificateurResultsComponent.results = f.results;
+ if (this.showGenericResults) { this.fixedVarResultsComponent.results = f.results; }
+ if (this.isJet) { this.jetResultsComponent.results = f.results; }
+ if (this.isMRC) { this.mrcResultsComponent.results = f.results; }
+ if (this.isPAB) { this.pabResultsComponent.results = f.results; }
+ if (this.isRemous) { this.remousResultsComponent.results = f.results; }
+ if (this.isSP) { this.sectionResultsComponent.results = f.results; }
+ if (this.isVerificateur) { this.verificateurResultsComponent.results = f.results; }
}
}
public updateView() {
- if (this.showGenericResults) this.fixedVarResultsComponent.updateView();
- if (this.isJet) this.jetResultsComponent.updateView();
- if (this.isMRC) this.mrcResultsComponent.updateView();
- if (this.isPAB) this.pabResultsComponent.updateView();
- if (this.isRemous) this.remousResultsComponent.updateView();
- if (this.isSP) this.sectionResultsComponent.updateView();
- if (this.isVerificateur) this.verificateurResultsComponent.updateView();
+ if (this.showGenericResults) { this.fixedVarResultsComponent.updateView(); }
+ if (this.isJet) { this.jetResultsComponent.updateView(); }
+ if (this.isMRC) { this.mrcResultsComponent.updateView(); }
+ if (this.isPAB) { this.pabResultsComponent.updateView(); }
+ if (this.isRemous) { this.remousResultsComponent.updateView(); }
+ if (this.isSP) { this.sectionResultsComponent.updateView(); }
+ if (this.isVerificateur) { this.verificateurResultsComponent.updateView(); }
}
public ngAfterViewChecked() {
@@ -117,7 +117,7 @@ export class CalculatorResultsComponent implements AfterViewChecked {
&& ! this.isRemous
&& ! this.isSP
&& ! this.isVerificateur
- )
+ );
}
public get isJet(): boolean {
diff --git a/src/app/components/dialog-edit-param-values/dialog-edit-param-values.component.ts b/src/app/components/dialog-edit-param-values/dialog-edit-param-values.component.ts
index 7da1e632c..3c419f000 100644
--- a/src/app/components/dialog-edit-param-values/dialog-edit-param-values.component.ts
+++ b/src/app/components/dialog-edit-param-values/dialog-edit-param-values.component.ts
@@ -215,7 +215,10 @@ export class DialogEditParamValuesComponent implements OnInit {
if (this.param.paramDefinition.step === 0) {
return 0;
} else {
- return Math.max(0, Math.ceil((this.param.paramDefinition.max - this.param.paramDefinition.min) / this.param.paramDefinition.step) + 1);
+ return Math.max(
+ 0,
+ Math.ceil((this.param.paramDefinition.max - this.param.paramDefinition.min) / this.param.paramDefinition.step) + 1
+ );
}
} catch (e) {
// min > max or something, silent fail
diff --git a/src/app/components/jet-results/jet-results.component.ts b/src/app/components/jet-results/jet-results.component.ts
index 28ecd927c..455521eab 100644
--- a/src/app/components/jet-results/jet-results.component.ts
+++ b/src/app/components/jet-results/jet-results.component.ts
@@ -28,7 +28,7 @@ export class JetResultsComponent extends FixedVarResultsComponent {
return this.hasResults && (
this._fixedResults && this._fixedResults.result && this._fixedResults.result.sourceNub.result.ok
||
- this._varResults&& this._varResults.result && this._varResults.result.sourceNub.result.ok
+ this._varResults && this._varResults.result && this._varResults.result.sourceNub.result.ok
);
}
@@ -46,7 +46,7 @@ export class JetResultsComponent extends FixedVarResultsComponent {
protected updateResults() {
const superUpdated = super.updateResults();
- let trajectoryChartUpdated = this.jetTrajectoryChartComponent !== undefined;
+ const trajectoryChartUpdated = this.jetTrajectoryChartComponent !== undefined;
if (trajectoryChartUpdated) {
// draw chart whether params are variating or not,
diff --git a/src/app/components/modules-diagram/modules-diagram.component.ts b/src/app/components/modules-diagram/modules-diagram.component.ts
index 0ec976df7..80d08b7b7 100644
--- a/src/app/components/modules-diagram/modules-diagram.component.ts
+++ b/src/app/components/modules-diagram/modules-diagram.component.ts
@@ -228,8 +228,8 @@ export class ModulesDiagramComponent implements AfterContentInit, AfterViewCheck
// add Verificateur links
if (nub instanceof Verificateur) {
const ntv = nub.nubToVerify;
- const sp = nub.species.filter((sp) => {
- return sp.species === FishSpecies.SPECIES_CUSTOM;
+ const sp = nub.species.filter((spe) => {
+ return spe.species === FishSpecies.SPECIES_CUSTOM;
});
const verifiesPass = this.intlService.localizeText("INFO_DIAGRAM_VERIFICATEUR_VERIFIES_PASS");
const verifiesSpecies = this.intlService.localizeText("INFO_DIAGRAM_VERIFICATEUR_VERIFIES_SPECIES");
diff --git a/src/app/components/section-results/section-results.component.ts b/src/app/components/section-results/section-results.component.ts
index ea10156d3..99df6bb4a 100644
--- a/src/app/components/section-results/section-results.component.ts
+++ b/src/app/components/section-results/section-results.component.ts
@@ -7,7 +7,7 @@ import { SectionResults } from "../../results/section-results";
import { CalculatorResults } from "../../results/calculator-results";
import { I18nService } from "../../services/internationalisation.service";
import { AppComponent } from "../../app.component";
-import { FixedVarResultsComponent } from '../fixedvar-results/fixedvar-results.component';
+import { FixedVarResultsComponent } from "../fixedvar-results/fixedvar-results.component";
@Component({
selector: "section-results",
@@ -114,7 +114,9 @@ export class SectionResultsComponent extends FixedVarResultsComponent implements
this._resultElement.addExtraResult(lbl, er);
if (this.isSectionLevel(k)) {
- this._sectionCanvasComponent.addLevel(er, k + " = " + this.formattedValue(er), SectionResultsComponent.labelColors[k]);
+ this._sectionCanvasComponent.addLevel(
+ er, k + " = " + this.formattedValue(er), SectionResultsComponent.labelColors[k]
+ );
}
}
}
@@ -131,7 +133,7 @@ export class SectionResultsComponent extends FixedVarResultsComponent implements
}, 100);
}
- let canvasUpdated = (! this.hasResults || this._sectionCanvasComponent !== undefined);
+ const canvasUpdated = (! this.hasResults || this._sectionCanvasComponent !== undefined);
return superUpdated && canvasUpdated;
}
diff --git a/src/app/components/verificateur-results/verificateur-results.component.ts b/src/app/components/verificateur-results/verificateur-results.component.ts
index c79542673..b384e2125 100644
--- a/src/app/components/verificateur-results/verificateur-results.component.ts
+++ b/src/app/components/verificateur-results/verificateur-results.component.ts
@@ -7,7 +7,7 @@ import { CalculatorResults } from "../../results/calculator-results";
import { VariableResultsSelectorComponent } from "../variable-results-selector/variable-results-selector.component";
import { I18nService } from "../../services/internationalisation.service";
import { VerificateurResults } from "../../results/verificateur-results";
-import { ResultsComponentDirective } from '../fixedvar-results/results.component';
+import { ResultsComponentDirective } from "../fixedvar-results/results.component";
import { LogDrawerComponent } from "../log-drawer/log-drawer.component";
@Component({
@@ -118,9 +118,12 @@ export class VerificateurResultsComponent extends ResultsComponentDirective impl
});
}
}
- // logs des Espece pour l'itération en cours; l.length devrait toujours être égal à this._verificateurResults.especeResults.length
+ // logs des Espece pour l'itération en cours; l.length devrait toujours être égal à especeResults.length
if (l.length !== this._verificateurResults.especeResults.length) {
- throw new Error("VerificateurResultsComponent: l.length !== this._verificateurResults.especeResults.length (" + l.length + " / " + this._verificateurResults.especeResults.length) + ")";
+ throw new Error(
+ "VerificateurResultsComponent: l.length !== this._verificateurResults.especeResults.length ("
+ + l.length + " / " + this._verificateurResults.especeResults.length + ")"
+ );
}
for (let i = 0; i < this._verificateurResults.especeResults.length; i++) {
const er = this._verificateurResults.especeResults[i];
diff --git a/src/app/formulaire/definition/form-definition.ts b/src/app/formulaire/definition/form-definition.ts
index 026ffdba4..7de69e2b6 100644
--- a/src/app/formulaire/definition/form-definition.ts
+++ b/src/app/formulaire/definition/form-definition.ts
@@ -24,7 +24,7 @@ import { TopFormulaireElementIterator } from "../form-iterator/top-element-itera
import { CalculatorResults } from "../../results/calculator-results";
import { ServiceFactory } from "../../services/service-factory";
import { PabTable } from "../elements/pab-table";
-import { SelectEntry } from '../elements/select-entry';
+import { SelectEntry } from "../elements/select-entry";
/**
* classe de base pour tous les formulaires
diff --git a/src/app/formulaire/definition/form-fixedvar.ts b/src/app/formulaire/definition/form-fixedvar.ts
index c9835398c..ca74b364d 100644
--- a/src/app/formulaire/definition/form-fixedvar.ts
+++ b/src/app/formulaire/definition/form-fixedvar.ts
@@ -7,7 +7,7 @@ import { ParamRadioConfig, NgParameter } from "../elements/ngparam";
import { FieldSet } from "../elements/fieldset";
import { Nub, IObservable } from "jalhyd";
-import { SelectFieldCustom } from '../elements/select-field-custom';
+import { SelectFieldCustom } from "../elements/select-field-custom";
export class FormulaireFixedVar extends FormulaireDefinition {
diff --git a/src/app/formulaire/elements/fieldset.ts b/src/app/formulaire/elements/fieldset.ts
index 13ee41a8d..f9063cb45 100644
--- a/src/app/formulaire/elements/fieldset.ts
+++ b/src/app/formulaire/elements/fieldset.ts
@@ -15,7 +15,7 @@ import { StringMap } from "../../stringmap";
import { FieldsetContainer } from "./fieldset-container";
import { SelectFieldCustom } from "./select-field-custom";
import { FormulaireFixedVar } from "../definition/form-fixedvar";
-import { SelectEntry } from './select-entry';
+import { SelectEntry } from "./select-entry";
export class FieldSet extends FormulaireElement implements Observer {
diff --git a/src/app/formulaire/elements/select-field-custom.ts b/src/app/formulaire/elements/select-field-custom.ts
index 270fb2b79..47a73730d 100644
--- a/src/app/formulaire/elements/select-field-custom.ts
+++ b/src/app/formulaire/elements/select-field-custom.ts
@@ -1,11 +1,11 @@
import { SelectEntry } from "./select-entry";
import { ServiceFactory } from "../../services/service-factory";
-import { SelectField } from './select-field';
+import { SelectField } from "./select-field";
import { decodeHtml, arraysAreEqual } from "../../util";
import { FishSpecies, Session, Solveur, FishPass, CalculatorType, Verificateur, Nub } from "jalhyd";
-import { sprintf } from 'sprintf-js';
+import { sprintf } from "sprintf-js";
/**
* A select field that populates itself with custom stuff (ex: references to Nubs, Parameters…)
@@ -219,7 +219,7 @@ export class SelectFieldCustom extends SelectField {
const previousSelectedEntry = this._selectedEntry;
this._selectedEntry = v;
// if value changed
- let valueChanged = (
+ const valueChanged = (
! previousSelectedEntry
|| (
! Array.isArray(previousSelectedEntry)
@@ -243,7 +243,7 @@ export class SelectFieldCustom extends SelectField {
*/
public setValueFromId(id: string | string[]) {
let found = false;
- let entries = [];
+ const entries = [];
if (this._multiple && Array.isArray(id)) {
for (const e of this._entries) {
if (id.includes(e.id)) {
diff --git a/src/app/results/verificateur-results.ts b/src/app/results/verificateur-results.ts
index 04f686404..304785720 100644
--- a/src/app/results/verificateur-results.ts
+++ b/src/app/results/verificateur-results.ts
@@ -1,6 +1,6 @@
import { MultiDimensionResults } from "./multidimension-results";
-import { Result } from 'jalhyd';
+import { Result } from "jalhyd";
export class VerificateurResults extends MultiDimensionResults {
diff --git a/src/app/services/internationalisation.service.ts b/src/app/services/internationalisation.service.ts
index 45fbe17cd..321b572e0 100644
--- a/src/app/services/internationalisation.service.ts
+++ b/src/app/services/internationalisation.service.ts
@@ -175,7 +175,8 @@ export class I18nService extends Observable implements Observer {
// replace "FORM_ID_X" by form name in current session, if any
m = m.replace(/FORM_ID_(\w{6})/g, (match, p1) => {
- const form = ServiceFactory.instance.formulaireService.getFormulaireFromNubId(p1); // cannot inject FormulaireService => cyclic dependency :/
+ // cannot inject FormulaireService => cyclic dependency :/
+ const form = ServiceFactory.instance.formulaireService.getFormulaireFromNubId(p1);
let formName = "**UNKNOWN_FORM**";
if (form !== undefined) {
formName = form.calculatorName;
diff --git a/src/app/util.ts b/src/app/util.ts
index 704320407..146002b23 100644
--- a/src/app/util.ts
+++ b/src/app/util.ts
@@ -163,15 +163,15 @@ export function generateValuesCombination(
}
export function arraysAreEqual(arrayA: any[], arrayB: any[], property?: string, sort = false): boolean {
- let aA: any[] = JSON.parse(JSON.stringify(arrayA)); // array copy
- let aB: any[] = JSON.parse(JSON.stringify(arrayB)); // array copy
+ const aA: any[] = JSON.parse(JSON.stringify(arrayA)); // array copy
+ const aB: any[] = JSON.parse(JSON.stringify(arrayB)); // array copy
if (sort) {
- aA.sort((a, b) => a-b);
- aB.sort((a, b) => a-b);
+ aA.sort((a, b) => a - b);
+ aB.sort((a, b) => a - b);
}
let equal = true;
if (aA.length === aB.length) {
- for (let i=0; i < aA.length; i++) {
+ for (let i = 0; i < aA.length; i++) {
const eA = aA[i];
const eB = aB[i];
if (property === undefined) {
--
GitLab