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.

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

Instrument page updates #194

Merged
merged 8 commits into from
Apr 28, 2022
Merged

Conversation

brandongregoryscott
Copy link
Owner

@brandongregoryscott brandongregoryscott commented Apr 28, 2022

Resolves #60
Resolves #115

  • Updates InstrumentsPage to render the InstrumentSettings component on the right side of the page to create or edit Instruments.
    image

    • If no Instruments currently exist, an empty state is rendered inside the table with a CTA to create a new one.

    • image

    • If Instruments exist and one has not been selected for editing, an empty state is rendered on the right side of the page with a CTA to create a new one

    • image

  • Fixed the bug where the Instrument preview functionality wouldn't work until persisted (this was initially caused by an undefined id on creation, however, I also found an issue where the proper sample wasn't playing after changing files. This should be fixed now.)

@khaki32
Copy link
Contributor

khaki32 commented Apr 28, 2022

Very cool! The system integrates very nicely.

I noticed that you commited this in a new branch and are merging this into the development branch. Is there a specific reason to do this compared to just commiting directly into development?

@brandongregoryscott
Copy link
Owner Author

Very cool! The system integrates very nicely.

Thanks! Glad you're digging it. It should be a nice upgrade from what's currently there.

I noticed that you commited this in a new branch and are merging this into the development branch. Is there a specific reason to do this compared to just commiting directly into development?

For larger features or refactors, I usually like to make a separate branch off of development to hold the changes. I'm pretty free with my commits since it all gets squashed down during the merge, so it lets me iterate & keep my progress without having to fully finish it at one time - if I wanted to stop and work on something smaller or unrelated to these changes, I would want to start off in a clean branch without something else that's half-finished coming along for the ride.

In terms of branching workflows, I think it's probably closest to GitLab's flow with feature branches, a staging/development branch, and a production branch.

… fix preview issue when creating in WorkstationPage
@brandongregoryscott brandongregoryscott merged commit e83dd82 into development Apr 28, 2022
@brandongregoryscott brandongregoryscott deleted the instrument-page-updates branch April 28, 2022 23:43
@khaki32
Copy link
Contributor

khaki32 commented Apr 29, 2022

Ah that's a nice way of doing it. GitLab's flow looks very interesting.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants