diff --git a/.eslintrc.js b/.eslintrc.js index 43d58afa64..9c79fa58a3 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -185,7 +185,10 @@ module.exports = { { files: ['*.html'], extends: ['plugin:@angular-eslint/template/recommended', 'plugin:@angular-eslint/template/accessibility'], - rules: {} + parser: '@angular-eslint/template-parser', + rules: { + '@angular-eslint/template/prefer-self-closing-tags': 'error' + } }, { files: ['*.spec.ts'], diff --git a/lib/cli/.eslintrc.json b/lib/cli/.eslintrc.json index 501e944e75..ff4c376670 100644 --- a/lib/cli/.eslintrc.json +++ b/lib/cli/.eslintrc.json @@ -13,7 +13,7 @@ "prefer-arrow/prefer-arrow-functions": "off", "@typescript-eslint/no-var-requires": "off", "@typescript-eslint/naming-convention": "warn", - "quote-props": "warn", + "quote-props": "off", "no-shadow": "warn", "no-restricted-syntax": "off", "no-underscore-dangle": "off", diff --git a/lib/content-services/.eslintrc.json b/lib/content-services/.eslintrc.json index e75d22748d..a4408fe1e6 100644 --- a/lib/content-services/.eslintrc.json +++ b/lib/content-services/.eslintrc.json @@ -22,12 +22,12 @@ } ], "no-shadow": "warn", - "quote-props": "warn", + "quote-props": "off", "object-shorthand": "warn", "prefer-const": "warn", "arrow-body-style": "warn", "@angular-eslint/no-output-native": "off", - "space-before-function-paren": "warn", + "space-before-function-paren": "off", "@angular-eslint/component-selector": [ "error", { diff --git a/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.html b/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.html index 3cf8a035c5..fa908d4a90 100644 --- a/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.html +++ b/lib/content-services/src/lib/aspect-list/aspect-list-dialog.component.html @@ -9,8 +9,7 @@ {{'ADF-ASPECT-LIST.DIALOG.SELECTED' | translate}}

- - + diff --git a/lib/content-services/src/lib/aspect-list/aspect-list.component.html b/lib/content-services/src/lib/aspect-list/aspect-list.component.html index f27daac042..a77fbc0211 100644 --- a/lib/content-services/src/lib/aspect-list/aspect-list.component.html +++ b/lib/content-services/src/lib/aspect-list/aspect-list.component.html @@ -44,6 +44,6 @@
- +
diff --git a/lib/content-services/src/lib/category/categories-management/categories-management.component.html b/lib/content-services/src/lib/category/categories-management/categories-management.component.html index 5dae329561..9a02fb4fe8 100644 --- a/lib/content-services/src/lib/category/categories-management/categories-management.component.html +++ b/lib/content-services/src/lib/category/categories-management/categories-management.component.html @@ -63,7 +63,6 @@ *ngIf="existingCategoriesLoading" [diameter]="50" class="adf-categories-management-spinner" - [attr.aria-label]="'CATEGORIES_MANAGEMENT.LOADING' | translate"> - + [attr.aria-label]="'CATEGORIES_MANAGEMENT.LOADING' | translate" /> diff --git a/lib/content-services/src/lib/common/services/saved-searches.service.ts b/lib/content-services/src/lib/common/services/saved-searches.service.ts index 8327fb31e8..33eea246a2 100644 --- a/lib/content-services/src/lib/common/services/saved-searches.service.ts +++ b/lib/content-services/src/lib/common/services/saved-searches.service.ts @@ -58,10 +58,8 @@ export class SavedSearchesService { */ getSavedSearches(): Observable { return this.getSavedSearchesNodeId().pipe( - concatMap(() => { - return from( - this.nodesApi.getNodeContent(this.savedSearchFileNodeId).then((content) => this.mapFileContentToSavedSearches(content)) - ).pipe( + concatMap(() => + from(this.nodesApi.getNodeContent(this.savedSearchFileNodeId).then((content) => this.mapFileContentToSavedSearches(content))).pipe( catchError((error) => { if (!this.createFileAttempt) { this.createFileAttempt = true; @@ -70,8 +68,8 @@ export class SavedSearchesService { } return throwError(() => error); }) - ); - }) + ) + ) ); } @@ -130,9 +128,9 @@ export class SavedSearchesService { tap((updatedSearches: SavedSearch[]) => { this.savedSearches$.next(updatedSearches); }), - switchMap((updatedSearches: SavedSearch[]) => { - return from(this.nodesApi.updateNodeContent(this.savedSearchFileNodeId, JSON.stringify(updatedSearches))); - }), + switchMap((updatedSearches: SavedSearch[]) => + from(this.nodesApi.updateNodeContent(this.savedSearchFileNodeId, JSON.stringify(updatedSearches))) + ), catchError((error) => { this.savedSearches$.next(previousSavedSearches); return throwError(() => error); @@ -161,9 +159,9 @@ export class SavedSearchesService { tap((updatedSearches: SavedSearch[]) => { this.savedSearches$.next(updatedSearches); }), - switchMap((updatedSearches: SavedSearch[]) => { - return from(this.nodesApi.updateNodeContent(this.savedSearchFileNodeId, JSON.stringify(updatedSearches))); - }), + switchMap((updatedSearches: SavedSearch[]) => + from(this.nodesApi.updateNodeContent(this.savedSearchFileNodeId, JSON.stringify(updatedSearches))) + ), catchError((error) => { this.savedSearches$.next(previousSavedSearchesOrder); return throwError(() => error); @@ -192,9 +190,9 @@ export class SavedSearchesService { })); }), tap((savedSearches: SavedSearch[]) => this.savedSearches$.next(savedSearches)), - switchMap((updatedSearches: SavedSearch[]) => { - return from(this.nodesApi.updateNodeContent(this.savedSearchFileNodeId, JSON.stringify(updatedSearches))); - }), + switchMap((updatedSearches: SavedSearch[]) => + from(this.nodesApi.updateNodeContent(this.savedSearchFileNodeId, JSON.stringify(updatedSearches))) + ), catchError((error) => { this.savedSearches$.next(previousSavedSearchesOrder); return throwError(() => error); diff --git a/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.html b/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.html index 756751988b..a237bfe327 100644 --- a/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.html +++ b/lib/content-services/src/lib/content-metadata/components/content-metadata-card/content-metadata-card.component.html @@ -11,8 +11,7 @@ [preset]="preset" [displayTags]="displayTags" [displayCategories]="displayCategories" - [customPanels]="customPanels"> - + [customPanels]="customPanels" />