Merge pull request #1895 from airqo-platform/staging

move to production

Author: Baalmart

k8s/netmanager/values-prod.yaml

@@ -1,7 +1,7 @@
 replicaCount: 2
 image:
   repository: eu.gcr.io/airqo-250220/airqo-platform-frontend
-  tag: prod-5c96593b-1708634895
+  tag: prod-ab2ae2ef-1709930981
   pullPolicy: Always
 imagePullSecrets: []
 nameOverride: ''

k8s/platform/values-prod.yaml

@@ -2,7 +2,7 @@ replicaCount: 1
 image:
   repository: eu.gcr.io/airqo-250220/airqo-next-platform
   pullPolicy: Always
-  tag: prod-4c7b8169-1709129299
+  tag: prod-ab2ae2ef-1709930981
 imagePullSecrets: []
 nameOverride: ''
 fullnameOverride: ''

netmanager/src/views/layouts/common/Sidebar/Sidebar.js

@@ -331,6 +331,7 @@ const Sidebar = (props) => {
         const selectedAdminPages = excludePages(allUserManagementPages, [
           'Users',
           'Candidates',
+          'Clients',
           'Roles',
           'Logs'
         ]);
@@ -353,6 +354,7 @@ const Sidebar = (props) => {
       const selectedAdminPages = excludePages(allUserManagementPages, [
         'Users',
         'Candidates',
+        'Clients',
         'Roles',
         'Logs'
       ]);

netmanager/src/views/pages/clients/index.js

@@ -16,6 +16,7 @@ import { activateUserClientApi, getClientsApi } from '../../apis/analytics';
 import { Close as CloseIcon } from '@material-ui/icons';
 import { updateMainAlert } from 'redux/MainAlert/operations';
 import { useDispatch } from 'react-redux';
+import { withPermission } from '../../containers/PageAccess';
 
 const useStyles = makeStyles((theme) => ({
   root: {
@@ -243,22 +244,16 @@ const Index = () => {
                       margin: 2
                     }}>
                     <Button
+                      disabled={row.isActive}
                       variant="contained"
                       size="small"
-                      style={{ backgroundColor: 'green', color: 'white' }}
+                      style={{
+                        background: row.isActive ? 'grey' : 'green',
+                        color: 'white'
+                      }}
                       onClick={() => {
-                        if (row.isActive) {
-                          dispatch(
-                            updateMainAlert({
-                              message: 'Client is already activated',
-                              show: true,
-                              severity: 'info'
-                            })
-                          );
-                        } else {
-                          setOpenActivate(true);
-                          setSelectedClient(row);
-                        }
+                        setOpenActivate(true);
+                        setSelectedClient(row);
                       }}>
                       Activate
                     </Button>
@@ -273,18 +268,8 @@ const Index = () => {
                       color="primary"
                       size="small"
                       onClick={() => {
-                        if (!row.isActive) {
-                          dispatch(
-                            updateMainAlert({
-                              message: 'Client is already deactivated',
-                              show: true,
-                              severity: 'info'
-                            })
-                          );
-                        } else {
-                          setOpenDeactivate(true);
-                          setSelectedClient(row);
-                        }
+                        setOpenDeactivate(true);
+                        setSelectedClient(row);
                       }}>
                       Deactivate
                     </Button>
@@ -336,4 +321,4 @@ const Index = () => {
   );
 };
 
-export default Index;
+export default withPermission(Index, 'CREATE_UPDATE_AND_DELETE_NETWORK_DEVICES');