-
Notifications
You must be signed in to change notification settings - Fork 175
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.
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
Protocol designer OT-3 development #12540
Closed
akshay-dighe
wants to merge
137
commits into
edge
from
pd_dev_RPLC-225-RPLC-384-Protocol-Designer-Landing-Page
Closed
Changes from 132 commits
Commits
Show all changes
137 commits
Select commit
Hold shift + click to select a range
b9aa99a
Landing Page Initial Commit
aditya-sancheti 29b20dc
Landing Page Initial Commit (#12446)
aditya-sancheti 9dab933
Merge branch 'edge' into pd_flex_main
aditya-sancheti f3ad753
Merge branch 'pd_flex_main' into pd_dev_RPLC-225-RPLC-384-Protocol-De…
aditya-sancheti cb4cb1a
Merge branch 'edge' into pd_flex_main
aditya-sancheti 248bc02
Merge branch 'pd_flex_main' into pd_dev_RPLC-225-RPLC-384-Protocol-De…
aditya-sancheti 5286508
Round Tabs implementation
aditya-sancheti 33262e0
Merge branch 'edge' into pd_flex_main
aditya-sancheti f4871aa
Merge branch 'pd_flex_main' into pd_dev_RPLC-225-RPLC-384-Protocol-De…
aditya-sancheti df31a44
Pd dev rplc 225 rplc 384 protocol designer landing page (#12477)
aditya-sancheti cb50e1f
Minor changes in code
aditya-sancheti 26f9ca4
Merge branch 'edge' into pd_flex_main
aditya-sancheti 48bc634
Merge branch 'pd_flex_main' into pd_dev_RPLC-225-RPLC-384-Protocol-De…
aditya-sancheti 60372fc
pipette selection logic done
akshay-dighe 8711f8c
Merge branch 'pd_dev_RPLC-225-RPLC-384-Protocol'
akshay-dighe dd378ce
imported styles css
akshay-dighe 7715870
changed strings
aditya-sancheti 85d35ed
Merge branch 'pd_dev_RPLC-225-RPLC-384-Protocol-Designer-Landing-Page…
aditya-sancheti d83009a
format
aditya-sancheti 1d166c3
Creating components for tabs
aditya-sancheti 28598b1
pipette and tiprack slection ongoing code
akshay-dighe fa14738
Merge branch 'edge' of https://github.com/Opentrons/opentrons into pd…
akshay-dighe e2b8da4
Cosmetic CSS changes to match Figma design & look
aditya-sancheti c20609e
Merge branch 'edge' of https://github.com/Opentrons/opentrons into pd…
akshay-dighe 4a3cdbe
pipette and tiprack selection logic
akshay-dighe 960f9c9
Merge branch 'pd_dev_RPLC-225-RPLC-384-Protocol-Designer-Landing-Page…
akshay-dighe 2cd325c
new name as per flex json
akshay-dighe 0ecb064
code refactor
akshay-dighe be43ddb
inital commit for module selection
aditya-sancheti aab78d9
import changes
aditya-sancheti eca58dd
fix cypress tests and update icon snapshot
jerader d7f06ab
Merge branch 'pd_dev_RPLC-225-RPLC-384-Protocol-Designer-Landing-Page…
aditya-sancheti 4bdc6c0
Custom tiprack selection and code formatted
akshay-dighe de3c5fe
Modules selection place holder
aditya-sancheti e38c164
Merge branch 'pd_flex_module_selection' of https://github.com/Opentro…
akshay-dighe 4ea7480
Merge branch 'edge' of https://github.com/Opentrons/opentrons into pd…
akshay-dighe 8c01fd5
converted 4 page navpills into the 3 pages
akshay-dighe 4a910dc
pipette selection changes
akshay-dighe 63c1550
Modules selection placeholder
aditya-sancheti 444d0fa
Merge branch 'pd_dev_RPLC-225-RPLC-384-Protocol-Designer-Landing-Page…
aditya-sancheti 433ee50
Flex Module selection
akshay-dighe 4a20a10
Merge branch 'edge' of https://github.com/Opentrons/opentrons into pd…
akshay-dighe 1568453
lint error resolved
akshay-dighe 9df7a8d
css changes
akshay-dighe 7bb4294
React router dom added
akshay-dighe 99f7697
Merge branch 'edge' of https://github.com/Opentrons/opentrons into pd…
akshay-dighe edd8f92
Merge branch 'edge' of https://github.com/Opentrons/opentrons into pd…
akshay-dighe 7dc5357
Merge branch 'edge' of https://github.com/Opentrons/opentrons into pd…
akshay-dighe 0d558e2
for flex robot dynamic module selection
akshay-dighe 487ad5c
Merge branch 'edge' of https://github.com/Opentrons/opentrons into pd…
akshay-dighe 9e2b014
created TipRackList file and removed unwanted code
akshay-dighe 21f4c22
Merge branch 'edge' of https://github.com/Opentrons/opentrons into pd…
akshay-dighe 2a1fcf4
Merge branch 'pd_dev_RPLC-225-RPLC-384-Protocol-Designer-Landing-Page…
akshay-dighe 0a79995
Merge branch 'edge' of https://github.com/Opentrons/opentrons into pd…
akshay-dighe 72c3231
Merge branch 'pd-flex-pipette-selection' of https://github.com/Opentr…
akshay-dighe b42c732
code review comment resolved
akshay-dighe 693a9b7
errors resloved
akshay-dighe 0ecbd00
Merge branch 'edge' of https://github.com/Opentrons/opentrons into pd…
akshay-dighe fdfa5a0
code formatting done
akshay-dighe 5987223
Merge branch 'edge' of https://github.com/Opentrons/opentrons into pd…
akshay-dighe 0c8e9ec
Altered Flex protocol directory structure
akshay-dighe 063f198
file formatted
akshay-dighe bc1c879
Validations
aditya-sancheti a447b79
Merge branch 'pd_dev_RPLC-225-RPLC-384-Protocol-Designer-Landing-Page…
abhijit-botre d192d58
Folder structure Restructuring
abhijit-botre 29ab1d9
Minor Code change for folder structure
abhijit-botre 0ee1bcc
Merge branch 'edge' of https://github.com/Opentrons/opentrons into pd…
akshay-dighe 0877913
placed new flex inside existing PD environment
akshay-dighe 844feba
lint and check js error resolved
akshay-dighe 3fa2558
Merge branch 'pd-flex-pipette-selection' of https://github.com/Opentr…
aditya-sancheti 30c2787
Confirmation Dialog and cosmetic changes
aditya-sancheti c3963c2
Merge branch 'pd-flex-pipette-selection' of https://github.com/Opentr…
abhijit-botre bd67347
Select pipette
aditya-sancheti 32aa541
Merge branch 'pd-flex-pipette-selection' of https://github.com/Opentr…
akshay-dighe 1639907
Swap_Pipettes_with_96_Channel
abhijit-botre 3829350
import json file functionality
akshay-dighe 49c8529
flex file changes and code merge
akshay-dighe 65f39ec
Merge branch 'edge' of https://github.com/Opentrons/opentrons into pd…
akshay-dighe 60e89d8
Merge branch 'pd_dev_confiramtion' of https://github.com/Opentrons/op…
akshay-dighe e54b547
Merge branch 'pd_flex_file_details' of https://github.com/Opentrons/o…
akshay-dighe ade88ad
Tip rack style issue resolved
akshay-dighe d39cdcb
check js error resolved
akshay-dighe 289a22e
instrument import
abhijit-botre 75d09fb
gripper added in the module section & css changes
akshay-dighe 00e9570
enabled flex supported tiprack
akshay-dighe a551a4e
Merge branch 'edge' of https://github.com/Opentrons/opentrons into pd…
akshay-dighe 95e9d96
module selection changes & check js error resolve
akshay-dighe a7143d6
Merge branch 'edge' of https://github.com/Opentrons/opentrons into pd…
akshay-dighe 1c655cf
Refactored pipette selection tabs into a unified form.
akshay-dighe dbe20f8
Merge branch 'edge' of https://github.com/Opentrons/opentrons into pd…
akshay-dighe 21e39ee
flex supported modules added in separate file
akshay-dighe 5eae400
File details page implementation with partial edit
abhijit-botre 912f904
Merge branch 'pd-flex-pipette-selection' of https://github.com/Opentr…
abhijit-botre 0b85f1a
Design and dynamic module fetching logic in file details page impleme…
abhijit-botre 5207a58
navigation changes and ot3 file save data
akshay-dighe 6b9b10c
Merge branch 'edge' of https://github.com/Opentrons/opentrons into pd…
akshay-dighe 2ce7e7f
Merge branch 'pd_flex_file_details' of https://github.com/Opentrons/o…
akshay-dighe 3abf0e5
resolved code conflict error
akshay-dighe b438b67
Refactored code to update the robot selection feature. Completed modi…
akshay-dighe 3054156
Merge branch 'edge' of https://github.com/Opentrons/opentrons into pd…
akshay-dighe 1d45e16
Pipette Selection Validation(Disabled, 96 ch handling, Mount), Instru…
abhijit-botre 8315b9d
Merge branch 'edge' of https://github.com/Opentrons/opentrons into pd…
akshay-dighe 69547c7
Merge branch 'pd_flex_file_details' of https://github.com/Opentrons/o…
akshay-dighe f908a04
Disable ConnectedSidebar for OT3 file-details page
akshay-dighe 8f5b462
ModuleChange
abhijit-botre 5001e8c
onEditUpdateButton
abhijit-botre 6b2850f
Flex new cancel button functionalility
akshay-dighe 2ea11fa
Merge branch 'pd_flex_file_details' of https://github.com/Opentrons/o…
akshay-dighe a35893a
Check js error resolved
akshay-dighe 7f6cc0e
Reolved lint JS error
akshay-dighe f7b5a6c
Merge branch 'edge' of https://github.com/Opentrons/opentrons into pd…
akshay-dighe 2988f26
Flex Module Edit value update
abhijit-botre 56c7aee
Merge branch 'pd-flex-pipette-selection' of https://github.com/Opentr…
abhijit-botre c18cbfc
CSS lint error resolved
akshay-dighe aa8f797
Merge branch 'edge' of https://github.com/Opentrons/opentrons into pd…
akshay-dighe 4d6fb7d
Flex Details CSS and name changes
abhijit-botre 8e6d34f
Merge branch 'pd-flex-pipette-selection' of https://github.com/Opentr…
abhijit-botre ce71477
Code review comments resolved
akshay-dighe 05f2597
Flex error resolved
abhijit-botre 4100f39
removed unwated gripper code and validation changes
akshay-dighe cca46e3
Sandbox Review Changes May 23, 2023
abhijit-botre 7623be8
resolved check js errors
akshay-dighe 0f18954
Merge branch 'pd_flex_file_details' of https://github.com/Opentrons/o…
akshay-dighe dcfe698
removed unused code
akshay-dighe 304eb5a
Merge branch 'edge' of https://github.com/Opentrons/opentrons into pd…
akshay-dighe d18dfc0
removed router dom from yarn
akshay-dighe a2b686f
code review comment changes
akshay-dighe 0ebb311
Merge branch 'edge' of https://github.com/Opentrons/opentrons into pd…
akshay-dighe 84a5aff
Merge branch 'edge' of https://github.com/Opentrons/opentrons into pd…
akshay-dighe 16d530d
Merge branch 'edge' of https://github.com/Opentrons/opentrons into pd…
akshay-dighe 73ab5aa
1. Confirmation dialog message updated
aditya-sancheti 5f13b79
Revert "1. Confirmation dialog message updated"
aditya-sancheti 3ff2bf3
Code review comment resolved
akshay-dighe 3a2f679
Merge branch 'edge' of https://github.com/Opentrons/opentrons into pd…
akshay-dighe c6ef595
Merge branch 'pd_dev_RPLC-225-RPLC-384-Protocol-Designer-Landing-Page…
akshay-dighe ca9c80c
Removed unnecessary code.
akshay-dighe a205691
96 selection change
akshay-dighe File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
...designer/cypress/integration/home.spec.js → ...igner/cypress/integration/ot2Home.spec.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
73 changes: 73 additions & 0 deletions
73
protocol-designer/src/components/FlexProtocolEditor/CreateFlexFileForm.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,73 @@ | ||
import React, { useState } from 'react' | ||
import { i18n } from '../../localization' | ||
import { FlexProtocolEditorComponent } from './FlexProtocolEditor' | ||
import { StyledText } from './StyledText' | ||
import styles from './FlexComponents.css' | ||
import { UpdateConfirmation } from './FlexUpdateConfirmation' | ||
import { actions as navActions } from '../../navigation' | ||
import { useDispatch } from 'react-redux' | ||
import { FlexHeadingButtonGroup } from './FlexFileDetails' | ||
|
||
function FlexFormComponent(): JSX.Element { | ||
const dispatch = useDispatch() | ||
const [showConfirmation, setShowConfirmation] = useState(false) | ||
|
||
const handleCancelClick = (): void => { | ||
setShowConfirmation(false) | ||
} | ||
|
||
const handleConfirmClick = (): void => { | ||
// handle the update action here | ||
dispatch(navActions.navigateToPage('landing-page')) | ||
setShowConfirmation(false) | ||
} | ||
|
||
function protocolCancelClick(): void { | ||
setShowConfirmation(true) | ||
} | ||
|
||
return ( | ||
<> | ||
{Boolean(showConfirmation) && ( | ||
<> | ||
<UpdateConfirmation | ||
confirmationTitle={i18n.t( | ||
'flex.cancel_create_protocol.confirmation_title' | ||
)} | ||
confirmationMessage={i18n.t( | ||
'flex.cancel_create_protocol.confirmation_message' | ||
)} | ||
cancelButtonName={i18n.t( | ||
'flex.cancel_create_protocol.cancel_button_name' | ||
)} | ||
continueButtonName={i18n.t( | ||
'flex.cancel_create_protocol.continue_button_name' | ||
)} | ||
handleCancelClick={handleCancelClick} | ||
handleConfirmClick={handleConfirmClick} | ||
/> | ||
</> | ||
)} | ||
<div className={styles.flex_header}> | ||
<div className={styles.flex_title}> | ||
<StyledText as="h1">{i18n.t('flex.header.title')}</StyledText> | ||
<FlexHeadingButtonGroup | ||
protocolCancelClickProps={protocolCancelClick} | ||
/> | ||
</div> | ||
<StyledText as="h5" className={styles.right_end}> | ||
{i18n.t('flex.header.required_fields')} | ||
</StyledText> | ||
<FlexProtocolEditorComponent | ||
FlexFileDetails={{ | ||
isEditValue: false, | ||
tabIdValue: undefined, | ||
formProps: undefined, | ||
}} | ||
/> | ||
</div> | ||
</> | ||
) | ||
} | ||
|
||
export const CreateFlexFileForm = FlexFormComponent | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is there a reason why the react import statement needed to be changed here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I will revert the change in this component since it is not necessary.