Merge 619bc83 into 571f1af

zooniverse · Apr 26, 2024 · 9b4d17a · 9b4d17a
2 parents 571f1af + 619bc83
commit 9b4d17a
Show file tree

Hide file tree

Showing 5 changed files with 94 additions and 45 deletions.
diff --git a/app/pages/lab-pages-editor/components/TasksPage/ExperimentalPanel.jsx b/app/pages/lab-pages-editor/components/TasksPage/ExperimentalPanel.jsx
@@ -5,13 +5,15 @@ export default function ExperimentalPanel({
 }) {
   function experimentalReset() {
     update({
+      first_task: '',
       tasks: {},
       steps: []
     });
   }
 
   function experimentalQuickSetup() {
     update({
+      first_task: '',
       tasks: {
         'T0': {
           answers: [

diff --git a/app/pages/lab-pages-editor/components/TasksPage/TasksPage.jsx b/app/pages/lab-pages-editor/components/TasksPage/TasksPage.jsx
@@ -7,21 +7,20 @@ import getNewStepKey from '../../helpers/getNewStepKey.js';
 import getNewTaskKey from '../../helpers/getNewTaskKey.js';
 import moveItemInArray from '../../helpers/moveItemInArray.js';
 import cleanupTasksAndSteps from '../../helpers/cleanupTasksAndSteps.js';
-import getPreviewEnv from '../../helpers/getPreviewEnv.js';
 // import strings from '../../strings.json'; // TODO: move all text into strings
 
 import ExperimentalPanel from './ExperimentalPanel.jsx';
 import EditStepDialog from './components/EditStepDialog';
 import NewTaskDialog from './components/NewTaskDialog.jsx';
 import StepItem from './components/StepItem';
-import ExternalLinkIcon from '../../icons/ExternalLinkIcon.jsx';
 
 export default function TasksPage() {
-  const { project, workflow, update } = useWorkflowContext();
+  const { workflow, update } = useWorkflowContext();
   const editStepDialog = useRef(null);
   const newTaskDialog = useRef(null);
   const [ activeStepIndex, setActiveStepIndex ] = useState(-1);  // Tracks which Step is being edited.
   const [ activeDragItem, setActiveDragItem ] = useState(-1);  // Keeps track of active item being dragged (StepItem). This is because "dragOver" CAN'T read the data from dragEnter.dataTransfer.getData().
+  const firstStepKey = workflow?.steps?.[0]?.[0] || '';
   const isActive = true; // TODO
 
   /*
@@ -156,6 +155,13 @@ export default function TasksPage() {
     setActiveStepIndex(-1);
   }
 
+  function handleChangeStartingPage(e) {
+    const targetStepKey = e?.target?.value || '';
+    const targetStepIndex = workflow?.steps?.findIndex(([stepKey]) => stepKey === targetStepKey) || -1;
+    if (targetStepIndex < 0) return;
+    moveStep(targetStepIndex, 0);
+  }
+
   // Changes the optional "next page" of a step/page
   function updateNextStepForStep(stepKey, next = undefined) {
     if (!workflow || !workflow.steps) return;
@@ -201,15 +207,14 @@ export default function TasksPage() {
     stepHasOneTask: activeStep?.[1]?.taskKeys?.length > 0,
     stepHasManyTasks: activeStep?.[1]?.taskKeys?.length > 1
   }
-  const previewEnv = getPreviewEnv();
-  const previewUrl = `https://frontend.preview.zooniverse.org/projects/${project?.slug}/classify/workflow/${workflow?.id}${previewEnv}`;
+
   if (!workflow) return null;
 
   return (
     <div className="tasks-page">
       <div className="workflow-title flex-row">
-        <h2 className="flex-item">{workflow?.display_name}</h2>
-        <span className="workflow-id">{`#${workflow?.id}`}</span>
+        <h2 className="flex-item">{workflow.display_name}</h2>
+        <span className="workflow-id">{`#${workflow.id}`}</span>
         {(isActive) ? <span className="status-active">Active</span> : <span className="status-inactive">Inactive</span>}
       </div>
       <section aria-labelledby="workflow-tasks-heading">
@@ -222,17 +227,27 @@ export default function TasksPage() {
           >
             Add a new Task
           </button>
-          <a
-            className="flex-item button-link"
-            href={previewUrl}
-            rel="noopener noreferrer"
-            target='_blank'
+          <select
+            aria-label="Choose starting Page"
+            className="flex-item workflow-starting-page"
+            onChange={handleChangeStartingPage}
+            style={(workflow?.steps?.length < 1) ? { display: 'none' } : undefined}
+            value={firstStepKey}
           >
-            Preview Workflow <ExternalLinkIcon />
-          </a>
+            <option value="">Choose starting page</option>
+            {workflow.steps?.map(([stepKey, stepBody]) => (
+              <option
+                key={`choose-starting-page-${stepKey}`}
+                value={stepKey}
+              >
+                {firstStepKey === stepKey && 'Starting page: '}
+                {stepBody?.taskKeys?.join(', ') || `(${stepKey})` /* Note: if you see the stepKey instead of the taskKeys, something's wrong. */}
+              </option>
+            ))}
+          </select>
         </div>
         <ul className="steps-list" aria-label="Pages/Steps">
-          {workflow.steps.map((step, index) => (
+          {workflow.steps?.map((step, index) => (
             <StepItem
               key={`stepItem-${step[0]}`}
               activeDragItem={activeDragItem}

diff --git a/app/pages/lab-pages-editor/components/WorkflowHeader.jsx b/app/pages/lab-pages-editor/components/WorkflowHeader.jsx
@@ -1,5 +1,7 @@
 import PropTypes from 'prop-types';
 
+import getPreviewEnv from '../helpers/getPreviewEnv.js';
+import ExternalLinkIcon from '../icons/ExternalLinkIcon.jsx';
 import ReturnIcon from '../icons/ReturnIcon.jsx';
 import { useWorkflowContext } from '../context.js';
 import strings from '../strings.json';
@@ -12,12 +14,14 @@ export default function WorkflowHeader({
   setCurrentTab = DEFAULT_HANDLER,
   tabs = []
 }) {
-  const { workflow } = useWorkflowContext();
+  const { project, workflow } = useWorkflowContext();
   const returnUrl = `/lab/${projectId}/workflows`;
+  const previewEnv = getPreviewEnv();
+  const previewUrl = `https://frontend.preview.zooniverse.org/projects/${project?.slug}/classify/workflow/${workflow?.id}${previewEnv}`;
 
   // When clicking a tab button, make that tab active. This is pretty straightforward.
   function onClick(e) {
-    const { tab } = e.target.dataset;
+    const { tab } = e?.target?.dataset || {};
     setCurrentTab(parseInt(tab));
   }
 
@@ -43,14 +47,25 @@ export default function WorkflowHeader({
   if (!workflow) return null;
 
   return (
-    <div className="workflow-header flex-row">
-      <a href={returnUrl}> {/* Formerly <Link> from 'react-router', but React was throwing Legacy Context errors. */}
-        <ReturnIcon />
-        {strings.PagesEditor.components.WorkflowHeader.return}
-      </a>
+    <div className="workflow-header">
+      <div className="workflow-header-links flex-row">
+        <a href={returnUrl}> {/* Formerly <Link> from 'react-router', but React was throwing Legacy Context errors. */}
+          <ReturnIcon />
+          {strings.PagesEditor.components.WorkflowHeader.return}
+        </a>
+        <span className="flex-item" />
+        <a
+          className="button-link"
+          href={previewUrl}
+          rel="noopener noreferrer"
+          target='_blank'
+        >
+          Preview Workflow <ExternalLinkIcon />
+        </a>
+      </div>
       <div
         role="tablist"
-        className="flex-row flex-item justify-around"
+        className="workflow-header-tabs flex-row flex-item justify-around"
       >
         {tabs.map((tab, index) => (
           <TabButton

diff --git a/app/pages/lab-pages-editor/components/WorkflowSettingsPage/WorkflowSettingsPage.jsx b/app/pages/lab-pages-editor/components/WorkflowSettingsPage/WorkflowSettingsPage.jsx
@@ -13,9 +13,10 @@ export default function WorkflowSettingsPage() {
   }
 
   function doUpdate(e) {
-    const key = e.target.name;
-    let value = e.target.value || '';
-    const { updaterule } = e.target.dataset;
+    const key = e?.target?.name;
+    let value = e?.target?.value || '';
+    const { updaterule } = e?.target?.dataset || {};
+    if (!key) return;
 
     if (updaterule === 'convert_to_number') value = parseInt(value);
     if (updaterule === 'undefined_if_empty') value = value || undefined;

diff --git a/css/lab-pages-editor.styl b/css/lab-pages-editor.styl
@@ -170,30 +170,41 @@ $fontWeightBoldPlus = 700
   // ---------------------------------------------------------------------------
 
   .workflow-header
-    border-bottom: 0.5px solid $grey1
+    margin-bottom: $sizeXL
 
     a
-      display: inline-block
-      font-size: $fontSizeS
-      text-decoration: none
+      min-width: 40%
 
-      .icon
-        margin-right: $sizeS
+    .workflow-header-links
+      margin-bottom: $sizeM
 
-    button
-      background: none
-      border: none
-      cursor: pointer
-      font-size: $fontSizeL
-      font-weight: $fontWeightBoldPlus
-      text-transform: uppercase
+      a
+        display: inline-block
+        font-size: $fontSizeS
+        text-decoration: none
 
-      &[aria-selected=true]
-        border-bottom: 4px solid $teal
-
-      &[aria-selected=false]
-        color: $grey1
-        border-bottom: 4px solid transparent
+        .icon
+          margin-right: $sizeS
+
+    .workflow-header-tabs
+      gap: $sizeXL
+      justify-content: center
+      border-bottom: 0.5px solid $grey1
+
+      button
+        background: none
+        border: none
+        cursor: pointer
+        font-size: $fontSizeL
+        font-weight: $fontWeightBoldPlus
+        text-transform: uppercase
+
+        &[aria-selected=true]
+          border-bottom: 4px solid $teal
+
+        &[aria-selected=false]
+          color: $grey1
+          border-bottom: 4px solid transparent
 
   // Component: Workflow Settings Page
   // ---------------------------------------------------------------------------
@@ -294,6 +305,11 @@ $fontWeightBoldPlus = 700
       .status-inactive
         color: $redBright
 
+    .workflow-starting-page
+      border: 1.5px solid $grey1
+      border-radius: $sizeXS
+      color: $grey2
+
     dialog
       border: 1px solid $grey1
       border-radius: $sizeS