working edit & upload

AudiusProject · Apr 9, 2024 · 80d5ad3 · 80d5ad3
1 parent 16869d3
commit 80d5ad3
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 21 deletions.
diff --git a/packages/common/src/hooks/useAccessAndRemixSettings.ts b/packages/common/src/hooks/useAccessAndRemixSettings.ts
@@ -48,8 +48,6 @@ export const useAccessAndRemixSettings = ({
     return numEthCollectibles + numSolCollectibles === 0
   })
 
-  console.log({ isInitiallyUnlisted, isUpload, initialStreamConditions })
-
   const isInitiallyPublic =
     !isInitiallyUnlisted && !isUpload && !initialStreamConditions
 

diff --git a/packages/common/src/schemas/upload/uploadFormSchema.ts b/packages/common/src/schemas/upload/uploadFormSchema.ts
@@ -278,7 +278,7 @@ export const createCollectionSchema = (collectionType: 'playlist' | 'album') =>
             USDCPurchaseConditionsSchema,
             z.object({
               usdc_purchase: z.object({
-                albumTrackPrice: z.number().optional() // Albums can set a price for all tracks
+                albumTrackPrice: z.number().optional() // Album uploads can set a price for all tracks
               })
             })
           )

diff --git a/packages/web/src/components/create-playlist/PlaylistForm.tsx b/packages/web/src/components/create-playlist/PlaylistForm.tsx
@@ -54,7 +54,7 @@ const createCollectionFormSchema = (collectionType: 'album' | 'playlist') => {
   return createCollectionSchema(collectionType).pick({
     artwork: true,
     playlist_name: true,
-    description: true,
+    description: true
   })
 }
 
