Merge pull request #1789 from Caltech-IPAC/FIREFLY-1762,1767,IRSA-6939-spherex-wording

FIREFLY-1762,1767,IRSA-6939: SPHEREx: wording changes and "coming soon"-ify Spectrophotometry

Author: jaladh-singhal

src/firefly/js/core/background/JobMonitor.jsx

@@ -242,7 +242,7 @@ function ControlRenderer({cellInfo}) {
 
 function Delete({job}) {
     const doDelete = () => {
-        showYesNoPopup('Are you sure that you want to delete this Job?',(id, yes) => {
+        showYesNoPopup('Are you sure that you want to delete this job?',(id, yes) => {
             if (yes) dispatchJobRemove(job?.meta?.jobId);
             dispatchHideDialog(id);
         });

src/firefly/js/templates/hydra/HydraViewer.jsx

@@ -32,7 +32,7 @@ import {LandingPage} from 'firefly/templates/fireflyviewer/LandingPage.jsx';
 import {Stacker} from 'firefly/ui/Stacker.jsx';
 import {setIf as setIfUndefined} from 'firefly/util/WebUtil.js';
 import {handleInitialAppNavigation} from 'firefly/templates/common/FireflyLayout';
-import {hexColorWithAlpha} from 'firefly/util/Color';
+import {joyVarColorWithAlpha} from 'firefly/util/Color';
 
 
 /*
@@ -187,7 +187,7 @@ const defaultPropsWithBgImage = ({bgImage}) => ({
             const darkPalette = theme.colorSchemes.dark.palette;
             return {
                 maxWidth: '56rem', m: 'auto',
-                backgroundColor: hexColorWithAlpha(darkPalette.background.surface.split(', ')?.[1]?.slice(0, -1) ?? '#000', 0.6),
+                backgroundColor: joyVarColorWithAlpha(darkPalette.background.surface, 0.6),
                 backdropFilter: 'blur(1px)',
                 '.MuiTypography-body-md, .MuiTypography-body-lg': { color: darkPalette.text.secondary },
                 '.MuiTypography-h2': { color: darkPalette.text.primary },

src/firefly/js/ui/CutoutSizeDialog.jsx

@@ -374,12 +374,12 @@ const StandardCutoutControls= ({cutoutTypeFieldKey, cutoutCenterWP, cutoutType,o
         }}/>
         {cutoutType===SEARCH_POSITION &&
             <Typography color='warning'  level='body-sm'>
-                Warning: If search position is not on the source image then the cutout will use row position
+                Warning: If search position is not on the source image, then the cutout will use row position.
             </Typography>
         }
         {cutoutType!==USER_ENTERED_POSITION &&
             <Typography level='body-sm'>
-                You may also click on the image to change position
+                You may also click on the image to change position.
             </Typography>
         }
         <OptionalTarget cutoutCenterWP={cutoutCenterWP}

src/firefly/js/util/Color.js

@@ -14,7 +14,7 @@ export const toRGB= (color) => chroma.valid(color) ? chroma(color).rgb() : [0,0,
 export const getRGBA= (color)  => chroma.valid(color) ? chroma(color).rgba() : [0,0,0,1];
 
 export const hexColorWithAlpha = (color, alpha) => chroma.valid(color) ? chroma(color).alpha(alpha).hex() : color;
-
+export const joyVarColorWithAlpha = (joyVarColor, alpha) => hexColorWithAlpha(joyVarColor.split(', ')?.[1]?.slice(0, -1) ?? joyVarColor, alpha);
 
 export const brighter = (colorStr,level=1) =>
     chroma.valid(colorStr) ? chroma(colorStr).brighten(level).toString() : undefined;

src/firefly/js/util/WebUtil.js

@@ -1021,3 +1021,4 @@ export function createBackgroundRunner({
     } );
 }
 
+export const varStr = (str) => '${' + str + '}';