diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index a8dbcbe67..e83c88e28 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -20,7 +20,9 @@ jobs: - uses: actions/checkout@v3 with: fetch-depth: 0 - - uses: actions/setup-node@v3 - name: Frontend code formatting check (Prettier) - run: npm install prettier@~3.1.0 && npm run format:check - working-directory: ./frontend \ No newline at end of file + uses: creyD/prettier_action@v4.3 + with: + dry: True + prettier_version: 3.1.0 + prettier_options: --config frontend/.prettierrc --check frontend/**/*.ts diff --git a/frontend/app/class/monitoring-object.ts b/frontend/app/class/monitoring-object.ts index da2cb497d..8d960a093 100644 --- a/frontend/app/class/monitoring-object.ts +++ b/frontend/app/class/monitoring-object.ts @@ -162,7 +162,7 @@ export class MonitoringObject extends MonitoringObjectBase { let parentOut = null; - if (parentType!='module' && !(this.parentId(parentType))) { + if (parentType != 'module' && !this.parentId(parentType)) { return of(null); } diff --git a/frontend/app/components/monitoring-map-list/monitoring-map-list.component.html b/frontend/app/components/monitoring-map-list/monitoring-map-list.component.html index 6cf25a5ed..28936bf4c 100644 --- a/frontend/app/components/monitoring-map-list/monitoring-map-list.component.html +++ b/frontend/app/components/monitoring-map-list/monitoring-map-list.component.html @@ -1,22 +1,22 @@
-
- - - -
-
- - - -
+
+ + + +
+
+ + + +
- diff --git a/frontend/app/components/monitoring-map-list/monitoring-map-list.component.ts b/frontend/app/components/monitoring-map-list/monitoring-map-list.component.ts index 8a369c965..8c0cb6aa6 100644 --- a/frontend/app/components/monitoring-map-list/monitoring-map-list.component.ts +++ b/frontend/app/components/monitoring-map-list/monitoring-map-list.component.ts @@ -19,7 +19,7 @@ export class MonitoringMapListComponent { obj: any; bEdit: boolean; objForm: FormGroup; - heightMap: string="80vh"; + heightMap: string = '80vh'; // displayMap: boolean = true; siteSiteGroup: SiteSiteGroup | null = null; @@ -37,7 +37,6 @@ export class MonitoringMapListComponent { setTimeout(() => { this.heightMap = height - 80 + 'px'; }); - } onActivate(component) { diff --git a/frontend/app/components/monitoring-properties-g/monitoring-properties-g.component.html b/frontend/app/components/monitoring-properties-g/monitoring-properties-g.component.html index 232479498..3bf877d90 100644 --- a/frontend/app/components/monitoring-properties-g/monitoring-properties-g.component.html +++ b/frontend/app/components/monitoring-properties-g/monitoring-properties-g.component.html @@ -43,32 +43,31 @@ - -
-
- {{ media.title_fr }} - - ({{ ms.typeMedia(media) - }} par {{ media.author }}) - -
-

{{media.description_fr}}

-
- - + *ngIf="obj?.properties['medias'] && obj.properties['medias'].length" + label="Médias ({{ (obj.properties['medias'] && obj.properties['medias'].length) || 0 }})" + > + +
+
+ {{ media.title_fr }} + + ({{ ms.typeMedia(media) }} par {{ media.author }}) + +
+

{{ media.description_fr }}

+
+ + +
-
- - + +