Merge branch 'master' into svcacct-property

Author: kaankabalak

models/login_details.go

@@ -64,7 +64,7 @@ const ProtectedRoute = ({ Component }: ProtectedRouteProps) => {
         dispatch(saveSessionResponse(res));
         dispatch(userLogged(true));
         setSessionLoading(false);
-        dispatch(globalSetDistributedSetup(res.distributedMode || false));
+        dispatch(globalSetDistributedSetup(res?.distributedMode || false));
 
         if (res.customStyles && res.customStyles !== "") {
           const overrideColorVariants = getOverrideColorVariants(

portal-ui/src/ProtectedRoutes.tsx

@@ -466,7 +466,6 @@ export interface LoginDetails {
     | "service-account"
     | "redirect-service-account";
   redirectRules?: RedirectRule[];
-  isDirectPV?: boolean;
   isK8S?: boolean;
   animatedLogin?: boolean;
 }

portal-ui/src/api/consoleApi.ts

@@ -1,6 +1,7 @@
 import { Api, HttpResponse, Error, FullRequestParams } from "./consoleApi";
 
 export let api = new Api();
+api.baseUrl = `${new URL(document.baseURI).pathname}api/v1`;
 const internalRequestFunc = api.request;
 api.request = async <T = any, E = any>({
   body,

portal-ui/src/api/index.ts

@@ -247,15 +247,22 @@ const Account = () => {
                   disabled={userIDP}
                 />
               </SecureComponent>
-              <Button
-                id={"create-service-account"}
-                onClick={() => {
-                  navigate(`${IAM_PAGES.ACCOUNT_ADD}`);
-                }}
-                label={`Create access key`}
-                icon={<AddIcon />}
-                variant={"callAction"}
-              />
+              <SecureComponent
+                scopes={[IAM_SCOPES.ADMIN_CREATE_SERVICEACCOUNT]}
+                resource={CONSOLE_UI_RESOURCE}
+                matchAll
+                errorProps={{ disabled: true }}
+              >
+                <Button
+                  id={"create-service-account"}
+                  onClick={() => {
+                    navigate(`${IAM_PAGES.ACCOUNT_ADD}`);
+                  }}
+                  label={`Create access key`}
+                  icon={<AddIcon />}
+                  variant={"callAction"}
+                />
+              </SecureComponent>
             </Box>
           </Grid>
 

portal-ui/src/screens/Console/Account/Account.tsx

@@ -285,33 +285,21 @@ const BasicDashboard = ({ usage }: IDashboardProps) => {
               <TimeStatItem
                 icon={<StorageIcon />}
                 label={"Backend type"}
-                value={
-                  usage?.backend?.backendType
-                    ? usage.backend.backendType
-                    : "Unknown"
-                }
+                value={usage?.backend?.backendType ?? "Unknown"}
               />
             </Grid>
             <Grid item xs={4}>
               <TimeStatItem
                 icon={<FormatDrivesIcon />}
                 label={"Standard storage class parity"}
-                value={
-                  usage?.backend?.standardSCParity
-                    ? usage.backend.standardSCParity.toString()
-                    : "n/a"
-                }
+                value={usage?.backend?.standardSCParity?.toString() ?? "n/a"}
               />
             </Grid>
             <Grid item xs={4}>
               <TimeStatItem
                 icon={<FormatDrivesIcon />}
                 label={"Reduced redundancy storage class parity"}
-                value={
-                  usage?.backend?.standardSCParity
-                    ? usage.backend.rrSCParity.toString()
-                    : "n/a"
-                }
+                value={usage?.backend?.rrSCParity?.toString() ?? "n/a"}
               />
             </Grid>
           </Grid>