Fixed custom sounds list issue

When a custom sound was uploaded a long list of unrecognisable sounds.
irllabs · Apr 7, 2022 · 3770134 · 3770134
1 parent cc617b6
commit 3770134
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 10 deletions.
diff --git a/src/audio-engine/Instruments.js b/src/audio-engine/Instruments.js
@@ -96,7 +96,7 @@ const Instruments = {
         options = _.sortBy(options, "label");
         return options;
     },
-    getInstrumentArticulationOptions(instrumentName, userId) {
+    getInstrumentArticulationOptions(instrumentName, userId, instrument) {
         // console.log('getInstrumentArticulationOptions()', instrumentName);
         if (instrumentName !== 'custom') {
             let options = [];
@@ -114,13 +114,20 @@ const Instruments = {
         } else {
             let options = []
             //   console.log('CustomSamples.samples', CustomSamples.samples);
-            for (let [id, sample] of Object.entries(CustomSamples.samples)) {
-                if (sample.createdBy === userId) {
-                    options.push({
-                        name: sample.name,
-                        value: id
-                    })
+            if (instrumentName !== 'custom' && !instrument.sampleId)
+                for (let [id, sample] of Object.entries(CustomSamples.samples)) {
+                    if (sample.createdBy === userId) {
+                        options.push({
+                            name: sample.name,
+                            value: id
+                        })
+                    }
                 }
+            else {
+                options.push({
+                    name: instrument.displayName,
+                    value: instrument.displayName
+                })
             }
             //   console.log('got sample options', options);
             return options

diff --git a/src/components/dialogs/CreateRoundModal.js b/src/components/dialogs/CreateRoundModal.js
@@ -260,6 +260,7 @@ const CreateRoundModal = ({
             urls && Array.isArray(urls) && urls.forEach(async url => {
                 let sample = getDefaultSample(user.id)
                 sample.remoteURL = url
+                sample.displayName = 'Custom'
                 await firebase.createSample(sample)
                 newSamples.push(sample)
                 if (newSamples.length === urls.length) {

diff --git a/src/components/play/layer-settings/LayerInstrument.js b/src/components/play/layer-settings/LayerInstrument.js
@@ -33,9 +33,10 @@ const LayerInstrument = ({
 }) => {
     const [selectedInstrument, setSelectedInstrument] = React.useState(selectedLayer.instrument.sampler)
     const [selectedArticulation, setSelectedArticulation] = React.useState(selectedLayer.instrument.sample)
+    const [selectedInstrumentFull, setSelectedInstrumentFull] = React.useState(selectedLayer.instrument)
     const dispatch = useDispatch();
     const instrumentOptions = Instruments.getInstrumentOptions(false)
-    const articulationOptions = Instruments.getInstrumentArticulationOptions(selectedInstrument, user.id)
+    const articulationOptions = Instruments.getInstrumentArticulationOptions(selectedInstrument, user.id, selectedInstrumentFull)
     const firebase = useContext(FirebaseContext);
 
     const onInstrumentSelect = async (instrument) => {
@@ -56,9 +57,10 @@ const LayerInstrument = ({
     }
 
     useEffect(() => {
+        setSelectedInstrumentFull(selectedLayer.instrument)
         setSelectedInstrument(selectedLayer.instrument.sampler)
         setSelectedArticulation(selectedLayer.instrument.sample)
-        hideAllLayerInspectorModals();
+        hideAllLayerInspectorModals()
     }, [selectedLayer, hideAllLayerInspectorModals])
 
     const onArticulationSelect = async (articulation) => {

diff --git a/src/utils/defaultData.js b/src/utils/defaultData.js
@@ -66,7 +66,8 @@ export const generateLayers = async (samples, userId) => {
                 "instrument": "Sampler",
                 "sampler": 'custom',
                 "sample": articulation.name,
-                "sampleId": sample.id
+                "sampleId": sample.id,
+                "displayName": sample.displayName
             })
             layers.push(layer)
             if (layers.length === samples.length)