Merge pull request #1648 from solita-sabinaf/TIS-905/disable_dry_run_…

…for_fintraffic Add a way to hide a dry run export possibility
entur · Nov 7, 2024 · d91a42a · d91a42a
2 parents fa64f0f + 52b3c1a
commit d91a42a
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 41 deletions.
diff --git a/src/config/config.ts b/src/config/config.ts
@@ -87,4 +87,6 @@ export interface Config {
    *    overriding translations (case appTitle)
    */
   extPath?: string;
+
+  hideExportDryRun?: boolean;
 }
diff --git a/src/ext/Fintraffic/CustomStyle/styles.scss b/src/ext/Fintraffic/CustomStyle/styles.scss
@@ -21,8 +21,7 @@ body {
 
 .page .page-content {
   margin: 1.5rem 1rem;
-  padding: 0rem;
-  padding-right: 2rem;
+  padding: 0rem 2rem 0rem 1px;
 }
 
 // Navigation menu:
@@ -62,6 +61,10 @@ body {
   line-height: unset;
 }
 
+.eds-side-navigation__item:focus-visible {
+  outline: none;
+}
+
 .eds-side-navigation {
   --padding-vertical: 10px !important;
 }

diff --git a/src/ext/JourneyPatternStopPointMap/JourneyPatternStopPointMap.tsx b/src/ext/JourneyPatternStopPointMap/JourneyPatternStopPointMap.tsx
@@ -205,8 +205,6 @@ const JourneyPatternStopPointMap = memo(
           cluster.properties as ClusterProperties;
         const stopPlace = (cluster.properties as AnyProps).stopPlace;
 
-        console.log(pointCount, typeof pointCount);
-
         if (isCluster) {
           return (
             <ClusterMarker

diff --git a/src/scenes/Exports/Creator/index.tsx b/src/scenes/Exports/Creator/index.tsx
@@ -18,6 +18,7 @@ import { useDispatch } from 'react-redux';
 import { useNavigate } from 'react-router-dom';
 import './styles.scss';
 import { exportIsValid } from './validateForm';
+import { useConfig } from '../../../config/ConfigContext';
 
 const ExportsCreator = () => {
   const navigate = useNavigate();
@@ -26,6 +27,7 @@ const ExportsCreator = () => {
   const [saveClicked, setSaveClicked] = useState<boolean>(false);
   const [isSaving, setSaving] = useState<boolean>(false);
   const [theExport, setTheExport] = useState<Export>(newExport());
+  const { hideExportDryRun } = useConfig();
 
   const dispatch = useDispatch<any>();
 
@@ -87,27 +89,31 @@ const ExportsCreator = () => {
             }}
           />
         </div>
-        <div className="export-dry-run">
-          <Checkbox
-            value="1"
-            checked={theExport.dryRun}
-            onChange={(e: ChangeEvent<HTMLInputElement>) =>
-              onFieldChange('dryRun', e.target.checked)
-            }
-          >
-            {formatMessage({ id: 'exportCreatorDryRunFormLabel' })}
-          </Checkbox>
-          <Tooltip
-            placement="right"
-            content={formatMessage({
-              id: 'exportCreatorDryRunFormLabelTooltip',
-            })}
-          >
-            <span className="question-icon">
-              <QuestionIcon />
-            </span>
-          </Tooltip>
-        </div>
+        {!hideExportDryRun ? (
+          <div className="export-dry-run">
+            <Checkbox
+              value="1"
+              checked={theExport.dryRun}
+              onChange={(e: ChangeEvent<HTMLInputElement>) =>
+                onFieldChange('dryRun', e.target.checked)
+              }
+            >
+              {formatMessage({ id: 'exportCreatorDryRunFormLabel' })}
+            </Checkbox>
+            <Tooltip
+              placement="right"
+              content={formatMessage({
+                id: 'exportCreatorDryRunFormLabelTooltip',
+              })}
+            >
+              <span className="question-icon">
+                <QuestionIcon />
+              </span>
+            </Tooltip>
+          </div>
+        ) : (
+          <></>
+        )}
         <SuccessButton className="export-save" onClick={handleOnSaveClick}>
           {formatMessage({ id: 'exportCreatorSaveButtonLabelText' })}
         </SuccessButton>

diff --git a/src/scenes/Exports/Viewer/index.tsx b/src/scenes/Exports/Viewer/index.tsx
@@ -42,6 +42,7 @@ const ExportsViewer = () => {
   const currentExport = useAppSelector(getCurrentExportSelector(params));
   const [theExport, setTheExport] = useState(currentExport);
   const dispatch = useDispatch<any>();
+  const { hideExportDryRun } = useConfig();
 
   const dispatchLoadExport = useCallback(() => {
     if (params.id) {
@@ -83,14 +84,16 @@ const ExportsViewer = () => {
                 label={formatMessage({ id: 'viewerNameLabel' })}
                 value={theExport!.name}
               />
-              <ExportItem
-                label={formatMessage({ id: 'viewerDryRunLabel' })}
-                value={
-                  theExport!.dryRun
-                    ? formatMessage({ id: 'viewerDryRunYes' })
-                    : formatMessage({ id: 'viewerDryRunNo' })
-                }
-              />
+              {!hideExportDryRun && (
+                <ExportItem
+                  label={formatMessage({ id: 'viewerDryRunLabel' })}
+                  value={
+                    theExport!.dryRun
+                      ? formatMessage({ id: 'viewerDryRunYes' })
+                      : formatMessage({ id: 'viewerDryRunNo' })
+                  }
+                />
+              )}
               <ExportItem
                 label={formatMessage({ id: 'viewerStatusLabel' })}
                 value={

diff --git a/src/scenes/Exports/index.tsx b/src/scenes/Exports/index.tsx
@@ -28,6 +28,7 @@ const Exports = () => {
   const exports: ExportsState = useAppSelector((state) => state.exports);
   const intl = useIntl();
   const { formatMessage, locale } = intl;
+  const { hideExportDryRun } = useConfig();
 
   const dispatch = useAppDispatch();
 
@@ -63,11 +64,13 @@ const Exports = () => {
                 </SecondarySquareButton>
               )}
             </DataCell>
-            <DataCell>
-              {e.dryRun
-                ? formatMessage({ id: 'exportsDryRunYes' })
-                : formatMessage({ id: 'exportsDryRunNo' })}
-            </DataCell>
+            {!hideExportDryRun && (
+              <DataCell>
+                {e.dryRun
+                  ? formatMessage({ id: 'exportsDryRunYes' })
+                  : formatMessage({ id: 'exportsDryRunNo' })}
+              </DataCell>
+            )}
           </TableRow>
         ))
       ) : (
@@ -117,9 +120,11 @@ const Exports = () => {
             <HeaderCell>
               {formatMessage({ id: 'exportsTableHeaderLabelDownload' })}
             </HeaderCell>
-            <HeaderCell>
-              {formatMessage({ id: 'exportsTableHeaderLabelDryrun' })}
-            </HeaderCell>
+            {!hideExportDryRun && (
+              <HeaderCell>
+                {formatMessage({ id: 'exportsTableHeaderLabelDryrun' })}
+              </HeaderCell>
+            )}
           </TableRow>
         </TableHead>
         <TableBody>{renderTableRows()}</TableBody>