Merge pull request #783 from aneoconsulting/sonar/syntax

fix: sonar code syntax
aneoconsulting · Dec 8, 2023 · 31f37c7 · 31f37c7 · github-actions · Dec 8, 2023
2 parents e1370c8 + eb251b7
commit 31f37c7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/src/app/components/columns-modify-dialog.component.ts b/src/app/components/columns-modify-dialog.component.ts
@@ -107,10 +107,8 @@ export class ColumnsModifyDialogComponent<T extends object,O extends object> imp
       if (!this.columns.includes(column) && this.data.availableColumns.includes(column)) {
         this.columns.push(column);
       }
-    } else {
-      if(this.columns.includes(column)) {
-        this.columns = this.columns.filter(currentColumn => currentColumn !== column);
-      }
+    } else if(this.columns.includes(column)) {
+      this.columns = this.columns.filter(currentColumn => currentColumn !== column);
     }
   }
 

diff --git a/src/app/services/storage.service.spec.ts b/src/app/services/storage.service.spec.ts
@@ -136,9 +136,19 @@ describe('StorageService', () => {
     it('Should export properly', () => {
       mockStorage.getItem.mockImplementationOnce((key: Key, parse) => {
         const result = mockItemData[key];
-        if (!parse) return result ? {'12': 'sessions'} : undefined;
-        else return result ? JSON.stringify({'12': 'sessions'}) : undefined;
+        if(result) {
+          if(!parse) {
+            return {'12': 'sessions'};
+          } 
+          else {
+            return JSON.stringify({'12': 'sessions'});
+          }
+        }
+        else {
+          return undefined;
+        }
       });
+
       expect(service.exportData()['navigation-sidebar'])
         .toEqual({
           '0': 'profile',
File	% Stmts	% Branch	% Funcs	% Lines	Uncovered Line #s
All files	92.77	82.29	88.77	92.65
applications	51.44	0	9.37	51.82
index.component.ts	51.44	0	9.37	51.82	251–307, 315–456
applications/services	97.1	80.95	91.66	96.96
applications-filters.service.ts	100	100	100	100
applications-grpc.service.ts	100	66.66	100	100	68–69
applications-index.service.ts	93.1	80	86.66	92.85	71–75
components	98.75	95.23	95.95	99.01
actions-toolbar-group.component.ts	100	100	100	100
actions-toolbar.component.ts	100	100	100	100
auto-refresh-button.component.ts	100	60	100	100	41, 64
auto-refresh-dialog.component.ts	100	100	100	100
columns-button.component.ts	100	100	100	100
columns-modify-dialog.component.ts	96.87	100	93.33	100
count-tasks-by-status.component.ts	100	50	100	100	48
page-header.component.ts	80	100	0	80	39
page-section-header.component.ts	80	100	0	80	31
page-section.component.ts	100	100	100	100
refresh-button.component.ts	100	100	100	100
share-url.component.ts	92.85	100	75	92.3	37
show-card-content.component.ts	100	100	100	100
spinner.component.ts	100	100	100	100
table-actions-toolbar.component.ts	100	100	100	100
table-container.component.ts	100	100	100	100
view-tasks-by-status-dialog.component.ts	100	100	100	100
view-tasks-by-status.component.ts	100	100	100	100
components/filters	88.55	68.42	87.23	88.83
filters-chips.component.ts	100	100	100	100
filters-dialog-and.component.ts	100	100	100	100
filters-dialog-filter-field.component.ts	86.2	75.75	92.3	85.96	99–100, 132, 174, 198–202
filters-dialog-input.component.ts	48.27	9.09	37.5	50	84–113, 124–132
filters-dialog-or.component.ts	100	100	100	100
filters-dialog.component.ts	100	100	100	100
filters-toolbar.component.ts	100	100	100	100
components/navigation	99.44	100	97.36	99.42
add-external-service-dialog.component.ts	100	100	100	100
edit-external-service-dialog.component.ts	100	100	100	100
form-external-service.component.ts	100	100	100	100
manage-external-services-dialog.component.ts	100	100	100	100
navigation.component.ts	98.14	100	88.88	98.11	215
theme-selector.component.ts	100	100	100	100
components/table	100	100	100	100
table-empty-data.component.ts	100	100	100	100
dashboard	100	100	100	100
index.component.ts	100	100	100	100
dashboard/components	100	100	100	100
add-line-dialog.component.ts	100	100	100	100
add-statuses-group-dialog.component.ts	100	100	100	100
edit-name-line-dialog.component.ts	100	100	100	100
edit-status-group-dialog.component.ts	100	100	100	100
form-name-line.component.ts	100	100	100	100
form-statuses-group.component.ts	100	100	100	100
line.component.ts	100	100	100	100
manage-groups-dialog.component.ts	100	100	100	100
reorganize-lines-dialog.component.ts	100	100	100	100
split-lines-dialog.component.ts	100	100	100	100
statuses-group-card.component.ts	100	100	100	100
dashboard/services	100	100	100	100
dashboard-index.service.ts	100	100	100	100
dashboard-storage.service.ts	100	100	100	100
directives	50	100	0	50
no-wrap.directive.ts	50	100	0	50	5–6
pipes	50	0	0	40
empty-cell.pipe.ts	50	0	0	40	6–10
services	98.36	95.41	95.69	98.24
auto-refresh.service.ts	100	100	100	100
date-handler.service.ts	100	100	100	100
default-config.service.ts	100	100	100	100
environment.service.ts	80	100	50	75	19
filters.service.ts	100	100	100	100
icons.service.ts	100	100	100	100
navigation.service.ts	100	80	100	100	109
notification.service.ts	100	100	100	100
query-params.service.ts	100	100	100	100
share-url.service.ts	100	100	100	100
storage.service.ts	98.03	100	100	97.95	95
table-storage.service.ts	50	0	0	42.85	11–31
table-url.service.ts	100	100	100	100
table.service.ts	100	100	100	100
tasks-by-status.service.ts	100	100	100	100
user-grpc.service.ts	100	100	100	100
user.service.ts	100	100	100	100
utils.service.ts	100	100	100	100
versions-grpc.service.ts	100	100	100	100
versions.service.ts	100	70	100	100	14, 25, 32
sessions/services	93.33	60	87.5	92.85
sessions-filters.service.ts	95.83	60	100	95.65	145
sessions-statuses.service.ts	83.33	100	50	80	13
tasks/services	77.45	50	83.78	76.53
tasks-filters.service.ts	100	100	100	100
tasks-grpc.service.ts	23.33	0	0	20.68	13–151
tasks-index.service.ts	100	100	100	100
tasks-statuses.service.ts	100	100	100	100
tokens	100	100	100	100
filters.token.ts	100	100	100	100
types	100	100	100	100
filter-definition.ts	100	100	100	100