fix ui

Opentrons · Jul 22, 2024 · 9f72818 · 9f72818
1 parent cafa1d0
commit 9f72818
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/protocol-designer/src/components/steplist/DraggableStepItems.tsx b/protocol-designer/src/components/steplist/DraggableStepItems.tsx
@@ -168,10 +168,11 @@ export const DraggableStepItems = (
                   border={BORDERS.lineBorder}
                   backgroundColor={COLORS.grey30}
                 >
-                  <Flex justifyContent={JUSTIFY_SPACE_BETWEEN}>
-                    <LegacyStyledText padding={SPACING.spacing8}>
-                      {item.groupName}
-                    </LegacyStyledText>
+                  <Flex
+                    justifyContent={JUSTIFY_SPACE_BETWEEN}
+                    padding={SPACING.spacing8}
+                  >
+                    <LegacyStyledText as='h2SemiBold'>{item.groupName}</LegacyStyledText>
                     <PrimaryButton
                       onClick={() => {
                         dispatch(removeGroup({ groupName: item.groupName }))

diff --git a/protocol-designer/src/containers/ConnectedStepItem.tsx b/protocol-designer/src/containers/ConnectedStepItem.tsx
@@ -271,7 +271,7 @@ export const ConnectedStepItem = (
               addStep(stepId)
             }}
           >
-            <Icon name={name} width="2rem" height="2rem" />
+            <Icon name={name} width="1rem" height="1rem" />
           </Btn>
         ) : null}
         <StepItem

diff --git a/protocol-designer/src/containers/__tests__/ConnectedStepItem.test.tsx b/protocol-designer/src/containers/__tests__/ConnectedStepItem.test.tsx
@@ -14,6 +14,8 @@ import {
   getInitialDeckSetup,
   getOrderedStepIds,
   getSavedStepForms,
+  getStepGroups,
+  getUnsavedGroup,
 } from '../../step-forms/selectors'
 import { selectors as labwareIngredSelectors } from '../../labware-ingred/selectors'
 import { getErrorStepId, getSubsteps } from '../../file-data/selectors'
@@ -27,6 +29,7 @@ import {
   getMultiSelectLastSelected,
   getSelectedStepId,
 } from '../../ui/steps'
+import { getEnableStepGrouping } from '../../feature-flags/selectors'
 import { getLabwareNicknamesById } from '../../ui/labware/selectors'
 import { ConnectedStepItem } from '../ConnectedStepItem'
 import type { LabwareDefinition2 } from '@opentrons/shared-data'
@@ -38,6 +41,7 @@ vi.mock('../../dismiss/selectors')
 vi.mock('../../ui/steps')
 vi.mock('../../labware-ingred/selectors')
 vi.mock('../../ui/labware/selectors')
+vi.mock('../../feature-flags/selectors')
 
 const render = (props: React.ComponentProps<typeof ConnectedStepItem>) => {
   return renderWithProviders(<ConnectedStepItem {...props} />, {
@@ -61,6 +65,9 @@ describe('ConnectedStepItem', () => {
       stepNumber: 2,
       onStepContextMenu: vi.fn(),
     }
+    vi.mocked(getStepGroups).mockReturnValue({})
+    vi.mocked(getUnsavedGroup).mockReturnValue([])
+    vi.mocked(getEnableStepGrouping).mockReturnValue(true)
     vi.mocked(getSavedStepForms).mockReturnValue({
       [pauseStepId]: {
         stepType: 'pause',

diff --git a/protocol-designer/src/ui/steps/reducers.ts b/protocol-designer/src/ui/steps/reducers.ts
@@ -70,7 +70,7 @@ const collapsedSteps: Reducer<CollapsedStepsState, any> = handleActions(
         (acc: CollapsedStepsState, stepId) => ({ ...acc, [stepId]: true }),
         {}
       ),
-},
+  },
   {}
 )
 export const SINGLE_STEP_SELECTION_TYPE: 'SINGLE_STEP_SELECTION_TYPE' =

diff --git a/robot-server/tests/protocols/test_completed_analysis_store.py b/robot-server/tests/protocols/test_completed_analysis_store.py
@@ -73,6 +73,7 @@ def make_dummy_protocol_resource(protocol_id: str) -> ProtocolResource:
             metadata={},
             robot_type="OT-2 Standard",
             content_hash="abc123",
+            command_annotations={},
         ),
         protocol_key=None,
         protocol_kind="standard",
-Original file line number
+Diff line change
@@ Expand Up @@
             (acc: CollapsedStepsState, stepId) => ({ ...acc, [stepId]: true }),
             {}
           ),
-    },
+      },
       {}
     )
     export const SINGLE_STEP_SELECTION_TYPE: 'SINGLE_STEP_SELECTION_TYPE' =
@@ Expand Down @@