diff --git a/.prettierrc b/.prettierrc index a9d2ada8a..2f43352e6 100644 --- a/.prettierrc +++ b/.prettierrc @@ -2,18 +2,24 @@ "printWidth": 180, "singleQuote": true, "htmlWhitespaceSensitivity": "strict", + "trailingComma": "es5", "overrides": [ { - "files": ["*.html"], + "files": [ + "*.html" + ], "options": { "parser": "angular" } }, { - "files": ["*.{j,t}sx", "*.ts"], + "files": [ + "*.{j,t}sx", + "*.ts" + ], "options": { "printWidth": 80 } } ] -} +} \ No newline at end of file diff --git a/app/__mocks__/i18next.test.ts b/app/__mocks__/i18next.test.ts index e6cc9707f..a1dbf0bf7 100644 --- a/app/__mocks__/i18next.test.ts +++ b/app/__mocks__/i18next.test.ts @@ -19,7 +19,7 @@ describe('mockT', () => { ${'{{number}} of {{total}}'} | ${{ number: 0, total: 999 }} | ${'0 of 999'} ${'There was an error:\n{{error}}'} | ${{ error: 'Failed' }} | ${'There was an error:\nFailed'} ${'Click:{{li}}{{li2}}{{li_3}}'} | ${{ li: '', li2: 'https://', li_3: '!@#$%' }} | ${'Click:https://!@#$%'} - ${'{{happy}}😏y✔{{sad}}{{laugh}}'} | ${{ happy: '😃', sad: '😢', laugh: '🤣' }} | ${'😃😏y✔😢🤣'} + ${'{{happy}}😏y✔{{sad}}{{laugh}}'} | ${{ happy: '😃', sad: '😢', laugh: '🤣' }} | ${'😃😏y✔😢🤣'} `( 'should return correctly while handling arguments in different scenarios', ({ testText, args, expectedText }) => { diff --git a/app/assets/fonts/nomad-icon.css b/app/assets/fonts/nomad-icon.css index e266b5819..93e2534c0 100644 --- a/app/assets/fonts/nomad-icon.css +++ b/app/assets/fonts/nomad-icon.css @@ -5,8 +5,11 @@ @font-face { font-family: 'nomad-icon'; src: url('nomad-icon/nomad-icon.eot?6tre2n'); - src: url('nomad-icon/nomad-icon.eot?6tre2n#iefix') format('embedded-opentype'), url('nomad-icon/nomad-icon.ttf?6tre2n') format('truetype'), - url('nomad-icon/nomad-icon.woff?6tre2n') format('woff'), url('nomad-icon/nomad-icon.svg?6tre2n#nomad-icon') format('svg'); + src: + url('nomad-icon/nomad-icon.eot?6tre2n#iefix') format('embedded-opentype'), + url('nomad-icon/nomad-icon.ttf?6tre2n') format('truetype'), + url('nomad-icon/nomad-icon.woff?6tre2n') format('woff'), + url('nomad-icon/nomad-icon.svg?6tre2n#nomad-icon') format('svg'); font-weight: normal; font-style: normal; font-display: block; diff --git a/app/docker/components/datatables/networks-datatable/network-row-content/networkRowContent.html b/app/docker/components/datatables/networks-datatable/network-row-content/networkRowContent.html index ca3842bd5..d335615a7 100644 --- a/app/docker/components/datatables/networks-datatable/network-row-content/networkRowContent.html +++ b/app/docker/components/datatables/networks-datatable/network-row-content/networkRowContent.html @@ -16,7 +16,7 @@ - {{ item.Name | truncate : 40 }} + {{ item.Name | truncate: 40 }} System {{ item.StackName ? item.StackName : '-' }} diff --git a/app/docker/components/datatables/service-tasks-datatable/serviceTasksDatatable.html b/app/docker/components/datatables/service-tasks-datatable/serviceTasksDatatable.html index e98d84bea..734414b09 100644 --- a/app/docker/components/datatables/service-tasks-datatable/serviceTasksDatatable.html +++ b/app/docker/components/datatables/service-tasks-datatable/serviceTasksDatatable.html @@ -98,7 +98,7 @@ > {{ item.Slot ? item.Slot : '-' }} - {{ item.NodeId | tasknodename : $ctrl.nodes }} + {{ item.NodeId | tasknodename: $ctrl.nodes }} {{ item.Updated | getisodate }} diff --git a/app/docker/components/datatables/services-datatable/servicesDatatable.html b/app/docker/components/datatables/services-datatable/servicesDatatable.html index ddb0274bc..173c57ced 100644 --- a/app/docker/components/datatables/services-datatable/servicesDatatable.html +++ b/app/docker/components/datatables/services-datatable/servicesDatatable.html @@ -180,7 +180,7 @@ {{ item.Image | hideshasum }} {{ item.Mode }} - {{ item.Tasks | runningtaskscount }} / {{ item.Mode === 'replicated' ? item.Replicas : ($ctrl.nodes | availablenodecount : item) }} + {{ item.Tasks | runningtaskscount }} / {{ item.Mode === 'replicated' ? item.Replicas : ($ctrl.nodes | availablenodecount: item) }} diff --git a/app/docker/components/datatables/tasks-datatable/tasksDatatable.html b/app/docker/components/datatables/tasks-datatable/tasksDatatable.html index 7af8b6fd1..f53d42405 100644 --- a/app/docker/components/datatables/tasks-datatable/tasksDatatable.html +++ b/app/docker/components/datatables/tasks-datatable/tasksDatatable.html @@ -105,7 +105,7 @@ > {{ item.Slot ? item.Slot : '-' }} - {{ item.NodeId | tasknodename : $ctrl.nodes }} + {{ item.NodeId | tasknodename: $ctrl.nodes }} {{ item.Updated | getisodate }} diff --git a/app/docker/components/datatables/volumes-datatable/volumesDatatable.html b/app/docker/components/datatables/volumes-datatable/volumesDatatable.html index 64787999d..80a8918bc 100644 --- a/app/docker/components/datatables/volumes-datatable/volumesDatatable.html +++ b/app/docker/components/datatables/volumes-datatable/volumesDatatable.html @@ -184,7 +184,7 @@ - {{ item.Id | truncate : 40 }} + {{ item.Id | truncate: 40 }} diff --git a/app/kubernetes/views/applications/create/createApplication.html b/app/kubernetes/views/applications/create/createApplication.html index 7f60839e8..5593981f6 100644 --- a/app/kubernetes/views/applications/create/createApplication.html +++ b/app/kubernetes/views/applications/create/createApplication.html @@ -1218,85 +1218,86 @@
-
- -
-
- -
+
+ +
+
+ +
-
- - +
+ + +
-
-
-
-
-

- This label is already defined. -

+
+
+
+

+ This label is already defined. +

+
-
-
- - Add rule - -
-
-
-
- + + Add rule +
+
+
+
+ +
+
-
-
Specify the policy associated to the placement rules.
-
+
+
Specify the policy associated to the placement rules.
+
- + +
diff --git a/app/kubernetes/views/configure/configure.html b/app/kubernetes/views/configure/configure.html index 50abdcf3e..2b5a5c21b 100644 --- a/app/kubernetes/views/configure/configure.html +++ b/app/kubernetes/views/configure/configure.html @@ -133,7 +133,7 @@
@@ -281,7 +281,7 @@
-