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

Jump to bottom

feat(protocol-designer): export and announcement modal for PD 8.1 #14870

Merged
merged 5 commits into from
Apr 11, 2024
Merged

feat(protocol-designer): export and announcement modal for PD 8.1 #14870

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2e54bb5
add announcement key
jerader Apr 11, 2024
2d42675
add export modal info
jerader Apr 11, 2024
7a4ad03
feat(protocol-designer): export and announcement modal for PD 8.1
jerader Apr 11, 2024
1dfd421
fix cypress
jerader Apr 11, 2024
22e4688
update copy
jerader Apr 11, 2024
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
Prev Previous commit
update copy
  • Loading branch information
@jerader
jerader committed Apr 11, 2024
commit 22e46885e3fb97af94b3ce831de69c6729f8383e
2 changes: 1 addition & 1 deletion protocol-designer/cypress/integration/migrations.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ describe('Protocol fixtures migrate and match snapshots', () => {

cy.get('div')
.contains(
'This protocol can only run on app and robot server version 7.2 or higher'
'This protocol can only run on app and robot server version 7.2.0 or higher'
)
.should('exist')
cy.get('button').contains('continue', { matchCase: false }).click()
Expand Down
6 changes: 1 addition & 5 deletions protocol-designer/src/components/modals/AnnouncementModal/announcements.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,10 +267,7 @@ export const useAnnouncements = (): Announcement[] => {
},
{
announcementKey: 'customParamsAndMultiTipAndModule8.1',
image: (
// TODO(jr, 4/11/24): add image to announcement modal
<Flex />
),
image: <Flex />,
heading: t('announcements.header', { pd: PD }),
message: (
<>
Expand All @@ -282,7 +279,6 @@ export const useAnnouncements = (): Announcement[] => {
<ul>
<li>{t('announcements.customParamsAndMultiTipAndModule.body2')}</li>
<li>
{' '}
<Trans
t={t}
i18nKey={'announcements.customParamsAndMultiTipAndModule.body3'}
Expand Down
2 changes: 1 addition & 1 deletion protocol-designer/src/localization/en/alert.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"export_v8_1_protocol_7_2": {
"title": "Robot and app update may be required",
"body1": "This protocol can only run on app and robot server version",
"body2": "7.2 or higher",
"body2": "7.2.0 or higher",
"body3": ". Please ensure your robot is updated to the correct version."
},
"change_magnet_module_model": {
Expand Down
12 changes: 6 additions & 6 deletions protocol-designer/src/localization/en/modal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,12 @@
"body2": "All protocols now require {{app}} version <strong> 7.1+ </strong> to run."
},
"customParamsAndMultiTipAndModule": {
"body1": "Introducing the {{pd}} 8.1. Starting today, you will be able to:",
"body2": "Customize blowout flowRate speed and height",
"body3": "Customize aspirate, dispense, and mix <i>'x'</i> and <i>'y'</i> well positioning",
"body4": "Assign up to 3 types of tipracks to a single pipette",
"body5": "For the Flex only; add up to 7 Temperature Modules on the deck at the same time",
"body6": "All protocols require {{app}} version <strong> 7.2+ </strong> to run."
"body1": "Introducing {{pd}} 8.1. Starting today, you will be able to:",
"body2": "Customize blowout speed and height.",
"body3": "Adjust horizontal position within a well when aspirating, dispensing, or mixing.",
"body4": "Assign up to three types of tip racks to a single pipette.",
"body5": "Add multiple Temperature Modules to the deck (Flex only).",
"body6": "All protocols require {{app}} version <strong>7.2.0 or later</strong> to run."
}
},
"labware_selection": {
Expand Down
Loading