Merge pull request #153 from espadonne/main

DAWn_EE and studio pages

Author: hcientist

.gitignore

@@ -33,5 +33,18 @@ yarn-error.log*
 # vercel
 .vercel
 
+# audio files for @mfwolffe DAW testing
+/public/sample_audio
 # Sentry Config File
 .env.sentry-build-plugin
+
+/public/sample_audio/
+
+# audio files for @mfwolffe DAW testing
+/public/sample_audio
+
+# asdf things
+.tool-versions
+
+# vscode things
+.vscode/settings.json

.vscode/settings.json

@@ -0,0 +1,148 @@
+# DAW Cruft Analysis & Cleanup Checklist
+
+*Generated on August 20, 2025*
+
+This document identifies orphaned, vestigial, and redundant components within the DAW system that can be safely removed or refactored to improve codebase maintainability.
+
+## Safe to Delete Immediately
+
+### Orphaned Test/Debug Components
+- [ ] **`components/audio/DAW/Multitrack/TrackDebug.js`**
+  - **Status**: Complete orphan
+  - **Justification**: Not imported anywhere in the codebase
+  - **Context**: Appears to be a debugging component left over from development
+  - **Risk**: None - no references found
+
+- [ ] **`components/audio/DAW/Multitrack/SimpleWaveformTest.js`**
+  - **Status**: Complete orphan
+  - **Justification**: Not imported or referenced anywhere
+  - **Context**: Test component with hardcoded `console.log` statements
+  - **Risk**: None - clearly a development artifact
+
+- [ ] **`components/audio/DAW/Multitrack/VirtualPiano.js`**
+  - **Status**: Complete orphan
+  - **Justification**: Not imported anywhere, potentially redundant with existing piano components
+  - **Context**: Appears to be an alternate implementation or abandoned feature
+  - **Risk**: None - no usage found
+
+### Deprecated Effect System
+- [ ] **`components/audio/DAW/Effects/index.js`**
+  - **Status**: Deprecated placeholder
+  - **Justification**: File contains comment "This file is kept for backward compatibility" and returns `null`
+  - **Context**: Old effects system replaced by `EffectsRack.js`
+  - **Risk**: None - explicitly marked as deprecated
+
+## Investigate Before Deleting
+
+### Legacy DAW Implementation
+- [ ] **`components/audio/daw-old/dawStd.js`**
+  - **Status**: Appears orphaned but needs verification
+  - **Justification**: `DawStd` component not imported anywhere, but file is substantial (278 lines)
+  - **Context**: Legacy single-track DAW implementation, replaced by new DAW system
+  - **Risk**: Low - but verify no dynamic imports or runtime references
+  - **Action**: Search for any string references to "dawStd" or "DawStd" in runtime code
+
+- [ ] **`components/audio/daw-old/control.js`**
+  - **Status**: Dependent on dawStd.js
+  - **Justification**: Only imported by `dawStd.js` - if dawStd is removed, this becomes orphaned
+  - **Context**: UI controls for legacy DAW implementation
+  - **Risk**: Low - remove after confirming dawStd.js removal
+
+### Potentially Unused Canvas Component
+- [ ] **`components/audio/DAW/Multitrack/TrackWaveCanvas.jsx`**
+  - **Status**: Not imported anywhere
+  - **Justification**: No import statements found for this component
+  - **Context**: Might be an alternate waveform rendering implementation
+  - **Risk**: Medium - could be used dynamically or be a newer implementation
+  - **Action**: Check git history and verify if this is a newer/alternate implementation
+
+## Refactor Candidates
+
+### Extract Dependencies from Legacy Code
+- [ ] **Extract `MinimapContainer` from `daw-old/common.js`**
+  - **Status**: Still needed by current DAW
+  - **Justification**: Used in `components/audio/DAW/Waveform.js`
+  - **Context**: Only component from old system still in use
+  - **Action**: Move to its own file, update import in `Waveform.js`
+  - **Risk**: Low - straightforward extraction
+
+- [ ] **Extract `HelpModal` from `daw-old/dawHelp.js`**
+  - **Status**: Still needed by current DAW
+  - **Justification**: Used in `components/audio/DAW/index.js`
+  - **Context**: Help system shared between old and new DAW
+  - **Action**: Move to shared location like `components/common/` or `components/DAW/`
+  - **Risk**: Low - clean extraction
+
+- [ ] **Clean up remaining `daw-old/common.js`**
+  - **Status**: Partially used
+  - **Justification**: After extracting `MinimapContainer`, check what else is exported/used
+  - **Context**: Large file (290+ lines) with multiple exports, some likely unused
+  - **Action**: Remove unused exports after extracting needed components
+  - **Risk**: Medium - need to verify all exports are truly unused
+
+## Questionable Components (Need Investigation)
+
+### Potentially Redundant Piano Components
+- [ ] **`components/audio/DAW/Multitrack/PianoKeyboard.js`**
+  - **Status**: Imported by MIDI components but might be redundant
+  - **Justification**: Similar functionality to `VirtualPiano.js` (which is orphaned)
+  - **Context**: Part of MIDI track functionality
+  - **Action**: Verify this is the "correct" piano implementation vs VirtualPiano
+  - **Risk**: Medium - used in MIDI system
+
+### MIDI/Pattern System Components
+- [ ] **Verify usage of Pattern system**
+  - **Components**: `PatternLibrary.js`, `PatternClipRenderer.js`
+  - **Status**: Used by `MIDITrack.js` but might be incomplete feature
+  - **Context**: MIDI pattern/clip system that might not be fully implemented
+  - **Action**: Test MIDI functionality to verify these are working features
+  - **Risk**: High - could break MIDI functionality
+
+## Impact Analysis
+
+### Files Currently Safe to Delete
+- **Count**: 4 files
+- **Total LOC**: ~200-300 lines (estimated)
+- **Dependencies**: None
+
+### Files Requiring Investigation
+- **Count**: 6-8 files
+- **Total LOC**: ~500-800 lines (estimated)
+- **Dependencies**: Some interdependent (dawStd.js → control.js)
+
+### Cleanup Benefits
+- **Code Reduction**: Potentially 700-1100 lines of dead code
+- **Maintenance**: Reduced cognitive load when navigating DAW components
+- **Clarity**: Cleaner import structure and component organization
+- **Build Size**: Marginal reduction in bundle size
+
+## Warnings & Considerations
+
+1. **Runtime References**: Some components might be referenced via string lookups or dynamic imports
+2. **Feature Completeness**: Some "orphaned" components might be newer implementations not yet integrated
+3. **Git History**: Check component creation dates and recent commits before deletion
+4. **User Impact**: Verify no user-facing features depend on questionable components
+5. **Testing**: Ensure full DAW functionality testing after any removals
+
+## Recommended Cleanup Order
+
+1. **Phase 1**: Delete confirmed orphans (TrackDebug, SimpleWaveformTest, VirtualPiano, Effects/index.js)
+2. **Phase 2**: Extract and relocate still-needed components from daw-old
+3. **Phase 3**: Investigate and remove legacy DAW implementation (dawStd.js, control.js)
+4. **Phase 4**: Clean up remaining daw-old files
+5. **Phase 5**: Investigate questionable multitrack components
+
+## Testing Checklist
+
+After any deletions, verify:
+- [ ] Single-track DAW functionality (waveform, effects, transport)
+- [ ] Multi-track DAW functionality (track management, mixing)
+- [ ] MIDI recording and playback
+- [ ] Effects rack functionality
+- [ ] Help system accessibility
+- [ ] Audio import/export
+- [ ] Project save/load (if implemented)
+
+---
+
+*Note: This analysis was performed via static code analysis. Dynamic usage patterns and runtime behavior should be verified before making changes.*

