Merge branch 'master' into support-replicate-ilm-expiry

Author: bexsoft

Dockerfile.release

@@ -1,17 +1,10 @@
-FROM --platform=linux/amd64 registry.access.redhat.com/ubi8/ubi-minimal:8.7 as build
+FROM registry.access.redhat.com/ubi9/ubi-minimal:9.2 as build
 
 RUN microdnf update --nodocs && microdnf install ca-certificates --nodocs
-RUN  curl -s -q https://raw.githubusercontent.com/minio/kes/master/LICENSE -o LICENSE
-RUN  curl -s -q https://raw.githubusercontent.com/minio/kes/master/CREDITS -o CREDITS
 
-FROM registry.access.redhat.com/ubi8/ubi-micro:8.7
+FROM registry.access.redhat.com/ubi9/ubi-micro:9.2
 
-# On RHEL the certificate bundle is located at:
-# - /etc/pki/tls/certs/ca-bundle.crt (RHEL 6)
-# - /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem (RHEL 7)
-COPY --from=build /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem /etc/pki/ca-trust/extracted/pem/
-COPY --from=build LICENSE /LICENSE
-COPY --from=build CREDITS /CREDITS
+ARG TAG
 
 LABEL name="MinIO" \
       vendor="MinIO Inc <dev@min.io>" \
@@ -21,7 +14,14 @@ LABEL name="MinIO" \
       summary="A graphical user interface for MinIO" \
       description="MinIO object storage is fundamentally different. Designed for performance and the S3 API, it is 100% open-source. MinIO is ideal for large, private cloud environments with stringent security requirements and delivers mission-critical availability across a diverse range of workloads."
 
-EXPOSE 9090
+# On RHEL the certificate bundle is located at:
+# - /etc/pki/tls/certs/ca-bundle.crt (RHEL 6)
+# - /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem (RHEL 7)
+COPY --from=build /etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem /etc/pki/ca-trust/extracted/pem/
+COPY LICENSE /LICENSE
+COPY CREDITS /CREDITS
 COPY console /console
 
+EXPOSE 9090
+
 ENTRYPOINT ["/console"]

portal-ui/package.json

@@ -17,7 +17,7 @@
     "local-storage-fallback": "^4.1.1",
     "lodash": "^4.17.21",
     "luxon": "^3.4.3",
-    "mds": "https://github.com/minio/mds.git#v0.10.1",
+    "mds": "https://github.com/minio/mds.git#v0.11.0",
     "react": "^18.1.0",
     "react-component-export-image": "^1.0.6",
     "react-copy-to-clipboard": "^5.0.2",

portal-ui/src/screens/Console/Buckets/ListBuckets/UploadFilesButton.tsx

@@ -15,14 +15,8 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import React, { Fragment, useState } from "react";
-import { Theme } from "@mui/material/styles";
 import { CSSObject } from "styled-components";
