Skip to content
This repository was archived by the owner on Oct 4, 2023. It is now read-only.

[C-2907] Add contextual-menu, refactor release-date-field - #3836

Merged
dylanjeffers merged 6 commits into
mainfrom
dj-c-2907-finish-contextual-menus
Aug 2, 2023
Merged

dylanjeffers merged 6 commits into
mainfrom
dj-c-2907-finish-contextual-menus

Conversation

@dylanjeffers

@dylanjeffers dylanjeffers commented Aug 1, 2023 •

Copy link
Copy Markdown
Contributor

Description

Adds contextual-menu, using combined pattern from modal-field and mobile's contextual-menu
Removes "submenu" naming
Updates Text, Icon, Modal, and Tile components to work with upload field requirements
Reimplements ReleaseDateField using new component

@dylanjeffers dylanjeffers changed the title [C-2907] Develop contextual-menu, use in release-date-field [C-2907] Add contextual-menu, refactor release-date-field Aug 1, 2023
@audius-infra

Copy link
Copy Markdown
Collaborator

@amendelsohn amendelsohn left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Nice work! I think I like the new form pattern, though I'm not sure it saves us all that much in terms of reused code. It's a win in terms of consistency, so probably worthwhile.

Comment on lines +8 to +11
display: flex;
flex-direction: column;
align-items: flex-start;
gap: var(--unit-2);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

<div classNames={cn(layoutStyles.col, layoutStyles.gap2)} /> will do this

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

oh rightt, hell yeah

Comment on lines +21 to +25
display: inline-flex;
flex: 1;
flex-grow: 1;
justify-content: space-between;
align-items: center;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

layoutStyles.row will do this, maybe still need the flex-grow

)
}, [])

const renderValue = renderValueProp ?? defaultRenderValue

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

nice! I like this pattern


