Fix comments

Signed-off-by: roy.elbaum <[email protected]>
AthenZ · Jul 20, 2023 · cb0c8a6 · cb0c8a6
1 parent 8d12c9f
commit cb0c8a6
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 84 deletions.
diff --git a/ui/src/components/history/CollectionHistoryList.js b/ui/src/components/history/CollectionHistoryList.js
@@ -25,7 +25,7 @@ import DateUtils from '../utils/DateUtils';
 import { selectIsLoading } from '../../redux/selectors/loading';
 import { connect } from 'react-redux';
 import { ReduxPageLoader } from '../denali/ReduxPageLoader';
-import {selectTimeZone} from "../../redux/selectors/domains";
+import {selectTimeZone} from '../../redux/selectors/domains';
 
 const HistorySectionDiv = styled.div`
     margin: 20px;

diff --git a/ui/src/pages/domain/[domain]/service/[service]/tags.js b/ui/src/pages/domain/[domain]/service/[service]/tags.js
@@ -159,15 +159,13 @@ class ServiceTagsPage extends React.Component {
                                             collection={serviceName}
                                             collectionDetails={
                                                 serviceDetails
-                                                    ? serviceDetails
-                                                    : {}
+                                                    || {}
                                             }
                                         />
                                         <CollectionDetails
                                             collectionDetails={
                                                 serviceDetails
-                                                    ? serviceDetails
-                                                    : {}
+                                                   || {}
                                             }
                                             _csrf={_csrf}
                                         />
@@ -178,7 +176,7 @@ class ServiceTagsPage extends React.Component {
                                         />
                                     </PageHeaderDiv>
                                     <TagList
-                                        collectionDetails={serviceDetails}
+                                        collectionDetails={serviceDetails || {}}
                                         domain={domainName}
                                         collectionName={serviceName}
                                         tags={serviceTags}

diff --git a/ui/src/redux/reducers/services.js b/ui/src/redux/reducers/services.js
@@ -196,8 +196,8 @@ export const services = (state = {}, action) => {
             if (category === 'service') {
                 newState = produce(state, (draft) => {
                     draft.services[collectionName]
-                        ? (draft.services[collectionName].tags = collectionTags.tags)
-                        : (draft.services[collectionName] = { collectionTags });
+                        ? (draft.services[collectionName].tags = collectionWithTags.tags)
+                        : (draft.services[collectionName] = collectionWithTags);
                 });
             }
             return newState;

diff --git a/ui/src/redux/selectors/services.js b/ui/src/redux/selectors/services.js
@@ -18,6 +18,14 @@ import { mapToList } from '../utils';
 import { getFullName } from '../utils';
 import { serviceDelimiter } from '../config';
 
+export const getSafe = (fn, defaultValue) => {
+    try {
+        return fn();
+    } catch (err) {
+        return defaultValue;
+    }
+};
+
 export const thunkSelectServices = (state) => {
     return state.services.services ? state.services.services : [];
 };
@@ -31,72 +39,55 @@ export const selectServices = (state) => {
 };
 
 export const selectService = (state, domainName, serviceName) => {
-    return state.services.services &&
-        state.services.services[
-            getFullName(domainName, serviceDelimiter, serviceName)
-        ]
-        ? state.services.services[
-              getFullName(domainName, serviceDelimiter, serviceName)
-          ]
-        : {};
+    return getSafe(
+        () =>
+            state.services.services[
+                getFullName(domainName, serviceDelimiter, serviceName)
+            ],
+        {}
+    );
 };
 
 export const selectServiceTags = (state, domainName, serviceName) => {
-    return state.services.services &&
-        state.services.services[
-            getFullName(domainName, serviceDelimiter, serviceName)
-        ] &&
-        state.services.services[
-            getFullName(domainName, serviceDelimiter, serviceName)
-        ].tags
-        ? state.services.services[
-              getFullName(domainName, serviceDelimiter, serviceName)
-          ].tags
-        : {};
+    return getSafe(
+        () =>
+            state.services.services[
+                getFullName(domainName, serviceDelimiter, serviceName)
+            ].tags,
+        {}
+    );
 };
 
 export const selectServicePublicKeys = (state, domainName, serviceName) => {
-    return state.services.services &&
-        state.services.services[
-            getFullName(domainName, serviceDelimiter, serviceName)
-        ] &&
-        state.services.services[
-            getFullName(domainName, serviceDelimiter, serviceName)
-        ].publicKeys
-        ? mapToList(
-              state.services.services[
-                  getFullName(domainName, serviceDelimiter, serviceName)
-              ].publicKeys
-          )
-        : [];
+    return mapToList(
+        getSafe(
+            () =>
+                state.services.services[
+                    getFullName(domainName, serviceDelimiter, serviceName)
+                ].publicKeys,
+            {}
+        )
+    );
 };
 
 export const selectServiceDescription = (state, domainName, serviceName) => {
-    return state.services.services &&
-        state.services.services[
-            getFullName(domainName, serviceDelimiter, serviceName)
-        ] &&
-        state.services.services[
-            getFullName(domainName, serviceDelimiter, serviceName)
-        ].description
-        ? state.services.services[
-              getFullName(domainName, serviceDelimiter, serviceName)
-          ].description
-        : null;
+    return getSafe(
+        () =>
+            state.services.services[
+                getFullName(domainName, serviceDelimiter, serviceName)
+            ].description,
+        null
+    );
 };
 
 export const selectProvider = (state, domainName, serviceName) => {
-    return state.services.services &&
-        state.services.services[
-            getFullName(domainName, serviceDelimiter, serviceName)
-        ] &&
-        state.services.services[
-            getFullName(domainName, serviceDelimiter, serviceName)
-        ].provider
-        ? state.services.services[
-              getFullName(domainName, serviceDelimiter, serviceName)
-          ].provider
-        : {};
+    return getSafe(
+        () =>
+            state.services.services[
+                getFullName(domainName, serviceDelimiter, serviceName)
+            ].provider,
+        {}
+    );
 };
 export const selectAllProviders = (state) => {
     return state.services && state.services.allProviders
@@ -109,35 +100,27 @@ export const selectDynamicServiceHeaderDetails = (
     domainName,
     serviceName
 ) => {
-    return state.services.services &&
-        state.services.services[
-            getFullName(domainName, serviceDelimiter, serviceName)
-        ] &&
-        state.services.services[
-            getFullName(domainName, serviceDelimiter, serviceName)
-        ].serviceHeaderDetails
-        ? state.services.services[
-              getFullName(domainName, serviceDelimiter, serviceName)
-          ].serviceHeaderDetails.dynamic
-        : {};
+    return getSafe(
+        () =>
+            state.services.services[
+                getFullName(domainName, serviceDelimiter, serviceName)
+            ].serviceHeaderDetails.dynamic,
+        {}
+    );
 };
 
 export const selectStaticServiceHeaderDetails = (
     state,
     domainName,
     serviceName
 ) => {
-    return state.services.services &&
-        state.services.services[
-            getFullName(domainName, serviceDelimiter, serviceName)
-        ] &&
-        state.services.services[
-            getFullName(domainName, serviceDelimiter, serviceName)
-        ].serviceHeaderDetails
-        ? state.services.services[
-              getFullName(domainName, serviceDelimiter, serviceName)
-          ].serviceHeaderDetails.static
-        : {};
+    return getSafe(
+        () =>
+            state.services.services[
+                getFullName(domainName, serviceDelimiter, serviceName)
+            ].serviceHeaderDetails.static,
+        {}
+    );
 };
 
 export const selectInstancesWorkLoadMeta = (