Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(app): fix failed error details modal styling and long protocol me display issue #13133

Merged
merged 9 commits into from
Jul 21, 2023
Merged

fix(app): fix failed error details modal styling and long protocol me display issue #13133

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
99af744
fix(app): fix failed error details modal styling and long protocol na…
koji Jul 19, 2023
0c6a4d3
remove unnecessary marginTop because we remove red stroke
koji Jul 20, 2023
204e0c1
fix ProtocolSetup play button's disabled condition
koji Jul 20, 2023
7ae7a5d
update the condition statement
koji Jul 20, 2023
1e4410f
Update OnDeviceDisplayApp.tsx
koji Jul 20, 2023
164aa02
Update index.tsx
koji Jul 20, 2023
768b643
Update index.tsx
koji Jul 21, 2023
910cbb2
add overflowWrap for a long protocol name without space
koji Jul 21, 2023
48b4186
address comment
koji Jul 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/App/OnDeviceDisplayApp.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ export const OnDeviceDisplayApp = (): JSX.Element => {
}, [dispatch, isIdle, usersBrightness])

return (
<ApiHostProvider hostname="localhost">
<ApiHostProvider hostname="192.168.0.107">
<ErrorBoundary FallbackComponent={OnDeviceDisplayAppFallback}>
<Box width="100%" css="user-select: none;">
{isIdle ? (
Expand Down
1 change: 0 additions & 1 deletion app/src/App/OnDeviceDisplayAppFallback.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ export function OnDeviceDisplayAppFallback({
return (
<Modal header={modalHeader}>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

header needs iconColor: COLORS.red2
Screen Shot 2023-07-21 at 2 26 41 PM

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thank you!

<Flex
marginTop={SPACING.spacing32}
flexDirection={DIRECTION_COLUMN}
gridGap={SPACING.spacing32}
alignItems={ALIGN_CENTER}
Expand Down
2 changes: 1 addition & 1 deletion app/src/organisms/OnDeviceDisplay/RunningProtocol/CurrentRunningProtocolCommand.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ const TITLE_TEXT_STYLE = css`
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
overflow-wrap: break-word;
overflow-wrap: anywhere;
height: max-content;
`

Expand Down
1 change: 1 addition & 0 deletions app/src/organisms/OnDeviceDisplay/RunningProtocol/RunFailedModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ export function RunFailedModal({
})}
</StyledText>
<Flex
width="100%"
flexDirection={DIRECTION_COLUMN}
gridGap={SPACING.spacing8}
maxHeight="11rem"
Expand Down
2 changes: 1 addition & 1 deletion app/src/organisms/OnDeviceDisplay/RunningProtocol/RunningProtocolCommandList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const TITLE_TEXT_STYLE = css`
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
overflow-wrap: break-word;
overflow-wrap: anywhere;
height: max-content;
`

Expand Down
6 changes: 3 additions & 3 deletions app/src/pages/OnDeviceDisplay/ProtocolSetup/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ function PrepareToRun({
if (
mostRecentAnalysis == null ||
attachedInstruments == null ||
(protocolHasModules && attachedModules == null) ||
(protocolHasModules && attachedModules.length === 0) ||
allPipettesCalibrationData == null
) {
return <ProtocolSetupSkeleton cancelAndClose={onConfirmCancelClose} />
Expand Down Expand Up @@ -491,8 +491,8 @@ function PrepareToRun({
disabled={
mostRecentAnalysis == null ||
attachedInstruments == null ||
(protocolHasModules && attachedModules == null) ||
allPipettesCalibrationData == null
(protocolHasModules && attachedModules.length === 0) ||
allPipettesCalibrationData.data.length === 0
Copy link
Contributor Author

@koji koji Jul 20, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

allPipettesCalibrationData is object

{
  data(array)
  links
}

In my understanding, this disabled is true if there is no calibration data. We need to check the length of allPipettesCalibrationData.data

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will be fixed in a following PR

}
onPlay={onPlay}
ready={isReadyToRun}
Expand Down
2 changes: 1 addition & 1 deletion app/src/pages/OnDeviceDisplay/RunSummary.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ const ProtocolName = styled.h4`
-webkit-box-orient: vertical;
-webkit-line-clamp: 2;
overflow: hidden;
overflow-wrap: break-word;
overflow-wrap: anywhere;
height: max-content;
`

Expand Down