DAW-CRUFT.md

@@ -533,10 +533,18 @@ export function postRecording({
     } = getState();
 
     dispatch(beginUpload(submissionId));
-    // let body = ''
+
+    // Try to get activity log from window global if composition not provided
+    let activityLogContent = composition;
+    if (!activityLogContent && typeof window !== 'undefined' && window.__PENDING_ACTIVITY_LOG__) {
+      activityLogContent = window.__PENDING_ACTIVITY_LOG__;
+      console.log('📊 Using activity log from window global for submission content');
+    }
+
     let bodyObj = { content: 'N/A for Perform submissions' };
-    if (composition) {
-      bodyObj = { content: composition };
+    if (activityLogContent) {
+      bodyObj = { content: activityLogContent };
+      console.log('📊 Setting submission content with activity log');
     }
 
     bodyObj.index = index;
@@ -555,14 +563,47 @@ export function postRecording({
       .then(assertResponse)
       .then((res) => res.json())
       .then((submission) => {
+        // Create FormData for the file upload
+        // Django/DRF typically expects 'file' as the field name
+        const formData = new FormData();
+
+        // Determine filename extension from MIME type
+        let extension = 'webm';
+        if (audio.type) {
+          if (audio.type.includes('webm')) extension = 'webm';
+          else if (audio.type.includes('ogg')) extension = 'ogg';
+          else if (audio.type.includes('wav')) extension = 'wav';
+          else if (audio.type.includes('mp4')) extension = 'mp4';
+          else if (audio.type.includes('mpeg') || audio.type.includes('mp3')) extension = 'mp3';
+        }
+
+        // Append the audio file with 'file' as the field name (standard Django field name)
+        formData.append('file', audio, `recording.${extension}`);
+
+        console.log('📊 Uploading audio:', {
+          fieldName: 'file',
+          filename: `recording.${extension}`,
+          type: audio.type,
+          size: audio.size
+        });
+
+        // Note: Activity log is now sent in the submission content field above,
+        // not as a separate attachment field. Clear the window global.
+        if (typeof window !== 'undefined' && window.__PENDING_ACTIVITY_LOG__) {
+          console.log('📊 Activity log was already included in submission content');
+          window.__PENDING_ACTIVITY_LOG__ = null;
+          window.__PENDING_ACTIVITY_LOG_TIMESTAMP__ = null;
+        }
+
         fetch(
           `${process.env.NEXT_PUBLIC_BACKEND_HOST}/api/courses/${slug}/assignments/${assignmentId}/submissions/${submission.id}/attachments/`,
           {
             headers: {
               Authorization: `Token ${token}`,
+              // Don't set Content-Type - let browser set it with multipart boundary
             },
             method: 'POST',
-            body: audio,
+            body: formData,
           },
         )
           .then(assertResponse)

actions.js

@@ -174,3 +174,62 @@ export function getAssignedPieces(assignments) {
     return pieces;
   };
 }
+
+// ========== Activity Progress API ==========
+
+export async function getActivityProgress({ slug, assignmentId }) {
+  const endpoint = `courses/${slug}/assignments/${assignmentId}/activity-progress/`;
+  try {
+    const json = await makeRequest(endpoint);
+    return json;
+  } catch (error) {
+    // Return null if not found (first time accessing)
+    if (error.message.includes('404')) {
+      return null;
+    }
+    throw error;
+  }
+}
+
+export function mutateLogActivityEvent({ slug, assignmentId }) {
+  return async ({ operation, step, data = {} }) => {
+    const endpoint = `courses/${slug}/assignments/${assignmentId}/activity-progress/log_event/`;
+    const body = { operation, step, data };
+    const json = await makeRequest(endpoint, 'POST', body);
+    return json;
+  };
+}
+
+export function mutateSubmitActivityStep({ slug, assignmentId }) {
+  return async ({ questionResponses = {}, step = null }) => {
+    const endpoint = `courses/${slug}/assignments/${assignmentId}/activity-progress/submit_step/`;
+    const body = { question_responses: questionResponses };
+    if (step !== null) {
+      body.step = step;
+    }
+    const json = await makeRequest(endpoint, 'POST', body);
+    return json;
+  };
+}
+
+export function mutateSaveQuestionResponse({ slug, assignmentId }) {
+  return async ({ questionId, response }) => {
+    const endpoint = `courses/${slug}/assignments/${assignmentId}/activity-progress/save_response/`;
+    const body = { question_id: questionId, response };
+    const json = await makeRequest(endpoint, 'POST', body);
+    return json;
+  };
+}
+
+export function mutateSaveAudioState({ slug, assignmentId }) {
+  return async ({ audioUrl, editHistory, metadata }) => {
+    const endpoint = `courses/${slug}/assignments/${assignmentId}/activity-progress/save_audio_state/`;
+    const body = {
+      audio_url: audioUrl,
+      edit_history: editHistory,
+      metadata,
+    };
+    const json = await makeRequest(endpoint, 'POST', body);
+    return json;
+  };
+}