Skip to content

Speakr is a personal, self-hosted web application designed for transcribing audio recordings

Python

Improve folder UI: sidebar selector, title bar icon, folder pills, and fix type coercion

Murtaza Nasirf11deb699f2b
diff --git a/src/api/folders.py b/src/api/folders.py
index 15d8caf5..06345840 100644
--- a/src/api/folders.py
+++ b/src/api/folders.py
@@ -416,10 +416,9 @@ def assign_recording_folder(recording_id):
if not recording:
return jsonify({'error': 'Recording not found'}), 404
- # Check access to recording
+ # Check access to recording (require edit permission)
if has_recording_access:
- has_access, permission = has_recording_access(recording, current_user)
- if not has_access or permission not in ['owner', 'edit']:
+ if not has_recording_access(recording, current_user, require_edit=True):
return jsonify({'error': 'You do not have permission to modify this recording'}), 403
else:
# Fallback: only owner can assign folder
@@ -481,10 +480,9 @@ def remove_recording_folder(recording_id):
if not recording:
return jsonify({'error': 'Recording not found'}), 404
- # Check access to recording
+ # Check access to recording (require edit permission)
if has_recording_access:
- has_access, permission = has_recording_access(recording, current_user)
- if not has_access or permission not in ['owner', 'edit']:
+ if not has_recording_access(recording, current_user, require_edit=True):
return jsonify({'error': 'You do not have permission to modify this recording'}), 403
else:
# Fallback: only owner can remove folder
@@ -539,10 +537,9 @@ def bulk_assign_folder():
if not recording:
continue
- # Check access
+ # Check access (require edit permission)
if has_recording_access:
- has_access, permission = has_recording_access(recording, current_user)
- if not has_access or permission not in ['owner', 'edit']:
+ if not has_recording_access(recording, current_user, require_edit=True):
continue
else:
if recording.user_id != current_user.id:
diff --git a/src/api/recordings.py b/src/api/recordings.py
index d01bf0bc..57ff492b 100644
--- a/src/api/recordings.py
+++ b/src/api/recordings.py
@@ -1374,6 +1374,7 @@ def get_recordings_paginated():
show_starred = request.args.get('starred', '').lower() == 'true'
show_inbox = request.args.get('inbox', '').lower() == 'true'
sort_by = request.args.get('sort_by', 'created_at') # 'created_at' or 'meeting_date'
+ folder_filter = request.args.get('folder', '').strip() # folder_id or 'none' for no folder
# Get all accessible recording IDs (own + shared)
accessible_recording_ids = get_accessible_recording_ids(current_user.id)
@@ -1441,6 +1442,19 @@ def get_recordings_paginated():
)
)
+ # Apply folder filter (AND with other filters)
+ if folder_filter:
+ if folder_filter.lower() == 'none':
+ # Filter recordings with no folder
+ stmt = stmt.where(Recording.folder_id.is_(None))
+ else:
+ # Filter by specific folder_id
+ try:
+ folder_id = int(folder_filter)
+ stmt = stmt.where(Recording.folder_id == folder_id)
+ except ValueError:
+ pass # Invalid folder_id, ignore filter
+
# Apply search filters if provided
if search_query:
# Extract date filters
@@ -2114,6 +2128,16 @@ def upload_file():
if tag and (tag.user_id == current_user.id or (tag.group_id and GroupMembership.query.filter_by(group_id=tag.group_id, user_id=current_user.id).first())):
selected_tags.append(tag)
+ # Get folder_id if provided
+ selected_folder = None
+ folder_id = request.form.get('folder_id')
+ if folder_id:
+ folder = Folder.query.filter_by(id=folder_id).first()
+ if folder:
+ # Allow folder if it's user's own folder OR it's a group folder where user is a member
+ if folder.user_id == current_user.id or (folder.group_id and GroupMembership.query.filter_by(group_id=folder.group_id, user_id=current_user.id).first()):
+ selected_folder = folder
+
# Get ASR advanced options if provided
language = request.form.get('language', '')
min_speakers = request.form.get('min_speakers') or None
@@ -2131,10 +2155,20 @@ def upload_file():
except (ValueError, TypeError):
max_speakers = None
- # Apply precedence hierarchy: user input > tag defaults > environment variables > auto-detect
+ # Apply precedence hierarchy: user input > tag defaults > folder defaults > environment variables > auto-detect
+
+ # Apply folder defaults first (lower priority than tags)
+ if selected_folder and not selected_tags:
+ # Only apply folder defaults if no tags are selected (tags take priority)
+ if not language and selected_folder.default_language:
+ language = selected_folder.default_language
+ if min_speakers is None and selected_folder.default_min_speakers:
+ min_speakers = selected_folder.default_min_speakers
+ if max_speakers is None and selected_folder.default_max_speakers:
+ max_speakers = selected_folder.default_max_speakers
# Apply tag defaults if tags are selected and values are not explicitly provided by user
- # Use first tag's defaults (highest priority)
+ # Use first tag's defaults (highest priority - overrides folder)
if selected_tags:
first_tag = selected_tags[0]
if not language and first_tag.default_language:
@@ -2193,6 +2227,7 @@ def upload_file():
user_id=current_user.id,
mime_type=mime_type,
notes=notes,
+ folder_id=selected_folder.id if selected_folder else None,
processing_source='upload' # Track that this was manually uploaded
)
db.session.add(recording)
diff --git a/static/js/app.modular.js b/static/js/app.modular.js
index 59a1f590..dee19475 100644
--- a/static/js/app.modular.js
+++ b/static/js/app.modular.js
@@ -2017,6 +2017,16 @@ document.addEventListener('DOMContentLoaded', async () => {
recordingsComposable.loadRecordings(1, false, searchQuery.value);
});
+ watch(filterFolder, (newValue) => {
+ // Persist folder selection to localStorage
+ if (newValue) {
+ localStorage.setItem('selectedFolder', newValue);
+ } else {
+ localStorage.removeItem('selectedFolder');
+ }
+ recordingsComposable.loadRecordings(1, false, searchQuery.value);
+ });
+
watch(sortBy, () => {
recordingsComposable.loadRecordings(1, false, searchQuery.value);
});
@@ -2169,6 +2179,15 @@ document.addEventListener('DOMContentLoaded', async () => {
showUsernamesInUI.value = config.show_usernames_in_ui === true;
enableIncognitoMode.value = config.enable_incognito_mode === true;
foldersEnabled.value = config.enable_folders === true;
+
+ // Restore saved folder selection from localStorage
+ if (foldersEnabled.value) {
+ const savedFolder = localStorage.getItem('selectedFolder');
+ if (savedFolder) {
+ filterFolder.value = savedFolder;
+ }
+ }
+
// Set default incognito mode state if feature enabled and default is true
if (config.enable_incognito_mode && config.incognito_mode_default) {
incognitoMode.value = true;
diff --git a/static/js/modules/composables/folders.js b/static/js/modules/composables/folders.js
index e5a3cf10..152e3843 100644
--- a/static/js/modules/composables/folders.js
+++ b/static/js/modules/composables/folders.js
@@ -12,10 +12,28 @@ export function useFolders({
showToast,
setGlobalError
}) {
- // Computed
+ // Computed / Helpers
const getRecordingFolder = (recording) => {
- if (!recording || !recording.folder) return null;
- return recording.folder;
+ if (!recording || !recording.folder_id) return null;
+ // Try to get from recording.folder first, then lookup
+ if (recording.folder) return recording.folder;
+ return availableFolders.value?.find(f => f.id === recording.folder_id) || null;
+ };
+
+ const getFolderById = (folderId) => {
+ if (!folderId || !availableFolders.value) return null;
+ // Use == for loose equality to handle string/number type mismatch (e.g., from localStorage)
+ return availableFolders.value.find(f => f.id == folderId) || null;
+ };
+
+ const getFolderColor = (folderId) => {
+ const folder = getFolderById(folderId);
+ return folder?.color || '#10B981';
+ };
+
+ const getFolderName = (folderId) => {
+ const folder = getFolderById(folderId);
+ return folder?.name || 'Folder';
};
const getAvailableFoldersForRecording = () => {
@@ -144,6 +162,9 @@ export function useFolders({
return {
// Methods
getRecordingFolder,
+ getFolderById,
+ getFolderColor,
+ getFolderName,
getAvailableFoldersForRecording,
assignFolderToRecording,
removeRecordingFromFolder,
diff --git a/static/js/modules/composables/recordings.js b/static/js/modules/composables/recordings.js
index 4ceb1672..2929c686 100644
--- a/static/js/modules/composables/recordings.js
+++ b/static/js/modules/composables/recordings.js
@@ -11,7 +11,7 @@ export function useRecordings(state, utils, reprocessComposable) {
currentPage, perPage, totalRecordings, totalPages, hasNextPage, hasPrevPage,
showSharedWithMe, showArchivedRecordings, searchQuery, searchDebounceTimer,
filterTags, filterSpeakers, filterDatePreset, filterDateRange, filterTextQuery,
- filterStarred, filterInbox, sortBy,
+ filterStarred, filterInbox, filterFolder, sortBy,
availableTags, availableSpeakers, availableFolders, selectedTagIds, uploadLanguage, uploadMinSpeakers, uploadMaxSpeakers,
useAsrEndpoint, connectorSupportsDiarization, globalError, uploadQueue, isProcessingActive, currentView,
isMobileScreen, isSidebarCollapsed, isRecording, audioBlobURL,
@@ -62,6 +62,11 @@ export function useRecordings(state, utils, reprocessComposable) {
params.set('inbox', 'true');
}
+ // Add folder filter
+ if (filterFolder && filterFolder.value) {
+ params.set('folder', filterFolder.value);
+ }
+
const response = await fetch(`${endpoint}?${params}`);
const data = await response.json();
if (!response.ok) throw new Error(data.error || 'Failed to load recordings');
@@ -387,6 +392,7 @@ export function useRecordings(state, utils, reprocessComposable) {
filterTextQuery.value = '';
filterStarred.value = false;
filterInbox.value = false;
+ // Note: filterFolder is NOT cleared here - it's a navigation element, not a filter
searchQuery.value = '';
};
diff --git a/static/js/modules/composables/upload.js b/static/js/modules/composables/upload.js
index 47127e8f..0eb96c42 100644
--- a/static/js/modules/composables/upload.js
+++ b/static/js/modules/composables/upload.js
@@ -37,6 +37,8 @@ export function useUpload(state, utils) {
selectedTagIds, uploadLanguage, uploadMinSpeakers, uploadMaxSpeakers,
useAsrEndpoint, connectorSupportsDiarization, asrLanguage, asrMinSpeakers, asrMaxSpeakers,
dragover, availableTags, uploadTagSearchFilter,
+ // Folder state
+ availableFolders, selectedFolderId,
// Incognito mode state
incognitoMode, incognitoRecording, incognitoProcessing,
// View state
@@ -322,6 +324,12 @@ export function useUpload(state, utils) {
formData.append(`tag_ids[${index}]`, tagId);
});
+ // Add folder if selected
+ const folderToUse = nextFileItem.folder_id || selectedFolderId.value;
+ if (folderToUse) {
+ formData.append('folder_id', folderToUse);
+ }
+
// Add diarization options if connector supports it
if (connectorSupportsDiarization.value) {
const asrOpts = nextFileItem.asrOptions || {};
diff --git a/static/locales/en.json b/static/locales/en.json
index 0853715f..9ec0f0d8 100644
--- a/static/locales/en.json
+++ b/static/locales/en.json
@@ -91,6 +91,7 @@
"about": "About",
"apiTokens": "API Tokens",
"customPrompts": "Custom Prompts",
+ "folderManagement": "Folder Management",
"namingTemplates": "Naming",
"promptOptions": "Prompt Options",
"sharedTranscripts": "Shared Transcripts",
@@ -977,6 +978,41 @@
"minSpeakers": "Min",
"noTags": "You haven't created any tags yet."
},
+ "folderManagement": {
+ "title": "Folder Management",
+ "description": "Organize your recordings into folders. Unlike tags, a recording can only belong to one folder. Folder prompts are applied before user prompts but after tag prompts.",
+ "createFolder": "Create Folder",
+ "editFolder": "Edit Folder",
+ "deleteFolder": "Delete Folder",
+ "folderName": "Folder Name",
+ "folderColor": "Folder Color",
+ "noFolders": "No folders created yet",
+ "noFoldersDescription": "Create your first folder to organize your recordings",
+ "customPrompt": "Custom Prompt",
+ "asrDefaults": "ASR Defaults",
+ "minSpeakers": "Min Speakers",
+ "maxSpeakers": "Max Speakers",
+ "defaultLanguage": "Default Language",
+ "retentionSettings": "Retention Settings",
+ "retentionDays": "Retention Days",
+ "retentionDaysHelp": "Recordings in this folder will be deleted after this many days. Leave empty to use global retention.",
+ "protectFromDeletion": "Protect from Deletion",
+ "protectFromDeletionHelp": "Protect recordings in this folder from auto-deletion",
+ "groupSettings": "Group Settings",
+ "autoShareOnApply": "Auto-share with group members",
+ "autoShareOnApplyHelp": "Auto-share recordings with all group members when added to this folder",
+ "shareWithGroupLead": "Share with group admins",
+ "shareWithGroupLeadHelp": "Share recordings with group admins when added to this folder",
+ "namingTemplate": "Naming Template",
+ "selectNamingTemplate": "Select naming template...",
+ "recordings": "recordings",
+ "confirmDelete": "Are you sure you want to delete this folder? Recordings will be removed from this folder but not deleted.",
+ "filterByFolder": "Filter by Folder",
+ "allFolders": "All Folders",
+ "noFolder": "No Folder",
+ "moveToFolder": "Move to Folder",
+ "removeFromFolder": "Remove from folder"
+ },
"tags": {
"addTag": "Add Tag",
"clearTagFilter": "Clear filter",
diff --git a/templates/account.html b/templates/account.html
index 7b0b3a21..7a9565b7 100644
--- a/templates/account.html
+++ b/templates/account.html
@@ -456,7 +456,7 @@
<i class="fas fa-users mr-0.5 sm:mr-2 text-xs sm:text-sm"></i><span data-i18n="accountTabs.speakersManagement">Speakers</span>
</a>
<a href="#" id="tab-folders" class="inline-flex items-center whitespace-nowrap py-1 px-1.5 sm:py-3 sm:px-3 border-b-2 font-medium text-xs sm:text-sm border-transparent text-[var(--text-muted)] hover:text-[var(--text-secondary)] hover:border-[var(--border-secondary)] rounded-t-md sm:rounded-t-lg hover:bg-[var(--bg-tertiary)]" style="display: none;">
- <i class="fas fa-folder mr-0.5 sm:mr-2 text-xs sm:text-sm"></i><span data-i18n="accountTabs.folderManagement">Folders</span>
+ <i class="fas fa-folder mr-0.5 sm:mr-2 text-xs sm:text-sm"></i><span data-i18n="accountTabs.folderManagement">Folder Management</span>
</a>
<a href="#" id="tab-tags" class="inline-flex items-center whitespace-nowrap py-1 px-1.5 sm:py-3 sm:px-3 border-b-2 font-medium text-xs sm:text-sm border-transparent text-[var(--text-muted)] hover:text-[var(--text-secondary)] hover:border-[var(--border-secondary)] rounded-t-md sm:rounded-t-lg hover:bg-[var(--bg-tertiary)]">
<i class="fas fa-tags mr-0.5 sm:mr-2 text-xs sm:text-sm"></i><span data-i18n="accountTabs.tagManagement">Tags</span>
@@ -884,11 +884,11 @@
<!-- Folders Tab Content -->
<div id="content-folders" class="hidden tab-content pt-6">
- <h2 class="text-2xl font-semibold text-[var(--text-primary)] mb-6" data-i18n="accountTabs.folderManagement">Folder Management</h2>
+ <h2 class="text-2xl font-semibold text-[var(--text-primary)] mb-6" data-i18n="folderManagement.title">Folder Management</h2>
<div class="mb-6">
<div class="flex justify-between items-center mb-4">
- <p class="text-[var(--text-secondary)]">Organize your recordings into folders. Unlike tags, a recording can only belong to one folder. Folder prompts are applied before user prompts but after tag prompts.</p>
+ <p class="text-[var(--text-secondary)]" data-i18n="folderManagement.description">Organize your recordings into folders. Unlike tags, a recording can only belong to one folder. Folder prompts are applied before user prompts but after tag prompts.</p>
<button id="createFolderBtn" class="inline-flex items-center px-4 py-2 bg-[var(--bg-button)] text-[var(--text-button)] rounded-md hover:bg-[var(--bg-button-hover)] focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-[var(--border-focus)] transition-colors duration-200">
<i class="fas fa-plus mr-2"></i> <span data-i18n="folderManagement.createFolder">Create Folder</span>
</button>
@@ -897,20 +897,20 @@
<!-- Loading state -->
<div id="foldersLoading" class="text-center py-8 hidden">
<i class="fas fa-spinner fa-spin text-2xl text-[var(--text-muted)]"></i>
- <p class="text-[var(--text-muted)] mt-2">Loading folders...</p>
+ <p class="text-[var(--text-muted)] mt-2" data-i18n="common.loading">Loading...</p>
</div>
<!-- Error state -->
<div id="foldersError" class="hidden bg-[var(--bg-danger-light)] text-[var(--text-danger-strong)] p-3 rounded-lg mb-4">
<i class="fas fa-exclamation-triangle mr-2"></i>
- <span id="foldersErrorMessage">Failed to load folders</span>
+ <span id="foldersErrorMessage" data-i18n="common.error">Failed to load folders</span>
</div>
<!-- Empty state -->
<div id="foldersEmpty" class="text-center py-12 hidden">
<i class="fas fa-folder text-4xl text-[var(--text-light)] mb-4"></i>
- <p class="text-[var(--text-muted)] text-lg mb-2">No folders created yet</p>
- <p class="text-sm text-[var(--text-light)]">Create your first folder to organize your recordings</p>
+ <p class="text-[var(--text-muted)] text-lg mb-2" data-i18n="folderManagement.noFolders">No folders created yet</p>
+ <p class="text-sm text-[var(--text-light)]" data-i18n="folderManagement.noFoldersDescription">Create your first folder to organize your recordings</p>
</div>
<!-- Folders grid -->
diff --git a/templates/components/detail/desktop-header.html b/templates/components/detail/desktop-header.html
index 6dea6061..af00857c 100644
--- a/templates/components/detail/desktop-header.html
+++ b/templates/components/detail/desktop-header.html
@@ -43,6 +43,21 @@
<div class="flex items-center gap-2 ml-4">
<!-- Incognito recordings have limited actions -->
<template v-if="!selectedRecording.incognito">
+ <!-- Folder Assignment (icon-only dropdown matching other buttons) -->
+ <div v-if="foldersEnabled && selectedRecording.can_edit !== false"
+ class="relative p-2 rounded-lg hover:bg-[var(--bg-tertiary)] transition-colors"
+ :title="selectedRecording.folder_id ? getFolderName(selectedRecording.folder_id) : 'Assign Folder'">
+ <select @change="assignFolderToRecording(selectedRecording.id, $event.target.value || null)"
+ :value="selectedRecording.folder_id || ''"
+ class="absolute inset-0 w-full h-full opacity-0 cursor-pointer">
+ <option value="">No Folder</option>
+ <option v-for="folder in availableFolders" :key="folder.id" :value="folder.id">
+ ${ folder.name }
+ </option>
+ </select>
+ <i class="fas fa-folder"
+ :style="{ color: selectedRecording.folder_id ? getFolderColor(selectedRecording.folder_id) : '' }"></i>
+ </div>
<button @click="toggleInbox(selectedRecording)"
class="p-2 rounded-lg hover:bg-[var(--bg-tertiary)] transition-colors"
:class="selectedRecording.is_inbox ? 'text-blue-500' : ''"
@@ -109,67 +124,52 @@
<!-- Metadata Row -->
<div class="flex flex-wrap items-center gap-x-6 gap-y-2 text-sm text-[var(--text-muted)] mt-2">
- <!-- Shared Status Badges and Tags -->
- <div v-if="selectedRecording.is_shared || selectedRecording.shared_with_count > 0 || selectedRecording.public_share_count > 0 || selectedRecording.has_group_tags || (selectedRecording.tags && selectedRecording.tags.length > 0)" class="flex items-center gap-1.5 flex-wrap">
+ <!-- Folder Pill, Shared Status Badges and Tags -->
+ <div v-if="(foldersEnabled && selectedRecording.folder_id && !selectedRecording.incognito) || selectedRecording.is_shared || selectedRecording.shared_with_count > 0 || selectedRecording.public_share_count > 0 || selectedRecording.has_group_tags || (selectedRecording.tags && selectedRecording.tags.length > 0)" class="flex items-center gap-1.5 flex-wrap">
+ <!-- Folder Pill (shown when folder assigned) -->
+ <span v-if="foldersEnabled && selectedRecording.folder_id && !selectedRecording.incognito"
+ class="inline-flex items-center px-2 py-0.5 text-xs font-medium rounded-full"
+ :style="{ backgroundColor: getFolderColor(selectedRecording.folder_id), color: getContrastTextColor(getFolderColor(selectedRecording.folder_id)) }"
+ :title="'Folder: ' + getFolderName(selectedRecording.folder_id)">
+ <i class="fas fa-folder mr-1 text-[10px]" style="vertical-align: middle; line-height: 0;"></i>
+ ${ getFolderName(selectedRecording.folder_id) }
+ </span>
<!-- Shared by someone else (INCOMING) -->
<span v-if="selectedRecording.is_shared"
- class="inline-flex items-center justify-center w-5 h-5 text-[10px] font-medium rounded-full bg-purple-500 text-white cursor-help"
+ class="inline-flex items-center justify-center w-5 h-5 text-[10px] font-medium rounded-full bg-purple-500 text-white"
:title="t('sharing.sharedBy') + ' ' + (selectedRecording.owner_username || t('sharing.unknown'))">
<i class="fas fa-arrow-down" style="vertical-align: middle; line-height: 0;"></i>
</span>
<!-- Group indicator (show for both owned and shared recordings with group tags) -->
<span v-if="selectedRecording.has_group_tags"
- class="inline-flex items-center justify-center w-5 h-5 text-[10px] font-medium rounded-full bg-blue-500 text-white cursor-help"
+ class="inline-flex items-center justify-center w-5 h-5 text-[10px] font-medium rounded-full bg-blue-500 text-white"
:title="t('sharing.teamRecording')">
<i class="fas fa-users" style="vertical-align: middle; line-height: 0;"></i>
</span>
<!-- Shared with others (OUTGOING) -->
<span v-if="!selectedRecording.is_shared && selectedRecording.shared_with_count > 0"
- class="inline-flex items-center justify-center w-5 h-5 text-[10px] font-medium rounded-full bg-indigo-500 text-white cursor-help"
+ class="inline-flex items-center justify-center w-5 h-5 text-[10px] font-medium rounded-full bg-indigo-500 text-white"
:title="t('sharing.sharedWith') + ' ' + selectedRecording.shared_with_count + ' ' + t('sharing.users')">
<i class="fas fa-arrow-up" style="vertical-align: middle; line-height: 0;"></i>
</span>
<!-- Public link shares -->
<span v-if="!selectedRecording.is_shared && selectedRecording.public_share_count > 0"
- class="inline-flex items-center justify-center w-5 h-5 text-[10px] font-medium rounded-full bg-teal-500 text-white cursor-help"
+ class="inline-flex items-center justify-center w-5 h-5 text-[10px] font-medium rounded-full bg-teal-500 text-white"
:title="selectedRecording.public_share_count + ' ' + t('sharing.publicLinksGenerated')">
<i class="fas fa-globe" style="vertical-align: middle; line-height: 0;"></i>
</span>
<!-- Tags -->
<span v-for="tag in selectedRecording.tags" :key="tag.id"
- class="inline-flex items-center px-2 py-0.5 text-xs font-medium rounded-full cursor-help"
+ class="inline-flex items-center px-2 py-0.5 text-xs font-medium rounded-full"
:style="{ backgroundColor: tag.color || '#6B7280', color: getContrastTextColor(tag.color || '#6B7280') }"
:title="tag.group_id ? ('Group: ' + tag.group_name) : tag.name">
<i v-if="tag.group_id" class="fas fa-users mr-1 text-[10px]" style="vertical-align: middle; line-height: 0;"></i>
${tag.name}
</span>
-
- <!-- Folder (only shown if folders are enabled) -->
- <span v-if="foldersEnabled && selectedRecording.folder"
- class="inline-flex items-center px-2 py-0.5 text-xs font-medium rounded-full cursor-help"
- :style="{ backgroundColor: selectedRecording.folder.color || '#10B981', color: getContrastTextColor(selectedRecording.folder.color || '#10B981') }"
- :title="selectedRecording.folder.group_id ? ('Group Folder: ' + selectedRecording.folder.group_name) : ('Folder: ' + selectedRecording.folder.name)">
- <i class="fas fa-folder mr-1 text-[10px]" style="vertical-align: middle; line-height: 0;"></i>
- ${selectedRecording.folder.name}
- </span>
- </div>
-
- <!-- Folder Assignment (only if folders enabled and recording can be edited) -->
- <div v-if="foldersEnabled && selectedRecording.can_edit !== false && !selectedRecording.incognito" class="relative flex items-center gap-2">
- <i class="fas fa-folder text-[var(--text-accent)]"></i>
- <select @change="assignFolderToRecording(selectedRecording.id, $event.target.value || null)"
- :value="selectedRecording.folder_id || ''"
- class="bg-transparent border-none text-sm text-[var(--text-muted)] cursor-pointer hover:text-[var(--text-accent)] focus:outline-none appearance-none pr-5"
- style="background-image: url('data:image/svg+xml,%3Csvg xmlns=%27http://www.w3.org/2000/svg%27 width=%2712%27 height=%2712%27 fill=%27%236B7280%27 viewBox=%270 0 16 16%27%3E%3Cpath d=%27M8 10.5l-4-4h8l-4 4z%27/%3E%3C/svg%3E'); background-repeat: no-repeat; background-position: right 0 center;">
- <option value="">No Folder</option>
- <option v-for="folder in availableFolders" :key="folder.id" :value="folder.id">
- ${ folder.name }
- </option>
- </select>
</div>
<!-- Participants -->
diff --git a/templates/components/detail/mobile-header.html b/templates/components/detail/mobile-header.html
index d7216f52..cc3ee18d 100644
--- a/templates/components/detail/mobile-header.html
+++ b/templates/components/detail/mobile-header.html
@@ -40,8 +40,16 @@
<p class="text-sm text-[var(--text-muted)] truncate">
${selectedRecording.participants || t('help.noParticipants')}
</p>
- <!-- Tags, Folder, and Share Status -->
- <div v-if="getRecordingTags(selectedRecording).length > 0 || selectedRecording.is_shared || selectedRecording.shared_with_count > 0 || selectedRecording.public_share_count > 0 || (foldersEnabled && selectedRecording.folder)" class="flex flex-wrap gap-1 mt-2">
+ <!-- Folder Pill, Tags and Share Status -->
+ <div v-if="(foldersEnabled && selectedRecording.folder_id) || getRecordingTags(selectedRecording).length > 0 || selectedRecording.is_shared || selectedRecording.shared_with_count > 0 || selectedRecording.public_share_count > 0" class="flex flex-wrap gap-1 mt-2">
+ <!-- Folder Pill -->
+ <span v-if="foldersEnabled && selectedRecording.folder_id && !selectedRecording.incognito"
+ class="inline-flex items-center px-2 py-1 rounded-full text-xs font-medium"
+ :style="{ backgroundColor: getFolderColor(selectedRecording.folder_id), color: getContrastTextColor(getFolderColor(selectedRecording.folder_id)) }"
+ :title="'Folder: ' + getFolderName(selectedRecording.folder_id)">
+ <i class="fas fa-folder mr-1" style="vertical-align: middle; line-height: 0;"></i>
+ ${ getFolderName(selectedRecording.folder_id) }
+ </span>
<button v-for="tag in getRecordingTags(selectedRecording)" :key="tag.id"
@click.stop="filterByTag(tag)"
class="inline-flex items-center px-2 py-1 rounded-full text-xs font-medium hover:opacity-80 transition-all cursor-pointer"
@@ -51,14 +59,6 @@
<i v-else class="fas fa-tag mr-1" style="vertical-align: middle; line-height: 0;"></i>
<span v-text="tag.name"></span>
</button>
- <!-- Folder Badge -->
- <span v-if="foldersEnabled && selectedRecording.folder"
- class="inline-flex items-center px-2 py-1 rounded-full text-xs font-medium"
- :style="{ backgroundColor: selectedRecording.folder.color || '#10B981', color: getContrastTextColor(selectedRecording.folder.color || '#10B981') }"
- :title="selectedRecording.folder.group_id ? ('Group Folder: ' + selectedRecording.folder.group_name) : ('Folder: ' + selectedRecording.folder.name)">
- <i class="fas fa-folder mr-1" style="vertical-align: middle; line-height: 0;"></i>
- <span v-text="selectedRecording.folder.name"></span>
- </span>
<span v-if="selectedRecording.is_shared" class="inline-flex items-center px-2 py-1 rounded-full text-xs font-medium bg-purple-500 text-white">
<i class="fas fa-arrow-down mr-1"></i>Shared
</span>
@@ -91,19 +91,6 @@
${selectedRecording.owner_username || t('sharing.unknown')}
</span>
</div>
- <!-- Folder Assignment (mobile) -->
- <div v-if="foldersEnabled && selectedRecording.can_edit !== false && !selectedRecording.incognito" class="flex items-center gap-2" @click.stop>
- <i class="fas fa-folder text-[var(--text-accent)]"></i>
- <select @change="assignFolderToRecording(selectedRecording.id, $event.target.value || null)"
- :value="selectedRecording.folder_id || ''"
- class="bg-transparent border-none text-sm text-[var(--text-muted)] cursor-pointer focus:outline-none appearance-none pr-4"
- style="background-image: url('data:image/svg+xml,%3Csvg xmlns=%27http://www.w3.org/2000/svg%27 width=%2712%27 height=%2712%27 fill=%27%236B7280%27 viewBox=%270 0 16 16%27%3E%3Cpath d=%27M8 10.5l-4-4h8l-4 4z%27/%3E%3C/svg%3E'); background-repeat: no-repeat; background-position: right 0 center;">
- <option value="">No Folder</option>
- <option v-for="folder in availableFolders" :key="folder.id" :value="folder.id">
- ${ folder.name }
- </option>
- </select>
- </div>
<template v-if="activeRecordingMetadata" v-for="(item, index) in activeRecordingMetadata" :key="index">
<span v-if="!item.isTagItem" class="flex items-center gap-1.5">
<i :class="item.icon"></i>
@@ -116,6 +103,21 @@
<div class="flex items-center gap-2 overflow-x-auto pb-2">
<!-- Incognito recordings have limited actions -->
<template v-if="!selectedRecording.incognito">
+ <!-- Folder Assignment (icon-only dropdown matching other buttons) -->
+ <div v-if="foldersEnabled && selectedRecording.can_edit !== false"
+ class="relative p-2 rounded-lg hover:bg-[var(--bg-tertiary)] transition-colors flex-shrink-0"
+ :title="selectedRecording.folder_id ? getFolderName(selectedRecording.folder_id) : 'Assign Folder'">
+ <select @change="assignFolderToRecording(selectedRecording.id, $event.target.value || null)"
+ :value="selectedRecording.folder_id || ''"
+ class="absolute inset-0 w-full h-full opacity-0 cursor-pointer">
+ <option value="">No Folder</option>
+ <option v-for="folder in availableFolders" :key="folder.id" :value="folder.id">
+ ${ folder.name }
+ </option>
+ </select>
+ <i class="fas fa-folder"
+ :style="{ color: selectedRecording.folder_id ? getFolderColor(selectedRecording.folder_id) : '' }"></i>
+ </div>
<button @click="toggleInbox(selectedRecording)" class="p-2 rounded-lg hover:bg-[var(--bg-tertiary)] transition-colors" :class="selectedRecording.is_inbox ? 'text-blue-500' : ''"><i class="fas fa-inbox"></i></button>
<button @click="toggleHighlight(selectedRecording)" class="p-2 rounded-lg hover:bg-[var(--bg-tertiary)] transition-colors" :class="selectedRecording.is_highlighted ? 'text-yellow-500' : ''"><i class="fas fa-star"></i></button>
<button @click="editRecordingTags(selectedRecording)" class="p-2 rounded-lg hover:bg-[var(--bg-tertiary)] transition-colors"><i class="fas fa-tags"></i></button>
diff --git a/templates/components/recording-view.html b/templates/components/recording-view.html
index c57b23c8..60c3e3a9 100644
--- a/templates/components/recording-view.html
+++ b/templates/components/recording-view.html
@@ -95,6 +95,27 @@
</button>
</div>
<div v-if="!isRecording && audioBlobURL" class="flex flex-col gap-3 md:gap-4">
+ <!-- Folder Selection (only shown if folders are enabled) -->
+ <div v-if="foldersEnabled">
+ <label class="block text-sm font-medium text-[var(--text-secondary)] mb-1.5 md:mb-2">
+ <i class="fas fa-folder mr-1"
+ :style="{ color: selectedFolderId ? getFolderColor(selectedFolderId) : 'var(--text-muted)' }"></i>
+ Folder (optional)
+ </label>
+ <div class="relative">
+ <select v-model="selectedFolderId"
+ class="w-full pl-8 pr-8 py-2 text-sm rounded-lg cursor-pointer focus:outline-none focus:ring-2 focus:ring-[var(--border-focus)] appearance-none border border-[var(--border-secondary)] bg-[var(--bg-secondary)] text-[var(--text-primary)] hover:bg-[var(--bg-input)] transition-colors">
+ <option :value="null">No Folder</option>
+ <option v-for="folder in availableFolders" :key="folder.id" :value="folder.id">
+ ${ folder.name }
+ </option>
+ </select>
+ <i class="fas fa-folder absolute left-2.5 top-1/2 transform -translate-y-1/2 pointer-events-none"
+ :style="{ color: selectedFolderId ? getFolderColor(selectedFolderId) : 'var(--text-muted)' }"></i>
+ <i class="fas fa-chevron-down absolute right-2.5 top-1/2 transform -translate-y-1/2 text-[var(--text-muted)] pointer-events-none" style="font-size: 10px;"></i>
+ </div>
+ </div>
+
<!-- Tag Selection -->
<div>
<label for="recordingTagSelect" class="block text-sm font-medium text-[var(--text-secondary)] mb-1.5 md:mb-2">
diff --git a/templates/components/sidebar.html b/templates/components/sidebar.html
index 7385440a..07680a1c 100644
--- a/templates/components/sidebar.html
+++ b/templates/components/sidebar.html
@@ -9,15 +9,24 @@
<div class="sidebar-content-wrapper">
<!-- Sidebar Header -->
<div class="p-4 border-b border-[var(--border-primary)] flex-shrink-0">
- <div class="flex items-center justify-between mb-4">
- <h2 class="text-lg font-semibold" v-text="t('nav.recording')"></h2>
- <div class="flex gap-2">
- {% if inquire_mode_enabled %}
- <a href="/inquire"
- class="px-2 py-1.5 bg-[var(--bg-accent)] text-[var(--text-accent)] rounded-lg hover:opacity-80 transition-opacity text-sm">
- <i class="fas fa-search"></i>
- </a>
- {% endif %}
+ <div class="flex items-center gap-1.5 mb-4">
+ <!-- Folder Selector (replaces static "Recording" title) -->
+ <div v-if="foldersEnabled && availableFolders.length > 0" class="relative flex-1 min-w-0">
+ <select v-model="filterFolder"
+ class="w-full pl-6 pr-6 py-1.5 text-sm font-semibold rounded-lg cursor-pointer appearance-none border border-[var(--border-secondary)] bg-[var(--bg-input)] text-[var(--text-primary)] hover:bg-[var(--bg-tertiary)] transition-colors"
+ style="outline: none !important; box-shadow: none !important; background-image: url('data:image/svg+xml,%3Csvg xmlns=%27http://www.w3.org/2000/svg%27 width=%2710%27 height=%2710%27 fill=%27%236B7280%27 viewBox=%270 0 16 16%27%3E%3Cpath d=%27M8 10.5l-4-4h8l-4 4z%27/%3E%3C/svg%3E'); background-repeat: no-repeat; background-position: right 6px center;">
+ <option value="">All Recordings</option>
+ <option value="none">Unfiled</option>
+ <option v-for="folder in availableFolders" :key="folder.id" :value="folder.id">
+ ${ folder.name }
+ </option>
+ </select>
+ <i class="fas fa-folder absolute left-2 top-1/2 transform -translate-y-1/2 pointer-events-none"
+ :style="{ color: filterFolder && filterFolder !== 'none' ? getFolderColor(filterFolder) : 'var(--text-muted)' }"
+ style="font-size: 11px;"></i>
+ </div>
+ <h2 v-else class="text-lg font-semibold flex-1" v-text="t('nav.recording')"></h2>
+ <div class="flex gap-1.5 flex-shrink-0">
<!-- Selection Mode Toggle -->
<button v-if="!selectionMode && recordings.length > 0"
@click="enterSelectionMode"
@@ -31,7 +40,14 @@
title="Exit selection mode">
<i class="fas fa-times mr-1"></i>Done
</button>
- <button v-if="!selectionMode"
+ <!-- New button - compact when folders enabled -->
+ <button v-if="!selectionMode && foldersEnabled && availableFolders.length > 0"
+ @click="switchToUploadView"
+ class="px-2 py-1.5 bg-[var(--bg-button)] text-[var(--text-button)] rounded-lg hover:bg-[var(--bg-button-hover)] transition-colors text-sm"
+ title="New Recording">
+ <i class="fas fa-plus"></i>
+ </button>
+ <button v-else-if="!selectionMode"
@click="switchToUploadView"
class="px-3 py-1.5 bg-[var(--bg-button)] text-[var(--text-button)] rounded-lg hover:bg-[var(--bg-button-hover)] transition-colors text-sm">
<i class="fas fa-plus mr-1"></i><span v-text="t('common.new')"></span>
@@ -47,16 +63,16 @@
class="flex-1 flex items-center justify-between px-3 py-2 bg-[var(--bg-input)] border border-[var(--border-secondary)] rounded-lg text-sm hover:bg-[var(--bg-tertiary)] transition-colors">
<span class="flex items-center">
<i class="fas fa-filter mr-2 text-[var(--text-muted)]"></i>
- <span v-if="!searchQuery && filterTags.length === 0 && filterSpeakers.length === 0 && !filterDatePreset && !filterDateRange.start && !filterDateRange.end && !filterTextQuery && !filterStarred && !filterInbox && !filterFolder"
+ <span v-if="!searchQuery && filterTags.length === 0 && filterSpeakers.length === 0 && !filterDatePreset && !filterDateRange.start && !filterDateRange.end && !filterTextQuery && !filterStarred && !filterInbox"
v-text="t('sidebar.searchRecordings')">
</span>
<span v-else class="text-[var(--text-accent)]">
- Active filters (${ (filterFolder ? 1 : 0) + (filterTags.length > 0 ? 1 : 0) + (filterSpeakers.length > 0 ? 1 : 0) + (filterDatePreset || filterDateRange.start || filterDateRange.end ? 1 : 0) + (filterTextQuery ? 1 : 0) + (filterStarred ? 1 : 0) + (filterInbox ? 1 : 0) })
+ Active filters (${ (filterTags.length > 0 ? 1 : 0) + (filterSpeakers.length > 0 ? 1 : 0) + (filterDatePreset || filterDateRange.start || filterDateRange.end ? 1 : 0) + (filterTextQuery ? 1 : 0) + (filterStarred ? 1 : 0) + (filterInbox ? 1 : 0) })
</span>
</span>
<i :class="['fas fa-chevron-down transition-transform text-[var(--text-muted)]', showAdvancedFilters ? 'rotate-180' : '']"></i>
</button>
- <button v-if="searchQuery || filterTags.length > 0 || filterSpeakers.length > 0 || filterDatePreset || filterDateRange.start || filterDateRange.end || filterTextQuery || filterStarred || filterInbox || filterFolder"
+ <button v-if="searchQuery || filterTags.length > 0 || filterSpeakers.length > 0 || filterDatePreset || filterDateRange.start || filterDateRange.end || filterTextQuery || filterStarred || filterInbox"
@click="clearAllFilters"
class="px-3 py-2 bg-[var(--bg-input)] border border-[var(--border-secondary)] rounded-lg text-sm hover:bg-[var(--bg-tertiary)] hover:text-[var(--text-primary)] transition-colors"
:title="t('buttons.clearAllFilters')">
@@ -108,28 +124,6 @@
</button>
</div>
- <!-- Folder Filter (only shown if folders are enabled) -->
- <div v-if="foldersEnabled" class="bg-[var(--bg-secondary)] rounded-lg p-2.5 border border-[var(--border-primary)]">
- <div class="flex items-center justify-between gap-2 mb-2">
- <label class="text-xs font-medium text-[var(--text-muted)] whitespace-nowrap">
- <i class="fas fa-folder mr-1"></i> Filter by Folder
- </label>
- </div>
- <div class="relative">
- <select v-model="filterFolder"
- class="w-full px-2 py-1.5 bg-[var(--bg-input)] border border-[var(--border-secondary)] rounded text-xs focus:outline-none focus:ring-1 focus:ring-[var(--ring-focus)] appearance-none cursor-pointer"
- :style="filterFolder ? { borderColor: (availableFolders.find(f => f.id === filterFolder) || {}).color || '' } : {}">
- <option value="">All Folders</option>
- <option value="none">No Folder</option>
- <option v-for="folder in availableFolders" :key="folder.id" :value="folder.id">
- ${ folder.name } (${ folder.recording_count || 0 })
- </option>
- </select>
- <i class="fas fa-chevron-down absolute right-2 top-1/2 transform -translate-y-1/2 text-[var(--text-muted)] pointer-events-none" style="font-size: 10px;"></i>
- </div>
- <p v-if="availableFolders.length === 0" class="text-xs text-[var(--text-muted)] italic mt-1">No folders created</p>
- </div>
-
<!-- Tag Filter -->
<div class="bg-[var(--bg-secondary)] rounded-lg p-2.5 border border-[var(--border-primary)]">
<div class="flex items-center justify-between gap-2 mb-2">
@@ -465,7 +459,7 @@
</button>
<span v-if="getRecordingTags(recording).length > 4"
class="inline-flex items-center px-1.5 py-0.5 rounded-md text-xs text-[var(--text-muted)]"
- :title="getRecordingTags(recording).slice(4).map(t => t.name).join(', ')">
+ :title="'More tags...'">
+${getRecordingTags(recording).length - 4}
</span>
</div>
diff --git a/templates/components/upload-view.html b/templates/components/upload-view.html
index 4cb7c747..fafda06b 100644
--- a/templates/components/upload-view.html
+++ b/templates/components/upload-view.html
@@ -177,6 +177,35 @@
</div>
</div>
+ <!-- Folder Selection (only shown if folders are enabled) -->
+ <div v-if="foldersEnabled" class="mt-4">
+ <label class="block text-sm font-medium text-[var(--text-secondary)] mb-2">
+ <i class="fas fa-folder mr-1"
+ :style="{ color: selectedFolderId ? getFolderColor(selectedFolderId) : 'var(--text-muted)' }"></i>
+ Folder
+ </label>
+ <div class="relative">
+ <select v-model="selectedFolderId"
+ class="w-full pl-8 pr-8 py-2 text-sm rounded-lg cursor-pointer focus:outline-none focus:ring-2 focus:ring-[var(--border-focus)] appearance-none border border-[var(--border-secondary)] bg-[var(--bg-tertiary)] text-[var(--text-primary)] hover:bg-[var(--bg-input)] transition-colors">
+ <option :value="null">No Folder</option>
+ <option v-for="folder in availableFolders" :key="folder.id" :value="folder.id">
+ ${ folder.name }
+ </option>
+ </select>
+ <i class="fas fa-folder absolute left-2.5 top-1/2 transform -translate-y-1/2 pointer-events-none"
+ :style="{ color: selectedFolderId ? getFolderColor(selectedFolderId) : 'var(--text-muted)' }"></i>
+ <i class="fas fa-chevron-down absolute right-2.5 top-1/2 transform -translate-y-1/2 text-[var(--text-muted)] pointer-events-none" style="font-size: 10px;"></i>
+ </div>
+ <p v-if="selectedFolderId && getFolderById(selectedFolderId)?.custom_prompt" class="text-xs text-[var(--text-muted)] mt-1">
+ <i class="fas fa-info-circle mr-1 text-[var(--text-accent)]"></i>
+ This folder has a custom summary prompt
+ </p>
+ <p v-if="availableFolders.length === 0" class="text-xs text-[var(--text-muted)] mt-1">
+ <i class="fas fa-info-circle mr-1"></i>
+ <a href="/account#folders" class="text-[var(--text-accent)] hover:underline">Create folders</a> to organize your recordings
+ </p>
+ </div>
+
<!-- Tag Selection -->
<div class="mt-4">
<label class="block text-sm font-medium text-[var(--text-secondary)] mb-2">