#22993 merging master done

dotCMS · Oct 19, 2022 · b34c947 · b34c947
2 parents a3437c7 + 1af08ec
commit b34c947
Show file tree

Hide file tree

Showing 227 changed files with 8,395 additions and 1,530 deletions.
diff --git a/core-web/.eslintrc.json b/core-web/.eslintrc.json
@@ -26,10 +26,19 @@
             "files": ["*.ts", "*.tsx"],
             "extends": ["plugin:@nrwl/nx/typescript"],
             "rules": {
-                "@typescript-eslint/keyword-spacing": ["error", { "after": true }],
+                "@typescript-eslint/keyword-spacing": [
+                    "error",
+                    {
+                        "after": true
+                    }
+                ],
                 "@typescript-eslint/padding-line-between-statements": [
                     "error",
-                    { "blankLine": "always", "prev": "*", "next": "return" },
+                    {
+                        "blankLine": "always",
+                        "prev": "*",
+                        "next": "return"
+                    },
                     {
                         "blankLine": "always",
                         "prev": ["case", "default", "block-like", "export", "for", "function"],
@@ -43,8 +52,20 @@
                         "argsIgnorePattern": "^_"
                     }
                 ],
-                "one-var": ["error", { "var": "never", "let": "never", "const": "never" }],
-                "no-console": ["error", { "allow": ["warn", "error"] }]
+                "one-var": [
+                    "error",
+                    {
+                        "var": "never",
+                        "let": "never",
+                        "const": "never"
+                    }
+                ],
+                "no-console": [
+                    "error",
+                    {
+                        "allow": ["warn", "error"]
+                    }
+                ]
             }
         },
         {

diff --git a/.../app/portlets/dot-edit-page/components/dot-favorite-page/dot-favorite-page.component.html b/.../app/portlets/dot-edit-page/components/dot-favorite-page/dot-favorite-page.component.html
@@ -1,14 +1,14 @@
 <dot-form-dialog
-    data-testId="dialogForm"
+    *ngIf="vm$ | async as vm"
     [saveButtonDisabled]="(isFormValid$ | async) === false"
     (cancel)="onCancel()"
     (save)="onSave()"
-    *ngIf="vm$ | async as vm"
+    data-testId="dialogForm"
 >
-    <form class="p-fluid" [formGroup]="form" data-testId="form" *ngIf="form">
+    <form class="p-fluid" *ngIf="form" [formGroup]="form" data-testId="form">
         <div class="fields-col">
             <div class="field" data-testId="titleField">
-                <label for="title" class="p-label-input-required">{{ 'title' | dm }}</label>
+                <label class="p-label-input-required" for="title">{{ 'title' | dm }}</label>
                 <input
                     id="title"
                     pInputText
@@ -21,7 +21,7 @@
                 ></dot-field-validation-message>
             </div>
             <div class="field" data-testId="urlField">
-                <label for="url" class="p-label-input-required">{{ 'url' | dm }}</label>
+                <label class="p-label-input-required" for="url">{{ 'url' | dm }}</label>
                 <input
                     id="url"
                     pInputText
@@ -33,7 +33,7 @@
                 ></dot-field-validation-message>
             </div>
             <div class="field" data-testId="orderField">
-                <label for="order" class="p-label-input-required">{{ 'order' | dm }}</label>
+                <label class="p-label-input-required" for="order">{{ 'order' | dm }}</label>
                 <input
                     id="order"
                     pInputText
@@ -44,7 +44,7 @@
                     [field]="form.get('order')"
                 ></dot-field-validation-message>
             </div>
-            <div class="field" data-testId="shareWithField" *ngIf="vm.isAdmin">
+            <div class="field" *ngIf="vm.isAdmin" data-testId="shareWithField">
                 <label for="permissions">{{ 'favoritePage.dialog.field.shareWith' | dm }}</label>
                 <p-multiSelect
                     id="permissions"
@@ -57,7 +57,7 @@
         </div>
         <div class="fields-col">
             <div class="field" data-testId="thumbnailField">
-                <label for="previewThumbnail" class="p-label-input-required">{{
+                <label class="p-label-input-required" for="previewThumbnail">{{
                     'preview' | dm
                 }}</label>
                 <dot-html-to-image

diff --git a/.../app/portlets/dot-edit-page/components/dot-favorite-page/dot-favorite-page.component.scss b/.../app/portlets/dot-edit-page/components/dot-favorite-page/dot-favorite-page.component.scss
@@ -6,4 +6,4 @@
         display: grid;
         grid-template-columns: 50% 49%;
     }
-}
+}