Merge pull request #595 from ianmcorvidae/analysis-page-tweaks

Amend analysis page icons
cyverse-de · Oct 4, 2024 · 9528645 · 9528645
2 parents 972c0f4 + e331e5d
commit 9528645
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 17 deletions.
diff --git a/src/components/analyses/landing/AnalysisSubmissionLanding.js b/src/components/analyses/landing/AnalysisSubmissionLanding.js
@@ -73,8 +73,9 @@ import {
     useTheme,
 } from "@mui/material";
 import {
-    ContactSupport,
+    Cancel as CancelIcon,
     ExpandMore,
+    HourglassEmptyRounded as HourGlassIcon,
     Refresh,
     Launch,
 } from "@mui/icons-material";
@@ -392,28 +393,54 @@ export default function AnalysisSubmissionLanding(props) {
                                             {!isSmDown && <>{t("refresh")}</>}
                                         </Button>
                                     </Grid>
-                                    <Grid item>
-                                        {allowShareWithSupport && (
+                                    {allowTimeExtn && (
+                                        <Grid item>
                                             <Button
                                                 id={buildID(
                                                     baseId,
-                                                    ids.SHARE_WITH_SUPPORT
+                                                    ids.MENUITEM_EXTEND_TIME_LIMIT
                                                 )}
                                                 variant="outlined"
-                                                onClick={() =>
-                                                    setHelpOpen(true)
-                                                }
                                                 size="small"
+                                                disableElevation
+                                                color="primary"
+                                                onClick={() => {
+                                                    setConfirmExtendTimeLimitDlgOpen(
+                                                        true
+                                                    );
+                                                }}
+                                                startIcon={<HourGlassIcon />}
+                                            >
+                                                {!isSmDown && (
+                                                    <>{t("extendTime")}</>
+                                                )}
+                                            </Button>
+                                        </Grid>
+                                    )}
+                                    {allowCancel && (
+                                        <Grid item>
+                                            <Button
+                                                id={buildID(
+                                                    baseId,
+                                                    ids.MENUITEM_CANCEL
+                                                )}
+                                                variant="outlined"
+                                                size="small"
+                                                disableElevation
+                                                color="primary"
+                                                onClick={() => {
+                                                    handleTerminateSelected();
+                                                }}
                                                 startIcon={
-                                                    <ContactSupport fontSize="small" />
+                                                    <CancelIcon color="error" />
                                                 }
-                                                color="primary"
-                                                title={t("requestHelp")}
                                             >
-                                                {t("requestHelp")}
+                                                {!isSmDown && (
+                                                    <>{t("terminate")}</>
+                                                )}
                                             </Button>
-                                        )}
-                                    </Grid>
+                                        </Grid>
+                                    )}
                                 </>
                             )}
 

diff --git a/src/components/analyses/landing/DotMenuItems.js b/src/components/analyses/landing/DotMenuItems.js
@@ -75,7 +75,7 @@ export default function DotMenuItems(props) {
                 <ListItemText primary={t("refresh")} />
             </MenuItem>
         ),
-        isMdDown && allowShareWithSupport && (
+        allowShareWithSupport && (
             <MenuItem
                 key={buildID(baseId, ids.MENUITEM_SHARE_WITH_SUPPORT)}
                 id={buildID(baseId, ids.MENUITEM_SHARE_WITH_SUPPORT)}
@@ -166,7 +166,7 @@ export default function DotMenuItems(props) {
                 <ListItemText primary={t("updateComments")} />
             </MenuItem>
         ),
-        allowTimeExtn && (
+        isMdDown && allowTimeExtn && (
             <MenuItem
                 key={buildID(baseId, ids.MENUITEM_EXTEND_TIME_LIMIT)}
                 id={buildID(baseId, ids.MENUITEM_EXTEND_TIME_LIMIT)}
@@ -181,7 +181,7 @@ export default function DotMenuItems(props) {
                 <ListItemText primary={t("extendTime")} />
             </MenuItem>
         ),
-        allowCancel && (
+        isMdDown && allowCancel && (
             <MenuItem
                 key={buildID(baseId, ids.MENUITEM_CANCEL)}
                 id={buildID(baseId, ids.MENUITEM_CANCEL)}
@@ -191,7 +191,7 @@ export default function DotMenuItems(props) {
                 }}
             >
                 <ListItemIcon>
-                    <CancelIcon fontSize="small" />
+                    <CancelIcon color="error" fontSize="small" />
                 </ListItemIcon>
                 <ListItemText primary={t("terminate")} />
             </MenuItem>