@@ -72,8 +72,6 @@ const PlaylistForm = ({
     SquareSizes.SIZE_1000_BY_1000
   )
 
-  console.log({ metadata })
-
   return (
     <Formik<EditPlaylistValues>
       initialValues={{

diff --git a/packages/web/src/components/edit-playlist/desktop/EditPlaylistModal.tsx b/packages/web/src/components/edit-playlist/desktop/EditPlaylistModal.tsx
@@ -63,7 +63,6 @@ const EditPlaylistModal = () => {
 
   const handleSubmit = useCallback(
     (formFields: any) => {
-      console.log({ formFields })
       if (playlistId) {
         dispatch(editPlaylist(playlistId, formFields))
       }

diff --git a/packages/web/src/pages/upload-page/fields/AccessAndSaleField.tsx b/packages/web/src/pages/upload-page/fields/AccessAndSaleField.tsx
@@ -14,7 +14,8 @@ import {
   USDCPurchaseConditions,
   AccessConditions
 } from '@audius/common/models'
-import { accountSelectors } from '@audius/common/store'
+import { CollectionValues } from '@audius/common/schemas'
+import { accountSelectors, EditPlaylistValues } from '@audius/common/store'
 import { formatPrice, Nullable } from '@audius/common/utils'
 import {
   IconCart,
@@ -25,7 +26,7 @@ import {
   IconVisibilityPublic,
   Text
 } from '@audius/harmony'
-import { useField } from 'formik'
+import { useField, useFormikContext } from 'formik'
 import { get, isEmpty, set } from 'lodash'
 import { useSelector } from 'react-redux'
 import { z } from 'zod'
@@ -40,7 +41,7 @@ import DynamicImage from 'components/dynamic-image/DynamicImage'
 import { defaultFieldVisibility } from 'pages/track-page/utils'
 
 import { useIndexedField, useTrackField } from '../hooks'
-import { SingleTrackEditValues } from '../types'
+import { SingleTrackEditValues, TrackEditFormValues } from '../types'
 
 import styles from './AccessAndSaleField.module.css'
 import { AccessAndSaleMenuFields } from './AccessAndSaleMenuFields'
@@ -170,7 +171,7 @@ export const AccessAndSaleFormSchema = (
     // Check for albumTrackPrice price >= min price (if applicable)
     .refine(
       (values) =>
-        isAlbum && !isUpload
+        isAlbum && isUpload
           ? refineMinPrice('albumTrackPrice', minContentPriceCents)(values)
           : true,
       {
@@ -185,7 +186,7 @@ export const AccessAndSaleFormSchema = (
     })
     .refine(
       (values) =>
-        isAlbum && !isUpload
+        isAlbum && isUpload
           ? refineMaxPrice('albumTrackPrice', maxContentPriceCents)(values)
           : true,
       {
@@ -237,7 +238,7 @@ type AccessAndSaleFieldProps = {
 }
 
 export const AccessAndSaleField = (props: AccessAndSaleFieldProps) => {
-  const { isUpload, isAlbum, forceOpen, setForceOpen } = props
+  const { isUpload = false, isAlbum, forceOpen, setForceOpen } = props
 
   const [{ value: index }] = useField('trackMetadatasIndex')
   const [{ value: trackLength }] = useIndexedField<number>(
@@ -248,6 +249,16 @@ export const AccessAndSaleField = (props: AccessAndSaleFieldProps) => {
 
   const usdcPurchaseConfig = useUSDCPurchaseConfig()
 
+  // For edit flows we need to track initial stream conditions from the parent form (not from inside contextual menu)
+  // So we take this from the parent form and pass it down to the menu fields
+  const { initialValues: parentFormInitialValues } = useFormikContext<
+    EditPlaylistValues | CollectionValues | TrackEditFormValues
+  >()
+  const parentFormInitialStreamConditions =
+    'stream_conditions' in parentFormInitialValues
+      ? (parentFormInitialValues.stream_conditions as AccessConditions)
+      : undefined
+
   // Fields from the outer form
   const [{ value: isUnlisted }, , { setValue: setIsUnlistedValue }] =
     useTrackField<SingleTrackEditValues[typeof IS_UNLISTED]>(IS_UNLISTED)
@@ -597,15 +608,14 @@ export const AccessAndSaleField = (props: AccessAndSaleFieldProps) => {
       </div>
     )
   }, [
-    fieldVisibility,
-    isUnlisted,
     savedStreamConditions,
+    isUnlisted,
+    isScheduledRelease,
+    fieldVisibility,
     preview,
-    isScheduledRelease
+    isUpload
   ])
 
-  console.log({ inititak: initialValues[STREAM_CONDITIONS] })
-
   return (
     <ContextualMenu
       label={messages.title}
@@ -629,7 +639,7 @@ export const AccessAndSaleField = (props: AccessAndSaleFieldProps) => {
           isUpload={isUpload}
           isAlbum={isAlbum}
           initialStreamConditions={
-            initialValues[STREAM_CONDITIONS] ?? undefined
+            parentFormInitialStreamConditions ?? undefined
           }
           isScheduledRelease={isScheduledRelease}
         />

diff --git a/...c/pages/upload-page/fields/stream-availability/usdc-purchase-gated/UsdcPurchaseFields.tsx b/...c/pages/upload-page/fields/stream-availability/usdc-purchase-gated/UsdcPurchaseFields.tsx
@@ -41,15 +41,15 @@ const messages = {
     albumTrackPrice: {
       title: 'Track Price',
       description:
-        'Set the price fans must pay to unlock a single track on your album (minimum price of $0.99)',
+        'Set the price fans must pay to unlock a single track on your album (minimum price of $1.00)',
       label: 'Track price',
       placeholder: '1.00'
     },
     // Album purchase flow
     albumPrice: {
       title: 'Album Price',
       description:
-        'Set the price fans must pay to unlock this album (minimum price of $0.99) ',
+        'Set the price fans must pay to unlock this album (minimum price of $1.00) ',
       label: 'Album price',
       placeholder: '5.00'
     }