-import { Menu, MenuItem } from "@mui/material";
-import createStyles from "@mui/styles/createStyles";
-import withStyles from "@mui/styles/withStyles";
-import ListItemText from "@mui/material/ListItemText";
-import ListItemIcon from "@mui/material/ListItemIcon";
-import { Button, UploadFolderIcon, UploadIcon } from "mds";
+import { Button, DropdownSelector, UploadFolderIcon, UploadIcon } from "mds";
 import {
   IAM_SCOPES,
   permissionTooltipHelper,
@@ -39,30 +33,20 @@ interface IUploadFilesButton {
   forceDisable?: boolean;
   uploadFileFunction: (closeFunction: () => void) => void;
   uploadFolderFunction: (closeFunction: () => void) => void;
-  classes: any;
   overrideStyles?: CSSObject;
 }
 
-const styles = (theme: Theme) =>
-  createStyles({
-    listUploadIcons: {
-      height: 20,
-      "& .min-icon": {
-        width: 18,
-        fill: "rgba(0,0,0,0.87)",
-      },
-    },
-  });
-
 const UploadFilesButton = ({
   uploadPath,
   bucketName,
   forceDisable = false,
   uploadFileFunction,
   uploadFolderFunction,
-  classes,
   overrideStyles = {},
 }: IUploadFilesButton) => {
+  const [anchorEl, setAnchorEl] = useState<null | HTMLElement>(null);
+  const [uploadOptionsOpen, uploadOptionsSetOpen] = useState<boolean>(false);
+
   const anonymousMode = useSelector(
     (state: AppState) => state.system.anonymousMode,
   );
@@ -82,9 +66,9 @@ const UploadFilesButton = ({
     putObjectPermScopes,
   );
 
-  const [anchorEl, setAnchorEl] = useState<null | HTMLElement>(null);
   const openUploadMenu = Boolean(anchorEl);
   const handleClick = (event: React.MouseEvent<HTMLElement>) => {
+    uploadOptionsSetOpen(!uploadOptionsOpen);
     setAnchorEl(event.currentTarget);
   };
   const handleCloseUpload = () => {
@@ -104,6 +88,15 @@ const UploadFilesButton = ({
     true,
   );
 
+  const uploadFolderAction = (action: string) => {
+    if (action === "folder") {
+      uploadFolderFunction(handleCloseUpload);
+      return;
+    }
+
+    uploadFileFunction(handleCloseUpload);
+  };
+
   const uploadEnabled: boolean = uploadObjectAllowed || uploadFolderAllowed;
 
   return (
@@ -131,48 +124,34 @@ const UploadFilesButton = ({
           sx={overrideStyles}
         />
       </TooltipWrapper>
-      <Menu
-        id={`upload-main-menu`}
-        aria-labelledby={`upload-main`}
-        anchorEl={anchorEl}
-        open={openUploadMenu}
-        onClose={() => {
-          handleCloseUpload();
-        }}
-        anchorOrigin={{
-          vertical: "bottom",
-          horizontal: "center",
+      <DropdownSelector
+        id={"upload-main-menu"}
+        options={[
+          {
+            label: "Upload File",
+            icon: <UploadIcon />,
+            value: "file",
+            disabled: !uploadObjectAllowed || forceDisable,
+          },
+          {
+            label: "Upload Folder",
+            icon: <UploadFolderIcon />,
+            value: "folder",
+            disabled: !uploadFolderAllowed || forceDisable,
+          },
+        ]}
+        selectedOption={""}
+        onSelect={(nValue) => uploadFolderAction(nValue)}
+        hideTriggerAction={() => {
+          uploadOptionsSetOpen(false);
         }}
-        transformOrigin={{
-          vertical: "top",
-          horizontal: "center",
-        }}
-      >
-        <MenuItem
-          onClick={() => {
-            uploadFileFunction(handleCloseUpload);
-          }}
-          disabled={!uploadObjectAllowed || forceDisable}
-        >
-          <ListItemIcon className={classes.listUploadIcons}>
-            <UploadIcon />
-          </ListItemIcon>
-          <ListItemText>Upload File</ListItemText>
-        </MenuItem>
-        <MenuItem
-          onClick={() => {
-            uploadFolderFunction(handleCloseUpload);
-          }}
-          disabled={!uploadFolderAllowed || forceDisable}
-        >
-          <ListItemIcon className={classes.listUploadIcons}>
-            <UploadFolderIcon />
-          </ListItemIcon>
-          <ListItemText>Upload Folder</ListItemText>
-        </MenuItem>
-      </Menu>
+        open={uploadOptionsOpen}
+        anchorEl={anchorEl}
+        anchorOrigin={"end"}
+        useAnchorWidth={false}
+      />
     </Fragment>
   );
 };
 
-export default withStyles(styles)(UploadFilesButton);
+export default UploadFilesButton;

portal-ui/src/screens/Console/Common/FormComponents/InputUnitMenu/InputUnitMenu.tsx

@@ -15,34 +15,27 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import React, { Fragment } from "react";
-import { Theme } from "@mui/material/styles";
-import createStyles from "@mui/styles/createStyles";
-import withStyles from "@mui/styles/withStyles";
-import { SelectorType } from "mds";
-import { Menu, MenuItem } from "@mui/material";
+import { DropdownSelector, SelectorType } from "mds";
+import styled from "styled-components";
+import get from "lodash/get";
 
 interface IInputUnitBox {
-  classes: any;
   id: string;
   unitSelected: string;
   unitsList: SelectorType[];
   disabled?: boolean;
   onUnitChange?: (newValue: string) => void;
 }
 
-const styles = (theme: Theme) =>
-  createStyles({
-    buttonTrigger: {
-      border: "#F0F2F2 1px solid",
-      borderRadius: 3,
-      color: "#838383",
-      backgroundColor: "#fff",
-      fontSize: 12,
-    },
-  });
+const UnitMenuButton = styled.button(({ theme }) => ({
+  border: `1px solid ${get(theme, "borderColor", "#E2E2E2")}`,
+  borderRadius: 3,
+  color: get(theme, "secondaryText", "#5B5C5C"),
+  backgroundColor: get(theme, "boxBackground", "#FBFAFA"),
+  fontSize: 12,
+}));
 
 const InputUnitMenu = ({
-  classes,
   id,
   unitSelected,
   unitsList,
@@ -63,46 +56,31 @@ const InputUnitMenu = ({
 
   return (
     <Fragment>
-      <button
+      <UnitMenuButton
         id={`${id}-button`}
         aria-controls={`${id}-menu`}
         aria-haspopup="true"
         aria-expanded={open ? "true" : undefined}
         onClick={handleClick}
-        className={classes.buttonTrigger}
         disabled={disabled}
         type={"button"}
       >
         {unitSelected}
-      </button>
-      <Menu
-        id={`${id}-menu`}
-        aria-labelledby={`${id}-button`}
-        anchorEl={anchorEl}
-        open={open}
-        onClose={() => {
+      </UnitMenuButton>
+      <DropdownSelector
+        id={"upload-main-menu"}
+        options={unitsList}
+        selectedOption={""}
+        onSelect={(value) => handleClose(value)}
+        hideTriggerAction={() => {
           handleClose("");
         }}
-        anchorOrigin={{
-          vertical: "bottom",
-          horizontal: "center",
-        }}
-        transformOrigin={{
-          vertical: "top",
-          horizontal: "center",
-        }}
-      >
-        {unitsList.map((unit) => (
-          <MenuItem
-            onClick={() => handleClose(unit.value)}
-            key={`itemUnit-${unit.value}-${unit.label}`}
-          >
-            {unit.label}
-          </MenuItem>
-        ))}
-      </Menu>
+        open={open}
+        anchorEl={anchorEl}
+        anchorOrigin={"end"}
+      />
     </Fragment>
   );
 };
 
-export default withStyles(styles)(InputUnitMenu);
+export default InputUnitMenu;

portal-ui/src/screens/Console/Configurations/types.ts

@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import { SelectorTypes } from "../../../common/types";
+import { EnvOverride } from "../../../api/consoleApi";
 
 export type KVFieldType =
   | "string"
@@ -51,15 +52,10 @@ export interface IConfigurationElement {
   url?: string;
 }
 
-export interface IEnvOverride {
-  name: string;
-  value: string;
-}
-
 export interface IElementValue {
   key: string;
   value: string;
-  env_override?: IEnvOverride;
+  env_override?: EnvOverride;
 }
 
 export interface IConfigurationSys {

portal-ui/src/screens/Console/Configurations/utils.tsx

@@ -429,8 +429,8 @@ export const overrideFields = (formFields: IElementValue[]): IOverrideEnv => {
     // it has override values, we construct the value
     if (envItem.env_override) {
       const value: OverrideValue = {
-        value: envItem.env_override.value,
-        overrideEnv: envItem.env_override.name,
+        value: envItem.env_override.value || "",
+        overrideEnv: envItem.env_override.name || "",
       };
 
       overrideReturn = { ...overrideReturn, [envItem.key]: value };