.flat:active {
border-radius: 8px;
border: 1px solid var(--border-strong, #e7e6eb);

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

are we using these backup styles?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

no excellent catch

icon={<IconCalendar className={styles.titleIcon} />}
initialValues={initialValues}
onSubmit={onSubmit}
menuForm={

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

wondering if this should be menuFields? You don't need to (and shouldn't) pass a Formik instance into this

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

yeah great call! cause its not the form itself

type ReleaseDateValue = EditFormValues[typeof RELEASE_DATE]

export const ReleaseDateField = () => {
const [{ value }, , { setValue }] = useField<ReleaseDateValue>(RELEASE_DATE)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

you might want to merge in my multi-track changes before reimplementing the rest of the forms. I had to change a lot of the field, initialValues, and onSubmits

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

yeah was thinking this when i saw the merge conflict, was like whew glad we paused here

return (
<div className={styles.root}>
<ReleaseDateModalForm />
<ReleaseDateField />

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

will the rest of these be renamed or kept as "form"? I see how ReleaseDate is basically a fancy field, but the others all have multiple fields in the modal

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

yeah that's exactly what im thinking, like at the end of the day these are fields that happen to render a contextual-menu that happens to render a form :D

@dylanjeffers

Copy link
Copy Markdown
Contributor Author

Nice work! I think I like the new form pattern, though I'm not sure it saves us all that much in terms of reused code. It's a win in terms of consistency, so probably worthwhile.

Thanks! I think what helps is the saved code with the previews and formik instantition on each modal field, but yeah I basically borrowed everything you wrote for it

@gitguardian

gitguardian Bot commented Aug 2, 2023

Copy link
Copy Markdown

⚠️ GitGuardian has uncovered 2 secrets following the scan of your pull request.

Please consider investigating the findings and remediating the incidents. Failure to do so may lead to compromising the associated services or software components.

🔎 Detected hardcoded secrets in your pull request
GitGuardian id Secret Commit Filename
2858198 Generic High Entropy Secret eae9f34 packages/mobile/.env.prod View secret
2858199 Generic High Entropy Secret eae9f34 packages/mobile/.env.stage View secret
🛠 Guidelines to remediate hardcoded secrets
  1. Understand the implications of revoking this secret by investigating where it is used in your code.
  2. Replace and store your secrets safely. Learn here the best practices.
  3. Revoke and rotate these secrets.
  4. If possible, rewrite git history. Rewriting git history is not a trivial act. You might completely break other contributing developers' workflow and you risk accidentally deleting legitimate data.

To avoid such incidents in the future consider


🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.

Our GitHub checks need improvements? Share your feedbacks!

@dylanjeffers
dylanjeffers merged commit bcb5137 into main Aug 2, 2023
@dylanjeffers
dylanjeffers deleted the dj-c-2907-finish-contextual-menus branch August 2, 2023 05:39
schottra added a commit that referenced this pull request Aug 3, 2023
* origin/main:
  Add npm run clean script (#3846)
  DMs: Web: Don't nav back when clicking outside the modal (#3844)
  Add prepare step to dapp-store ci flow (#3841)
  [Harmony] Add SelectablePill to Harmony PAY-1654 (#3803)
  [PAY-1688] Mobile: Share track, collection to DMs (#3840)
  Disable upload redesign (#3842)
  Update dapp-store build artifacts
  Update dapp-store build artifacts
  Fix dapp store deployment (#3829)
  [C-2907] Add contextual-menu, refactor release-date-field (#3836)
  [PAY-1687] Web: Share tracks, playlists, and albums via Direct Message (#3828)
  Upgrade sdk to beta.105 to fix rewards claiming (#3839)
  [C-2923] Fix toasts in modal screens (#3838)
  Add cypress upload test for subgenre (#3833)
  [PAY-1685] Wire up stripe UI for USDC purchase in mobile (#3837)
  Fix broken track upload for electronic subgenres on mobile (#3835)
  Fix tag input (#3832)
audius-infra pushed a commit that referenced this pull request Aug 5, 2023
[f9e1380] Add DirectMessages Banner and Update All Banners (#3851) Marcus Pasell
[e523d39] [PAY-1692] Rewrite 'Share to DMs' using less stateful logic (#3852) Marcus Pasell
[af62892] [C-2675][C-2692] Add multi track navigation sidebar and form controls (#3847) Andrew Mendelsohn
[ee38400] Fix send audio flow (#3850) Reed
[bd1752b] Update SDK to latest 3.0.3-beta.109 (#3849) nicoback2
[6988a03] Add npm run clean script (#3846) Reed
[68bd638] DMs: Web: Don't nav back when clicking outside the modal (#3844) Marcus Pasell
[1f7d7d0] Add prepare step to dapp-store ci flow (#3841) Raymond Jacobson
[6c87efd] [Harmony] Add SelectablePill to Harmony PAY-1654 (#3803) nicoback2
[69fbfb3] [PAY-1688] Mobile: Share track, collection to DMs (#3840) Marcus Pasell
[f2f9717] Disable upload redesign (#3842) Andrew Mendelsohn
[9671c06] Update dapp-store build artifacts audius-infra
[77b4030] Update dapp-store build artifacts audius-infra
[baedc13] Fix dapp store deployment (#3829) Raymond Jacobson
[bcb5137] [C-2907] Add contextual-menu, refactor release-date-field (#3836) Dylan Jeffers
[df90566] [PAY-1687] Web: Share tracks, playlists, and albums via Direct Message (#3828) Marcus Pasell
[ec16cc3] Upgrade sdk to beta.105 to fix rewards claiming (#3839) Dylan Jeffers
[270cc2f] [C-2923] Fix toasts in modal screens (#3838) Dylan Jeffers
[18616df] Add cypress upload test for subgenre (#3833) Raymond Jacobson
[8a76f7c] [PAY-1685] Wire up stripe UI for USDC purchase in mobile (#3837) Reed
[6337949] Fix broken track upload for electronic subgenres on mobile (#3835) nicoback2
[f643695] Fix tag input (#3832) Andrew Mendelsohn
[5da8e8f] Update userbank function usage to pass config object (#3823) Randy Schott
[8a5419d] Update dapp-store build artifacts audius-infra
[6284c14] [C-2857] Revert remove get blocknumber (#3802)" (#3826) Dylan Jeffers
[6a54b3a] [C-2742] Multi-track form pagination (#3818) Andrew Mendelsohn
[65471a1] Bump mobile versions for client v1.5.35 full app release (#3827) nicoback2
[6c88515] Revert "Add purchased + reposted tracks to library PAY-1633  (#3820)" (#3825) nicoback2
[8dc4c8a] Add purchased + reposted tracks to library PAY-1633  (#3820) nicoback2
[5ddf078] Update SDK version + ActivityFull type (#3819) nicoback2
[c643b8a] Use audius-query in USDC Purchase Drawer (#3822) Reed
[a119db1] Update bootstrap nodes (#3821) Theo Ilie
[d2630a8] [PAY-1589] Wire up Stripe Onramp in mobile (#3814) Reed
@AudiusProject AudiusProject deleted a comment from linear Bot Sep 11, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants