feat: Implement persistent "Embed Mode" to hide UI shell via Session Storage (#1484)

* initial implementation

* updates in ViewerInfoVideoTitleBanner component

* Implement persistent "Embed Mode" to hide UI shell via Session Storage

---------

Co-authored-by: Yiannis <1515939+styiannis@users.noreply.github.com>

.dockerignore

@@ -1,2 +1,69 @@
-node_modules
+# Node.js/JavaScript dependencies and artifacts
-npm-debug.log
+**/node_modules
+**/npm-debug.log*
+**/yarn-debug.log*
+**/yarn-error.log*
+**/.yarn/cache
+**/.yarn/unplugged
+**/package-lock.json
+**/.npm
+**/.cache
+**/.parcel-cache
+**/dist
+**/build
+**/*.tsbuildinfo
+
+# Python bytecode and cache
+**/__pycache__
+**/*.py[cod]
+**/*$py.class
+**/*.so
+**/.Python
+**/pip-log.txt
+**/pip-delete-this-directory.txt
+**/.pytest_cache
+**/.coverage
+**/htmlcov
+**/.tox
+**/.mypy_cache
+**/.ruff_cache
+
+# Version control
+**/.git
+**/.gitignore
+**/.gitattributes
+
+# IDE and editor files
+**/.DS_Store
+**/.vscode
+**/.idea
+**/*.swp
+**/*.swo
+**/*~
+
+# Logs and runtime files
+**/logs
+**/*.log
+**/celerybeat-schedule*
+**/.env
+**/.env.*
+
+# Media files and data directories (should not be in image)
+media_files/**
+postgres_data/**
+pids/**
+
+# Static files collected at runtime
+static_collected/**
+
+# Documentation and development files
+**/.github
+**/CHANGELOG.md
+
+# Test files and directories
+**/tests
+**/test_*.py
+**/*_test.py
+
+# Frontend build artifacts (built separately)
+frontend/dist/**

.github/workflows/frontend-build-and-test.yml

@@ -0,0 +1,42 @@
+name: Frontend build and test
+
+on:
+    pull_request:
+    workflow_dispatch:
+
+concurrency:
+    group: ${{ github.head_ref ||  github.ref }}
+    cancel-in-progress: true
+
+jobs:
+    build-and-test:
+        strategy:
+            matrix:
+                os: [ubuntu-latest]
+                node: [20]
+        runs-on: ${{ matrix.os }}
+        name: '${{ matrix.os }} - node v${{ matrix.node }}'
+        permissions:
+            contents: read
+        defaults:
+            run:
+                working-directory: ./frontend
+        steps:
+            - name: Checkout repository
+              uses: actions/checkout@v4
+              with:
+                  fetch-depth: 0
+
+            - name: Set up Node.js
+              uses: actions/setup-node@v4
+              with:
+                  node-version: ${{ matrix.node }}
+
+            - name: Install dependencies
+              run: npm install
+
+            - name: Build script
+              run: npm run dist
+
+            - name: Test script
+              run: npm run test

.gitignore

@@ -6,8 +6,9 @@ media_files/hls/
 media_files/chunks/
 media_files/uploads/
 media_files/tinymce_media/
+media_files/userlogos/
 postgres_data/
-celerybeat-schedule
+celerybeat-schedule*
 logs/
 pids/
 static/admin/
@@ -19,8 +20,8 @@ static/drf-yasg
 cms/local_settings.py
 deploy/docker/local_settings.py
 yt.readme.md
-/frontend-tools/video-editor/node_modules
+# Node.js dependencies (covers all node_modules directories, including frontend-tools)
-/frontend-tools/video-editor/client/node_modules
+**/node_modules/
 /static_collected
 /frontend-tools/video-editor-v1
 frontend-tools/.DS_Store
@@ -35,3 +36,4 @@ frontend-tools/video-editor/client/public/videos/sample-video.mp3
 frontend-tools/chapters-editor/client/public/videos/sample-video.mp3
 static/chapters_editor/videos/sample-video.mp3
 static/video_editor/videos/sample-video.mp3
+templates/todo-MS4.md

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pycqa/flake8
-    rev: 6.0.0
+    rev: 6.1.0
     hooks:
       - id: flake8
   - repo: https://github.com/pycqa/isort

README.md

@@ -69,7 +69,7 @@ Copyright Markos Gogoulos.
 
 ## Support and paid services
 
-We provide custom installations, development of extra functionality, migration from existing systems, integrations with legacy systems, training and support. Contact us at info@mediacms.io for more information.
+We provide custom installations, development of extra functionality, migration from existing systems, integrations with legacy systems, training and support. Checkout our [services page](https://mediacms.io/#services/) for more information.
 
 ### Commercial Hostings
 **Elestio**

cms/settings.py

@@ -563,7 +563,8 @@ ALLOW_VIDEO_TRIMMER = True
 
 ALLOW_CUSTOM_MEDIA_URLS = False
 
-# Whether to allow anonymous users to list all users
+ALLOW_MEDIA_REPLACEMENT = False
+
 ALLOW_ANONYMOUS_USER_LISTING = True
 
 # Who can see the members page

cms/version.py

@@ -1 +1 @@
-VERSION = "7.1.0"
+VERSION = "7.7"

files/context_processors.py

@@ -58,6 +58,7 @@ def stuff(request):
     ret["USE_RBAC"] = settings.USE_RBAC
     ret["USE_ROUNDED_CORNERS"] = settings.USE_ROUNDED_CORNERS
     ret["INCLUDE_LISTING_NUMBERS"] = settings.INCLUDE_LISTING_NUMBERS
+    ret["ALLOW_MEDIA_REPLACEMENT"] = getattr(settings, 'ALLOW_MEDIA_REPLACEMENT', False)
     ret["VERSION"] = VERSION
 
     if request.user.is_superuser:

files/forms.py

@@ -6,6 +6,7 @@ from django.conf import settings
 
 from .methods import get_next_state, is_mediacms_editor
 from .models import MEDIA_STATES, Category, Media, Subtitle
+from .widgets import CategoryModalWidget
 
 
 class CustomField(Field):
@@ -121,13 +122,18 @@ class MediaPublishForm(forms.ModelForm):
         fields = ("category", "state", "featured", "reported_times", "is_reviewed", "allow_download")
 
         widgets = {
-            "category": MultipleSelect(),
+            "category": CategoryModalWidget(),
         }
 
     def __init__(self, user, *args, **kwargs):
         self.user = user
         super(MediaPublishForm, self).__init__(*args, **kwargs)
 
+        self.has_custom_permissions = self.instance.permissions.exists() if self.instance.pk else False
+        self.has_rbac_categories = self.instance.category.filter(is_rbac_category=True).exists() if self.instance.pk else False
+        self.is_shared = self.has_custom_permissions or self.has_rbac_categories
+        self.actual_state = self.instance.state if self.instance.pk else None
+
         if not is_mediacms_editor(user):
             for field in ["featured", "reported_times", "is_reviewed"]:
                 self.fields[field].disabled = True
@@ -140,6 +146,13 @@ class MediaPublishForm(forms.ModelForm):
                     valid_states.append(self.instance.state)
                 self.fields["state"].choices = [(state, dict(MEDIA_STATES).get(state, state)) for state in valid_states]
 
+        if self.is_shared:
+            current_choices = list(self.fields["state"].choices)
+            current_choices.insert(0, ("shared", "Shared"))
+            self.fields["state"].choices = current_choices
+            self.fields["state"].initial = "shared"
+            self.initial["state"] = "shared"
+
         if getattr(settings, 'USE_RBAC', False) and 'category' in self.fields:
             if is_mediacms_editor(user):
                 pass
@@ -178,34 +191,76 @@ class MediaPublishForm(forms.ModelForm):
         state = cleaned_data.get("state")
         categories = cleaned_data.get("category")
 
-        if getattr(settings, 'USE_RBAC', False) and 'category' in self.fields:
+        if self.is_shared and state != "shared":
+            self.fields['confirm_state'].widget = forms.CheckboxInput()
+            state_index = None
+            for i, layout_item in enumerate(self.helper.layout):
+                if isinstance(layout_item, CustomField) and layout_item.fields[0] == 'state':
+                    state_index = i
+                    break
+
+            if state_index is not None:
+                layout_items = list(self.helper.layout)
+                layout_items.insert(state_index + 1, CustomField('confirm_state'))
+                self.helper.layout = Layout(*layout_items)
+
+            if not cleaned_data.get('confirm_state'):
+                if state == 'private':
+                    error_parts = []
+                    if self.has_rbac_categories:
+                        rbac_cat_titles = self.instance.category.filter(is_rbac_category=True).values_list('title', flat=True)
+                        error_parts.append(f"shared with users that have access to categories: {', '.join(rbac_cat_titles)}")
+                    if self.has_custom_permissions:
+                        error_parts.append("shared by me with other users (visible in 'Shared by me' page)")
+
+                    error_message = f"I understand that changing to Private will remove all sharing. Currently this media is {' and '.join(error_parts)}. All this sharing will be removed."
+                    self.add_error('confirm_state', error_message)
+                else:
+                    error_message = f"I understand that changing to {state.title()} will maintain existing sharing settings."
+                    self.add_error('confirm_state', error_message)
+
+        elif state in ['private', 'unlisted']:
+            custom_permissions = self.instance.permissions.exists()
             rbac_categories = categories.filter(is_rbac_category=True).values_list('title', flat=True)
-
+            if rbac_categories or custom_permissions:
-            if rbac_categories and state in ['private', 'unlisted']:
-                # Make the confirm_state field visible and add it to the layout
                 self.fields['confirm_state'].widget = forms.CheckboxInput()
-
-                # add it after the state field
                 state_index = None
                 for i, layout_item in enumerate(self.helper.layout):
                     if isinstance(layout_item, CustomField) and layout_item.fields[0] == 'state':
                         state_index = i
                         break
 
-                if state_index:
+                if state_index is not None:
                     layout_items = list(self.helper.layout)
                     layout_items.insert(state_index + 1, CustomField('confirm_state'))
                     self.helper.layout = Layout(*layout_items)
 
                 if not cleaned_data.get('confirm_state'):
-                    error_message = f"I understand that although media state is {state}, the media is also shared with users that have access to the following categories: {', '.join(rbac_categories)}"
+                    if rbac_categories:
-                    self.add_error('confirm_state', error_message)
+                        error_message = f"I understand that although media state is {state}, the media is also shared with users that have access to categories: {', '.join(rbac_categories)}"
+                        self.add_error('confirm_state', error_message)
+                    if custom_permissions:
+                        error_message = f"I understand that although media state is {state}, the media is also shared by me with other users, that I can see in the 'Shared by me' page"
+                        self.add_error('confirm_state', error_message)
+
+        # Convert "shared" state to actual underlying state for saving. we dont keep shared state in DB
+        if state == "shared":
+            cleaned_data["state"] = self.actual_state
 
         return cleaned_data
 
     def save(self, *args, **kwargs):
         data = self.cleaned_data
         state = data.get("state")
+
+        # If transitioning from shared to private, remove all sharing
+        if self.is_shared and state == 'private' and data.get('confirm_state'):
+            # Remove all custom permissions
+            self.instance.permissions.all().delete()
+            # Remove RBAC categories
+            rbac_cats = self.instance.category.filter(is_rbac_category=True)
+            self.instance.category.remove(*rbac_cats)
+
         if state != self.initial["state"]:
             self.instance.state = get_next_state(self.user, self.initial["state"], self.instance.state)
 
@@ -332,3 +387,35 @@ class ContactForm(forms.Form):
         if user.is_authenticated:
             self.fields.pop("name")
             self.fields.pop("from_email")
+
+
+class ReplaceMediaForm(forms.Form):
+    new_media_file = forms.FileField(
+        required=True,
+        label="New Media File",
+        help_text="Select a new file to replace the current media",
+    )
+
+    def __init__(self, media_instance, *args, **kwargs):
+        self.media_instance = media_instance
+        super(ReplaceMediaForm, self).__init__(*args, **kwargs)
+
+        self.helper = FormHelper()
+        self.helper.form_tag = True
+        self.helper.form_class = 'post-form'
+        self.helper.form_method = 'post'
+        self.helper.form_enctype = "multipart/form-data"
+        self.helper.form_show_errors = False
+        self.helper.layout = Layout(
+            CustomField('new_media_file'),
+        )
+
+        self.helper.layout.append(FormActions(Submit('submit', 'Replace Media', css_class='primaryAction')))
+
+    def clean_new_media_file(self):
+        file = self.cleaned_data.get("new_media_file", False)
+        if file:
+            if file.size > settings.UPLOAD_MAX_SIZE:
+                max_size_mb = settings.UPLOAD_MAX_SIZE / (1024 * 1024)
+                raise forms.ValidationError(f"File too large. Maximum size: {max_size_mb:.0f}MB")
+            return file

files/frontend_translations/ar.py

@@ -162,6 +162,7 @@ translation_strings = {
     "Remove from list": "إزالة من القائمة",
     "Remove tag": "إزالة العلامة",
     "Remove user": "إزالة المستخدم",
+    "Replace": "",
     "SAVE": "حفظ",
     "SEARCH": "بحث",
     "SHARE": "مشاركة",

files/frontend_translations/bn.py

@@ -162,6 +162,7 @@ translation_strings = {
     "Remove from list": "",
     "Remove tag": "",
     "Remove user": "",
+    "Replace": "",
     "SAVE": "সংরক্ষণ করুন",
     "SEARCH": "অনুসন্ধান",
     "SHARE": "শেয়ার করুন",

files/frontend_translations/da.py

@@ -162,6 +162,7 @@ translation_strings = {
     "Remove from list": "Fjern fra liste",
     "Remove tag": "Fjern tag",
     "Remove user": "Fjern bruger",
+    "Replace": "",
     "SAVE": "GEM",
     "SEARCH": "SØG",
     "SHARE": "DEL",

files/frontend_translations/de.py

@@ -162,6 +162,7 @@ translation_strings = {
     "Remove from list": "Aus Liste entfernen",
     "Remove tag": "Tag entfernen",
     "Remove user": "Benutzer entfernen",
+    "Replace": "",
     "SAVE": "SPEICHERN",
     "SEARCH": "SUCHE",
     "SHARE": "TEILEN",

files/frontend_translations/el.py

@@ -162,6 +162,7 @@ translation_strings = {
     "Remove from list": "Αφαίρεση από λίστα",
     "Remove tag": "Αφαίρεση ετικέτας",
     "Remove user": "Αφαίρεση χρήστη",
+    "Replace": "",
     "SAVE": "ΑΠΟΘΗΚΕΥΣΗ",
     "SEARCH": "ΑΝΑΖΗΤΗΣΗ",
     "SHARE": "ΚΟΙΝΟΠΟΙΗΣΗ",

files/frontend_translations/en.py

@@ -165,6 +165,7 @@ translation_strings = {
     "Recommended": "",
     "Record Screen": "",
     "Register": "",
+    "Replace": "",
     "Remove category": "",
     "Remove from list": "",
     "Remove tag": "",

files/frontend_translations/es.py

@@ -162,6 +162,7 @@ translation_strings = {
     "Remove from list": "Eliminar de la lista",
     "Remove tag": "Eliminar etiqueta",
     "Remove user": "Eliminar usuario",
+    "Replace": "",
     "SAVE": "GUARDAR",
     "SEARCH": "BUSCAR",
     "SHARE": "COMPARTIR",

files/frontend_translations/fr.py

@@ -163,6 +163,7 @@ translation_strings = {
     "Remove from list": "Supprimer de la liste",
     "Remove tag": "Supprimer le tag",
     "Remove user": "Supprimer l'utilisateur",
+    "Replace": "",
     "SAVE": "ENREGISTRER",
     "SEARCH": "RECHERCHER",
     "SHARE": "PARTAGER",

files/frontend_translations/he.py

@@ -162,6 +162,7 @@ translation_strings = {
     "Remove from list": "",
     "Remove tag": "",
     "Remove user": "",
+    "Replace": "",
     "SAVE": "שמור",
     "SEARCH": "חפש",
     "SHARE": "שתף",

files/frontend_translations/hi.py

@@ -162,6 +162,7 @@ translation_strings = {
     "Remove from list": "सूची से हटाएं",
     "Remove tag": "टैग हटाएं",
     "Remove user": "उपयोगकर्ता हटाएं",
+    "Replace": "",
     "SAVE": "सहेजें",
     "SEARCH": "खोजें",
     "SHARE": "साझा करें",

files/frontend_translations/id.py

@@ -162,6 +162,7 @@ translation_strings = {
     "Remove from list": "Hapus dari daftar",
     "Remove tag": "Hapus tag",
     "Remove user": "Hapus pengguna",
+    "Replace": "",
     "SAVE": "SIMPAN",
     "SEARCH": "CARI",
     "SHARE": "BAGIKAN",

files/frontend_translations/it.py

@@ -163,6 +163,7 @@ translation_strings = {
     "Remove from list": "Rimuovi dalla lista",
     "Remove tag": "Rimuovi tag",
     "Remove user": "Rimuovi utente",
+    "Replace": "",
     "SAVE": "SALVA",
     "SEARCH": "CERCA",
     "SHARE": "CONDIVIDI",

files/frontend_translations/ja.py

@@ -162,6 +162,7 @@ translation_strings = {
     "Remove from list": "リストから削除",
     "Remove tag": "タグを削除",
     "Remove user": "ユーザーを削除",
+    "Replace": "",
     "SAVE": "保存",
     "SEARCH": "検索",
     "SHARE": "共有",

files/frontend_translations/ko.py

@@ -162,6 +162,7 @@ translation_strings = {
     "Remove from list": "목록에서 제거",
     "Remove tag": "태그 제거",
     "Remove user": "사용자 제거",
+    "Replace": "",
     "SAVE": "저장",
     "SEARCH": "검색",
     "SHARE": "공유",

files/frontend_translations/nl.py

@@ -162,6 +162,7 @@ translation_strings = {
     "Remove from list": "Verwijderen uit lijst",
     "Remove tag": "Tag verwijderen",
     "Remove user": "Gebruiker verwijderen",
+    "Replace": "",
     "SAVE": "OPSLAAN",
     "SEARCH": "ZOEKEN",
     "SHARE": "DELEN",

files/frontend_translations/pt.py

@@ -162,6 +162,7 @@ translation_strings = {
     "Remove from list": "Remover da lista",
     "Remove tag": "Remover tag",
     "Remove user": "Remover usuário",
+    "Replace": "",
     "SAVE": "SALVAR",
     "SEARCH": "PESQUISAR",
     "SHARE": "COMPARTILHAR",

files/frontend_translations/ru.py

@@ -162,6 +162,7 @@ translation_strings = {
     "Remove from list": "Удалить из списка",
     "Remove tag": "Удалить тег",
     "Remove user": "Удалить пользователя",
+    "Replace": "",
     "SAVE": "СОХРАНИТЬ",
     "SEARCH": "ПОИСК",
     "SHARE": "ПОДЕЛИТЬСЯ",

files/frontend_translations/sl.py

@@ -162,6 +162,7 @@ translation_strings = {
     "Remove from list": "Odstrani s seznama",
     "Remove tag": "Odstrani oznako",
     "Remove user": "Odstrani uporabnika",
+    "Replace": "",
     "SAVE": "SHRANI",
     "SEARCH": "ISKANJE",
     "SHARE": "DELI",

files/frontend_translations/tr.py

@@ -162,6 +162,7 @@ translation_strings = {
     "Remove from list": "Listeden kaldır",
     "Remove tag": "Etiketi kaldır",
     "Remove user": "Kullanıcıyı kaldır",
+    "Replace": "",
     "SAVE": "KAYDET",
     "SEARCH": "ARA",
     "SHARE": "PAYLAŞ",

files/frontend_translations/ur.py

@@ -162,6 +162,7 @@ translation_strings = {
     "Remove from list": "فہرست سے ہٹائیں",
     "Remove tag": "ٹیگ ہٹائیں",
     "Remove user": "صارف ہٹائیں",
+    "Replace": "",
     "SAVE": "محفوظ کریں",
     "SEARCH": "تلاش کریں",
     "SHARE": "شیئر کریں",

files/frontend_translations/zh_hans.py

@@ -162,6 +162,7 @@ translation_strings = {
     "Remove from list": "",
     "Remove tag": "",
     "Remove user": "",
+    "Replace": "",
     "SAVE": "保存",
     "SEARCH": "搜索",
     "SHARE": "分享",

files/frontend_translations/zh_hant.py

@@ -162,6 +162,7 @@ translation_strings = {
     "Remove from list": "",
     "Remove tag": "",
     "Remove user": "",
+    "Replace": "",
     "SAVE": "儲存",
     "SEARCH": "搜尋",
     "SHARE": "分享",

files/helpers.py

@@ -910,7 +910,9 @@ def trim_video_method(media_file_path, timestamps_list):
         return False
 
     with tempfile.TemporaryDirectory(dir=settings.TEMP_DIRECTORY) as temp_dir:
-        output_file = os.path.join(temp_dir, "output.mp4")
+        # Detect input file extension to preserve original format
+        _, input_ext = os.path.splitext(media_file_path)
+        output_file = os.path.join(temp_dir, f"output{input_ext}")
 
         segment_files = []
         for i, item in enumerate(timestamps_list):
@@ -920,7 +922,7 @@ def trim_video_method(media_file_path, timestamps_list):
 
             # For single timestamp, we can use the output file directly
             # For multiple timestamps, we need to create segment files
-            segment_file = output_file if len(timestamps_list) == 1 else os.path.join(temp_dir, f"segment_{i}.mp4")
+            segment_file = output_file if len(timestamps_list) == 1 else os.path.join(temp_dir, f"segment_{i}{input_ext}")
 
             cmd = [settings.FFMPEG_COMMAND, "-y", "-ss", str(item['startTime']), "-i", media_file_path, "-t", str(duration), "-c", "copy", "-avoid_negative_ts", "1", segment_file]
 

files/methods.py

@@ -272,12 +272,16 @@ def show_related_media_content(media, request, limit):
         category = media.category.first()
         if category:
             q_category = Q(listable=True, category=category)
-            q_res = models.Media.objects.filter(q_category).order_by(order_criteria[random.randint(0, len(order_criteria) - 1)]).prefetch_related("user")[: limit - media.user.media_count]
+            # Fix: Ensure slice index is never negative
+            remaining = max(0, limit - len(m))
+            q_res = models.Media.objects.filter(q_category).order_by(order_criteria[random.randint(0, len(order_criteria) - 1)]).prefetch_related("user")[:remaining]
             m = list(itertools.chain(m, q_res))
 
         if len(m) < limit:
             q_generic = Q(listable=True)
-            q_res = models.Media.objects.filter(q_generic).order_by(order_criteria[random.randint(0, len(order_criteria) - 1)]).prefetch_related("user")[: limit - media.user.media_count]
+            # Fix: Ensure slice index is never negative
+            remaining = max(0, limit - len(m))
+            q_res = models.Media.objects.filter(q_generic).order_by(order_criteria[random.randint(0, len(order_criteria) - 1)]).prefetch_related("user")[:remaining]
             m = list(itertools.chain(m, q_res))
 
     m = list(set(m[:limit]))  # remove duplicates
@@ -490,7 +494,6 @@ def copy_video(original_media, copy_encodings=True, title_suffix="(Trimmed)"):
             state=helpers.get_default_state(user=original_media.user),
             is_reviewed=original_media.is_reviewed,
             encoding_status=original_media.encoding_status,
-            listable=original_media.listable,
             add_date=timezone.now(),
             video_height=original_media.video_height,
             size=original_media.size,
@@ -666,11 +669,8 @@ def change_media_owner(media_id, new_user):
     media.user = new_user
     media.save(update_fields=["user"])
 
-    # Update any related permissions
+    # Optimize: Update any related permissions in bulk instead of loop
-    media_permissions = models.MediaPermission.objects.filter(media=media)
+    models.MediaPermission.objects.filter(media=media).update(owner_user=new_user)
-    for permission in media_permissions:
-        permission.owner_user = new_user
-        permission.save(update_fields=["owner_user"])
 
     # remove any existing permissions for the new user, since they are now owner
     models.MediaPermission.objects.filter(media=media, user=new_user).delete()
@@ -713,7 +713,6 @@ def copy_media(media):
                 state=helpers.get_default_state(user=media.user),
                 is_reviewed=media.is_reviewed,
                 encoding_status=media.encoding_status,
-                listable=media.listable,
                 add_date=timezone.now(),
             )
 

files/migrations/0014_alter_subtitle_options_and_more.py

@@ -0,0 +1,24 @@
+# Generated by Django 5.2.6 on 2025-12-16 14:05
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('files', '0013_page_tinymcemedia'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='subtitle',
+            options={'ordering': ['language__title'], 'verbose_name': 'Caption', 'verbose_name_plural': 'Captions'},
+        ),
+        migrations.AlterModelOptions(
+            name='transcriptionrequest',
+            options={'verbose_name': 'Caption Request', 'verbose_name_plural': 'Caption Requests'},
+        ),
+        migrations.AlterModelOptions(
+            name='videotrimrequest',
+            options={'verbose_name': 'Trim Request', 'verbose_name_plural': 'Trim Requests'},
+        ),
+    ]

files/models/category.py

@@ -91,10 +91,10 @@ class Category(models.Model):
         if self.listings_thumbnail:
             return self.listings_thumbnail
 
-        if Media.objects.filter(category=self, state="public").exists():
+        # Optimize: Use first() directly instead of exists() + first() (saves one query)
-            media = Media.objects.filter(category=self, state="public").order_by("-views").first()
+        media = Media.objects.filter(category=self, state="public").order_by("-views").first()
-            if media:
+        if media:
-                return media.thumbnail_url
+            return media.thumbnail_url
 
         return None
 

files/models/media.py

@@ -270,7 +270,9 @@ class Media(models.Model):
             if self.media_file != self.__original_media_file:
                 # set this otherwise gets to infinite loop
                 self.__original_media_file = self.media_file
-                self.media_init()
+                from .. import tasks
+
+                tasks.media_init.apply_async(args=[self.friendly_token], countdown=5)
 
             # for video files, if user specified a different time
             # to automatically grub thumbnail
@@ -282,7 +284,7 @@ class Media(models.Model):
                 self.allow_whisper_transcribe != self.__original_allow_whisper_transcribe or self.allow_whisper_transcribe_and_translate != self.__original_allow_whisper_transcribe_and_translate
             )
 
-            if transcription_changed and self.media_type == "video":
+            if transcription_changed and self.media_type in ["video", "audio"]:
                 self.transcribe_function()
 
             # Update the original values for next comparison
@@ -329,10 +331,17 @@ class Media(models.Model):
 
             if to_transcribe:
                 TranscriptionRequest.objects.create(media=self, translate_to_english=False)
-                tasks.whisper_transcribe.delay(self.friendly_token, translate_to_english=False)
+                tasks.whisper_transcribe.apply_async(
+                    args=[self.friendly_token, False],
+                    countdown=10,
+                )
+
             if to_transcribe_and_translate:
                 TranscriptionRequest.objects.create(media=self, translate_to_english=True)
-                tasks.whisper_transcribe.delay(self.friendly_token, translate_to_english=True)
+                tasks.whisper_transcribe.apply_async(
+                    args=[self.friendly_token, True],
+                    countdown=10,
+                )
 
     def update_search_vector(self):
         """
@@ -410,6 +419,11 @@ class Media(models.Model):
                 self.media_type = "image"
             elif kind == "pdf":
                 self.media_type = "pdf"
+            elif kind == "audio":
+                self.media_type = "audio"
+            elif kind == "video":
+                self.media_type = "video"
+
         if self.media_type in ["image", "pdf"]:
             self.encoding_status = "success"
         else:
@@ -763,6 +777,8 @@ class Media(models.Model):
             return helpers.url_from_path(self.uploaded_thumbnail.path)
         if self.thumbnail:
             return helpers.url_from_path(self.thumbnail.path)
+        if self.media_type == "audio":
+            return helpers.url_from_path("userlogos/poster_audio.jpg")
         return None
 
     @property
@@ -776,6 +792,9 @@ class Media(models.Model):
             return helpers.url_from_path(self.uploaded_poster.path)
         if self.poster:
             return helpers.url_from_path(self.poster.path)
+        if self.media_type == "audio":
+            return helpers.url_from_path("userlogos/poster_audio.jpg")
+
         return None
 
     @property

files/serializers.py

@@ -101,10 +101,17 @@ class MediaSerializer(serializers.ModelSerializer):
 class SingleMediaSerializer(serializers.ModelSerializer):
     user = serializers.ReadOnlyField(source="user.username")
     url = serializers.SerializerMethodField()
+    is_shared = serializers.SerializerMethodField()
 
     def get_url(self, obj):
         return self.context["request"].build_absolute_uri(obj.get_absolute_url())
 
+    def get_is_shared(self, obj):
+        """Check if media has custom permissions or RBAC categories"""
+        custom_permissions = obj.permissions.exists()
+        rbac_categories = obj.category.filter(is_rbac_category=True).exists()
+        return custom_permissions or rbac_categories
+
     class Meta:
         model = Media
         read_only_fields = (
@@ -133,6 +140,7 @@ class SingleMediaSerializer(serializers.ModelSerializer):
             "edit_date",
             "media_type",
             "state",
+            "is_shared",
             "duration",
             "thumbnail_url",
             "poster_url",

files/tasks.py

@@ -625,6 +625,18 @@ def create_hls(friendly_token):
     return True
 
 
+@task(name="media_init", queue="short_tasks")
+def media_init(friendly_token):
+    try:
+        media = Media.objects.get(friendly_token=friendly_token)
+    except:  # noqa
+        logger.info("failed to get media with friendly_token %s" % friendly_token)
+        return False
+    media.media_init()
+
+    return True
+
+
 @task(name="check_running_states", queue="short_tasks")
 def check_running_states():
     # Experimental - unused

files/urls.py

@@ -20,6 +20,7 @@ urlpatterns = [
     re_path(r"^contact$", views.contact, name="contact"),
     re_path(r"^publish", views.publish_media, name="publish_media"),
     re_path(r"^edit_chapters", views.edit_chapters, name="edit_chapters"),
+    re_path(r"^replace_media", views.replace_media, name="replace_media"),
     re_path(r"^edit_video", views.edit_video, name="edit_video"),
     re_path(r"^edit", views.edit_media, name="edit_media"),
     re_path(r"^embed", views.embed_media, name="get_embed"),
@@ -110,7 +111,7 @@ urlpatterns = [
     re_path(r"^manage/users$", views.manage_users, name="manage_users"),
     # Media uploads in ADMIN created pages
     re_path(r"^tinymce/upload/", tinymce_handlers.upload_image, name="tinymce_upload_image"),
-    re_path("^(?P<slug>[\w.-]*)$", views.get_page, name="get_page"),  # noqa: W605
+    re_path(r"^(?P<slug>[\w.-]*)$", views.get_page, name="get_page"),  # noqa: W605
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
 

files/views/__init__.py

@@ -32,6 +32,7 @@ from .pages import members  # noqa: F401
 from .pages import publish_media  # noqa: F401
 from .pages import recommended_media  # noqa: F401
 from .pages import record_screen  # noqa: F401
+from .pages import replace_media  # noqa: F401
 from .pages import search  # noqa: F401
 from .pages import setlanguage  # noqa: F401
 from .pages import sitemap  # noqa: F401

files/views/media.py

@@ -74,10 +74,8 @@ class MediaList(APIView):
         if not request.user.is_authenticated:
             return base_queryset.filter(base_filters)
 
-        # Build OR conditions for authenticated users
+        conditions = base_filters
-        conditions = base_filters  # Start with listable media
 
-        # Add user permissions
         permission_filter = {'user': request.user}
         if user:
             permission_filter['owner_user'] = user
@@ -88,7 +86,6 @@ class MediaList(APIView):
                 perm_conditions &= Q(user=user)
             conditions |= perm_conditions
 
-        # Add RBAC conditions
         if getattr(settings, 'USE_RBAC', False):
             rbac_categories = request.user.get_rbac_categories_as_member()
             rbac_conditions = Q(category__in=rbac_categories)
@@ -99,7 +96,6 @@ class MediaList(APIView):
         return base_queryset.filter(conditions).distinct()
 
     def get(self, request, format=None):
-        # Show media
         # authenticated users can see:
 
         # All listable media (public access)
@@ -118,7 +114,6 @@ class MediaList(APIView):
         publish_state = params.get('publish_state', '').strip()
         query = params.get("q", "").strip().lower()
 
-        # Handle combined sort options (e.g., title_asc, views_desc)
         parsed_combined = False
         if sort_by and '_' in sort_by:
             parts = sort_by.rsplit('_', 1)
@@ -231,20 +226,25 @@ class MediaList(APIView):
             elif duration == '60-120':
                 media = media.filter(duration__gte=3600)
 
-        if publish_state and publish_state in ['private', 'public', 'unlisted']:
+        if publish_state:
-            media = media.filter(state=publish_state)
+            if publish_state == 'shared':
+                # Filter media that have custom permissions OR RBAC categories
+                shared_conditions = Q(permissions__isnull=False) | Q(category__is_rbac_category=True)
+                media = media.filter(shared_conditions).distinct()
+            elif publish_state in ['private', 'public', 'unlisted']:
+                media = media.filter(state=publish_state)
 
         if not already_sorted:
             media = media.order_by(f"{ordering}{sort_by}")
 
-        media = media[:1000]  # limit to 1000 results
+        media = media[:1000]
 
         paginator = pagination_class()
 
         page = paginator.paginate_queryset(media, request)
 
         serializer = MediaSerializer(page, many=True, context={"request": request})
-        # Collect all unique tags from the current page results
+
         tags_set = set()
         for media_obj in page:
             for tag in media_obj.tags.all():
@@ -354,28 +354,23 @@ class MediaBulkUserActions(APIView):
         },
     )
     def post(self, request, format=None):
-        # Check if user is authenticated
         if not request.user.is_authenticated:
             return Response({"detail": "Authentication required"}, status=status.HTTP_401_UNAUTHORIZED)
 
-        # Get required parameters
         media_ids = request.data.get('media_ids', [])
         action = request.data.get('action')
 
-        # Validate required parameters
         if not media_ids:
             return Response({"detail": "media_ids is required"}, status=status.HTTP_400_BAD_REQUEST)
 
         if not action:
             return Response({"detail": "action is required"}, status=status.HTTP_400_BAD_REQUEST)
 
-        # Get media objects owned by the user
         media = Media.objects.filter(user=request.user, friendly_token__in=media_ids)
 
         if not media:
             return Response({"detail": "No matching media found"}, status=status.HTTP_400_BAD_REQUEST)
 
-        # Process based on action
         if action == "enable_comments":
             media.update(enable_comments=True)
             return Response({"detail": f"Comments enabled for {media.count()} media items"})
@@ -446,12 +441,10 @@ class MediaBulkUserActions(APIView):
             if state not in valid_states:
                 return Response({"detail": f"state must be one of {valid_states}"}, status=status.HTTP_400_BAD_REQUEST)
 
-            # Check if user can set public state
             if not is_mediacms_editor(request.user) and settings.PORTAL_WORKFLOW != "public":
                 if state == "public":
                     return Response({"detail": "You are not allowed to set media to public state"}, status=status.HTTP_400_BAD_REQUEST)
 
-            # Update media state
             for m in media:
                 m.state = state
                 if m.state == "public" and m.encoding_status == "success" and m.is_reviewed is True:
@@ -495,8 +488,6 @@ class MediaBulkUserActions(APIView):
             if ownership_type not in valid_ownership_types:
                 return Response({"detail": f"ownership_type must be one of {valid_ownership_types}"}, status=status.HTTP_400_BAD_REQUEST)
 
-            # Find users who have the permission on ALL media items (intersection)
-
             media_count = media.count()
 
             users = (
@@ -523,7 +514,6 @@ class MediaBulkUserActions(APIView):
             if not usernames:
                 return Response({"detail": "users is required for set_ownership action"}, status=status.HTTP_400_BAD_REQUEST)
 
-            # Get valid users from the provided usernames
             users = User.objects.filter(username__in=usernames)
             if not users.exists():
                 return Response({"detail": "No valid users found"}, status=status.HTTP_400_BAD_REQUEST)
@@ -548,22 +538,17 @@ class MediaBulkUserActions(APIView):
             if not usernames:
                 return Response({"detail": "users is required for remove_ownership action"}, status=status.HTTP_400_BAD_REQUEST)
 
-            # Get valid users from the provided usernames
             users = User.objects.filter(username__in=usernames)
             if not users.exists():
                 return Response({"detail": "No valid users found"}, status=status.HTTP_400_BAD_REQUEST)
 
-            # Delete MediaPermission objects matching the criteria
             MediaPermission.objects.filter(media__in=media, permission=ownership_type, user__in=users).delete()
 
             return Response({"detail": "Action succeeded"})
 
         elif action == "playlist_membership":
-            # Find playlists that contain ALL the selected media (intersection)
-
             media_count = media.count()
 
-            # Query playlists owned by user that contain these media
             results = list(
                 Playlist.objects.filter(user=request.user, playlistmedia__media__in=media)
                 .values('id', 'friendly_token', 'title')
@@ -574,21 +559,15 @@ class MediaBulkUserActions(APIView):
             return Response({'results': results})
 
         elif action == "category_membership":
-            # Find categories that contain ALL the selected media (intersection)
-
             media_count = media.count()
 
-            # Query categories that contain these media
             results = list(Category.objects.filter(media__in=media).values('title', 'uid').annotate(media_count=Count('media', distinct=True)).filter(media_count=media_count))
 
             return Response({'results': results})
 
         elif action == "tag_membership":
-            # Find tags that contain ALL the selected media (intersection)
-
             media_count = media.count()
 
-            # Query tags that contain these media
             results = list(Tag.objects.filter(media__in=media).values('title').annotate(media_count=Count('media', distinct=True)).filter(media_count=media_count))
 
             return Response({'results': results})
@@ -605,7 +584,6 @@ class MediaBulkUserActions(APIView):
             added_count = 0
             for category in categories:
                 for m in media:
-                    # Add media to category (ManyToMany relationship)
                     if not m.category.filter(uid=category.uid).exists():
                         m.category.add(category)
                         added_count += 1
@@ -624,7 +602,6 @@ class MediaBulkUserActions(APIView):
             removed_count = 0
             for category in categories:
                 for m in media:
-                    # Remove media from category (ManyToMany relationship)
                     if m.category.filter(uid=category.uid).exists():
                         m.category.remove(category)
                         removed_count += 1
@@ -643,7 +620,6 @@ class MediaBulkUserActions(APIView):
             added_count = 0
             for tag in tags:
                 for m in media:
-                    # Add media to tag (ManyToMany relationship)
                     if not m.tags.filter(title=tag.title).exists():
                         m.tags.add(tag)
                         added_count += 1
@@ -662,7 +638,6 @@ class MediaBulkUserActions(APIView):
             removed_count = 0
             for tag in tags:
                 for m in media:
-                    # Remove media from tag (ManyToMany relationship)
                     if m.tags.filter(title=tag.title).exists():
                         m.tags.remove(tag)
                         removed_count += 1
@@ -829,13 +804,14 @@ class MediaDetail(APIView):
 
         serializer = MediaSerializer(media, data=request.data, context={"request": request})
         if serializer.is_valid():
-            serializer.save(user=request.user)
-            # no need to update the media file itself, only the metadata
             # if request.data.get('media_file'):
-            #    media_file = request.data["media_file"]
+            #     media_file = request.data["media_file"]
-            #    serializer.save(user=request.user, media_file=media_file)
+            #     media.state = helpers.get_default_state(request.user)
+            #     media.listable = False
+            #     serializer.save(user=request.user, media_file=media_file)
             # else:
-            #    serializer.save(user=request.user)
+            #     serializer.save(user=request.user)
+            serializer.save(user=request.user)
             return Response(serializer.data, status=status.HTTP_201_CREATED)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 

files/views/pages.py

@@ -1,4 +1,5 @@
 import json
+import os
 
 from django.conf import settings
 from django.contrib import messages
@@ -18,6 +19,7 @@ from ..forms import (
     EditSubtitleForm,
     MediaMetadataForm,
     MediaPublishForm,
+    ReplaceMediaForm,
     SubtitleForm,
     WhisperSubtitlesForm,
 )
@@ -363,6 +365,76 @@ def publish_media(request):
     )
 
 
+@login_required
+def replace_media(request):
+    """Replace media file"""
+
+    if not getattr(settings, 'ALLOW_MEDIA_REPLACEMENT', False):
+        return HttpResponseRedirect("/")
+
+    friendly_token = request.GET.get("m", "").strip()
+    if not friendly_token:
+        return HttpResponseRedirect("/")
+    media = Media.objects.filter(friendly_token=friendly_token).first()
+
+    if not media:
+        return HttpResponseRedirect("/")
+
+    if not (request.user.has_contributor_access_to_media(media) or is_mediacms_editor(request.user)):
+        return HttpResponseRedirect("/")
+
+    if not is_media_allowed_type(media):
+        return HttpResponseRedirect(media.get_absolute_url())
+
+    if request.method == "POST":
+        form = ReplaceMediaForm(media, request.POST, request.FILES)
+        if form.is_valid():
+            new_media_file = form.cleaned_data.get("new_media_file")
+
+            media.encodings.all().delete()
+
+            if media.thumbnail:
+                helpers.rm_file(media.thumbnail.path)
+                media.thumbnail = None
+            if media.poster:
+                helpers.rm_file(media.poster.path)
+                media.poster = None
+            if media.uploaded_thumbnail:
+                helpers.rm_file(media.uploaded_thumbnail.path)
+                media.uploaded_thumbnail = None
+            if media.uploaded_poster:
+                helpers.rm_file(media.uploaded_poster.path)
+                media.uploaded_poster = None
+            if media.sprites:
+                helpers.rm_file(media.sprites.path)
+                media.sprites = None
+            if media.preview_file_path:
+                helpers.rm_file(media.preview_file_path)
+                media.preview_file_path = ""
+
+            if media.hls_file:
+                hls_dir = os.path.dirname(media.hls_file)
+                helpers.rm_dir(hls_dir)
+                media.hls_file = ""
+
+            media.media_file = new_media_file
+
+            media.listable = False
+            media.state = helpers.get_default_state(request.user)
+            media.save()
+
+            messages.add_message(request, messages.INFO, translate_string(request.LANGUAGE_CODE, "Media file was replaced successfully"))
+            return HttpResponseRedirect(media.get_absolute_url())
+    else:
+        form = ReplaceMediaForm(media)
+
+    return render(
+        request,
+        "cms/replace_media.html",
+        {"form": form, "media_object": media, "add_subtitle_url": media.add_subtitle_url},
+    )
+
+
 @login_required
 def edit_chapters(request):
     """Edit chapters"""

files/widgets.py

@@ -0,0 +1,39 @@
+import json
+
+from django import forms
+from django.utils.safestring import mark_safe
+
+
+class CategoryModalWidget(forms.SelectMultiple):
+    """Two-panel category selector with modal"""
+
+    class Media:
+        css = {'all': ('css/category_modal.css',)}
+        js = ('js/category_modal.js',)
+
+    def render(self, name, value, attrs=None, renderer=None):
+        # Get all categories as JSON
+        categories = []
+        for opt_value, opt_label in self.choices:
+            if opt_value:  # Skip empty choice
+                categories.append({'id': str(opt_value), 'title': str(opt_label)})
+
+        all_categories_json = json.dumps(categories)
+        selected_ids_json = json.dumps([str(v) for v in (value or [])])
+
+        html = f'''<div class="category-widget" data-name="{name}">
+  <div class="category-content">
+    <div class="category-panel">
+      <input type="text" class="category-search" placeholder="Search categories...">
+      <div class="category-list scrollable" data-panel="left"></div>
+    </div>
+    <div class="category-panel">
+      <h3>Selected Categories</h3>
+      <div class="category-list scrollable" data-panel="right"></div>
+    </div>
+  </div>
+  <div class="hidden-inputs"></div>
+  <script type="application/json" class="category-data">{{"all":{all_categories_json},"selected":{selected_ids_json}}}</script>
+</div>'''
+
+        return mark_safe(html)

frontend-tools/chapters-editor/client/src/App.tsx

@@ -150,6 +150,11 @@ const App = () => {
                     canRedo={historyPosition < history.length - 1}
                 />
 
+                {/* Timeline Header */}
+                <div className="timeline-header-container">
+                    <h2 className="timeline-header-title">Add Chapters</h2>
+                </div>
+
                 {/* Timeline Controls */}
                 <TimelineControls
                     currentTime={currentTime}

frontend-tools/chapters-editor/client/src/components/ClipSegments.tsx

@@ -28,9 +28,9 @@ const ClipSegments = ({ segments, selectedSegmentId }: ClipSegmentsProps) => {
 
     // Generate the same color background for a segment as shown in the timeline
     const getSegmentColorClass = (index: number) => {
-        // Return CSS class based on index modulo 8
+        // Return CSS class based on index modulo 20
-        // This matches the CSS nth-child selectors in the timeline
+        // This matches the CSS classes for up to 20 segments
-        return `segment-default-color segment-color-${(index % 8) + 1}`;
+        return `segment-default-color segment-color-${(index % 20) + 1}`;
     };
 
     // Get selected segment
@@ -65,8 +65,8 @@ const ClipSegments = ({ segments, selectedSegmentId }: ClipSegmentsProps) => {
                     <div className="segment-actions">
                         <button
                             className="delete-button"
-                            aria-label="Delete Segment"
+                            aria-label="Delete Chapter"
-                            data-tooltip="Delete this segment"
+                            data-tooltip="Delete this chapter"
                             onClick={() => handleDeleteSegment(segment.id)}
                         >
                             <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">

frontend-tools/chapters-editor/client/src/components/IOSVideoPlayer.tsx

@@ -13,6 +13,7 @@ const IOSVideoPlayer = ({ videoRef, currentTime, duration }: IOSVideoPlayerProps
     const [videoUrl, setVideoUrl] = useState<string>('');
     const [iosVideoRef, setIosVideoRef] = useState<HTMLVideoElement | null>(null);
     const [posterImage, setPosterImage] = useState<string | undefined>(undefined);
+    const [isAudioFile, setIsAudioFile] = useState(false);
 
     // Refs for hold-to-continue functionality
     const incrementIntervalRef = useRef<NodeJS.Timeout | null>(null);
@@ -41,12 +42,13 @@ const IOSVideoPlayer = ({ videoRef, currentTime, duration }: IOSVideoPlayerProps
         setVideoUrl(url);
 
         // Check if the media is an audio file and set poster image
-        const isAudioFile = url.match(/\.(mp3|wav|ogg|m4a|aac|flac)$/i) !== null;
+        const audioFile = url.match(/\.(mp3|wav|ogg|m4a|aac|flac)$/i) !== null;
+        setIsAudioFile(audioFile);
         
         // Get posterUrl from MEDIA_DATA, or use audio-poster.jpg as fallback for audio files when posterUrl is empty, null, or "None"
         const mediaPosterUrl = (typeof window !== 'undefined' && (window as any).MEDIA_DATA?.posterUrl) || '';
         const isValidPoster = mediaPosterUrl && mediaPosterUrl !== 'None' && mediaPosterUrl.trim() !== '';
-        setPosterImage(isValidPoster ? mediaPosterUrl : (isAudioFile ? AUDIO_POSTER_URL : undefined));
+        setPosterImage(isValidPoster ? mediaPosterUrl : (audioFile ? AUDIO_POSTER_URL : undefined));
     }, [videoRef]);
 
     // Function to jump 15 seconds backward
@@ -128,22 +130,34 @@ const IOSVideoPlayer = ({ videoRef, currentTime, duration }: IOSVideoPlayerProps
                 </span>
             </div>
 
-            {/* iOS-optimized Video Element with Native Controls */}
+            {/* Video container with persistent background for audio files */}
-            <video
+            <div className="ios-video-wrapper">
-                ref={(ref) => setIosVideoRef(ref)}
+                {/* Persistent background image for audio files (Safari fix) */}
-                className="w-full rounded-md"
+                {isAudioFile && posterImage && (
-                src={videoUrl}
+                    <div 
-                controls
+                        className="ios-audio-poster-background" 
-                playsInline
+                        style={{ backgroundImage: `url(${posterImage})` }}
-                webkit-playsinline="true"
+                        aria-hidden="true"
-                x-webkit-airplay="allow"
+                    />
-                preload="auto"
+                )}
-                crossOrigin="anonymous"
+                
-                poster={posterImage}
+                {/* iOS-optimized Video Element with Native Controls */}
-            >
+                <video
-                <source src={videoUrl} type="video/mp4" />
+                    ref={(ref) => setIosVideoRef(ref)}
-                <p>Your browser doesn't support HTML5 video.</p>
+                    className={`w-full rounded-md ${isAudioFile && posterImage ? 'audio-with-poster' : ''}`}
-            </video>
+                    src={videoUrl}
+                    controls
+                    playsInline
+                    webkit-playsinline="true"
+                    x-webkit-airplay="allow"
+                    preload="auto"
+                    crossOrigin="anonymous"
+                    poster={posterImage}
+                >
+                    <source src={videoUrl} type="video/mp4" />
+                    <p>Your browser doesn't support HTML5 video.</p>
+                </video>
+            </div>
 
             {/* iOS Video Skip Controls */}
             <div className="ios-skip-controls mt-3 flex justify-center gap-4">

frontend-tools/chapters-editor/client/src/components/TimelineControls.tsx

@@ -177,7 +177,16 @@ const TimelineControls = ({
     const [isAutoSaving, setIsAutoSaving] = useState(false);
     const autoSaveTimerRef = useRef<NodeJS.Timeout | null>(null);
     const clipSegmentsRef = useRef(clipSegments);
-    
+    // Track when a drag just ended to prevent Safari from triggering clicks after drag
+    const dragJustEndedRef = useRef<boolean>(false);
+    const dragEndTimeoutRef = useRef<NodeJS.Timeout | null>(null);
+
+    // Helper function to detect Safari browser
+    const isSafari = () => {
+        if (typeof window === 'undefined') return false;
+        const userAgent = navigator.userAgent || navigator.vendor || (window as any).opera;
+        return /Safari/.test(userAgent) && !/Chrome/.test(userAgent) && !/Chromium/.test(userAgent);
+    };
 
     // Keep clipSegmentsRef updated
     useEffect(() => {
@@ -268,13 +277,8 @@ const TimelineControls = ({
     // Update editing title when selected segment changes
     useEffect(() => {
         if (selectedSegment) {
-            // Check if the chapter title is a default generated name (e.g., "Chapter 1", "Chapter 2", etc.)
+            // Always show the chapter title in the textarea, whether it's default or custom
-            const isDefaultChapterName = selectedSegment.chapterTitle && 
+            setEditingChapterTitle(selectedSegment.chapterTitle || '');
-                /^Chapter \d+$/.test(selectedSegment.chapterTitle);
-            
-            // If it's a default name, show empty string so placeholder appears
-            // If it's a custom title, show the actual title
-            setEditingChapterTitle(isDefaultChapterName ? '' : (selectedSegment.chapterTitle || ''));
         } else {
             setEditingChapterTitle('');
         }
@@ -872,6 +876,12 @@ const TimelineControls = ({
                 logger.debug('Clearing auto-save timer in cleanup:', autoSaveTimerRef.current);
                 clearTimeout(autoSaveTimerRef.current);
             }
+
+            // Clear any pending drag end timeout
+            if (dragEndTimeoutRef.current) {
+                clearTimeout(dragEndTimeoutRef.current);
+                dragEndTimeoutRef.current = null;
+            }
         };
     }, [scheduleAutoSave]);
 
@@ -1089,16 +1099,20 @@ const TimelineControls = ({
     };
 
     // Helper function to calculate available space for a new segment
-    const calculateAvailableSpace = (startTime: number): number => {
+    const calculateAvailableSpace = (startTime: number, segmentsOverride?: Segment[]): number => {
         // Always return at least 0.1 seconds to ensure tooltip shows
         const MIN_SPACE = 0.1;
 
+        // Use override segments if provided, otherwise use ref to get latest segments
+        // This ensures we always have the most up-to-date segments, especially important for Safari
+        const segmentsToUse = segmentsOverride || clipSegmentsRef.current;
+
         // Determine the amount of available space:
         // 1. Check remaining space until the end of video
         const remainingDuration = Math.max(0, duration - startTime);
 
         // 2. Find the next segment (if any)
-        const sortedSegments = [...clipSegments].sort((a, b) => a.startTime - b.startTime);
+        const sortedSegments = [...segmentsToUse].sort((a, b) => a.startTime - b.startTime);
 
         // Find the next and previous segments
         const nextSegment = sortedSegments.find((seg) => seg.startTime > startTime);
@@ -1114,14 +1128,6 @@ const TimelineControls = ({
             availableSpace = duration - startTime;
         }
 
-        // Log the space calculation for debugging
-        logger.debug('Space calculation:', {
-            position: formatDetailedTime(startTime),
-            nextSegment: nextSegment ? formatDetailedTime(nextSegment.startTime) : 'none',
-            prevSegment: prevSegment ? formatDetailedTime(prevSegment.endTime) : 'none',
-            availableSpace: formatDetailedTime(Math.max(MIN_SPACE, availableSpace)),
-        });
-
         // Always return at least MIN_SPACE to ensure tooltip shows
         return Math.max(MIN_SPACE, availableSpace);
     };
@@ -1130,8 +1136,11 @@ const TimelineControls = ({
     const updateTooltipForPosition = (currentPosition: number) => {
         if (!timelineRef.current) return;
 
+        // Use ref to get latest segments to avoid stale state issues
+        const currentSegments = clipSegmentsRef.current;
+
         // Find if we're in a segment at the current position with a small tolerance
-        const segmentAtPosition = clipSegments.find((seg) => {
+        const segmentAtPosition = currentSegments.find((seg) => {
             const isWithinSegment = currentPosition >= seg.startTime && currentPosition <= seg.endTime;
             const isVeryCloseToStart = Math.abs(currentPosition - seg.startTime) < 0.001;
             const isVeryCloseToEnd = Math.abs(currentPosition - seg.endTime) < 0.001;
@@ -1139,7 +1148,7 @@ const TimelineControls = ({
         });
 
         // Find the next and previous segments
-        const sortedSegments = [...clipSegments].sort((a, b) => a.startTime - b.startTime);
+        const sortedSegments = [...currentSegments].sort((a, b) => a.startTime - b.startTime);
         const nextSegment = sortedSegments.find((seg) => seg.startTime > currentPosition);
         const prevSegment = [...sortedSegments].reverse().find((seg) => seg.endTime < currentPosition);
 
@@ -1149,21 +1158,13 @@ const TimelineControls = ({
             setShowEmptySpaceTooltip(false);
         } else {
             // We're in a cutaway area
-            // Calculate available space for new segment
+            // Calculate available space for new segment using current segments
-            const availableSpace = calculateAvailableSpace(currentPosition);
+            const availableSpace = calculateAvailableSpace(currentPosition, currentSegments);
             setAvailableSegmentDuration(availableSpace);
 
             // Always show empty space tooltip
             setSelectedSegmentId(null);
             setShowEmptySpaceTooltip(true);
-
-            // Log position info for debugging
-            logger.debug('Cutaway position:', {
-                current: formatDetailedTime(currentPosition),
-                prevSegmentEnd: prevSegment ? formatDetailedTime(prevSegment.endTime) : 'none',
-                nextSegmentStart: nextSegment ? formatDetailedTime(nextSegment.startTime) : 'none',
-                availableSpace: formatDetailedTime(availableSpace),
-            });
         }
 
         // Update tooltip position
@@ -1193,6 +1194,12 @@ const TimelineControls = ({
 
         if (!timelineRef.current || !scrollContainerRef.current) return;
 
+        // Safari-specific fix: Ignore clicks that happen immediately after a drag operation
+        // Safari fires click events after drag ends, which can cause issues with stale state
+        if (isSafari() && dragJustEndedRef.current) {
+            return;
+        }
+
         // If on mobile device and video hasn't been initialized, don't handle timeline clicks
         if (isIOSUninitialized) {
             return;
@@ -1200,7 +1207,6 @@ const TimelineControls = ({
 
         // Check if video is globally playing before the click
         const wasPlaying = videoRef.current && !videoRef.current.paused;
-        logger.debug('Video was playing before timeline click:', wasPlaying);
 
         // Reset continuation flag when clicking on timeline - ensures proper boundary detection
         setContinuePastBoundary(false);
@@ -1221,14 +1227,6 @@ const TimelineControls = ({
 
         const newTime = position * duration;
 
-        // Log the position for debugging
-        logger.debug(
-            'Timeline clicked at:',
-            formatDetailedTime(newTime),
-            'distance from end:',
-            formatDetailedTime(duration - newTime)
-        );
-
         // Store position globally for iOS Safari (this is critical for first-time visits)
         if (typeof window !== 'undefined') {
             window.lastSeekedPosition = newTime;
@@ -1241,8 +1239,12 @@ const TimelineControls = ({
         setClickedTime(newTime);
         setDisplayTime(newTime);
 
+        // Use ref to get latest segments to avoid stale state issues, especially in Safari
+        // Safari can fire click events immediately after drag before React re-renders
+        const currentSegments = clipSegmentsRef.current;
+
         // Find if we clicked in a segment with a small tolerance for boundaries
-        const segmentAtClickedTime = clipSegments.find((seg) => {
+        const segmentAtClickedTime = currentSegments.find((seg) => {
             // Standard check for being inside a segment
             const isInside = newTime >= seg.startTime && newTime <= seg.endTime;
             // Additional checks for being exactly at the start or end boundary (with small tolerance)
@@ -1263,7 +1265,7 @@ const TimelineControls = ({
             if (isPlayingSegments && wasPlaying) {
                 // Update the current segment index if we clicked into a segment
                 if (segmentAtClickedTime) {
-                    const orderedSegments = [...clipSegments].sort((a, b) => a.startTime - b.startTime);
+                    const orderedSegments = [...currentSegments].sort((a, b) => a.startTime - b.startTime);
                     const targetSegmentIndex = orderedSegments.findIndex((seg) => seg.id === segmentAtClickedTime.id);
 
                     if (targetSegmentIndex !== -1) {
@@ -1316,8 +1318,9 @@ const TimelineControls = ({
                 // We're in a cutaway area - always show tooltip
                 setSelectedSegmentId(null);
 
-                // Calculate the available space for a new segment
+                // Calculate the available space for a new segment using current segments from ref
-                const availableSpace = calculateAvailableSpace(newTime);
+                // This ensures we use the latest segments even if React hasn't re-rendered yet
+                const availableSpace = calculateAvailableSpace(newTime, currentSegments);
                 setAvailableSegmentDuration(availableSpace);
 
                 // Calculate and set tooltip position correctly for zoomed timeline
@@ -1339,18 +1342,6 @@ const TimelineControls = ({
 
                 // Always show the empty space tooltip in cutaway areas
                 setShowEmptySpaceTooltip(true);
-
-                // Log the cutaway area details
-                const sortedSegments = [...clipSegments].sort((a, b) => a.startTime - b.startTime);
-                const prevSegment = [...sortedSegments].reverse().find((seg) => seg.endTime < newTime);
-                const nextSegment = sortedSegments.find((seg) => seg.startTime > newTime);
-
-                logger.debug('Clicked in cutaway area:', {
-                    position: formatDetailedTime(newTime),
-                    availableSpace: formatDetailedTime(availableSpace),
-                    prevSegmentEnd: prevSegment ? formatDetailedTime(prevSegment.endTime) : 'none',
-                    nextSegmentStart: nextSegment ? formatDetailedTime(nextSegment.startTime) : 'none',
-                });
             }
         }
     };
@@ -1503,6 +1494,10 @@ const TimelineControls = ({
                 return seg;
             });
 
+            // Update the ref immediately during drag to ensure we always have latest segments
+            // This is critical for Safari which may fire events before React re-renders
+            clipSegmentsRef.current = updatedSegments;
+
             // Create a custom event to update the segments WITHOUT recording in history during drag
             const updateEvent = new CustomEvent('update-segments', {
                 detail: {
@@ -1587,6 +1582,26 @@ const TimelineControls = ({
                 return seg;
             });
 
+            // CRITICAL: Update the ref immediately with the new segments
+            // This ensures that if Safari fires a click event before React re-renders,
+            // the click handler will use the updated segments instead of stale ones
+            clipSegmentsRef.current = finalSegments;
+
+            // Safari-specific fix: Set flag to ignore clicks immediately after drag
+            // Safari fires click events after drag ends, which can interfere with state updates
+            if (isSafari()) {
+                dragJustEndedRef.current = true;
+                // Clear the flag after a delay to allow React to re-render with updated segments
+                // Increased timeout to ensure state has propagated
+                if (dragEndTimeoutRef.current) {
+                    clearTimeout(dragEndTimeoutRef.current);
+                }
+                dragEndTimeoutRef.current = setTimeout(() => {
+                    dragJustEndedRef.current = false;
+                    dragEndTimeoutRef.current = null;
+                }, 200); // 200ms to ensure React has processed the state update and re-rendered
+            }
+
             // Now we can create a history record for the complete drag operation
             const actionType = isLeft ? 'adjust_segment_start' : 'adjust_segment_end';
             document.dispatchEvent(
@@ -1599,6 +1614,13 @@ const TimelineControls = ({
                 })
             );
 
+            // Dispatch segment-drag-end event for other listeners
+            document.dispatchEvent(
+                new CustomEvent('segment-drag-end', {
+                    detail: { segmentId },
+                })
+            );
+
             // After drag is complete, do a final check to see if playhead is inside the segment
             if (selectedSegmentId === segmentId && videoRef.current) {
                 const currentTime = videoRef.current.currentTime;
@@ -3948,9 +3970,7 @@ const TimelineControls = ({
                         <button
                             onClick={() => setShowSaveChaptersModal(true)}
                             className="save-chapters-button"
-                            data-tooltip={clipSegments.length === 0 
+                            {...(clipSegments.length === 0 && { 'data-tooltip': 'Clear all chapters' })}
-                                ? "Clear all chapters" 
-                                : "Save chapters"}
                         >
                             {clipSegments.length === 0 
                                 ? 'Clear Chapters' 
@@ -4087,4 +4107,4 @@ const TimelineControls = ({
     );
 };
 
-export default TimelineControls;
+export default TimelineControls;

frontend-tools/chapters-editor/client/src/components/VideoPlayer.tsx

@@ -353,8 +353,18 @@ const VideoPlayer: React.FC<VideoPlayerProps> = ({
 
     return (
         <div className="video-player-container">
+            {/* Persistent background image for audio files (Safari fix) */}
+            {isAudioFile && posterImage && (
+                <div 
+                    className="audio-poster-background" 
+                    style={{ backgroundImage: `url(${posterImage})` }}
+                    aria-hidden="true"
+                />
+            )}
+            
             <video
                 ref={videoRef}
+                className={isAudioFile && posterImage ? 'audio-with-poster' : ''}
                 preload="metadata"
                 crossOrigin="anonymous"
                 onClick={handleVideoClick}

frontend-tools/chapters-editor/client/src/hooks/useVideoChapters.tsx

@@ -20,7 +20,7 @@ const useVideoChapters = () => {
         // Sort by start time to find chronological position
         const sortedSegments = allSegments.sort((a, b) => a.startTime - b.startTime);
         // Find the index of our new segment
-        const chapterIndex = sortedSegments.findIndex(seg => seg.startTime === newSegmentStartTime);
+        const chapterIndex = sortedSegments.findIndex((seg) => seg.startTime === newSegmentStartTime);
         return `Chapter ${chapterIndex + 1}`;
     };
 
@@ -28,12 +28,18 @@ const useVideoChapters = () => {
     const renumberAllSegments = (segments: Segment[]): Segment[] => {
         // Sort segments by start time
         const sortedSegments = [...segments].sort((a, b) => a.startTime - b.startTime);
-        
+
         // Renumber each segment based on its chronological position
-        return sortedSegments.map((segment, index) => ({
+        // Only update titles that follow the default "Chapter X" pattern to preserve custom titles
-            ...segment,
+        return sortedSegments.map((segment, index) => {
-            chapterTitle: `Chapter ${index + 1}`
+            const currentTitle = segment.chapterTitle || '';
-        }));
+            const isDefaultTitle = /^Chapter \d+$/.test(currentTitle);
+
+            return {
+                ...segment,
+                chapterTitle: isDefaultTitle ? `Chapter ${index + 1}` : currentTitle,
+            };
+        });
     };
 
     // Helper function to parse time string (HH:MM:SS.mmm) to seconds
@@ -54,6 +60,9 @@ const useVideoChapters = () => {
     const [duration, setDuration] = useState(0);
     const [isPlaying, setIsPlaying] = useState(false);
     const [isMuted, setIsMuted] = useState(false);
+    
+    // Track if editor has been initialized to prevent re-initialization on Safari metadata events
+    const isInitializedRef = useRef<boolean>(false);
 
     // Timeline state
     const [trimStart, setTrimStart] = useState(0);
@@ -102,11 +111,7 @@ const useVideoChapters = () => {
     // Detect Safari browser
     const isSafari = () => {
         const userAgent = navigator.userAgent || navigator.vendor || (window as any).opera;
-        const isSafariBrowser = /Safari/.test(userAgent) && !/Chrome/.test(userAgent) && !/Chromium/.test(userAgent);
+        return /Safari/.test(userAgent) && !/Chrome/.test(userAgent) && !/Chromium/.test(userAgent);
-        if (isSafariBrowser) {
-            logger.debug('Safari browser detected, enabling audio support fallbacks');
-        }
-        return isSafariBrowser;
     };
 
     // Initialize video event listeners
@@ -115,7 +120,15 @@ const useVideoChapters = () => {
         if (!video) return;
 
         const handleLoadedMetadata = () => {
-            logger.debug('Video loadedmetadata event fired, duration:', video.duration);
+            // CRITICAL: Prevent re-initialization if editor has already been initialized
+            // Safari fires loadedmetadata multiple times, which was resetting segments
+            if (isInitializedRef.current) {
+                // Still update duration and trimEnd in case they changed
+                setDuration(video.duration);
+                setTrimEnd(video.duration);
+                return;
+            }
+            
             setDuration(video.duration);
             setTrimEnd(video.duration);
 
@@ -124,9 +137,7 @@ const useVideoChapters = () => {
                 let initialSegments: Segment[] = [];
 
                 // Check if we have existing chapters from the backend
-                const existingChapters =
+                const existingChapters = (typeof window !== 'undefined' && (window as any).MEDIA_DATA?.chapters) || [];
-                    (typeof window !== 'undefined' && (window as any).MEDIA_DATA?.chapters) ||
-                    [];
 
                 if (existingChapters.length > 0) {
                     // Create segments from existing chapters
@@ -150,7 +161,7 @@ const useVideoChapters = () => {
                     // Create a default segment that spans the entire video on first load
                     const initialSegment: Segment = {
                         id: 1,
-                        chapterTitle: '',
+                        chapterTitle: 'Chapter 1',
                         startTime: 0,
                         endTime: video.duration,
                     };
@@ -169,7 +180,7 @@ const useVideoChapters = () => {
                 setHistory([initialState]);
                 setHistoryPosition(0);
                 setClipSegments(initialSegments);
-                logger.debug('Editor initialized with segments:', initialSegments.length);
+                isInitializedRef.current = true; // Mark as initialized
             };
 
             initializeEditor();
@@ -177,20 +188,18 @@ const useVideoChapters = () => {
 
         // Safari-specific fallback for audio files
         const handleCanPlay = () => {
-            logger.debug('Video canplay event fired');
             // If loadedmetadata hasn't fired yet but we have duration, trigger initialization
-            if (video.duration && duration === 0) {
+            // Also check if already initialized to prevent re-initialization
-                logger.debug('Safari fallback: Using canplay event to initialize');
+            if (video.duration && duration === 0 && !isInitializedRef.current) {
                 handleLoadedMetadata();
             }
         };
 
         // Additional Safari fallback for audio files
         const handleLoadedData = () => {
-            logger.debug('Video loadeddata event fired');
             // If we still don't have duration, try again
-            if (video.duration && duration === 0) {
+            // Also check if already initialized to prevent re-initialization
-                logger.debug('Safari fallback: Using loadeddata event to initialize');
+            if (video.duration && duration === 0 && !isInitializedRef.current) {
                 handleLoadedMetadata();
             }
         };
@@ -222,14 +231,12 @@ const useVideoChapters = () => {
 
         // Safari-specific fallback event listeners for audio files
         if (isSafari()) {
-            logger.debug('Adding Safari-specific event listeners for audio support');
             video.addEventListener('canplay', handleCanPlay);
             video.addEventListener('loadeddata', handleLoadedData);
-            
+
             // Additional timeout fallback for Safari audio files
             const safariTimeout = setTimeout(() => {
-                if (video.duration && duration === 0) {
+                if (video.duration && duration === 0 && !isInitializedRef.current) {
-                    logger.debug('Safari timeout fallback: Force initializing editor');
                     handleLoadedMetadata();
                 }
             }, 1000);
@@ -261,21 +268,21 @@ const useVideoChapters = () => {
     useEffect(() => {
         if (isSafari() && videoRef.current) {
             const video = videoRef.current;
-            
+
             const initializeSafariOnInteraction = () => {
                 // Try to load video metadata by attempting to play and immediately pause
                 const attemptInitialization = async () => {
                     try {
                         logger.debug('Safari: Attempting auto-initialization on user interaction');
-                        
+
                         // Briefly play to trigger metadata loading, then pause
                         await video.play();
                         video.pause();
-                        
+
                         // Check if we now have duration and initialize if needed
                         if (video.duration > 0 && clipSegments.length === 0) {
                             logger.debug('Safari: Successfully initialized metadata, creating default segment');
-                            
+
                             const defaultSegment: Segment = {
                                 id: 1,
                                 chapterTitle: '',
@@ -286,14 +293,14 @@ const useVideoChapters = () => {
                             setDuration(video.duration);
                             setTrimEnd(video.duration);
                             setClipSegments([defaultSegment]);
-                            
+
                             const initialState: EditorState = {
                                 trimStart: 0,
                                 trimEnd: video.duration,
                                 splitPoints: [],
                                 clipSegments: [defaultSegment],
                             };
-                            
+
                             setHistory([initialState]);
                             setHistoryPosition(0);
                         }
@@ -315,7 +322,7 @@ const useVideoChapters = () => {
             // Add listeners for various user interactions
             document.addEventListener('click', handleUserInteraction);
             document.addEventListener('keydown', handleUserInteraction);
-            
+
             return () => {
                 document.removeEventListener('click', handleUserInteraction);
                 document.removeEventListener('keydown', handleUserInteraction);
@@ -332,7 +339,7 @@ const useVideoChapters = () => {
                 // This play/pause will trigger metadata loading in Safari
                 await video.play();
                 video.pause();
-                
+
                 // The metadata events should fire now and initialize segments
                 return true;
             } catch (error) {
@@ -564,8 +571,11 @@ const useVideoChapters = () => {
                     `Updating segments with action: ${actionType}, recordHistory: ${isSignificantChange ? 'true' : 'false'}`
                 );
 
+                // Renumber all segments to ensure proper chronological naming
+                const renumberedSegments = renumberAllSegments(e.detail.segments);
+
                 // Update segment state immediately for UI feedback
-                setClipSegments(e.detail.segments);
+                setClipSegments(renumberedSegments);
 
                 // Always save state to history for non-intermediate actions
                 if (isSignificantChange) {
@@ -573,7 +583,7 @@ const useVideoChapters = () => {
                     // ensure we capture the state properly
                     setTimeout(() => {
                         // Deep clone to ensure state is captured correctly
-                        const segmentsClone = JSON.parse(JSON.stringify(e.detail.segments));
+                        const segmentsClone = JSON.parse(JSON.stringify(renumberedSegments));
 
                         // Create a complete state snapshot
                         const stateWithAction: EditorState = {
@@ -919,10 +929,10 @@ const useVideoChapters = () => {
                 const singleChapter = backendChapters[0];
                 const startSeconds = parseTimeToSeconds(singleChapter.startTime);
                 const endSeconds = parseTimeToSeconds(singleChapter.endTime);
-                
+
                 // Check if this single chapter spans the entire video (within 0.1 second tolerance)
                 const isFullVideoChapter = startSeconds <= 0.1 && Math.abs(endSeconds - duration) <= 0.1;
-                
+
                 if (isFullVideoChapter) {
                     logger.debug('Manual save: Single chapter spans full video - sending empty array');
                     backendChapters = [];

frontend-tools/chapters-editor/client/src/styles/ClipSegments.css

@@ -82,27 +82,24 @@
         font-size: 0.875rem;
         font-weight: 500;
         color: var(--foreground, #333);
-        margin: 0;
+        margin-bottom: 0.75rem;
     }
 
     .save-chapters-button {
-        display: flex;
+        color: #ffffff;
-        align-items: center;
+        background: #059669;
-        gap: 0.5rem;
+        border-radius: 0.25rem;
-        padding: 0.5rem 1rem;
+        font-size: 0.75rem;
-        background-color: #3b82f6;
+        padding: 0.25rem 0.5rem;
-        color: white;
-        border: none;
-        border-radius: 0.375rem;
-        font-size: 0.875rem;
-        font-weight: 500;
         cursor: pointer;
-        transition: all 0.2s ease;
+        border: none;
+        white-space: nowrap;
+        transition: background-color 0.2s;
+        min-width: fit-content;
 
         &:hover {
-            background-color: #2563eb;
+            background-color: #059669;
-            transform: translateY(-1px);
+            box-shadow: 0 4px 6px -1px rgba(5, 150, 105, 0.3);
-            box-shadow: 0 4px 6px -1px rgba(59, 130, 246, 0.3);
         }
 
         &.has-changes {
@@ -205,9 +202,9 @@
         }
 
         &.selected {
-            border-color: #3b82f6;
+            border-color: #059669;
-            box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.1);
+            box-shadow: 0 0 0 3px rgba(5, 150, 105, 0.1);
-            background-color: rgba(59, 130, 246, 0.05);
+            background-color: rgba(5, 150, 105, 0.05);
         }
     }
 
@@ -287,29 +284,68 @@
         color: rgba(51, 51, 51, 0.7);
     }
 
+    /* Generate 20 shades of #059669 (rgb(5, 150, 105)) */
+    /* Base color: #059669 = rgb(5, 150, 105) */
+    /* Creating variations from lighter to darker */
     .segment-color-1 {
-        background-color: rgba(59, 130, 246, 0.15);
+        background-color: rgba(167, 243, 208, 0.2);
     }
     .segment-color-2 {
-        background-color: rgba(16, 185, 129, 0.15);
+        background-color: rgba(134, 239, 172, 0.2);
     }
     .segment-color-3 {
-        background-color: rgba(245, 158, 11, 0.15);
+        background-color: rgba(101, 235, 136, 0.2);
     }
     .segment-color-4 {
-        background-color: rgba(239, 68, 68, 0.15);
+        background-color: rgba(68, 231, 100, 0.2);
     }
     .segment-color-5 {
-        background-color: rgba(139, 92, 246, 0.15);
+        background-color: rgba(35, 227, 64, 0.2);
     }
     .segment-color-6 {
-        background-color: rgba(236, 72, 153, 0.15);
+        background-color: rgba(20, 207, 54, 0.2);
     }
     .segment-color-7 {
-        background-color: rgba(6, 182, 212, 0.15);
+        background-color: rgba(15, 187, 48, 0.2);
     }
     .segment-color-8 {
-        background-color: rgba(250, 204, 21, 0.15);
+        background-color: rgba(10, 167, 42, 0.2);
+    }
+    .segment-color-9 {
+        background-color: rgba(5, 150, 105, 0.2);
+    }
+    .segment-color-10 {
+        background-color: rgba(4, 135, 95, 0.2);
+    }
+    .segment-color-11 {
+        background-color: rgba(3, 120, 85, 0.2);
+    }
+    .segment-color-12 {
+        background-color: rgba(2, 105, 75, 0.2);
+    }
+    .segment-color-13 {
+        background-color: rgba(2, 90, 65, 0.2);
+    }
+    .segment-color-14 {
+        background-color: rgba(1, 75, 55, 0.2);
+    }
+    .segment-color-15 {
+        background-color: rgba(1, 66, 48, 0.2);
+    }
+    .segment-color-16 {
+        background-color: rgba(1, 57, 41, 0.2);
+    }
+    .segment-color-17 {
+        background-color: rgba(1, 48, 34, 0.2);
+    }
+    .segment-color-18 {
+        background-color: rgba(0, 39, 27, 0.2);
+    }
+    .segment-color-19 {
+        background-color: rgba(0, 30, 20, 0.2);
+    }
+    .segment-color-20 {
+        background-color: rgba(0, 21, 13, 0.2);
     }
 
     /* Responsive styles */

frontend-tools/chapters-editor/client/src/styles/IOSNotification.css

@@ -31,7 +31,7 @@
 
 .ios-notification-icon {
     flex-shrink: 0;
-    color: #0066cc;
+    color: #059669;
     margin-right: 15px;
     margin-top: 3px;
 }
@@ -96,7 +96,7 @@
 }
 
 .ios-desktop-mode-btn {
-    background-color: #0066cc;
+    background-color: #059669;
     color: white;
     border: none;
     border-radius: 8px;

frontend-tools/chapters-editor/client/src/styles/IOSVideoPlayer.css

@@ -8,12 +8,40 @@
     overflow: hidden;
 }
 
+/* Video wrapper for positioning background */
+.ios-video-wrapper {
+    position: relative;
+    width: 100%;
+    background-color: black;
+    border-radius: 0.5rem;
+    overflow: hidden;
+}
+
+/* Persistent background poster for audio files (Safari fix) */
+.ios-audio-poster-background {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-size: contain;
+    background-position: center;
+    background-repeat: no-repeat;
+    z-index: -1;
+    pointer-events: none;
+}
+
 .ios-video-player-container video {
+    position: relative;
     width: 100%;
     height: auto;
     max-height: 360px;
     aspect-ratio: 16/9;
-    background-color: black;
+}
+
+/* Make video transparent only for audio files with poster so background shows through */
+.ios-video-player-container video.audio-with-poster {
+    background-color: transparent;
 }
 
 .ios-time-display {

frontend-tools/chapters-editor/client/src/styles/Modal.css

@@ -92,12 +92,12 @@
     }
 
     .modal-button-primary {
-        background-color: #0066cc;
+        background-color: #059669;
         color: white;
     }
 
     .modal-button-primary:hover {
-        background-color: #0055aa;
+        background-color: #059669;
     }
 
     .modal-button-secondary {
@@ -138,7 +138,7 @@
     .spinner {
         border: 4px solid rgba(0, 0, 0, 0.1);
         border-radius: 50%;
-        border-top: 4px solid #0066cc;
+        border-top: 4px solid #059669;
         width: 30px;
         height: 30px;
         animation: spin 1s linear infinite;
@@ -224,7 +224,7 @@
         padding: 12px 16px;
         border: none;
         border-radius: 4px;
-        background-color: #0066cc;
+        background-color: #059669;
         text-align: center;
         cursor: pointer;
         transition: all 0.2s;
@@ -258,12 +258,12 @@
         margin: 0 auto;
         width: auto;
         min-width: 220px;
-        background-color: #0066cc;
+        background-color: #059669;
         color: white;
     }
 
     .centered-choice:hover {
-        background-color: #0055aa;
+        background-color: #059669;
     }
 
     @media (max-width: 480px) {
@@ -300,7 +300,7 @@
 
     .countdown {
         font-weight: bold;
-        color: #0066cc;
+        color: #059669;
         font-size: 1.1rem;
     }
 }

frontend-tools/chapters-editor/client/src/styles/TimelineControls.css

@@ -1,4 +1,16 @@
 #chapters-editor-root {
+    .timeline-header-container {
+        margin-left: 1rem;
+        margin-top: -0.5rem;
+    }
+
+    .timeline-header-title {
+        font-size: 1.125rem;
+        font-weight: 600;
+        color: #059669;
+        margin: 0;
+    }
+
     .timeline-container-card {
         background-color: white;
         border-radius: 0.5rem;
@@ -11,6 +23,8 @@
         display: flex;
         justify-content: space-between;
         align-items: center;
+        padding-bottom: 0.5rem;
+        border-bottom: 2px solid rgba(16, 185, 129, 0.2);
     }
 
     .timeline-title {
@@ -20,7 +34,7 @@
     }
 
     .timeline-title-text {
-        font-weight: 700;
+        font-size: 0.875rem;
     }
 
     .current-time {
@@ -48,10 +62,11 @@
     .timeline-container {
         position: relative;
         min-width: 100%;
-        background-color: #fafbfc;
+        background-color: #e2ede4;
         height: 70px;
         border-radius: 0.25rem;
         overflow: visible !important;
+        border: 1px solid rgba(16, 185, 129, 0.2);
     }
 
     .timeline-marker {
@@ -194,7 +209,7 @@
         left: 0;
         right: 0;
         padding: 0.4rem;
-        background-color: rgba(0, 0, 0, 0.4);
+        background-color: rgba(16, 185, 129, 0.6);
         color: white;
         opacity: 1;
         transition: background-color 0.2s;
@@ -202,15 +217,15 @@
     }
 
     .clip-segment:hover .clip-segment-info {
-        background-color: rgba(0, 0, 0, 0.5);
+        background-color: rgba(16, 185, 129, 0.7);
     }
 
     .clip-segment.selected .clip-segment-info {
-        background-color: rgba(59, 130, 246, 0.5);
+        background-color: rgba(5, 150, 105, 0.8);
     }
 
     .clip-segment.selected:hover .clip-segment-info {
-        background-color: rgba(59, 130, 246, 0.4);
+        background-color: rgba(5, 150, 105, 0.75);
     }
 
     .clip-segment-name {
@@ -540,7 +555,7 @@
     .save-copy-button,
     .save-segments-button {
         color: #ffffff;
-        background: #0066cc;
+        background: #059669;
         border-radius: 0.25rem;
         font-size: 0.75rem;
         padding: 0.25rem 0.5rem;
@@ -713,7 +728,7 @@
         height: 50px;
         border: 5px solid rgba(0, 0, 0, 0.1);
         border-radius: 50%;
-        border-top-color: #0066cc;
+        border-top-color: #059669;
         animation: spin 1s ease-in-out infinite;
     }
 
@@ -753,7 +768,7 @@
         align-items: center;
         justify-content: center;
         padding: 0.75rem 1.25rem;
-        background-color: #0066cc;
+        background-color: #059669;
         color: white;
         border-radius: 4px;
         text-decoration: none;
@@ -766,7 +781,7 @@
     }
 
     .modal-choice-button:hover {
-        background-color: #0056b3;
+        background-color:rgb(7, 119, 84);
     }
 
     .modal-choice-button svg {
@@ -941,7 +956,6 @@
 
 .save-chapters-button:hover {
     background-color: #2563eb;
-    transform: translateY(-1px);
     box-shadow: 0 4px 6px -1px rgba(59, 130, 246, 0.3);
 }
 

frontend-tools/chapters-editor/client/src/styles/VideoPlayer.css

@@ -76,10 +76,26 @@
         user-select: none;
     }
 
+    /* Persistent background poster for audio files (Safari fix) */
+    .audio-poster-background {
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        background-size: contain;
+        background-position: center;
+        background-repeat: no-repeat;
+        z-index: 1;
+        pointer-events: none;
+    }
+
     .video-player-container video {
+        position: relative;
         width: 100%;
         height: 100%;
         cursor: pointer;
+        z-index: 2;
         /* Force hardware acceleration */
         transform: translateZ(0);
         -webkit-transform: translateZ(0);
@@ -88,6 +104,11 @@
         user-select: none;
     }
 
+    /* Make video transparent only for audio files with poster so background shows through */
+    .video-player-container video.audio-with-poster {
+        background: transparent;
+    }
+
     /* iOS-specific styles */
     @supports (-webkit-touch-callout: none) {
         .video-player-container video {
@@ -109,6 +130,7 @@
         opacity: 0;
         transition: opacity 0.3s;
         pointer-events: none;
+        z-index: 3;
     }
 
     .video-player-container:hover .play-pause-indicator {
@@ -187,6 +209,7 @@
         background: linear-gradient(transparent, rgba(0, 0, 0, 0.7));
         opacity: 0;
         transition: opacity 0.3s;
+        z-index: 3;
     }
 
     .video-player-container:hover .video-controls {

frontend-tools/video-editor/client/src/App.tsx

@@ -309,6 +309,11 @@ const App = () => {
           canRedo={historyPosition < history.length - 1}
         />
 
+                 {/* Timeline Header */}
+                 <div className="timeline-header-container">
+                     <h2 className="timeline-header-title">Trim or Split</h2>
+                 </div>
+
         {/* Timeline Controls */}
         <TimelineControls
           currentTime={currentTime}

frontend-tools/video-editor/client/src/components/ClipSegments.tsx

@@ -28,9 +28,9 @@ const ClipSegments = ({ segments }: ClipSegmentsProps) => {
 
     // Generate the same color background for a segment as shown in the timeline
     const getSegmentColorClass = (index: number) => {
-        // Return CSS class based on index modulo 8
+        // Return CSS class based on index modulo 20
-        // This matches the CSS nth-child selectors in the timeline
+        // This matches the CSS classes for up to 20 segments
-        return `segment-default-color segment-color-${(index % 8) + 1}`;
+        return `segment-default-color segment-color-${(index % 20) + 1}`;
     };
 
     return (

frontend-tools/video-editor/client/src/components/IOSVideoPlayer.tsx

@@ -13,6 +13,7 @@ const IOSVideoPlayer = ({ videoRef, currentTime, duration }: IOSVideoPlayerProps
     const [videoUrl, setVideoUrl] = useState<string>('');
     const [iosVideoRef, setIosVideoRef] = useState<HTMLVideoElement | null>(null);
     const [posterImage, setPosterImage] = useState<string | undefined>(undefined);
+    const [isAudioFile, setIsAudioFile] = useState(false);
 
     // Refs for hold-to-continue functionality
     const incrementIntervalRef = useRef<NodeJS.Timeout | null>(null);
@@ -41,12 +42,13 @@ const IOSVideoPlayer = ({ videoRef, currentTime, duration }: IOSVideoPlayerProps
         setVideoUrl(url);
 
         // Check if the media is an audio file and set poster image
-        const isAudioFile = url.match(/\.(mp3|wav|ogg|m4a|aac|flac)$/i) !== null;
+        const audioFile = url.match(/\.(mp3|wav|ogg|m4a|aac|flac)$/i) !== null;
+        setIsAudioFile(audioFile);
         
         // Get posterUrl from MEDIA_DATA, or use audio-poster.jpg as fallback for audio files when posterUrl is empty, null, or "None"
         const mediaPosterUrl = (typeof window !== 'undefined' && (window as any).MEDIA_DATA?.posterUrl) || '';
         const isValidPoster = mediaPosterUrl && mediaPosterUrl !== 'None' && mediaPosterUrl.trim() !== '';
-        setPosterImage(isValidPoster ? mediaPosterUrl : (isAudioFile ? AUDIO_POSTER_URL : undefined));
+        setPosterImage(isValidPoster ? mediaPosterUrl : (audioFile ? AUDIO_POSTER_URL : undefined));
     }, [videoRef]);
 
     // Function to jump 15 seconds backward
@@ -128,22 +130,34 @@ const IOSVideoPlayer = ({ videoRef, currentTime, duration }: IOSVideoPlayerProps
                 </span>
             </div>
 
-            {/* iOS-optimized Video Element with Native Controls */}
+            {/* Video container with persistent background for audio files */}
-            <video
+            <div className="ios-video-wrapper">
-                ref={(ref) => setIosVideoRef(ref)}
+                {/* Persistent background image for audio files (Safari fix) */}
-                className="w-full rounded-md"
+                {isAudioFile && posterImage && (
-                src={videoUrl}
+                    <div 
-                controls
+                        className="ios-audio-poster-background" 
-                playsInline
+                        style={{ backgroundImage: `url(${posterImage})` }}
-                webkit-playsinline="true"
+                        aria-hidden="true"
-                x-webkit-airplay="allow"
+                    />
-                preload="auto"
+                )}
-                crossOrigin="anonymous"
+                
-                poster={posterImage}
+                {/* iOS-optimized Video Element with Native Controls */}
-            >
+                <video
-                <source src={videoUrl} type="video/mp4" />
+                    ref={(ref) => setIosVideoRef(ref)}
-                <p>Your browser doesn't support HTML5 video.</p>
+                    className={`w-full rounded-md ${isAudioFile && posterImage ? 'audio-with-poster' : ''}`}
-            </video>
+                    src={videoUrl}
+                    controls
+                    playsInline
+                    webkit-playsinline="true"
+                    x-webkit-airplay="allow"
+                    preload="auto"
+                    crossOrigin="anonymous"
+                    poster={posterImage}
+                >
+                    <source src={videoUrl} type="video/mp4" />
+                    <p>Your browser doesn't support HTML5 video.</p>
+                </video>
+            </div>
 
             {/* iOS Video Skip Controls */}
             <div className="ios-skip-controls mt-3 flex justify-center gap-4">

frontend-tools/video-editor/client/src/components/VideoPlayer.tsx

@@ -353,8 +353,18 @@ const VideoPlayer: React.FC<VideoPlayerProps> = ({
 
     return (
         <div className="video-player-container">
+            {/* Persistent background image for audio files (Safari fix) */}
+            {isAudioFile && posterImage && (
+                <div 
+                    className="audio-poster-background" 
+                    style={{ backgroundImage: `url(${posterImage})` }}
+                    aria-hidden="true"
+                />
+            )}
+            
             <video
                 ref={videoRef}
+                className={isAudioFile && posterImage ? 'audio-with-poster' : ''}
                 preload="metadata"
                 crossOrigin="anonymous"
                 onClick={handleVideoClick}

frontend-tools/video-editor/client/src/styles/ClipSegments.css

@@ -99,6 +99,7 @@
     }
 
     .segment-thumbnail {
+        display: none;
         width: 4rem;
         height: 2.25rem;
         background-size: cover;
@@ -129,7 +130,7 @@
         margin-top: 0.25rem;
         display: inline-block;
         background-color: #f3f4f6;
-        padding: 0 0.5rem;
+        padding: 0;
         border-radius: 0.25rem;
         color: black;
     }
@@ -169,28 +170,67 @@
         color: rgba(51, 51, 51, 0.7);
     }
 
+    /* Generate 20 shades of #2563eb (rgb(37, 99, 235)) */
+    /* Base color: #2563eb = rgb(37, 99, 235) */
+    /* Creating variations from lighter to darker */
     .segment-color-1 {
-        background-color: rgba(59, 130, 246, 0.15);
+        background-color: rgba(147, 179, 247, 0.2);
     }
     .segment-color-2 {
-        background-color: rgba(16, 185, 129, 0.15);
+        background-color: rgba(129, 161, 243, 0.2);
     }
     .segment-color-3 {
-        background-color: rgba(245, 158, 11, 0.15);
+        background-color: rgba(111, 143, 239, 0.2);
     }
     .segment-color-4 {
-        background-color: rgba(239, 68, 68, 0.15);
+        background-color: rgba(93, 125, 237, 0.2);
     }
     .segment-color-5 {
-        background-color: rgba(139, 92, 246, 0.15);
+        background-color: rgba(75, 107, 235, 0.2);
     }
     .segment-color-6 {
-        background-color: rgba(236, 72, 153, 0.15);
+        background-color: rgba(65, 99, 235, 0.2);
     }
     .segment-color-7 {
-        background-color: rgba(6, 182, 212, 0.15);
+        background-color: rgba(55, 91, 235, 0.2);
     }
     .segment-color-8 {
-        background-color: rgba(250, 204, 21, 0.15);
+        background-color: rgba(45, 83, 235, 0.2);
+    }
+    .segment-color-9 {
+        background-color: rgba(37, 99, 235, 0.2);
+    }
+    .segment-color-10 {
+        background-color: rgba(33, 89, 215, 0.2);
+    }
+    .segment-color-11 {
+        background-color: rgba(29, 79, 195, 0.2);
+    }
+    .segment-color-12 {
+        background-color: rgba(25, 69, 175, 0.2);
+    }
+    .segment-color-13 {
+        background-color: rgba(21, 59, 155, 0.2);
+    }
+    .segment-color-14 {
+        background-color: rgba(17, 49, 135, 0.2);
+    }
+    .segment-color-15 {
+        background-color: rgba(15, 43, 119, 0.2);
+    }
+    .segment-color-16 {
+        background-color: rgba(13, 37, 103, 0.2);
+    }
+    .segment-color-17 {
+        background-color: rgba(11, 31, 87, 0.2);
+    }
+    .segment-color-18 {
+        background-color: rgba(9, 25, 71, 0.2);
+    }
+    .segment-color-19 {
+        background-color: rgba(7, 19, 55, 0.2);
+    }
+    .segment-color-20 {
+        background-color: rgba(5, 13, 39, 0.2);
     }
 }

frontend-tools/video-editor/client/src/styles/IOSVideoPlayer.css

@@ -8,12 +8,40 @@
     overflow: hidden;
 }
 
+/* Video wrapper for positioning background */
+.ios-video-wrapper {
+    position: relative;
+    width: 100%;
+    background-color: black;
+    border-radius: 0.5rem;
+    overflow: hidden;
+}
+
+/* Persistent background poster for audio files (Safari fix) */
+.ios-audio-poster-background {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-size: contain;
+    background-position: center;
+    background-repeat: no-repeat;
+    z-index: -1;
+    pointer-events: none;
+}
+
 .ios-video-player-container video {
+    position: relative;
     width: 100%;
     height: auto;
     max-height: 360px;
     aspect-ratio: 16/9;
-    background-color: black;
+}
+
+/* Make video transparent only for audio files with poster so background shows through */
+.ios-video-player-container video.audio-with-poster {
+    background-color: transparent;
 }
 
 .ios-time-display {

frontend-tools/video-editor/client/src/styles/TimelineControls.css

@@ -1,4 +1,16 @@
 #video-editor-trim-root {
+    .timeline-header-container {
+        margin-left: 1rem;
+        margin-top: -0.5rem;
+    }
+
+    .timeline-header-title {
+        font-size: 1.125rem;
+        font-weight: 600;
+        color: #2563eb;
+        margin: 0;
+    }
+
     .timeline-container-card {
         background-color: white;
         border-radius: 0.5rem;
@@ -11,6 +23,8 @@
         display: flex;
         justify-content: space-between;
         align-items: center;
+        padding-bottom: 0.5rem;
+        border-bottom: 2px solid rgba(59, 130, 246, 0.2);
     }
 
     .timeline-title {
@@ -20,7 +34,7 @@
     }
 
     .timeline-title-text {
-        font-weight: 700;
+        font-size: 0.875rem;
     }
 
     .current-time {
@@ -48,10 +62,11 @@
     .timeline-container {
         position: relative;
         min-width: 100%;
-        background-color: #fafbfc;
+        background-color: #eff6ff;
         height: 70px;
         border-radius: 0.25rem;
         overflow: visible !important;
+        border: 1px solid rgba(59, 130, 246, 0.2);
     }
 
     .timeline-marker {
@@ -194,7 +209,7 @@
         left: 0;
         right: 0;
         padding: 0.4rem;
-        background-color: rgba(0, 0, 0, 0.4);
+        background-color: rgba(59, 130, 246, 0.6);
         color: white;
         opacity: 1;
         transition: background-color 0.2s;
@@ -202,15 +217,15 @@
     }
 
     .clip-segment:hover .clip-segment-info {
-        background-color: rgba(0, 0, 0, 0.5);
+        background-color: rgba(59, 130, 246, 0.7);
     }
 
     .clip-segment.selected .clip-segment-info {
-        background-color: rgba(59, 130, 246, 0.5);
+        background-color: rgba(37, 99, 235, 0.8);
     }
 
     .clip-segment.selected:hover .clip-segment-info {
-        background-color: rgba(59, 130, 246, 0.4);
+        background-color: rgba(37, 99, 235, 0.75);
     }
 
     .clip-segment-name {

frontend-tools/video-editor/client/src/styles/VideoPlayer.css

@@ -76,10 +76,26 @@
         user-select: none;
     }
 
+    /* Persistent background poster for audio files (Safari fix) */
+    .audio-poster-background {
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        background-size: contain;
+        background-position: center;
+        background-repeat: no-repeat;
+        z-index: 1;
+        pointer-events: none;
+    }
+
     .video-player-container video {
+        position: relative;
         width: 100%;
         height: 100%;
         cursor: pointer;
+        z-index: 2;
         /* Force hardware acceleration */
         transform: translateZ(0);
         -webkit-transform: translateZ(0);
@@ -88,6 +104,11 @@
         user-select: none;
     }
 
+    /* Make video transparent only for audio files with poster so background shows through */
+    .video-player-container video.audio-with-poster {
+        background: transparent;
+    }
+
     /* iOS-specific styles */
     @supports (-webkit-touch-callout: none) {
         .video-player-container video {
@@ -109,6 +130,7 @@
         opacity: 0;
         transition: opacity 0.3s;
         pointer-events: none;
+        z-index: 3;
     }
 
     .video-player-container:hover .play-pause-indicator {
@@ -187,6 +209,7 @@
         background: linear-gradient(transparent, rgba(0, 0, 0, 0.7));
         opacity: 0;
         transition: opacity 0.3s;
+        z-index: 3;
     }
 
     .video-player-container:hover .video-controls {

frontend-tools/video-js/src/components/controls/CustomChaptersOverlay.js

@@ -20,6 +20,7 @@ class CustomChaptersOverlay extends Component {
         this.touchStartTime = 0;
         this.touchThreshold = 150; // ms for tap vs scroll detection
         this.isSmallScreen = window.innerWidth <= 480;
+        this.scrollY = 0; // Track scroll position before locking
 
         // Bind methods
         this.createOverlay = this.createOverlay.bind(this);
@@ -31,6 +32,8 @@ class CustomChaptersOverlay extends Component {
         this.handleMobileInteraction = this.handleMobileInteraction.bind(this);
         this.setupResizeListener = this.setupResizeListener.bind(this);
         this.handleResize = this.handleResize.bind(this);
+        this.lockBodyScroll = this.lockBodyScroll.bind(this);
+        this.unlockBodyScroll = this.unlockBodyScroll.bind(this);
 
         // Initialize after player is ready
         this.player().ready(() => {
@@ -65,6 +68,9 @@ class CustomChaptersOverlay extends Component {
 
         const el = this.player().el();
         if (el) el.classList.remove('chapters-open');
+
+        // Restore body scroll on mobile when closing
+        this.unlockBodyScroll();
     }
 
     setupResizeListener() {
@@ -164,6 +170,8 @@ class CustomChaptersOverlay extends Component {
             this.overlay.style.display = 'none';
             const el = this.player().el();
             if (el) el.classList.remove('chapters-open');
+            // Restore body scroll on mobile when closing
+            this.unlockBodyScroll();
         };
         chapterClose.appendChild(closeBtn);
         playlistTitle.appendChild(chapterClose);
@@ -355,6 +363,37 @@ class CustomChaptersOverlay extends Component {
         }
     }
 
+    lockBodyScroll() {
+        if (!this.isMobile) return;
+
+        // Save current scroll position
+        this.scrollY = window.scrollY || window.pageYOffset;
+
+        // Lock body scroll with proper iOS handling
+        document.body.style.overflow = 'hidden';
+        document.body.style.position = 'fixed';
+        document.body.style.top = `-${this.scrollY}px`;
+        document.body.style.left = '0';
+        document.body.style.right = '0';
+        document.body.style.width = '100%';
+    }
+
+    unlockBodyScroll() {
+        if (!this.isMobile) return;
+
+        // Restore body scroll
+        const scrollY = this.scrollY;
+        document.body.style.overflow = '';
+        document.body.style.position = '';
+        document.body.style.top = '';
+        document.body.style.left = '';
+        document.body.style.right = '';
+        document.body.style.width = '';
+
+        // Restore scroll position
+        window.scrollTo(0, scrollY);
+    }
+
     toggleOverlay() {
         if (!this.overlay) return;
 
@@ -369,17 +408,11 @@ class CustomChaptersOverlay extends Component {
             navigator.vibrate(30);
         }
 
-        // Prevent body scroll on mobile when overlay is open
+        // Lock/unlock body scroll on mobile when overlay opens/closes
-        if (this.isMobile) {
+        if (isHidden) {
-            if (isHidden) {
+            this.lockBodyScroll();
-                document.body.style.overflow = 'hidden';
+        } else {
-                document.body.style.position = 'fixed';
+            this.unlockBodyScroll();
-                document.body.style.width = '100%';
-            } else {
-                document.body.style.overflow = '';
-                document.body.style.position = '';
-                document.body.style.width = '';
-            }
         }
 
         try {
@@ -390,7 +423,9 @@ class CustomChaptersOverlay extends Component {
                     m.classList.remove('vjs-lock-showing');
                     m.style.display = 'none';
                 });
-        } catch (e) {}
+        } catch {
+            // Ignore errors when closing menus
+        }
     }
 
     updateCurrentChapter() {
@@ -406,7 +441,6 @@ class CustomChaptersOverlay extends Component {
                 currentTime >= chapter.startTime &&
                 (index === this.chaptersData.length - 1 || currentTime < this.chaptersData[index + 1].startTime);
 
-            const handle = item.querySelector('.playlist-drag-handle');
             const dynamic = item.querySelector('.meta-dynamic');
             if (isPlaying) {
                 currentChapterIndex = index;
@@ -463,11 +497,7 @@ class CustomChaptersOverlay extends Component {
             if (el) el.classList.remove('chapters-open');
 
             // Restore body scroll on mobile
-            if (this.isMobile) {
+            this.unlockBodyScroll();
-                document.body.style.overflow = '';
-                document.body.style.position = '';
-                document.body.style.width = '';
-            }
         }
     }
 
@@ -479,11 +509,7 @@ class CustomChaptersOverlay extends Component {
         if (el) el.classList.remove('chapters-open');
 
         // Restore body scroll on mobile when disposing
-        if (this.isMobile) {
+        this.unlockBodyScroll();
-            document.body.style.overflow = '';
-            document.body.style.position = '';
-            document.body.style.width = '';
-        }
 
         // Clean up event listeners
         if (this.handleResize) {

frontend-tools/video-js/src/components/controls/CustomSettingsMenu.js

@@ -25,6 +25,7 @@ class CustomSettingsMenu extends Component {
         this.isMobile = this.detectMobile();
         this.isSmallScreen = window.innerWidth <= 480;
         this.touchThreshold = 150; // ms for tap vs scroll detection
+        this.scrollY = 0; // Track scroll position before locking
 
         // Bind methods
         this.createSettingsButton = this.createSettingsButton.bind(this);
@@ -41,6 +42,8 @@ class CustomSettingsMenu extends Component {
         this.detectMobile = this.detectMobile.bind(this);
         this.handleMobileInteraction = this.handleMobileInteraction.bind(this);
         this.setupResizeListener = this.setupResizeListener.bind(this);
+        this.lockBodyScroll = this.lockBodyScroll.bind(this);
+        this.unlockBodyScroll = this.unlockBodyScroll.bind(this);
 
         // Initialize after player is ready
         this.player().ready(() => {
@@ -656,6 +659,8 @@ class CustomSettingsMenu extends Component {
                 if (btnEl) {
                     btnEl.classList.remove('settings-clicked');
                 }
+                // Restore body scroll on mobile when closing
+                this.unlockBodyScroll();
             };
 
             closeButton.addEventListener('click', closeFunction);
@@ -942,6 +947,37 @@ class CustomSettingsMenu extends Component {
         this.startSubtitleSync();
     }
 
+    lockBodyScroll() {
+        if (!this.isMobile) return;
+        
+        // Save current scroll position
+        this.scrollY = window.scrollY || window.pageYOffset;
+        
+        // Lock body scroll with proper iOS handling
+        document.body.style.overflow = 'hidden';
+        document.body.style.position = 'fixed';
+        document.body.style.top = `-${this.scrollY}px`;
+        document.body.style.left = '0';
+        document.body.style.right = '0';
+        document.body.style.width = '100%';
+    }
+
+    unlockBodyScroll() {
+        if (!this.isMobile) return;
+        
+        // Restore body scroll
+        const scrollY = this.scrollY;
+        document.body.style.overflow = '';
+        document.body.style.position = '';
+        document.body.style.top = '';
+        document.body.style.left = '';
+        document.body.style.right = '';
+        document.body.style.width = '';
+        
+        // Restore scroll position
+        window.scrollTo(0, scrollY);
+    }
+
     toggleSettings(e) {
         // e.stopPropagation();
         const isVisible = this.settingsOverlay.classList.contains('show');
@@ -954,11 +990,7 @@ class CustomSettingsMenu extends Component {
             this.stopKeepingControlsVisible();
 
             // Restore body scroll on mobile when closing
-            if (this.isMobile) {
+            this.unlockBodyScroll();
-                document.body.style.overflow = '';
-                document.body.style.position = '';
-                document.body.style.width = '';
-            }
         } else {
             this.settingsOverlay.classList.add('show');
             this.settingsOverlay.style.display = 'block';
@@ -972,11 +1004,7 @@ class CustomSettingsMenu extends Component {
             }
 
             // Prevent body scroll on mobile when overlay is open
-            if (this.isMobile) {
+            this.lockBodyScroll();
-                document.body.style.overflow = 'hidden';
-                document.body.style.position = 'fixed';
-                document.body.style.width = '100%';
-            }
         }
 
         this.speedSubmenu.style.display = 'none'; // Hide submenu when main menu toggles
@@ -1002,6 +1030,9 @@ class CustomSettingsMenu extends Component {
         this.settingsOverlay.classList.add('show');
         this.settingsOverlay.style.display = 'block';
 
+        // Lock body scroll when opening
+        this.lockBodyScroll();
+
         // Hide other submenus and show subtitles submenu
         this.speedSubmenu.style.display = 'none';
         if (this.qualitySubmenu) this.qualitySubmenu.style.display = 'none';
@@ -1072,11 +1103,7 @@ class CustomSettingsMenu extends Component {
             }
 
             // Restore body scroll on mobile when closing
-            if (this.isMobile) {
+            this.unlockBodyScroll();
-                document.body.style.overflow = '';
-                document.body.style.position = '';
-                document.body.style.width = '';
-            }
         }
     }
 
@@ -1417,6 +1444,8 @@ class CustomSettingsMenu extends Component {
             if (btnEl) {
                 btnEl.classList.remove('settings-clicked');
             }
+            // Restore body scroll on mobile when closing
+            this.unlockBodyScroll();
         }
     }
 
@@ -1493,11 +1522,7 @@ class CustomSettingsMenu extends Component {
         }
 
         // Restore body scroll on mobile when disposing
-        if (this.isMobile) {
+        this.unlockBodyScroll();
-            document.body.style.overflow = '';
-            document.body.style.position = '';
-            document.body.style.width = '';
-        }
 
         // Remove DOM elements
         if (this.settingsOverlay) {

frontend/.babelrc

@@ -1,12 +1,28 @@
 {
-	"presets": [
+    "presets": [
-		"@babel/react", ["@babel/env", {
+        "@babel/react",
-			"modules": false,
+        [
-			"useBuiltIns": "usage",
+            "@babel/env",
-    		"corejs": 3,
+            {
-			"targets": {
+                "modules": false,
-				"browsers": ["defaults"]
+                "useBuiltIns": "usage",
-			}
+                "corejs": 3,
-		}]
+                "targets": {
-	]
+                    "browsers": ["defaults"]
-}
+                }
+            }
+        ]
+    ],
+    "env": {
+        "test": {
+            "presets": [
+                [
+                    "@babel/env",
+                    {
+                        "targets": { "node": "current" }
+                    }
+                ]
+            ]
+        }
+    }
+}

frontend/README.md

@@ -27,3 +27,39 @@ Open in browser: [http://localhost:8088](http://localhost:8088)
 Generates the folder "**_frontend/dist_**".
 
 Copy folders and files from "**_frontend/dist/static_**" into "**_static_**".
+
+---
+
+### Test Scripts
+
+#### test
+
+Run all unit tests once.
+
+```sh
+npm run test
+```
+
+#### test-watch
+
+Run tests in watch mode for development.
+
+```sh
+npm run test-watch
+```
+
+#### test-coverage
+
+Run tests with coverage reporting in `./coverage` folder.
+
+```sh
+npm run test-coverage
+```
+
+#### test-coverage-watch
+
+Run tests with coverage in watch mode.
+
+```sh
+npm run test-coverage-watch
+```

frontend/jest.config.js

@@ -0,0 +1,9 @@
+/** @type {import("jest").Config} **/
+module.exports = {
+    testEnvironment: 'jsdom',
+    transform: {
+        '^.+\\.tsx?$': 'ts-jest',
+        '^.+\\.jsx?$': 'babel-jest',
+    },
+    collectCoverageFrom: ['src/**'],
+};

frontend/package.json

@@ -1,57 +1,69 @@
 {
-  "name": "mediacms-frontend",
+    "name": "mediacms-frontend",
-  "version": "0.9.1",
+    "version": "0.9.2",
-  "description": "",
+    "description": "",
-  "author": "",
+    "author": "",
-  "license": "",
+    "license": "",
-  "keywords": [],
+    "keywords": [],
-  "main": "index.js",
+    "main": "index.js",
-  "scripts": {
+    "scripts": {
-    "start": "mediacms-scripts development --config=./config/mediacms.config.js --host=0.0.0.0 --port=8088",
+        "start": "mediacms-scripts development --config=./config/mediacms.config.js --host=0.0.0.0 --port=8088",
-    "dist": "mediacms-scripts rimraf ./dist && mediacms-scripts build --config=./config/mediacms.config.js --env=dist"
+        "dist": "mediacms-scripts rimraf ./dist && mediacms-scripts build --config=./config/mediacms.config.js --env=dist",
-  },
+        "test": "jest",
-  "browserslist": [
+        "test-coverage": "npx rimraf ./coverage && jest --coverage",
-    "cover 99.5%"
+        "test-coverage-watch": "npm run test-coverage -- --watchAll",
-  ],
+        "test-watch": "jest --watch"
-  "devDependencies": {
+    },
-    "@babel/core": "^7.26.9",
+    "browserslist": [
-    "@babel/preset-env": "^7.26.9",
+        "cover 99.5%"
-    "@babel/preset-react": "^7.26.3",
+    ],
-    "@types/minimatch": "^5.1.2",
+    "devDependencies": {
-    "@types/react": "^19.0.10",
+        "@babel/core": "^7.26.9",
-    "@types/react-dom": "^19.0.4",
+        "@babel/preset-env": "^7.26.9",
-    "autoprefixer": "^10.4.21",
+        "@babel/preset-react": "^7.26.3",
-    "babel-loader": "^10.0.0",
+        "@types/flux": "^3.1.15",
-    "compass-mixins": "^0.12.12",
+        "@types/jest": "^29.5.12",
-    "copy-webpack-plugin": "^13.0.0",
+        "@types/minimatch": "^5.1.2",
-    "core-js": "^3.41.0",
+        "@types/react": "^19.0.10",
-    "css-loader": "^7.1.2",
+        "@types/react-dom": "^19.0.4",
-    "dotenv": "^16.4.7",
+        "@types/url-parse": "^1.4.11",
-    "ejs": "^3.1.10",
+        "autoprefixer": "^10.4.21",
-    "ejs-compiled-loader": "^3.1.0",
+        "babel-jest": "^30.2.0",
-    "mediacms-scripts": "file:packages/scripts",
+        "babel-loader": "^10.0.0",
-    "postcss-loader": "^8.1.1",
+        "compass-mixins": "^0.12.12",
-    "prettier": "^3.5.3",
+        "copy-webpack-plugin": "^13.0.0",
-    "prop-types": "^15.8.1",
+        "core-js": "^3.41.0",
-    "sass": "^1.85.1",
+        "css-loader": "^7.1.2",
-    "sass-loader": "^16.0.5",
+        "dotenv": "^16.4.7",
-    "ts-loader": "^9.5.2",
+        "ejs": "^3.1.10",
-    "typescript": "^5.8.2",
+        "ejs-compiled-loader": "^3.1.0",
-    "url-loader": "^4.1.1",
+        "jest": "^29.7.0",
-    "webpack": "^5.98.0"
+        "jest-environment-jsdom": "^30.2.0",
-  },
+        "jsdom": "^27.3.0",
-  "dependencies": {
+        "mediacms-scripts": "file:packages/scripts",
-    "@react-pdf-viewer/core": "^3.9.0",
+        "postcss-loader": "^8.1.1",
-    "@react-pdf-viewer/default-layout": "^3.9.0",
+        "prettier": "^3.5.3",
-    "axios": "^1.8.2",
+        "prop-types": "^15.8.1",
-    "flux": "^4.0.4",
+        "sass": "^1.85.1",
-    "normalize.css": "^8.0.1",
+        "sass-loader": "^16.0.5",
-    "pdfjs-dist": "3.4.120",
+        "ts-jest": "^29.2.5",
-    "react": "^17.0.2",
+        "ts-loader": "^9.5.2",
-    "react-dom": "^17.0.2",
+        "typescript": "^5.9.3",
-    "react-mentions": "^4.3.1",
+        "url-loader": "^4.1.1",
-    "sortablejs": "^1.13.0",
+        "webpack": "^5.98.0"
-    "timeago.js": "^4.0.2",
+    },
-    "url-parse": "^1.5.10"
+    "dependencies": {
-  }
+        "@react-pdf-viewer/core": "^3.9.0",
+        "@react-pdf-viewer/default-layout": "^3.9.0",
+        "axios": "^1.8.2",
+        "flux": "^4.0.4",
+        "normalize.css": "^8.0.1",
+        "pdfjs-dist": "3.4.120",
+        "react": "^17.0.2",
+        "react-dom": "^17.0.2",
+        "react-mentions": "^4.3.1",
+        "sortablejs": "^1.13.0",
+        "timeago.js": "^4.0.2",
+        "url-parse": "^1.5.10"
+    }
 }

frontend/src/static/js/components/BulkActionPublishStateModal.tsx

@@ -26,17 +26,12 @@ export const BulkActionPublishStateModal: React.FC<BulkActionPublishStateModalPr
   csrfToken,
 }) => {
   const [selectedState, setSelectedState] = useState('public');
-  const [initialState, setInitialState] = useState('public');
   const [isProcessing, setIsProcessing] = useState(false);
 
   useEffect(() => {
     if (!isOpen) {
       // Reset state when modal closes
       setSelectedState('public');
-      setInitialState('public');
-    } else {
-      // When modal opens, set initial state
-      setInitialState('public');
     }
   }, [isOpen]);
 
@@ -79,7 +74,9 @@ export const BulkActionPublishStateModal: React.FC<BulkActionPublishStateModalPr
 
   if (!isOpen) return null;
 
-  const hasStateChanged = selectedState !== initialState;
+  // Note: We don't check hasStateChanged because the modal doesn't know the actual
+  // current state of the selected media. Users should be able to set any state.
+  // If the state is already the same, the backend will handle it gracefully.
 
   return (
     <div className="publish-state-modal-overlay">
@@ -116,7 +113,7 @@ export const BulkActionPublishStateModal: React.FC<BulkActionPublishStateModalPr
           <button
             className="publish-state-btn publish-state-btn-submit"
             onClick={handleSubmit}
-            disabled={isProcessing || !hasStateChanged}
+            disabled={isProcessing}
           >
             {isProcessing ? translateString('Processing...') : translateString('Submit')}
           </button>

frontend/src/static/js/components/MediaListWrapper.scss

@@ -9,10 +9,29 @@
 
   .bulk-actions-container {
     display: flex;
-    align-items: center;
+    align-items: flex-start;
+    justify-content: space-between;
     flex-wrap: wrap;
     gap: 20px;
     margin-bottom: 16px;
+
+    .add-media-button {
+      margin-left: auto;
+
+      a {
+        display: flex;
+        align-items: center;
+      }
+
+      .circle-icon-button {
+        width: 48px;
+        height: 48px;
+
+        .material-icons {
+          font-size: 32px;
+        }
+      }
+    }
   }
 }
 

frontend/src/static/js/components/MediaListWrapper.tsx

@@ -2,6 +2,9 @@ import React from 'react';
 import { MediaListRow } from './MediaListRow';
 import { BulkActionsDropdown } from './BulkActionsDropdown';
 import { SelectAllCheckbox } from './SelectAllCheckbox';
+import { CircleIconButton, MaterialIcon } from './_shared';
+import { LinksConsumer } from '../utils/contexts';
+import { translateString } from '../utils/helpers/';
 import './MediaListWrapper.scss';
 
 interface MediaListWrapperProps {
@@ -17,6 +20,7 @@ interface MediaListWrapperProps {
   onBulkAction?: (action: string) => void;
   onSelectAll?: () => void;
   onDeselectAll?: () => void;
+  showAddMediaButton?: boolean;
 }
 
 export const MediaListWrapper: React.FC<MediaListWrapperProps> = ({
@@ -32,19 +36,35 @@ export const MediaListWrapper: React.FC<MediaListWrapperProps> = ({
   onBulkAction = () => {},
   onSelectAll = () => {},
   onDeselectAll = () => {},
+  showAddMediaButton = false,
 }) => (
   <div className={(className ? className + ' ' : '') + 'media-list-wrapper'} style={style}>
     <MediaListRow title={title} viewAllLink={viewAllLink} viewAllText={viewAllText}>
       {showBulkActions && (
-        <div className="bulk-actions-container">
+        <LinksConsumer>
-          <BulkActionsDropdown selectedCount={selectedCount} onActionSelect={onBulkAction} />
+          {(links) => (
-          <SelectAllCheckbox
+            <div className="bulk-actions-container">
-            totalCount={totalCount}
+              <div style={{ display: 'flex', alignItems: 'center', gap: '10px' }}>
-            selectedCount={selectedCount}
+                <BulkActionsDropdown selectedCount={selectedCount} onActionSelect={onBulkAction} />
-            onSelectAll={onSelectAll}
+                <SelectAllCheckbox
-            onDeselectAll={onDeselectAll}
+                  totalCount={totalCount}
-          />
+                  selectedCount={selectedCount}
-        </div>
+                  onSelectAll={onSelectAll}
+                  onDeselectAll={onDeselectAll}
+                />
+              </div>
+              {showAddMediaButton && (
+                <div className="add-media-button">
+                  <a href={links.user.addMedia} title={translateString('Add media')}>
+                    <CircleIconButton>
+                      <MaterialIcon type="video_call" />
+                    </CircleIconButton>
+                  </a>
+                </div>
+              )}
+            </div>
+          )}
+        </LinksConsumer>
       )}
       {children || null}
     </MediaListRow>

frontend/src/static/js/components/list-item/PlaylistItem.jsx

@@ -53,9 +53,9 @@ export function PlaylistItem(props) {
         <UnderThumbWrapper title={props.title} link={props.link}>
           {titleComponent()}
           {metaComponents()}
-          <a href={props.link} title="" className="view-full-playlist">
+          <span className="view-full-playlist">
             VIEW FULL PLAYLIST
-          </a>
+          </span>
         </UnderThumbWrapper>
       </div>
     </div>

frontend/src/static/js/components/media-actions/VideoMediaDownloadLink.jsx

@@ -21,12 +21,16 @@ function downloadOptionsList() {
         for (g in encodings_info[k]) {
           if (encodings_info[k].hasOwnProperty(g)) {
             if ('success' === encodings_info[k][g].status && 100 === encodings_info[k][g].progress && null !== encodings_info[k][g].url) {
+              // Use original media URL for download instead of encoded version
+              const originalUrl = media_data.original_media_url;
+              const originalFilename = originalUrl ? originalUrl.substring(originalUrl.lastIndexOf('/') + 1) : media_data.title;
+
               optionsList[encodings_info[k][g].title] = {
                 text: k + ' - ' + g.toUpperCase() + ' (' + encodings_info[k][g].size + ')',
-                link: formatInnerLink(encodings_info[k][g].url, SiteContext._currentValue.url),
+                link: formatInnerLink(media_data.original_media_url, SiteContext._currentValue.url),
                 linkAttr: {
                   target: '_blank',
-                  download: media_data.title + '_' + k + '_' + g.toUpperCase(),
+                  download: originalFilename,
                 },
               };
             }
@@ -36,12 +40,16 @@ function downloadOptionsList() {
     }
   }
 
+  // Extract actual filename from the original media URL
+  const originalUrl = media_data.original_media_url;
+  const originalFilename = originalUrl ? originalUrl.substring(originalUrl.lastIndexOf('/') + 1) : media_data.title;
+
   optionsList.original_media_url = {
     text: 'Original file (' + media_data.size + ')',
     link: formatInnerLink(media_data.original_media_url, SiteContext._currentValue.url),
     linkAttr: {
       target: '_blank',
-      download: media_data.title,
+      download: originalFilename,
     },
   };
 

frontend/src/static/js/components/media-page/ViewerInfoContent.js

@@ -3,257 +3,278 @@ import { SiteContext } from '../../utils/contexts/';
 import { useUser, usePopup } from '../../utils/hooks/';
 import { PageStore, MediaPageStore } from '../../utils/stores/';
 import { PageActions, MediaPageActions } from '../../utils/actions/';
-import { formatInnerLink, publishedOnDate } from '../../utils/helpers/';
+import { formatInnerLink, inEmbeddedApp, publishedOnDate } from '../../utils/helpers/';
 import { PopupMain } from '../_shared/';
 import CommentsList from '../comments/Comments';
 import { replaceString } from '../../utils/helpers/';
 import { translateString } from '../../utils/helpers/';
 
 function metafield(arr) {
-  let i;
+    let i;
-  let sep;
+    let sep;
-  let ret = [];
+    let ret = [];
 
-  if (arr && arr.length) {
+    if (arr && arr.length) {
-    i = 0;
+        i = 0;
-    sep = 1 < arr.length ? ', ' : '';
+        sep = 1 < arr.length ? ', ' : '';
-    while (i < arr.length) {
+        while (i < arr.length) {
-      ret[i] = (
+            ret[i] = (
-        <div key={i}>
+                <div key={i}>
-          <a href={arr[i].url} title={arr[i].title}>
+                    <a href={arr[i].url} title={arr[i].title}>
-            {arr[i].title}
+                        {arr[i].title}
-          </a>
+                    </a>
-          {i < arr.length - 1 ? sep : ''}
+                    {i < arr.length - 1 ? sep : ''}
-        </div>
+                </div>
-      );
+            );
-      i += 1;
+            i += 1;
+        }
     }
-  }
 
-  return ret;
+    return ret;
 }
 
 function MediaAuthorBanner(props) {
-  return (
+    return (
-    <div className="media-author-banner">
+        <div className="media-author-banner">
-      <div>
+            <div>
-        <a className="author-banner-thumb" href={props.link || null} title={props.name}>
+                <a className="author-banner-thumb" href={props.link || null} title={props.name}>
-          <span style={{ backgroundImage: 'url(' + props.thumb + ')' }}>
+                    <span style={{ backgroundImage: 'url(' + props.thumb + ')' }}>
-            <img src={props.thumb} loading="lazy" alt={props.name} title={props.name} />
+                        <img src={props.thumb} loading="lazy" alt={props.name} title={props.name} />
-          </span>
+                    </span>
-        </a>
+                </a>
-      </div>
+            </div>
-      <div>
+            <div>
-        <span>
+                <span>
-          <a href={props.link} className="author-banner-name" title={props.name}>
+                    <a href={props.link} className="author-banner-name" title={props.name}>
-            <span>{props.name}</span>
+                        <span>{props.name}</span>
-          </a>
+                    </a>
-        </span>
+                </span>
-        {PageStore.get('config-media-item').displayPublishDate && props.published ? (
+                {PageStore.get('config-media-item').displayPublishDate && props.published ? (
-          <span className="author-banner-date">
+                    <span className="author-banner-date">
-            {translateString('Published on')} {replaceString(publishedOnDate(new Date(props.published)))}
+                        {translateString('Published on')} {replaceString(publishedOnDate(new Date(props.published)))}
-          </span>
+                    </span>
-        ) : null}
+                ) : null}
-      </div>
+            </div>
-    </div>
+        </div>
-  );
+    );
 }
 
 function MediaMetaField(props) {
-  return (
+    return (
-    <div className={props.id.trim() ? 'media-content-' + props.id.trim() : null}>
+        <div className={props.id.trim() ? 'media-content-' + props.id.trim() : null}>
-      <div className="media-content-field">
+            <div className="media-content-field">
-        <div className="media-content-field-label">
+                <div className="media-content-field-label">
-          <h4>{props.title}</h4>
+                    <h4>{props.title}</h4>
+                </div>
+                <div className="media-content-field-content">{props.value}</div>
+            </div>
         </div>
-        <div className="media-content-field-content">{props.value}</div>
+    );
-      </div>
-    </div>
-  );
 }
 
 function EditMediaButton(props) {
-  let link = props.link;
+    let link = props.link;
 
-  if (window.MediaCMS.site.devEnv) {
+    if (window.MediaCMS.site.devEnv) {
-    link = '/edit-media.html';
+        link = '/edit-media.html';
-  }
+    }
 
-  return (
+    return (
-    <a href={link} rel="nofollow" title={translateString('Edit media')} className="edit-media-icon">
+        <a href={link} rel="nofollow" title={translateString('Edit media')} className="edit-media-icon">
-      <i className="material-icons">edit</i>
+            <i className="material-icons">edit</i>
-    </a>
+        </a>
-  );
+    );
 }
 
 export default function ViewerInfoContent(props) {
-  const { userCan } = useUser();
+    const { userCan } = useUser();
 
-  const description = props.description.trim();
+    const description = props.description.trim();
-  const tagsContent =
+    const tagsContent =
-    !PageStore.get('config-enabled').taxonomies.tags || PageStore.get('config-enabled').taxonomies.tags.enabled
+        !PageStore.get('config-enabled').taxonomies.tags || PageStore.get('config-enabled').taxonomies.tags.enabled
-      ? metafield(MediaPageStore.get('media-tags'))
+            ? metafield(MediaPageStore.get('media-tags'))
-      : [];
+            : [];
-  const categoriesContent = PageStore.get('config-options').pages.media.categoriesWithTitle
+    const categoriesContent = PageStore.get('config-options').pages.media.categoriesWithTitle
-    ? []
+        ? []
-    : !PageStore.get('config-enabled').taxonomies.categories ||
+        : !PageStore.get('config-enabled').taxonomies.categories ||
-      PageStore.get('config-enabled').taxonomies.categories.enabled
+            PageStore.get('config-enabled').taxonomies.categories.enabled
-    ? metafield(MediaPageStore.get('media-categories'))
+          ? metafield(MediaPageStore.get('media-categories'))
-    : [];
+          : [];
 
-  let summary = MediaPageStore.get('media-summary');
+    let summary = MediaPageStore.get('media-summary');
 
-  summary = summary ? summary.trim() : '';
+    summary = summary ? summary.trim() : '';
 
-  const [popupContentRef, PopupContent, PopupTrigger] = usePopup();
+    const [popupContentRef, PopupContent, PopupTrigger] = usePopup();
 
-  const [hasSummary, setHasSummary] = useState('' !== summary);
+    const [hasSummary, setHasSummary] = useState('' !== summary);
-  const [isContentVisible, setIsContentVisible] = useState('' == summary);
+    const [isContentVisible, setIsContentVisible] = useState('' == summary);
 
-  function proceedMediaRemoval() {
+    function proceedMediaRemoval() {
-    MediaPageActions.removeMedia();
+        MediaPageActions.removeMedia();
-    popupContentRef.current.toggle();
+        popupContentRef.current.toggle();
-  }
-
-  function cancelMediaRemoval() {
-    popupContentRef.current.toggle();
-  }
-
-  function onMediaDelete(mediaId) {
-    // FIXME: Without delay creates conflict [ Uncaught Error: Dispatch.dispatch(...): Cannot dispatch in the middle of a dispatch. ].
-    setTimeout(function () {
-      PageActions.addNotification('Media removed. Redirecting...', 'mediaDelete');
-      setTimeout(function () {
-        window.location.href =
-          SiteContext._currentValue.url + '/' + MediaPageStore.get('media-data').author_profile.replace(/^\//g, '');
-      }, 2000);
-    }, 100);
-
-    if (void 0 !== mediaId) {
-      console.info("Removed media '" + mediaId + '"');
-    }
-  }
-
-  function onMediaDeleteFail(mediaId) {
-    // FIXME: Without delay creates conflict [ Uncaught Error: Dispatch.dispatch(...): Cannot dispatch in the middle of a dispatch. ].
-    setTimeout(function () {
-      PageActions.addNotification('Media removal failed', 'mediaDeleteFail');
-    }, 100);
-
-    if (void 0 !== mediaId) {
-      console.info('Media "' + mediaId + '"' + ' removal failed');
-    }
-  }
-
-  function onClickLoadMore() {
-    setIsContentVisible(!isContentVisible);
-  }
-
-  useEffect(() => {
-    MediaPageStore.on('media_delete', onMediaDelete);
-    MediaPageStore.on('media_delete_fail', onMediaDeleteFail);
-    return () => {
-      MediaPageStore.removeListener('media_delete', onMediaDelete);
-      MediaPageStore.removeListener('media_delete_fail', onMediaDeleteFail);
-    };
-  }, []);
-
-  const authorLink = formatInnerLink(props.author.url, SiteContext._currentValue.url);
-  const authorThumb = formatInnerLink(props.author.thumb, SiteContext._currentValue.url);
-
-  function setTimestampAnchors(text) {
-    function wrapTimestampWithAnchor(match, string) {
-      let split = match.split(':'),
-        s = 0,
-        m = 1;
-
-      while (split.length > 0) {
-        s += m * parseInt(split.pop(), 10);
-        m *= 60;
-      }
-
-      const wrapped = `<a href="#" data-timestamp="${s}" class="video-timestamp">${match}</a>`;
-      return wrapped;
     }
 
-    const timeRegex = new RegExp('((\\d)?\\d:)?(\\d)?\\d:\\d\\d', 'g');
+    function cancelMediaRemoval() {
-    return text.replace(timeRegex, wrapTimestampWithAnchor);
+        popupContentRef.current.toggle();
-  }
+    }
 
-  return (
+    function onMediaDelete(mediaId) {
-    <div className="media-info-content">
+        // FIXME: Without delay creates conflict [ Uncaught Error: Dispatch.dispatch(...): Cannot dispatch in the middle of a dispatch. ].
-      {void 0 === PageStore.get('config-media-item').displayAuthor ||
+        setTimeout(function () {
-      null === PageStore.get('config-media-item').displayAuthor ||
+            PageActions.addNotification('Media removed. Redirecting...', 'mediaDelete');
-      !!PageStore.get('config-media-item').displayAuthor ? (
+            setTimeout(function () {
-        <MediaAuthorBanner link={authorLink} thumb={authorThumb} name={props.author.name} published={props.published} />
+                window.location.href =
-      ) : null}
+                    SiteContext._currentValue.url +
+                    '/' +
+                    MediaPageStore.get('media-data').author_profile.replace(/^\//g, '');
+            }, 2000);
+        }, 100);
 
-      <div className="media-content-banner">
+        if (void 0 !== mediaId) {
-        <div className="media-content-banner-inner">
+            console.info("Removed media '" + mediaId + '"');
-          {hasSummary ? <div className="media-content-summary">{summary}</div> : null}
+        }
-          {(!hasSummary || isContentVisible) && description ? (
+    }
-            <div
-              className="media-content-description"
-              dangerouslySetInnerHTML={{ __html: setTimestampAnchors(description) }}
-            ></div>
-          ) : null}
-          {hasSummary ? (
-            <button className="load-more" onClick={onClickLoadMore}>
-              {isContentVisible ? 'SHOW LESS' : 'SHOW MORE'}
-            </button>
-          ) : null}
-          {tagsContent.length ? (
-            <MediaMetaField
-              value={tagsContent}
-              title={1 < tagsContent.length ? translateString('Tags') : translateString('Tag')}
-              id="tags"
-            />
-          ) : null}
-          {categoriesContent.length ? (
-            <MediaMetaField
-              value={categoriesContent}
-              title={1 < categoriesContent.length ? translateString('Categories') : translateString('Category')}
-              id="categories"
-            />
-          ) : null}
 
-          {userCan.editMedia ? (
+    function onMediaDeleteFail(mediaId) {
-            <div className="media-author-actions">
+        // FIXME: Without delay creates conflict [ Uncaught Error: Dispatch.dispatch(...): Cannot dispatch in the middle of a dispatch. ].
-              {userCan.editMedia ? <EditMediaButton link={MediaPageStore.get('media-data').edit_url} /> : null}
+        setTimeout(function () {
+            PageActions.addNotification('Media removal failed', 'mediaDeleteFail');
+        }, 100);
 
-              {userCan.deleteMedia ? (
+        if (void 0 !== mediaId) {
-                <PopupTrigger contentRef={popupContentRef}>
+            console.info('Media "' + mediaId + '"' + ' removal failed');
-                  <button className="remove-media-icon" title={translateString('Delete media')}>
+        }
-                    <i className="material-icons">delete</i>
+    }
-                  </button>
-                </PopupTrigger>
-              ) : null}
 
-              {userCan.deleteMedia ? (
+    function onClickLoadMore() {
-                <PopupContent contentRef={popupContentRef}>
+        setIsContentVisible(!isContentVisible);
-                  <PopupMain>
+    }
-                    <div className="popup-message">
+
-                      <span className="popup-message-title">Media removal</span>
+    useEffect(() => {
-                      <span className="popup-message-main">You're willing to remove media permanently?</span>
+        MediaPageStore.on('media_delete', onMediaDelete);
-                    </div>
+        MediaPageStore.on('media_delete_fail', onMediaDeleteFail);
-                    <hr />
+        return () => {
-                    <span className="popup-message-bottom">
+            MediaPageStore.removeListener('media_delete', onMediaDelete);
-                      <button className="button-link cancel-comment-removal" onClick={cancelMediaRemoval}>
+            MediaPageStore.removeListener('media_delete_fail', onMediaDeleteFail);
-                        CANCEL
+        };
-                      </button>
+    }, []);
-                      <button className="button-link proceed-comment-removal" onClick={proceedMediaRemoval}>
+
-                        PROCEED
+    const authorLink = formatInnerLink(props.author.url, SiteContext._currentValue.url);
-                      </button>
+    const authorThumb = formatInnerLink(props.author.thumb, SiteContext._currentValue.url);
-                    </span>
+
-                  </PopupMain>
+    function setTimestampAnchors(text) {
-                </PopupContent>
+        function wrapTimestampWithAnchor(match, string) {
-              ) : null}
+            let split = match.split(':'),
+                s = 0,
+                m = 1;
+
+            while (split.length > 0) {
+                s += m * parseInt(split.pop(), 10);
+                m *= 60;
+            }
+
+            const wrapped = `<a href="#" data-timestamp="${s}" class="video-timestamp">${match}</a>`;
+            return wrapped;
+        }
+
+        const timeRegex = new RegExp('((\\d)?\\d:)?(\\d)?\\d:\\d\\d', 'g');
+        return text.replace(timeRegex, wrapTimestampWithAnchor);
+    }
+
+    return (
+        <div className="media-info-content">
+            {void 0 === PageStore.get('config-media-item').displayAuthor ||
+            null === PageStore.get('config-media-item').displayAuthor ||
+            !!PageStore.get('config-media-item').displayAuthor ? (
+                <MediaAuthorBanner
+                    link={authorLink}
+                    thumb={authorThumb}
+                    name={props.author.name}
+                    published={props.published}
+                />
+            ) : null}
+
+            <div className="media-content-banner">
+                <div className="media-content-banner-inner">
+                    {hasSummary ? <div className="media-content-summary">{summary}</div> : null}
+                    {(!hasSummary || isContentVisible) && description ? (
+                        <div
+                            className="media-content-description"
+                            dangerouslySetInnerHTML={{ __html: setTimestampAnchors(description) }}
+                        ></div>
+                    ) : null}
+                    {hasSummary ? (
+                        <button className="load-more" onClick={onClickLoadMore}>
+                            {isContentVisible ? 'SHOW LESS' : 'SHOW MORE'}
+                        </button>
+                    ) : null}
+                    {tagsContent.length ? (
+                        <MediaMetaField
+                            value={tagsContent}
+                            title={1 < tagsContent.length ? translateString('Tags') : translateString('Tag')}
+                            id="tags"
+                        />
+                    ) : null}
+                    {categoriesContent.length ? (
+                        <MediaMetaField
+                            value={categoriesContent}
+                            title={
+                                1 < categoriesContent.length
+                                    ? translateString('Categories')
+                                    : translateString('Category')
+                            }
+                            id="categories"
+                        />
+                    ) : null}
+
+                    {userCan.editMedia ? (
+                        <div className="media-author-actions">
+                            {userCan.editMedia ? (
+                                <EditMediaButton link={MediaPageStore.get('media-data').edit_url} />
+                            ) : null}
+
+                            {userCan.deleteMedia ? (
+                                <PopupTrigger contentRef={popupContentRef}>
+                                    <button className="remove-media-icon" title={translateString('Delete media')}>
+                                        <i className="material-icons">delete</i>
+                                    </button>
+                                </PopupTrigger>
+                            ) : null}
+
+                            {userCan.deleteMedia ? (
+                                <PopupContent contentRef={popupContentRef}>
+                                    <PopupMain>
+                                        <div className="popup-message">
+                                            <span className="popup-message-title">Media removal</span>
+                                            <span className="popup-message-main">
+                                                You're willing to remove media permanently?
+                                            </span>
+                                        </div>
+                                        <hr />
+                                        <span className="popup-message-bottom">
+                                            <button
+                                                className="button-link cancel-comment-removal"
+                                                onClick={cancelMediaRemoval}
+                                            >
+                                                CANCEL
+                                            </button>
+                                            <button
+                                                className="button-link proceed-comment-removal"
+                                                onClick={proceedMediaRemoval}
+                                            >
+                                                PROCEED
+                                            </button>
+                                        </span>
+                                    </PopupMain>
+                                </PopupContent>
+                            ) : null}
+                        </div>
+                    ) : null}
+                </div>
             </div>
-          ) : null}
-        </div>
-      </div>
 
-      <CommentsList />
+            {!inEmbeddedApp() && <CommentsList />}
-    </div>
+        </div>
-  );
+    );
 }

frontend/src/static/js/components/media-page/ViewerInfoTitleBanner.js

@@ -54,6 +54,10 @@ export default class ViewerInfoTitleBanner extends React.PureComponent {
         ? formatInnerLink(MediaPageStore.get('media-original-url'), SiteContext._currentValue.url)
         : null;
 
+    // Extract actual filename from URL for non-video downloads
+    const originalUrl = MediaPageStore.get('media-original-url');
+    this.downloadFilename = originalUrl ? originalUrl.substring(originalUrl.lastIndexOf('/') + 1) : this.props.title;
+
     this.updateStateValues = this.updateStateValues.bind(this);
   }
 
@@ -104,7 +108,9 @@ export default class ViewerInfoTitleBanner extends React.PureComponent {
   render() {
     const displayViews = PageStore.get('config-options').pages.media.displayViews && void 0 !== this.props.views;
 
-    const mediaState = MediaPageStore.get('media-data').state;
+    const mediaData = MediaPageStore.get('media-data');
+    const mediaState = mediaData.state;
+    const isShared = mediaData.is_shared;
 
     let stateTooltip = '';
 
@@ -117,6 +123,8 @@ export default class ViewerInfoTitleBanner extends React.PureComponent {
         break;
     }
 
+    const sharedTooltip = 'This media is shared with specific users or categories';
+
     return (
       <div className="media-title-banner">
         {displayViews && PageStore.get('config-options').pages.media.categoriesWithTitle
@@ -125,15 +133,28 @@ export default class ViewerInfoTitleBanner extends React.PureComponent {
 
         {void 0 !== this.props.title ? <h1>{this.props.title}</h1> : null}
 
-        {'public' !== mediaState ? (
+        {isShared || 'public' !== mediaState ? (
           <div className="media-labels-area">
             <div className="media-labels-area-inner">
-              <span className="media-label-state">
+              {isShared ? (
-                <span>{mediaState}</span>
+                <>
-              </span>
+                  <span className="media-label-state">
-              <span className="helper-icon" data-tooltip={stateTooltip}>
+                    <span>shared</span>
-                <i className="material-icons">help_outline</i>
+                  </span>
-              </span>
+                  <span className="helper-icon" data-tooltip={sharedTooltip}>
+                    <i className="material-icons">help_outline</i>
+                  </span>
+                </>
+              ) : 'public' !== mediaState ? (
+                <>
+                  <span className="media-label-state">
+                    <span>{mediaState}</span>
+                  </span>
+                  <span className="helper-icon" data-tooltip={stateTooltip}>
+                    <i className="material-icons">help_outline</i>
+                  </span>
+                </>
+              ) : null}
             </div>
           </div>
         ) : null}
@@ -171,7 +192,7 @@ export default class ViewerInfoTitleBanner extends React.PureComponent {
                 .downloadLink ? (
                 <VideoMediaDownloadLink />
               ) : (
-                <OtherMediaDownloadLink link={this.downloadLink} title={this.props.title} />
+                <OtherMediaDownloadLink link={this.downloadLink} title={this.downloadFilename} />
               )}
 
               <MediaMoreOptionsIcon allowDownload={this.props.allowDownload} />

frontend/src/static/js/components/media-page/ViewerInfoVideoTitleBanner.js

@@ -1,90 +1,119 @@
 import React from 'react';
-import { formatViewsNumber } from '../../utils/helpers/';
+import { formatViewsNumber, inEmbeddedApp } from '../../utils/helpers/';
 import { PageStore, MediaPageStore } from '../../utils/stores/';
 import { MemberContext, PlaylistsContext } from '../../utils/contexts/';
-import { MediaLikeIcon, MediaDislikeIcon, OtherMediaDownloadLink, VideoMediaDownloadLink, MediaSaveButton, MediaShareButton, MediaMoreOptionsIcon } from '../media-actions/';
+import {
+    MediaLikeIcon,
+    MediaDislikeIcon,
+    OtherMediaDownloadLink,
+    VideoMediaDownloadLink,
+    MediaSaveButton,
+    MediaShareButton,
+    MediaMoreOptionsIcon,
+} from '../media-actions/';
 import ViewerInfoTitleBanner from './ViewerInfoTitleBanner';
 import { translateString } from '../../utils/helpers/';
 
 export default class ViewerInfoVideoTitleBanner extends ViewerInfoTitleBanner {
-  render() {
+    render() {
-    const displayViews = PageStore.get('config-options').pages.media.displayViews && void 0 !== this.props.views;
+        const displayViews = PageStore.get('config-options').pages.media.displayViews && void 0 !== this.props.views;
 
-    const mediaState = MediaPageStore.get('media-data').state;
+        const mediaData = MediaPageStore.get('media-data');
+        const mediaState = mediaData.state;
+        const isShared = mediaData.is_shared;
 
-    let stateTooltip = '';
+        let stateTooltip = '';
 
-    switch (mediaState) {
+        switch (mediaState) {
-      case 'private':
+            case 'private':
-        stateTooltip = 'The site admins have to make its access public';
+                stateTooltip = 'The site admins have to make its access public';
-        break;
+                break;
-      case 'unlisted':
+            case 'unlisted':
-        stateTooltip = 'The site admins have to make it appear on listings';
+                stateTooltip = 'The site admins have to make it appear on listings';
-        break;
+                break;
+        }
+
+        const sharedTooltip = 'This media is shared with specific users or categories';
+
+        return (
+            <div className="media-title-banner">
+                {displayViews && PageStore.get('config-options').pages.media.categoriesWithTitle
+                    ? this.mediaCategories(true)
+                    : null}
+
+                {void 0 !== this.props.title ? <h1>{this.props.title}</h1> : null}
+
+                {isShared || 'public' !== mediaState ? (
+                    <div className="media-labels-area">
+                        <div className="media-labels-area-inner">
+                            {isShared ? (
+                                <>
+                                    <span className="media-label-state">
+                                        <span>shared</span>
+                                    </span>
+                                    <span className="helper-icon" data-tooltip={sharedTooltip}>
+                                        <i className="material-icons">help_outline</i>
+                                    </span>
+                                </>
+                            ) : 'public' !== mediaState ? (
+                                <>
+                                    <span className="media-label-state">
+                                        <span>{mediaState}</span>
+                                    </span>
+                                    <span className="helper-icon" data-tooltip={stateTooltip}>
+                                        <i className="material-icons">help_outline</i>
+                                    </span>
+                                </>
+                            ) : null}
+                        </div>
+                    </div>
+                ) : null}
+
+                <div
+                    className={
+                        'media-views-actions' +
+                        (this.state.likedMedia ? ' liked-media' : '') +
+                        (this.state.dislikedMedia ? ' disliked-media' : '')
+                    }
+                >
+                    {!displayViews && PageStore.get('config-options').pages.media.categoriesWithTitle
+                        ? this.mediaCategories()
+                        : null}
+
+                    {displayViews ? (
+                        <div className="media-views">
+                            {formatViewsNumber(this.props.views, true)}{' '}
+                            {1 >= this.props.views ? translateString('view') : translateString('views')}
+                        </div>
+                    ) : null}
+
+                    <div className="media-actions">
+                        <div>
+                            {MemberContext._currentValue.can.likeMedia ? <MediaLikeIcon /> : null}
+                            {MemberContext._currentValue.can.dislikeMedia ? <MediaDislikeIcon /> : null}
+                            {!inEmbeddedApp() && MemberContext._currentValue.can.shareMedia ? (
+                                <MediaShareButton isVideo={true} />
+                            ) : null}
+
+                            {!inEmbeddedApp() &&
+                            !MemberContext._currentValue.is.anonymous &&
+                            MemberContext._currentValue.can.saveMedia &&
+                            -1 < PlaylistsContext._currentValue.mediaTypes.indexOf(MediaPageStore.get('media-type')) ? (
+                                <MediaSaveButton />
+                            ) : null}
+
+                            {!this.props.allowDownload || !MemberContext._currentValue.can.downloadMedia ? null : !this
+                                  .downloadLink ? (
+                                <VideoMediaDownloadLink />
+                            ) : (
+                                <OtherMediaDownloadLink link={this.downloadLink} title={this.downloadFilename} />
+                            )}
+
+                            <MediaMoreOptionsIcon allowDownload={this.props.allowDownload} />
+                        </div>
+                    </div>
+                </div>
+            </div>
+        );
     }
-
-    return (
-      <div className="media-title-banner">
-        {displayViews && PageStore.get('config-options').pages.media.categoriesWithTitle
-          ? this.mediaCategories(true)
-          : null}
-
-        {void 0 !== this.props.title ? <h1>{this.props.title}</h1> : null}
-
-        {'public' !== mediaState ? (
-          <div className="media-labels-area">
-            <div className="media-labels-area-inner">
-              <span className="media-label-state">
-                <span>{mediaState}</span>
-              </span>
-              <span className="helper-icon" data-tooltip={stateTooltip}>
-                <i className="material-icons">help_outline</i>
-              </span>
-            </div>
-          </div>
-        ) : null}
-
-        <div
-          className={
-            'media-views-actions' +
-            (this.state.likedMedia ? ' liked-media' : '') +
-            (this.state.dislikedMedia ? ' disliked-media' : '')
-          }
-        >
-          {!displayViews && PageStore.get('config-options').pages.media.categoriesWithTitle
-            ? this.mediaCategories()
-            : null}
-
-          {displayViews ? (
-            <div className="media-views">
-              {formatViewsNumber(this.props.views, true)} {1 >= this.props.views ? translateString('view') : translateString('views')}
-            </div>
-          ) : null}
-
-          <div className="media-actions">
-            <div>
-              {MemberContext._currentValue.can.likeMedia ? <MediaLikeIcon /> : null}
-              {MemberContext._currentValue.can.dislikeMedia ? <MediaDislikeIcon /> : null}
-              {MemberContext._currentValue.can.shareMedia ? <MediaShareButton isVideo={true} /> : null}
-
-              {!MemberContext._currentValue.is.anonymous &&
-                MemberContext._currentValue.can.saveMedia &&
-                -1 < PlaylistsContext._currentValue.mediaTypes.indexOf(MediaPageStore.get('media-type')) ? (
-                <MediaSaveButton />
-              ) : null}
-
-              {!this.props.allowDownload || !MemberContext._currentValue.can.downloadMedia ? null : !this
-                .downloadLink ? (
-                <VideoMediaDownloadLink />
-              ) : (
-                <OtherMediaDownloadLink link={this.downloadLink} title={this.props.title} />
-              )}
-
-              <MediaMoreOptionsIcon allowDownload={this.props.allowDownload} />
-            </div>
-          </div>
-        </div>
-      </div>
-    );
-  }
 }

frontend/src/static/js/components/page-layout/PageMain.scss

@@ -1,28 +1,33 @@
 .page-main-wrap {
-  padding-top: var(--header-height);
+    padding-top: var(--header-height);
-  will-change: padding-left;
+    will-change: padding-left;
+
+    @media (min-width: 768px) {
+        .visible-sidebar & {
+            padding-left: var(--sidebar-width);
+            opacity: 1;
+        }
+    }
+
+    .visible-sidebar #page-media & {
+        padding-left: 0;
+    }
 
-  @media (min-width: 768px) {
     .visible-sidebar & {
-      padding-left: var(--sidebar-width);
+        #page-media {
-      opacity: 1;
+            padding-left: 0;
+        }
     }
-  }
 
-  .visible-sidebar #page-media & {
+    body.sliding-sidebar & {
-    padding-left: 0;
+        transition-property: padding-left;
-  }
+        transition-duration: 0.2s;
-
-  .visible-sidebar & {
-    #page-media {
-      padding-left: 0;
     }
-  }
 
-  body.sliding-sidebar & {
+    .embedded-app & {
-    transition-property: padding-left;
+        padding-top: 0;
-    transition-duration: 0.2s;
+        padding-left: 0;
-  }
+    }
 }
 
 #page-profile-media,
@@ -30,20 +35,20 @@
 #page-profile-about,
 #page-liked.profile-page-liked,
 #page-history.profile-page-history {
-  .page-main {
+    .page-main {
-    min-height: calc(100vh - var(--header-height));
+        min-height: calc(100vh - var(--header-height));
-  }
+    }
 }
 
 .page-main {
-  position: relative;
+    position: relative;
-  width: 100%;
+    width: 100%;
-  padding-bottom: 16px;
+    padding-bottom: 16px;
 }
 
 .page-main-inner {
-  display: block;
+    display: block;
-  margin: 1em 1em 0 1em;
+    margin: 1em 1em 0 1em;
 }
 
 #page-profile-media,
@@ -51,7 +56,7 @@
 #page-profile-about,
 #page-liked.profile-page-liked,
 #page-history.profile-page-history {
-  .page-main-wrap {
+    .page-main-wrap {
-    background-color: var(--body-bg-color);
+        background-color: var(--body-bg-color);
-  }
+    }
 }

frontend/src/static/js/components/search-filters/ProfileMediaFilters.jsx

@@ -32,6 +32,7 @@ const filters = {
     { id: 'private', title: translateString('Private') },
     { id: 'unlisted', title: translateString('Unlisted') },
     { id: 'public', title: translateString('Published') },
+    { id: 'shared', title: translateString('Shared') },
   ],
   sort_by: [
     { id: 'date_added_desc', title: translateString('Upload date (newest)') },

frontend/src/static/js/pages/ProfileAboutPage.js

@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import UrlParse from 'url-parse';
 import { ApiUrlContext, MemberContext, SiteContext } from '../utils/contexts/';
-import { formatInnerLink, csrfToken, postRequest } from '../utils/helpers/';
+import { formatInnerLink, csrfToken, postRequest, inEmbeddedApp } from '../utils/helpers/';
 import { PageActions } from '../utils/actions/';
 import { PageStore, ProfilePageStore } from '../utils/stores/';
 import ProfilePagesHeader from '../components/profile-page/ProfilePagesHeader';
@@ -268,7 +268,7 @@ export class ProfileAboutPage extends ProfileMediaPage {
 
     return [
       this.state.author ? (
-        <ProfilePagesHeader key="ProfilePagesHeader" author={this.state.author} type="about" />
+        <ProfilePagesHeader key="ProfilePagesHeader" author={this.state.author} type="about" hideChannelBanner={inEmbeddedApp()} />
       ) : null,
       this.state.author ? (
         <ProfilePagesContent key="ProfilePagesContent" enabledContactForm={this.enabledContactForm}>

frontend/src/static/js/pages/ProfileHistoryPage.js

@@ -2,6 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { ApiUrlConsumer } from '../utils/contexts/';
 import { PageStore } from '../utils/stores/';
+import { inEmbeddedApp } from '../utils/helpers/';
 import { MediaListWrapper } from '../components/MediaListWrapper';
 import ProfilePagesHeader from '../components/profile-page/ProfilePagesHeader';
 import ProfilePagesContent from '../components/profile-page/ProfilePagesContent';
@@ -28,7 +29,7 @@ export class ProfileHistoryPage extends ProfileMediaPage {
   pageContent() {
     return [
       this.state.author ? (
-        <ProfilePagesHeader key="ProfilePagesHeader" author={this.state.author} type="history" />
+        <ProfilePagesHeader key="ProfilePagesHeader" author={this.state.author} type="history" hideChannelBanner={inEmbeddedApp()} />
       ) : null,
       this.state.author ? (
         <ProfilePagesContent key="ProfilePagesContent">

frontend/src/static/js/pages/ProfileLikedPage.js

@@ -2,6 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { ApiUrlConsumer } from '../utils/contexts/';
 import { PageStore } from '../utils/stores/';
+import { inEmbeddedApp } from '../utils/helpers/';
 import { MediaListWrapper } from '../components/MediaListWrapper';
 import ProfilePagesHeader from '../components/profile-page/ProfilePagesHeader';
 import ProfilePagesContent from '../components/profile-page/ProfilePagesContent';
@@ -28,7 +29,7 @@ export class ProfileLikedPage extends ProfileMediaPage {
   pageContent() {
     return [
       this.state.author ? (
-        <ProfilePagesHeader key="ProfilePagesHeader" author={this.state.author} type="liked" />
+        <ProfilePagesHeader key="ProfilePagesHeader" author={this.state.author} type="liked" hideChannelBanner={inEmbeddedApp()} />
       ) : null,
       this.state.author ? (
         <ProfilePagesContent key="ProfilePagesContent">

frontend/src/static/js/pages/ProfilePlaylistsPage.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import { ApiUrlConsumer } from '../utils/contexts/';
 import { PageStore } from '../utils/stores/';
+import { inEmbeddedApp } from '../utils/helpers/';
 import { MediaListWrapper } from '../components/MediaListWrapper';
 import ProfilePagesHeader from '../components/profile-page/ProfilePagesHeader';
 import ProfilePagesContent from '../components/profile-page/ProfilePagesContent';
@@ -30,7 +31,7 @@ export class ProfilePlaylistsPage extends ProfileMediaPage {
   pageContent() {
     return [
       this.state.author ? (
-        <ProfilePagesHeader key="ProfilePagesHeader" author={this.state.author} type="playlists" />
+        <ProfilePagesHeader key="ProfilePagesHeader" author={this.state.author} type="playlists" hideChannelBanner={inEmbeddedApp()} />
       ) : null,
       this.state.author ? (
         <ProfilePagesContent key="ProfilePagesContent">

frontend/src/static/js/pages/ProfileSharedByMePage.js

@@ -11,7 +11,7 @@ import { ProfileMediaFilters } from '../components/search-filters/ProfileMediaFi
 import { ProfileMediaTags } from '../components/search-filters/ProfileMediaTags';
 import { ProfileMediaSorting } from '../components/search-filters/ProfileMediaSorting';
 import { BulkActionsModals } from '../components/BulkActionsModals';
-import { translateString } from '../utils/helpers';
+import { inEmbeddedApp, translateString } from '../utils/helpers';
 import { withBulkActions } from '../utils/hoc/withBulkActions';
 
 import { Page } from './_Page';
@@ -19,400 +19,443 @@ import { Page } from './_Page';
 import '../components/profile-page/ProfilePage.scss';
 
 function EmptySharedByMe(props) {
-  return (
+    return (
-    <LinksConsumer>
+        <LinksConsumer>
-      {(links) => (
+            {(links) => (
-        <div className="empty-media empty-channel-media">
+                <div className="empty-media empty-channel-media">
-          <div className="welcome-title">No shared media</div>
+                    <div className="welcome-title">No shared media</div>
-          <div className="start-uploading">
+                    <div className="start-uploading">Media that you have shared with others will show up here.</div>
-            Media that you have shared with others will show up here.
+                </div>
-          </div>
+            )}
-        </div>
+        </LinksConsumer>
-      )}
+    );
-    </LinksConsumer>
-  );
 }
 
 class ProfileSharedByMePage extends Page {
-  constructor(props, pageSlug) {
+    constructor(props, pageSlug) {
-    super(props, 'string' === typeof pageSlug ? pageSlug : 'author-shared-by-me');
+        super(props, 'string' === typeof pageSlug ? pageSlug : 'author-shared-by-me');
 
-    this.profilePageSlug = 'string' === typeof pageSlug ? pageSlug : 'author-shared-by-me';
+        this.profilePageSlug = 'string' === typeof pageSlug ? pageSlug : 'author-shared-by-me';
 
-    this.state = {
+        this.state = {
-      channelMediaCount: -1,
+            channelMediaCount: -1,
-      author: ProfilePageStore.get('author-data'),
+            author: ProfilePageStore.get('author-data'),
-      uploadsPreviewItemsCount: 0,
+            uploadsPreviewItemsCount: 0,
-      title: this.props.title,
+            title: this.props.title,
-      query: ProfilePageStore.get('author-query'),
+            query: ProfilePageStore.get('author-query'),
-      requestUrl: null,
+            requestUrl: null,
-      hiddenFilters: true,
+            hiddenFilters: true,
-      hiddenTags: true,
+            hiddenTags: true,
-      hiddenSorting: true,
+            hiddenSorting: true,
-      filterArgs: '',
+            filterArgs: '',
-      availableTags: [],
+            availableTags: [],
-      selectedTag: 'all',
+            selectedTag: 'all',
-      selectedSort: 'date_added_desc',
+            selectedSort: 'date_added_desc',
-    };
+        };
 
-    this.authorDataLoad = this.authorDataLoad.bind(this);
+        this.authorDataLoad = this.authorDataLoad.bind(this);
-    this.onAuthorPreviewItemsCountCallback = this.onAuthorPreviewItemsCountCallback.bind(this);
+        this.onAuthorPreviewItemsCountCallback = this.onAuthorPreviewItemsCountCallback.bind(this);
-    this.getCountFunc = this.getCountFunc.bind(this);
+        this.getCountFunc = this.getCountFunc.bind(this);
-    this.changeRequestQuery = this.changeRequestQuery.bind(this);
+        this.changeRequestQuery = this.changeRequestQuery.bind(this);
-    this.onToggleFiltersClick = this.onToggleFiltersClick.bind(this);
+        this.onToggleFiltersClick = this.onToggleFiltersClick.bind(this);
-    this.onToggleTagsClick = this.onToggleTagsClick.bind(this);
+        this.onToggleTagsClick = this.onToggleTagsClick.bind(this);
-    this.onToggleSortingClick = this.onToggleSortingClick.bind(this);
+        this.onToggleSortingClick = this.onToggleSortingClick.bind(this);
-    this.onFiltersUpdate = this.onFiltersUpdate.bind(this);
+        this.onFiltersUpdate = this.onFiltersUpdate.bind(this);
-    this.onTagSelect = this.onTagSelect.bind(this);
+        this.onTagSelect = this.onTagSelect.bind(this);
-    this.onSortSelect = this.onSortSelect.bind(this);
+        this.onSortSelect = this.onSortSelect.bind(this);
-    this.onResponseDataLoaded = this.onResponseDataLoaded.bind(this);
+        this.onResponseDataLoaded = this.onResponseDataLoaded.bind(this);
 
-    ProfilePageStore.on('load-author-data', this.authorDataLoad);
+        ProfilePageStore.on('load-author-data', this.authorDataLoad);
-  }
-
-  componentDidMount() {
-    ProfilePageActions.load_author_data();
-  }
-
-  authorDataLoad() {
-    const author = ProfilePageStore.get('author-data');
-
-    let requestUrl = this.state.requestUrl;
-
-    if (author) {
-      if (this.state.query) {
-        requestUrl = ApiUrlContext._currentValue.media + '?author=' + author.id + '&show=shared_by_me&q=' + encodeURIComponent(this.state.query) + this.state.filterArgs;
-      } else {
-        requestUrl = ApiUrlContext._currentValue.media + '?author=' + author.id + '&show=shared_by_me' + this.state.filterArgs;
-      }
     }
 
-    this.setState({
+    componentDidMount() {
-      author: author,
+        ProfilePageActions.load_author_data();
-      requestUrl: requestUrl,
+    }
-    });
-  }
 
-  onAuthorPreviewItemsCountCallback(totalAuthorPreviewItems) {
+    authorDataLoad() {
-    this.setState({
+        const author = ProfilePageStore.get('author-data');
-      uploadsPreviewItemsCount: totalAuthorPreviewItems,
-    });
-  }
 
-  getCountFunc(count) {
+        let requestUrl = this.state.requestUrl;
-    this.setState(
-      {
-        channelMediaCount: count,
-      },
-      () => {
-        if (this.state.query) {
-          let title = '';
 
-          if (!count) {
+        if (author) {
-            title = 'No results for "' + this.state.query + '"';
+            if (this.state.query) {
-          } else if (1 === count) {
+                requestUrl =
-            title = '1 result for "' + this.state.query + '"';
+                    ApiUrlContext._currentValue.media +
-          } else {
+                    '?author=' +
-            title = count + ' results for "' + this.state.query + '"';
+                    author.id +
-          }
+                    '&show=shared_by_me&q=' +
-
+                    encodeURIComponent(this.state.query) +
-          this.setState({
+                    this.state.filterArgs;
-            title: title,
+            } else {
-          });
+                requestUrl =
+                    ApiUrlContext._currentValue.media +
+                    '?author=' +
+                    author.id +
+                    '&show=shared_by_me' +
+                    this.state.filterArgs;
+            }
         }
-      }
-    );
-  }
 
-  changeRequestQuery(newQuery) {
+        this.setState({
-    if (!this.state.author) {
+            author: author,
-      return;
+            requestUrl: requestUrl,
+        });
     }
 
-    let requestUrl;
+    onAuthorPreviewItemsCountCallback(totalAuthorPreviewItems) {
-
+        this.setState({
-    if (newQuery) {
+            uploadsPreviewItemsCount: totalAuthorPreviewItems,
-      requestUrl = ApiUrlContext._currentValue.media + '?author=' + this.state.author.id + '&show=shared_by_me&q=' + encodeURIComponent(newQuery) + this.state.filterArgs;
+        });
-    } else {
-      requestUrl = ApiUrlContext._currentValue.media + '?author=' + this.state.author.id + '&show=shared_by_me' + this.state.filterArgs;
     }
 
-    let title = this.state.title;
+    getCountFunc(count) {
+        this.setState(
+            {
+                channelMediaCount: count,
+            },
+            () => {
+                if (this.state.query) {
+                    let title = '';
 
-    if ('' === newQuery) {
+                    if (!count) {
-      title = this.props.title;
+                        title = 'No results for "' + this.state.query + '"';
+                    } else if (1 === count) {
+                        title = '1 result for "' + this.state.query + '"';
+                    } else {
+                        title = count + ' results for "' + this.state.query + '"';
+                    }
+
+                    this.setState({
+                        title: title,
+                    });
+                }
+            }
+        );
     }
 
-    this.setState({
+    changeRequestQuery(newQuery) {
-      requestUrl: requestUrl,
-      query: newQuery,
-      title: title,
-    });
-  }
-
-  onToggleFiltersClick() {
-    this.setState({
-      hiddenFilters: !this.state.hiddenFilters,
-      hiddenTags: true,
-      hiddenSorting: true,
-    });
-  }
-
-  onToggleTagsClick() {
-    this.setState({
-      hiddenFilters: true,
-      hiddenTags: !this.state.hiddenTags,
-      hiddenSorting: true,
-    });
-  }
-
-  onToggleSortingClick() {
-    this.setState({
-      hiddenFilters: true,
-      hiddenTags: true,
-      hiddenSorting: !this.state.hiddenSorting,
-    });
-  }
-
-  onTagSelect(tag) {
-    this.setState({ selectedTag: tag }, () => {
-      this.onFiltersUpdate({
-        media_type: this.state.filterArgs.match(/media_type=([^&]+)/)?.[1],
-        upload_date: this.state.filterArgs.match(/upload_date=([^&]+)/)?.[1],
-        duration: this.state.filterArgs.match(/duration=([^&]+)/)?.[1],
-        publish_state: this.state.filterArgs.match(/publish_state=([^&]+)/)?.[1],
-        sort_by: this.state.selectedSort,
-        tag: tag,
-      });
-    });
-  }
-
-  onSortSelect(sortBy) {
-    this.setState({ selectedSort: sortBy }, () => {
-      this.onFiltersUpdate({
-        media_type: this.state.filterArgs.match(/media_type=([^&]+)/)?.[1],
-        upload_date: this.state.filterArgs.match(/upload_date=([^&]+)/)?.[1],
-        duration: this.state.filterArgs.match(/duration=([^&]+)/)?.[1],
-        publish_state: this.state.filterArgs.match(/publish_state=([^&]+)/)?.[1],
-        sort_by: sortBy,
-        tag: this.state.selectedTag,
-      });
-    });
-  }
-
-  onFiltersUpdate(updatedArgs) {
-    const args = {
-      media_type: null,
-      upload_date: null,
-      duration: null,
-      publish_state: null,
-      sort_by: null,
-      ordering: null,
-      t: null,
-    };
-
-    switch (updatedArgs.media_type) {
-      case 'video':
-      case 'audio':
-      case 'image':
-      case 'pdf':
-        args.media_type = updatedArgs.media_type;
-        break;
-    }
-
-    switch (updatedArgs.upload_date) {
-      case 'today':
-      case 'this_week':
-      case 'this_month':
-      case 'this_year':
-        args.upload_date = updatedArgs.upload_date;
-        break;
-    }
-
-    // Handle duration filter
-    if (updatedArgs.duration && updatedArgs.duration !== 'all') {
-      args.duration = updatedArgs.duration;
-    }
-
-    // Handle publish state filter
-    if (updatedArgs.publish_state && updatedArgs.publish_state !== 'all') {
-      args.publish_state = updatedArgs.publish_state;
-    }
-
-    switch (updatedArgs.sort_by) {
-      case 'date_added_desc':
-        // Default sorting, no need to add parameters
-        break;
-      case 'date_added_asc':
-        args.ordering = 'asc';
-        break;
-      case 'alphabetically_asc':
-        args.sort_by = 'title_asc';
-        break;
-      case 'alphabetically_desc':
-        args.sort_by = 'title_desc';
-        break;
-      case 'plays_least':
-        args.sort_by = 'views_asc';
-        break;
-      case 'plays_most':
-        args.sort_by = 'views_desc';
-        break;
-      case 'likes_least':
-        args.sort_by = 'likes_asc';
-        break;
-      case 'likes_most':
-        args.sort_by = 'likes_desc';
-        break;
-    }
-
-    if (updatedArgs.tag && updatedArgs.tag !== 'all') {
-      args.t = updatedArgs.tag;
-    }
-
-    const newArgs = [];
-
-    for (let arg in args) {
-      if (null !== args[arg]) {
-        newArgs.push(arg + '=' + args[arg]);
-      }
-    }
-
-    this.setState(
-      {
-        filterArgs: newArgs.length ? '&' + newArgs.join('&') : '',
-      },
-      function () {
         if (!this.state.author) {
-          return;
+            return;
         }
 
         let requestUrl;
 
-        if (this.state.query) {
+        if (newQuery) {
-          requestUrl = ApiUrlContext._currentValue.media + '?author=' + this.state.author.id + '&show=shared_by_me&q=' + encodeURIComponent(this.state.query) + this.state.filterArgs;
+            requestUrl =
+                ApiUrlContext._currentValue.media +
+                '?author=' +
+                this.state.author.id +
+                '&show=shared_by_me&q=' +
+                encodeURIComponent(newQuery) +
+                this.state.filterArgs;
         } else {
-          requestUrl = ApiUrlContext._currentValue.media + '?author=' + this.state.author.id + '&show=shared_by_me' + this.state.filterArgs;
+            requestUrl =
+                ApiUrlContext._currentValue.media +
+                '?author=' +
+                this.state.author.id +
+                '&show=shared_by_me' +
+                this.state.filterArgs;
+        }
+
+        let title = this.state.title;
+
+        if ('' === newQuery) {
+            title = this.props.title;
         }
 
         this.setState({
-          requestUrl: requestUrl,
+            requestUrl: requestUrl,
+            query: newQuery,
+            title: title,
         });
-      }
-    );
-  }
-
-  onResponseDataLoaded(responseData) {
-    if (responseData && responseData.tags) {
-      const tags = responseData.tags.split(',').map((tag) => tag.trim()).filter((tag) => tag);
-      this.setState({ availableTags: tags });
     }
-  }
 
-  pageContent() {
+    onToggleFiltersClick() {
-    const authorData = ProfilePageStore.get('author-data');
+        this.setState({
+            hiddenFilters: !this.state.hiddenFilters,
+            hiddenTags: true,
+            hiddenSorting: true,
+        });
+    }
 
-    const isMediaAuthor = authorData && authorData.username === MemberContext._currentValue.username;
+    onToggleTagsClick() {
+        this.setState({
+            hiddenFilters: true,
+            hiddenTags: !this.state.hiddenTags,
+            hiddenSorting: true,
+        });
+    }
 
-    // Check if any filters are active
+    onToggleSortingClick() {
-    const hasActiveFilters = this.state.filterArgs && (
+        this.setState({
-      this.state.filterArgs.includes('media_type=') ||
+            hiddenFilters: true,
-      this.state.filterArgs.includes('upload_date=') ||
+            hiddenTags: true,
-      this.state.filterArgs.includes('duration=') ||
+            hiddenSorting: !this.state.hiddenSorting,
-      this.state.filterArgs.includes('publish_state=')
+        });
-    );
+    }
 
-    return [
+    onTagSelect(tag) {
-      this.state.author ? (
+        this.setState({ selectedTag: tag }, () => {
-        <ProfilePagesHeader
+            this.onFiltersUpdate({
-          key="ProfilePagesHeader"
+                media_type: this.state.filterArgs.match(/media_type=([^&]+)/)?.[1],
-          author={this.state.author}
+                upload_date: this.state.filterArgs.match(/upload_date=([^&]+)/)?.[1],
-          type="shared_by_me"
+                duration: this.state.filterArgs.match(/duration=([^&]+)/)?.[1],
-          onQueryChange={this.changeRequestQuery}
+                publish_state: this.state.filterArgs.match(/publish_state=([^&]+)/)?.[1],
-          onToggleFiltersClick={this.onToggleFiltersClick}
+                sort_by: this.state.selectedSort,
-          onToggleTagsClick={this.onToggleTagsClick}
+                tag: tag,
-          onToggleSortingClick={this.onToggleSortingClick}
+            });
-          hasActiveFilters={hasActiveFilters}
+        });
-          hasActiveTags={this.state.selectedTag !== 'all'}
+    }
-          hasActiveSort={this.state.selectedSort !== 'date_added_desc'}
+
-        />
+    onSortSelect(sortBy) {
-      ) : null,
+        this.setState({ selectedSort: sortBy }, () => {
-      this.state.author ? (
+            this.onFiltersUpdate({
-        <ProfilePagesContent key="ProfilePagesContent">
+                media_type: this.state.filterArgs.match(/media_type=([^&]+)/)?.[1],
-          <MediaListWrapper
+                upload_date: this.state.filterArgs.match(/upload_date=([^&]+)/)?.[1],
-            title={this.state.title}
+                duration: this.state.filterArgs.match(/duration=([^&]+)/)?.[1],
-            className="items-list-ver"
+                publish_state: this.state.filterArgs.match(/publish_state=([^&]+)/)?.[1],
-            showBulkActions={isMediaAuthor}
+                sort_by: sortBy,
-            selectedCount={this.props.bulkActions.selectedMedia.size}
+                tag: this.state.selectedTag,
-            totalCount={this.props.bulkActions.availableMediaIds.length}
+            });
-            onBulkAction={this.props.bulkActions.handleBulkAction}
+        });
-            onSelectAll={this.props.bulkActions.handleSelectAll}
+    }
-            onDeselectAll={this.props.bulkActions.handleDeselectAll}
+
-          >
+    onFiltersUpdate(updatedArgs) {
-            <ProfileMediaFilters hidden={this.state.hiddenFilters} tags={this.state.availableTags} onFiltersUpdate={this.onFiltersUpdate} />
+        const args = {
-            <ProfileMediaTags hidden={this.state.hiddenTags} tags={this.state.availableTags} onTagSelect={this.onTagSelect} />
+            media_type: null,
-            <ProfileMediaSorting hidden={this.state.hiddenSorting} onSortSelect={this.onSortSelect} />
+            upload_date: null,
-            <LazyLoadItemListAsync
+            duration: null,
-              key={`${this.state.requestUrl}-${this.props.bulkActions.listKey}`}
+            publish_state: null,
-              requestUrl={this.state.requestUrl}
+            sort_by: null,
-              hideAuthor={true}
+            ordering: null,
-              itemsCountCallback={this.state.requestUrl ? this.getCountFunc : null}
+            t: null,
-              hideViews={!PageStore.get('config-media-item').displayViews}
+        };
-              hideDate={!PageStore.get('config-media-item').displayPublishDate}
+
-              canEdit={isMediaAuthor}
+        switch (updatedArgs.media_type) {
-              onResponseDataLoaded={this.onResponseDataLoaded}
+            case 'video':
-              showSelection={isMediaAuthor}
+            case 'audio':
-              hasAnySelection={this.props.bulkActions.selectedMedia.size > 0}
+            case 'image':
-              selectedMedia={this.props.bulkActions.selectedMedia}
+            case 'pdf':
-              onMediaSelection={this.props.bulkActions.handleMediaSelection}
+                args.media_type = updatedArgs.media_type;
-              onItemsUpdate={this.props.bulkActions.handleItemsUpdate}
+                break;
-            />
+        }
-            {isMediaAuthor && 0 === this.state.channelMediaCount && !this.state.query ? (
+
-              <EmptySharedByMe name={this.state.author.name} />
+        switch (updatedArgs.upload_date) {
-            ) : null}
+            case 'today':
-          </MediaListWrapper>
+            case 'this_week':
-        </ProfilePagesContent>
+            case 'this_month':
-      ) : null,
+            case 'this_year':
-      this.state.author && isMediaAuthor ? (
+                args.upload_date = updatedArgs.upload_date;
-        <BulkActionsModals
+                break;
-          key="BulkActionsModals"
+        }
-          {...this.props.bulkActions}
+
-          selectedMediaIds={Array.from(this.props.bulkActions.selectedMedia)}
+        // Handle duration filter
-          csrfToken={this.props.bulkActions.getCsrfToken()}
+        if (updatedArgs.duration && updatedArgs.duration !== 'all') {
-          username={this.state.author.username}
+            args.duration = updatedArgs.duration;
-          onConfirmCancel={this.props.bulkActions.handleConfirmCancel}
+        }
-          onConfirmProceed={this.props.bulkActions.handleConfirmProceed}
+
-          onPermissionModalCancel={this.props.bulkActions.handlePermissionModalCancel}
+        // Handle publish state filter
-          onPermissionModalSuccess={this.props.bulkActions.handlePermissionModalSuccess}
+        if (updatedArgs.publish_state && updatedArgs.publish_state !== 'all') {
-          onPermissionModalError={this.props.bulkActions.handlePermissionModalError}
+            args.publish_state = updatedArgs.publish_state;
-          onPlaylistModalCancel={this.props.bulkActions.handlePlaylistModalCancel}
+        }
-          onPlaylistModalSuccess={this.props.bulkActions.handlePlaylistModalSuccess}
+
-          onPlaylistModalError={this.props.bulkActions.handlePlaylistModalError}
+        switch (updatedArgs.sort_by) {
-          onChangeOwnerModalCancel={this.props.bulkActions.handleChangeOwnerModalCancel}
+            case 'date_added_desc':
-          onChangeOwnerModalSuccess={this.props.bulkActions.handleChangeOwnerModalSuccess}
+                // Default sorting, no need to add parameters
-          onChangeOwnerModalError={this.props.bulkActions.handleChangeOwnerModalError}
+                break;
-          onPublishStateModalCancel={this.props.bulkActions.handlePublishStateModalCancel}
+            case 'date_added_asc':
-          onPublishStateModalSuccess={this.props.bulkActions.handlePublishStateModalSuccess}
+                args.ordering = 'asc';
-          onPublishStateModalError={this.props.bulkActions.handlePublishStateModalError}
+                break;
-          onCategoryModalCancel={this.props.bulkActions.handleCategoryModalCancel}
+            case 'alphabetically_asc':
-          onCategoryModalSuccess={this.props.bulkActions.handleCategoryModalSuccess}
+                args.sort_by = 'title_asc';
-          onCategoryModalError={this.props.bulkActions.handleCategoryModalError}
+                break;
-          onTagModalCancel={this.props.bulkActions.handleTagModalCancel}
+            case 'alphabetically_desc':
-          onTagModalSuccess={this.props.bulkActions.handleTagModalSuccess}
+                args.sort_by = 'title_desc';
-          onTagModalError={this.props.bulkActions.handleTagModalError}
+                break;
-        />
+            case 'plays_least':
-      ) : null,
+                args.sort_by = 'views_asc';
-    ];
+                break;
-  }
+            case 'plays_most':
+                args.sort_by = 'views_desc';
+                break;
+            case 'likes_least':
+                args.sort_by = 'likes_asc';
+                break;
+            case 'likes_most':
+                args.sort_by = 'likes_desc';
+                break;
+        }
+
+        if (updatedArgs.tag && updatedArgs.tag !== 'all') {
+            args.t = updatedArgs.tag;
+        }
+
+        const newArgs = [];
+
+        for (let arg in args) {
+            if (null !== args[arg]) {
+                newArgs.push(arg + '=' + args[arg]);
+            }
+        }
+
+        this.setState(
+            {
+                filterArgs: newArgs.length ? '&' + newArgs.join('&') : '',
+            },
+            function () {
+                if (!this.state.author) {
+                    return;
+                }
+
+                let requestUrl;
+
+                if (this.state.query) {
+                    requestUrl =
+                        ApiUrlContext._currentValue.media +
+                        '?author=' +
+                        this.state.author.id +
+                        '&show=shared_by_me&q=' +
+                        encodeURIComponent(this.state.query) +
+                        this.state.filterArgs;
+                } else {
+                    requestUrl =
+                        ApiUrlContext._currentValue.media +
+                        '?author=' +
+                        this.state.author.id +
+                        '&show=shared_by_me' +
+                        this.state.filterArgs;
+                }
+
+                this.setState({
+                    requestUrl: requestUrl,
+                });
+            }
+        );
+    }
+
+    onResponseDataLoaded(responseData) {
+        if (responseData && responseData.tags) {
+            const tags = responseData.tags
+                .split(',')
+                .map((tag) => tag.trim())
+                .filter((tag) => tag);
+            this.setState({ availableTags: tags });
+        }
+    }
+
+    pageContent() {
+        const authorData = ProfilePageStore.get('author-data');
+
+        const isMediaAuthor = authorData && authorData.username === MemberContext._currentValue.username;
+
+        // Check if any filters are active
+        const hasActiveFilters =
+            this.state.filterArgs &&
+            (this.state.filterArgs.includes('media_type=') ||
+                this.state.filterArgs.includes('upload_date=') ||
+                this.state.filterArgs.includes('duration=') ||
+                this.state.filterArgs.includes('publish_state='));
+
+        return [
+            this.state.author ? (
+                <ProfilePagesHeader
+                    key="ProfilePagesHeader"
+                    author={this.state.author}
+                    type="shared_by_me"
+                    onQueryChange={this.changeRequestQuery}
+                    onToggleFiltersClick={this.onToggleFiltersClick}
+                    onToggleTagsClick={this.onToggleTagsClick}
+                    onToggleSortingClick={this.onToggleSortingClick}
+                    hasActiveFilters={hasActiveFilters}
+                    hasActiveTags={this.state.selectedTag !== 'all'}
+                    hasActiveSort={this.state.selectedSort !== 'date_added_desc'}
+                    hideChannelBanner={inEmbeddedApp()}
+                />
+            ) : null,
+            this.state.author ? (
+                <ProfilePagesContent key="ProfilePagesContent">
+                    <MediaListWrapper
+                        title={this.state.title}
+                        className="items-list-ver"
+                        showBulkActions={isMediaAuthor}
+                        selectedCount={this.props.bulkActions.selectedMedia.size}
+                        totalCount={this.props.bulkActions.availableMediaIds.length}
+                        onBulkAction={this.props.bulkActions.handleBulkAction}
+                        onSelectAll={this.props.bulkActions.handleSelectAll}
+                        onDeselectAll={this.props.bulkActions.handleDeselectAll}
+                    >
+                        <ProfileMediaFilters
+                            hidden={this.state.hiddenFilters}
+                            tags={this.state.availableTags}
+                            onFiltersUpdate={this.onFiltersUpdate}
+                        />
+                        <ProfileMediaTags
+                            hidden={this.state.hiddenTags}
+                            tags={this.state.availableTags}
+                            onTagSelect={this.onTagSelect}
+                        />
+                        <ProfileMediaSorting hidden={this.state.hiddenSorting} onSortSelect={this.onSortSelect} />
+                        <LazyLoadItemListAsync
+                            key={`${this.state.requestUrl}-${this.props.bulkActions.listKey}`}
+                            requestUrl={this.state.requestUrl}
+                            hideAuthor={true}
+                            itemsCountCallback={this.state.requestUrl ? this.getCountFunc : null}
+                            hideViews={!PageStore.get('config-media-item').displayViews}
+                            hideDate={!PageStore.get('config-media-item').displayPublishDate}
+                            canEdit={isMediaAuthor}
+                            onResponseDataLoaded={this.onResponseDataLoaded}
+                            showSelection={isMediaAuthor}
+                            hasAnySelection={this.props.bulkActions.selectedMedia.size > 0}
+                            selectedMedia={this.props.bulkActions.selectedMedia}
+                            onMediaSelection={this.props.bulkActions.handleMediaSelection}
+                            onItemsUpdate={this.props.bulkActions.handleItemsUpdate}
+                        />
+                        {isMediaAuthor && 0 === this.state.channelMediaCount && !this.state.query ? (
+                            <EmptySharedByMe name={this.state.author.name} />
+                        ) : null}
+                    </MediaListWrapper>
+                </ProfilePagesContent>
+            ) : null,
+            this.state.author && isMediaAuthor ? (
+                <BulkActionsModals
+                    key="BulkActionsModals"
+                    {...this.props.bulkActions}
+                    selectedMediaIds={Array.from(this.props.bulkActions.selectedMedia)}
+                    csrfToken={this.props.bulkActions.getCsrfToken()}
+                    username={this.state.author.username}
+                    onConfirmCancel={this.props.bulkActions.handleConfirmCancel}
+                    onConfirmProceed={this.props.bulkActions.handleConfirmProceed}
+                    onPermissionModalCancel={this.props.bulkActions.handlePermissionModalCancel}
+                    onPermissionModalSuccess={this.props.bulkActions.handlePermissionModalSuccess}
+                    onPermissionModalError={this.props.bulkActions.handlePermissionModalError}
+                    onPlaylistModalCancel={this.props.bulkActions.handlePlaylistModalCancel}
+                    onPlaylistModalSuccess={this.props.bulkActions.handlePlaylistModalSuccess}
+                    onPlaylistModalError={this.props.bulkActions.handlePlaylistModalError}
+                    onChangeOwnerModalCancel={this.props.bulkActions.handleChangeOwnerModalCancel}
+                    onChangeOwnerModalSuccess={this.props.bulkActions.handleChangeOwnerModalSuccess}
+                    onChangeOwnerModalError={this.props.bulkActions.handleChangeOwnerModalError}
+                    onPublishStateModalCancel={this.props.bulkActions.handlePublishStateModalCancel}
+                    onPublishStateModalSuccess={this.props.bulkActions.handlePublishStateModalSuccess}
+                    onPublishStateModalError={this.props.bulkActions.handlePublishStateModalError}
+                    onCategoryModalCancel={this.props.bulkActions.handleCategoryModalCancel}
+                    onCategoryModalSuccess={this.props.bulkActions.handleCategoryModalSuccess}
+                    onCategoryModalError={this.props.bulkActions.handleCategoryModalError}
+                    onTagModalCancel={this.props.bulkActions.handleTagModalCancel}
+                    onTagModalSuccess={this.props.bulkActions.handleTagModalSuccess}
+                    onTagModalError={this.props.bulkActions.handleTagModalError}
+                />
+            ) : null,
+        ];
+    }
 }
 
 ProfileSharedByMePage.propTypes = {
-  title: PropTypes.string.isRequired,
+    title: PropTypes.string.isRequired,
-  bulkActions: PropTypes.object.isRequired,
+    bulkActions: PropTypes.object.isRequired,
 };
 
 ProfileSharedByMePage.defaultProps = {
-  title: 'Shared by me',
+    title: 'Shared by me',
 };
 
 // Wrap with HOC and export as named export for compatibility

frontend/src/static/js/pages/ProfileSharedWithMePage.js

@@ -10,364 +10,404 @@ import { LazyLoadItemListAsync } from '../components/item-list/LazyLoadItemListA
 import { ProfileMediaFilters } from '../components/search-filters/ProfileMediaFilters';
 import { ProfileMediaTags } from '../components/search-filters/ProfileMediaTags';
 import { ProfileMediaSorting } from '../components/search-filters/ProfileMediaSorting';
-import { translateString } from '../utils/helpers';
+import { inEmbeddedApp, translateString } from '../utils/helpers';
 
 import { Page } from './_Page';
 
 import '../components/profile-page/ProfilePage.scss';
 
 function EmptySharedWithMe(props) {
-  return (
+    return (
-    <LinksConsumer>
+        <LinksConsumer>
-      {(links) => (
+            {(links) => (
-        <div className="empty-media empty-channel-media">
+                <div className="empty-media empty-channel-media">
-          <div className="welcome-title">No shared media</div>
+                    <div className="welcome-title">No shared media</div>
-          <div className="start-uploading">
+                    <div className="start-uploading">Media that others have shared with you will show up here.</div>
-            Media that others have shared with you will show up here.
+                </div>
-          </div>
+            )}
-        </div>
+        </LinksConsumer>
-      )}
+    );
-    </LinksConsumer>
-  );
 }
 
 export class ProfileSharedWithMePage extends Page {
-  constructor(props, pageSlug) {
+    constructor(props, pageSlug) {
-    super(props, 'string' === typeof pageSlug ? pageSlug : 'author-shared-with-me');
+        super(props, 'string' === typeof pageSlug ? pageSlug : 'author-shared-with-me');
 
-    this.profilePageSlug = 'string' === typeof pageSlug ? pageSlug : 'author-shared-with-me';
+        this.profilePageSlug = 'string' === typeof pageSlug ? pageSlug : 'author-shared-with-me';
 
-    this.state = {
+        this.state = {
-      channelMediaCount: -1,
+            channelMediaCount: -1,
-      author: ProfilePageStore.get('author-data'),
+            author: ProfilePageStore.get('author-data'),
-      uploadsPreviewItemsCount: 0,
+            uploadsPreviewItemsCount: 0,
-      title: this.props.title,
+            title: this.props.title,
-      query: ProfilePageStore.get('author-query'),
+            query: ProfilePageStore.get('author-query'),
-      requestUrl: null,
+            requestUrl: null,
-      hiddenFilters: true,
+            hiddenFilters: true,
-      hiddenTags: true,
+            hiddenTags: true,
-      hiddenSorting: true,
+            hiddenSorting: true,
-      filterArgs: '',
+            filterArgs: '',
-      availableTags: [],
+            availableTags: [],
-      selectedTag: 'all',
+            selectedTag: 'all',
-      selectedSort: 'date_added_desc',
+            selectedSort: 'date_added_desc',
-    };
+        };
 
-    this.authorDataLoad = this.authorDataLoad.bind(this);
+        this.authorDataLoad = this.authorDataLoad.bind(this);
-    this.onAuthorPreviewItemsCountCallback = this.onAuthorPreviewItemsCountCallback.bind(this);
+        this.onAuthorPreviewItemsCountCallback = this.onAuthorPreviewItemsCountCallback.bind(this);
-    this.getCountFunc = this.getCountFunc.bind(this);
+        this.getCountFunc = this.getCountFunc.bind(this);
-    this.changeRequestQuery = this.changeRequestQuery.bind(this);
+        this.changeRequestQuery = this.changeRequestQuery.bind(this);
-    this.onToggleFiltersClick = this.onToggleFiltersClick.bind(this);
+        this.onToggleFiltersClick = this.onToggleFiltersClick.bind(this);
-    this.onToggleTagsClick = this.onToggleTagsClick.bind(this);
+        this.onToggleTagsClick = this.onToggleTagsClick.bind(this);
-    this.onToggleSortingClick = this.onToggleSortingClick.bind(this);
+        this.onToggleSortingClick = this.onToggleSortingClick.bind(this);
-    this.onFiltersUpdate = this.onFiltersUpdate.bind(this);
+        this.onFiltersUpdate = this.onFiltersUpdate.bind(this);
-    this.onTagSelect = this.onTagSelect.bind(this);
+        this.onTagSelect = this.onTagSelect.bind(this);
-    this.onSortSelect = this.onSortSelect.bind(this);
+        this.onSortSelect = this.onSortSelect.bind(this);
-    this.onResponseDataLoaded = this.onResponseDataLoaded.bind(this);
+        this.onResponseDataLoaded = this.onResponseDataLoaded.bind(this);
 
-    ProfilePageStore.on('load-author-data', this.authorDataLoad);
+        ProfilePageStore.on('load-author-data', this.authorDataLoad);
-  }
-
-  componentDidMount() {
-    ProfilePageActions.load_author_data();
-  }
-
-  authorDataLoad() {
-    const author = ProfilePageStore.get('author-data');
-
-    let requestUrl = this.state.requestUrl;
-
-    if (author) {
-      if (this.state.query) {
-        requestUrl = ApiUrlContext._currentValue.media + '?author=' + author.id + '&show=shared_with_me&q=' + encodeURIComponent(this.state.query) + this.state.filterArgs;
-      } else {
-        requestUrl = ApiUrlContext._currentValue.media + '?author=' + author.id + '&show=shared_with_me' + this.state.filterArgs;
-      }
     }
 
-    this.setState({
+    componentDidMount() {
-      author: author,
+        ProfilePageActions.load_author_data();
-      requestUrl: requestUrl,
+    }
-    });
-  }
 
-  onAuthorPreviewItemsCountCallback(totalAuthorPreviewItems) {
+    authorDataLoad() {
-    this.setState({
+        const author = ProfilePageStore.get('author-data');
-      uploadsPreviewItemsCount: totalAuthorPreviewItems,
-    });
-  }
 
-  getCountFunc(count) {
+        let requestUrl = this.state.requestUrl;
-    this.setState(
-      {
-        channelMediaCount: count,
-      },
-      () => {
-        if (this.state.query) {
-          let title = '';
 
-          if (!count) {
+        if (author) {
-            title = 'No results for "' + this.state.query + '"';
+            if (this.state.query) {
-          } else if (1 === count) {
+                requestUrl =
-            title = '1 result for "' + this.state.query + '"';
+                    ApiUrlContext._currentValue.media +
-          } else {
+                    '?author=' +
-            title = count + ' results for "' + this.state.query + '"';
+                    author.id +
-          }
+                    '&show=shared_with_me&q=' +
-
+                    encodeURIComponent(this.state.query) +
-          this.setState({
+                    this.state.filterArgs;
-            title: title,
+            } else {
-          });
+                requestUrl =
+                    ApiUrlContext._currentValue.media +
+                    '?author=' +
+                    author.id +
+                    '&show=shared_with_me' +
+                    this.state.filterArgs;
+            }
         }
-      }
-    );
-  }
 
-  changeRequestQuery(newQuery) {
+        this.setState({
-    if (!this.state.author) {
+            author: author,
-      return;
+            requestUrl: requestUrl,
+        });
     }
 
-    let requestUrl;
+    onAuthorPreviewItemsCountCallback(totalAuthorPreviewItems) {
-
+        this.setState({
-    if (newQuery) {
+            uploadsPreviewItemsCount: totalAuthorPreviewItems,
-      requestUrl = ApiUrlContext._currentValue.media + '?author=' + this.state.author.id + '&show=shared_with_me&q=' + encodeURIComponent(newQuery) + this.state.filterArgs;
+        });
-    } else {
-      requestUrl = ApiUrlContext._currentValue.media + '?author=' + this.state.author.id + '&show=shared_with_me' + this.state.filterArgs;
     }
 
-    let title = this.state.title;
+    getCountFunc(count) {
+        this.setState(
+            {
+                channelMediaCount: count,
+            },
+            () => {
+                if (this.state.query) {
+                    let title = '';
 
-    if ('' === newQuery) {
+                    if (!count) {
-      title = this.props.title;
+                        title = 'No results for "' + this.state.query + '"';
+                    } else if (1 === count) {
+                        title = '1 result for "' + this.state.query + '"';
+                    } else {
+                        title = count + ' results for "' + this.state.query + '"';
+                    }
+
+                    this.setState({
+                        title: title,
+                    });
+                }
+            }
+        );
     }
 
-    this.setState({
+    changeRequestQuery(newQuery) {
-      requestUrl: requestUrl,
-      query: newQuery,
-      title: title,
-    });
-  }
-
-  onToggleFiltersClick() {
-    this.setState({
-      hiddenFilters: !this.state.hiddenFilters,
-      hiddenTags: true,
-      hiddenSorting: true,
-    });
-  }
-
-  onToggleTagsClick() {
-    this.setState({
-      hiddenFilters: true,
-      hiddenTags: !this.state.hiddenTags,
-      hiddenSorting: true,
-    });
-  }
-
-  onToggleSortingClick() {
-    this.setState({
-      hiddenFilters: true,
-      hiddenTags: true,
-      hiddenSorting: !this.state.hiddenSorting,
-    });
-  }
-
-  onTagSelect(tag) {
-    this.setState({ selectedTag: tag }, () => {
-      this.onFiltersUpdate({
-        media_type: this.state.filterArgs.match(/media_type=([^&]+)/)?.[1],
-        upload_date: this.state.filterArgs.match(/upload_date=([^&]+)/)?.[1],
-        duration: this.state.filterArgs.match(/duration=([^&]+)/)?.[1],
-        publish_state: this.state.filterArgs.match(/publish_state=([^&]+)/)?.[1],
-        sort_by: this.state.selectedSort,
-        tag: tag,
-      });
-    });
-  }
-
-  onSortSelect(sortBy) {
-    this.setState({ selectedSort: sortBy }, () => {
-      this.onFiltersUpdate({
-        media_type: this.state.filterArgs.match(/media_type=([^&]+)/)?.[1],
-        upload_date: this.state.filterArgs.match(/upload_date=([^&]+)/)?.[1],
-        duration: this.state.filterArgs.match(/duration=([^&]+)/)?.[1],
-        publish_state: this.state.filterArgs.match(/publish_state=([^&]+)/)?.[1],
-        sort_by: sortBy,
-        tag: this.state.selectedTag,
-      });
-    });
-  }
-
-  onFiltersUpdate(updatedArgs) {
-    const args = {
-      media_type: null,
-      upload_date: null,
-      duration: null,
-      publish_state: null,
-      sort_by: null,
-      ordering: null,
-      t: null,
-    };
-
-    switch (updatedArgs.media_type) {
-      case 'video':
-      case 'audio':
-      case 'image':
-      case 'pdf':
-        args.media_type = updatedArgs.media_type;
-        break;
-    }
-
-    switch (updatedArgs.upload_date) {
-      case 'today':
-      case 'this_week':
-      case 'this_month':
-      case 'this_year':
-        args.upload_date = updatedArgs.upload_date;
-        break;
-    }
-
-    // Handle duration filter
-    if (updatedArgs.duration && updatedArgs.duration !== 'all') {
-      args.duration = updatedArgs.duration;
-    }
-
-    // Handle publish state filter
-    if (updatedArgs.publish_state && updatedArgs.publish_state !== 'all') {
-      args.publish_state = updatedArgs.publish_state;
-    }
-
-    switch (updatedArgs.sort_by) {
-      case 'date_added_desc':
-        // Default sorting, no need to add parameters
-        break;
-      case 'date_added_asc':
-        args.ordering = 'asc';
-        break;
-      case 'alphabetically_asc':
-        args.sort_by = 'title_asc';
-        break;
-      case 'alphabetically_desc':
-        args.sort_by = 'title_desc';
-        break;
-      case 'plays_least':
-        args.sort_by = 'views_asc';
-        break;
-      case 'plays_most':
-        args.sort_by = 'views_desc';
-        break;
-      case 'likes_least':
-        args.sort_by = 'likes_asc';
-        break;
-      case 'likes_most':
-        args.sort_by = 'likes_desc';
-        break;
-    }
-
-    if (updatedArgs.tag && updatedArgs.tag !== 'all') {
-      args.t = updatedArgs.tag;
-    }
-
-    const newArgs = [];
-
-    for (let arg in args) {
-      if (null !== args[arg]) {
-        newArgs.push(arg + '=' + args[arg]);
-      }
-    }
-
-    this.setState(
-      {
-        filterArgs: newArgs.length ? '&' + newArgs.join('&') : '',
-      },
-      function () {
         if (!this.state.author) {
-          return;
+            return;
         }
 
         let requestUrl;
 
-        if (this.state.query) {
+        if (newQuery) {
-          requestUrl = ApiUrlContext._currentValue.media + '?author=' + this.state.author.id + '&show=shared_with_me&q=' + encodeURIComponent(this.state.query) + this.state.filterArgs;
+            requestUrl =
+                ApiUrlContext._currentValue.media +
+                '?author=' +
+                this.state.author.id +
+                '&show=shared_with_me&q=' +
+                encodeURIComponent(newQuery) +
+                this.state.filterArgs;
         } else {
-          requestUrl = ApiUrlContext._currentValue.media + '?author=' + this.state.author.id + '&show=shared_with_me' + this.state.filterArgs;
+            requestUrl =
+                ApiUrlContext._currentValue.media +
+                '?author=' +
+                this.state.author.id +
+                '&show=shared_with_me' +
+                this.state.filterArgs;
+        }
+
+        let title = this.state.title;
+
+        if ('' === newQuery) {
+            title = this.props.title;
         }
 
         this.setState({
-          requestUrl: requestUrl,
+            requestUrl: requestUrl,
+            query: newQuery,
+            title: title,
         });
-      }
-    );
-  }
-
-  onResponseDataLoaded(responseData) {
-    if (responseData && responseData.tags) {
-      const tags = responseData.tags.split(',').map((tag) => tag.trim()).filter((tag) => tag);
-      this.setState({ availableTags: tags });
     }
-  }
 
-  pageContent() {
+    onToggleFiltersClick() {
-    const authorData = ProfilePageStore.get('author-data');
+        this.setState({
+            hiddenFilters: !this.state.hiddenFilters,
+            hiddenTags: true,
+            hiddenSorting: true,
+        });
+    }
 
-    const isMediaAuthor = authorData && authorData.username === MemberContext._currentValue.username;
+    onToggleTagsClick() {
+        this.setState({
+            hiddenFilters: true,
+            hiddenTags: !this.state.hiddenTags,
+            hiddenSorting: true,
+        });
+    }
 
-    // Check if any filters are active
+    onToggleSortingClick() {
-    const hasActiveFilters = this.state.filterArgs && (
+        this.setState({
-      this.state.filterArgs.includes('media_type=') ||
+            hiddenFilters: true,
-      this.state.filterArgs.includes('upload_date=') ||
+            hiddenTags: true,
-      this.state.filterArgs.includes('duration=') ||
+            hiddenSorting: !this.state.hiddenSorting,
-      this.state.filterArgs.includes('publish_state=')
+        });
-    );
+    }
 
-    return [
+    onTagSelect(tag) {
-      this.state.author ? (
+        this.setState({ selectedTag: tag }, () => {
-        <ProfilePagesHeader
+            this.onFiltersUpdate({
-          key="ProfilePagesHeader"
+                media_type: this.state.filterArgs.match(/media_type=([^&]+)/)?.[1],
-          author={this.state.author}
+                upload_date: this.state.filterArgs.match(/upload_date=([^&]+)/)?.[1],
-          type="shared_with_me"
+                duration: this.state.filterArgs.match(/duration=([^&]+)/)?.[1],
-          onQueryChange={this.changeRequestQuery}
+                publish_state: this.state.filterArgs.match(/publish_state=([^&]+)/)?.[1],
-          onToggleFiltersClick={this.onToggleFiltersClick}
+                sort_by: this.state.selectedSort,
-          onToggleTagsClick={this.onToggleTagsClick}
+                tag: tag,
-          onToggleSortingClick={this.onToggleSortingClick}
+            });
-          hasActiveFilters={hasActiveFilters}
+        });
-          hasActiveTags={this.state.selectedTag !== 'all'}
+    }
-          hasActiveSort={this.state.selectedSort !== 'date_added_desc'}
+
-        />
+    onSortSelect(sortBy) {
-      ) : null,
+        this.setState({ selectedSort: sortBy }, () => {
-      this.state.author ? (
+            this.onFiltersUpdate({
-        <ProfilePagesContent key="ProfilePagesContent">
+                media_type: this.state.filterArgs.match(/media_type=([^&]+)/)?.[1],
-          <MediaListWrapper
+                upload_date: this.state.filterArgs.match(/upload_date=([^&]+)/)?.[1],
-            title={this.state.title}
+                duration: this.state.filterArgs.match(/duration=([^&]+)/)?.[1],
-            className="items-list-ver"
+                publish_state: this.state.filterArgs.match(/publish_state=([^&]+)/)?.[1],
-          >
+                sort_by: sortBy,
-            <ProfileMediaFilters hidden={this.state.hiddenFilters} tags={this.state.availableTags} onFiltersUpdate={this.onFiltersUpdate} />
+                tag: this.state.selectedTag,
-            <ProfileMediaTags hidden={this.state.hiddenTags} tags={this.state.availableTags} onTagSelect={this.onTagSelect} />
+            });
-            <ProfileMediaSorting hidden={this.state.hiddenSorting} onSortSelect={this.onSortSelect} />
+        });
-            <LazyLoadItemListAsync
+    }
-              key={this.state.requestUrl}
+
-              requestUrl={this.state.requestUrl}
+    onFiltersUpdate(updatedArgs) {
-              hideAuthor={true}
+        const args = {
-              itemsCountCallback={this.state.requestUrl ? this.getCountFunc : null}
+            media_type: null,
-              hideViews={!PageStore.get('config-media-item').displayViews}
+            upload_date: null,
-              hideDate={!PageStore.get('config-media-item').displayPublishDate}
+            duration: null,
-              canEdit={false}
+            publish_state: null,
-              onResponseDataLoaded={this.onResponseDataLoaded}
+            sort_by: null,
-            />
+            ordering: null,
-            {isMediaAuthor && 0 === this.state.channelMediaCount && !this.state.query ? (
+            t: null,
-              <EmptySharedWithMe name={this.state.author.name} />
+        };
-            ) : null}
+
-          </MediaListWrapper>
+        switch (updatedArgs.media_type) {
-        </ProfilePagesContent>
+            case 'video':
-      ) : null,
+            case 'audio':
-    ];
+            case 'image':
-  }
+            case 'pdf':
+                args.media_type = updatedArgs.media_type;
+                break;
+        }
+
+        switch (updatedArgs.upload_date) {
+            case 'today':
+            case 'this_week':
+            case 'this_month':
+            case 'this_year':
+                args.upload_date = updatedArgs.upload_date;
+                break;
+        }
+
+        // Handle duration filter
+        if (updatedArgs.duration && updatedArgs.duration !== 'all') {
+            args.duration = updatedArgs.duration;
+        }
+
+        // Handle publish state filter
+        if (updatedArgs.publish_state && updatedArgs.publish_state !== 'all') {
+            args.publish_state = updatedArgs.publish_state;
+        }
+
+        switch (updatedArgs.sort_by) {
+            case 'date_added_desc':
+                // Default sorting, no need to add parameters
+                break;
+            case 'date_added_asc':
+                args.ordering = 'asc';
+                break;
+            case 'alphabetically_asc':
+                args.sort_by = 'title_asc';
+                break;
+            case 'alphabetically_desc':
+                args.sort_by = 'title_desc';
+                break;
+            case 'plays_least':
+                args.sort_by = 'views_asc';
+                break;
+            case 'plays_most':
+                args.sort_by = 'views_desc';
+                break;
+            case 'likes_least':
+                args.sort_by = 'likes_asc';
+                break;
+            case 'likes_most':
+                args.sort_by = 'likes_desc';
+                break;
+        }
+
+        if (updatedArgs.tag && updatedArgs.tag !== 'all') {
+            args.t = updatedArgs.tag;
+        }
+
+        const newArgs = [];
+
+        for (let arg in args) {
+            if (null !== args[arg]) {
+                newArgs.push(arg + '=' + args[arg]);
+            }
+        }
+
+        this.setState(
+            {
+                filterArgs: newArgs.length ? '&' + newArgs.join('&') : '',
+            },
+            function () {
+                if (!this.state.author) {
+                    return;
+                }
+
+                let requestUrl;
+
+                if (this.state.query) {
+                    requestUrl =
+                        ApiUrlContext._currentValue.media +
+                        '?author=' +
+                        this.state.author.id +
+                        '&show=shared_with_me&q=' +
+                        encodeURIComponent(this.state.query) +
+                        this.state.filterArgs;
+                } else {
+                    requestUrl =
+                        ApiUrlContext._currentValue.media +
+                        '?author=' +
+                        this.state.author.id +
+                        '&show=shared_with_me' +
+                        this.state.filterArgs;
+                }
+
+                this.setState({
+                    requestUrl: requestUrl,
+                });
+            }
+        );
+    }
+
+    onResponseDataLoaded(responseData) {
+        if (responseData && responseData.tags) {
+            const tags = responseData.tags
+                .split(',')
+                .map((tag) => tag.trim())
+                .filter((tag) => tag);
+            this.setState({ availableTags: tags });
+        }
+    }
+
+    pageContent() {
+        const authorData = ProfilePageStore.get('author-data');
+
+        const isMediaAuthor = authorData && authorData.username === MemberContext._currentValue.username;
+
+        // Check if any filters are active
+        const hasActiveFilters =
+            this.state.filterArgs &&
+            (this.state.filterArgs.includes('media_type=') ||
+                this.state.filterArgs.includes('upload_date=') ||
+                this.state.filterArgs.includes('duration=') ||
+                this.state.filterArgs.includes('publish_state='));
+
+        return [
+            this.state.author ? (
+                <ProfilePagesHeader
+                    key="ProfilePagesHeader"
+                    author={this.state.author}
+                    type="shared_with_me"
+                    onQueryChange={this.changeRequestQuery}
+                    onToggleFiltersClick={this.onToggleFiltersClick}
+                    onToggleTagsClick={this.onToggleTagsClick}
+                    onToggleSortingClick={this.onToggleSortingClick}
+                    hasActiveFilters={hasActiveFilters}
+                    hasActiveTags={this.state.selectedTag !== 'all'}
+                    hasActiveSort={this.state.selectedSort !== 'date_added_desc'}
+                    hideChannelBanner={inEmbeddedApp()}
+                />
+            ) : null,
+            this.state.author ? (
+                <ProfilePagesContent key="ProfilePagesContent">
+                    <MediaListWrapper title={this.state.title} className="items-list-ver">
+                        <ProfileMediaFilters
+                            hidden={this.state.hiddenFilters}
+                            tags={this.state.availableTags}
+                            onFiltersUpdate={this.onFiltersUpdate}
+                        />
+                        <ProfileMediaTags
+                            hidden={this.state.hiddenTags}
+                            tags={this.state.availableTags}
+                            onTagSelect={this.onTagSelect}
+                        />
+                        <ProfileMediaSorting hidden={this.state.hiddenSorting} onSortSelect={this.onSortSelect} />
+                        <LazyLoadItemListAsync
+                            key={this.state.requestUrl}
+                            requestUrl={this.state.requestUrl}
+                            hideAuthor={true}
+                            itemsCountCallback={this.state.requestUrl ? this.getCountFunc : null}
+                            hideViews={!PageStore.get('config-media-item').displayViews}
+                            hideDate={!PageStore.get('config-media-item').displayPublishDate}
+                            canEdit={false}
+                            onResponseDataLoaded={this.onResponseDataLoaded}
+                        />
+                        {isMediaAuthor && 0 === this.state.channelMediaCount && !this.state.query ? (
+                            <EmptySharedWithMe name={this.state.author.name} />
+                        ) : null}
+                    </MediaListWrapper>
+                </ProfilePagesContent>
+            ) : null,
+        ];
+    }
 }
 
 ProfileSharedWithMePage.propTypes = {
-  title: PropTypes.string.isRequired,
+    title: PropTypes.string.isRequired,
 };
 
 ProfileSharedWithMePage.defaultProps = {
-  title: 'Shared with me',
+    title: 'Shared with me',
 };

frontend/src/static/js/pages/_MediaPage.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import { PageStore, MediaPageStore } from '../utils/stores/';
 import { MediaPageActions } from '../utils/actions/';
+import { inEmbeddedApp } from '../utils/helpers/';
 import ViewerError from '../components/media-page/ViewerError';
 import ViewerInfo from '../components/media-page/ViewerInfo';
 import ViewerSidebar from '../components/media-page/ViewerSidebar';
@@ -10,102 +11,102 @@ import '../components/media-page/MediaPage.scss';
 const wideLayoutBreakpoint = 1216;
 
 export class _MediaPage extends Page {
-  constructor(props) {
+    constructor(props) {
-    super(props, 'media');
+        super(props, 'media');
 
-    const isWideLayout = wideLayoutBreakpoint <= window.innerWidth;
+        const isWideLayout = wideLayoutBreakpoint <= window.innerWidth;
 
-    this.state = {
+        this.state = {
-      mediaLoaded: false,
+            mediaLoaded: false,
-      mediaLoadFailed: false,
+            mediaLoadFailed: false,
-      wideLayout: isWideLayout,
+            wideLayout: isWideLayout,
-      infoAndSidebarViewType: !isWideLayout ? 0 : 1,
+            infoAndSidebarViewType: !isWideLayout ? 0 : 1,
-      viewerClassname: 'cf viewer-section viewer-wide',
+            viewerClassname: 'cf viewer-section viewer-wide',
-      viewerNestedClassname: 'viewer-section-nested',
+            viewerNestedClassname: 'viewer-section-nested',
-      pagePlaylistLoaded: false,
+            pagePlaylistLoaded: false,
-    };
+        };
 
-    this.onWindowResize = this.onWindowResize.bind(this);
+        this.onWindowResize = this.onWindowResize.bind(this);
-    this.onMediaLoad = this.onMediaLoad.bind(this);
+        this.onMediaLoad = this.onMediaLoad.bind(this);
-    this.onMediaLoadError = this.onMediaLoadError.bind(this);
+        this.onMediaLoadError = this.onMediaLoadError.bind(this);
-    this.onPagePlaylistLoad = this.onPagePlaylistLoad.bind(this);
+        this.onPagePlaylistLoad = this.onPagePlaylistLoad.bind(this);
 
-    MediaPageStore.on('loaded_media_data', this.onMediaLoad);
+        MediaPageStore.on('loaded_media_data', this.onMediaLoad);
-    MediaPageStore.on('loaded_media_error', this.onMediaLoadError);
+        MediaPageStore.on('loaded_media_error', this.onMediaLoadError);
-    MediaPageStore.on('loaded_page_playlist_data', this.onPagePlaylistLoad);
+        MediaPageStore.on('loaded_page_playlist_data', this.onPagePlaylistLoad);
-  }
+    }
 
-  componentDidMount() {
+    componentDidMount() {
-    MediaPageActions.loadMediaData();
+        MediaPageActions.loadMediaData();
-    // FIXME: Is not neccessary to check on every window dimension for changes...
+        // FIXME: Is not neccessary to check on every window dimension for changes...
-    PageStore.on('window_resize', this.onWindowResize);
+        PageStore.on('window_resize', this.onWindowResize);
-  }
+    }
 
-  onPagePlaylistLoad() {
+    onPagePlaylistLoad() {
-    this.setState({
+        this.setState({
-      pagePlaylistLoaded: true,
+            pagePlaylistLoaded: true,
-    });
+        });
-  }
+    }
 
-  onWindowResize() {
+    onWindowResize() {
-    const isWideLayout = wideLayoutBreakpoint <= window.innerWidth;
+        const isWideLayout = wideLayoutBreakpoint <= window.innerWidth;
 
-    this.setState({
+        this.setState({
-      wideLayout: isWideLayout,
+            wideLayout: isWideLayout,
-      infoAndSidebarViewType: !isWideLayout || (MediaPageStore.isVideo() && this.state.theaterMode) ? 0 : 1,
+            infoAndSidebarViewType: !isWideLayout || (MediaPageStore.isVideo() && this.state.theaterMode) ? 0 : 1,
-    });
+        });
-  }
+    }
 
-  onMediaLoad() {
+    onMediaLoad() {
-    this.setState({ mediaLoaded: true });
+        this.setState({ mediaLoaded: true });
-  }
+    }
 
-  onMediaLoadError() {
+    onMediaLoadError() {
-    this.setState({ mediaLoadFailed: true });
+        this.setState({ mediaLoadFailed: true });
-  }
+    }
 
-  viewerContainerContent() {
+    viewerContainerContent() {
-    return null;
+        return null;
-  }
+    }
 
-  mediaType() {
+    mediaType() {
-    return null;
+        return null;
-  }
+    }
 
-  pageContent() {
+    pageContent() {
-    return this.state.mediaLoadFailed ? (
+        return this.state.mediaLoadFailed ? (
-      <div className={this.state.viewerClassname}>
+            <div className={this.state.viewerClassname}>
-        <ViewerError />
+                <ViewerError />
-      </div>
+            </div>
-    ) : (
+        ) : (
-      <div className={this.state.viewerClassname}>
+            <div className={this.state.viewerClassname}>
-        <div className="viewer-container" key="viewer-container">
+                <div className="viewer-container" key="viewer-container">
-          {this.state.mediaLoaded ? this.viewerContainerContent() : null}
+                    {this.state.mediaLoaded ? this.viewerContainerContent() : null}
-        </div>
+                </div>
-        <div key="viewer-section-nested" className={this.state.viewerNestedClassname}>
+                <div key="viewer-section-nested" className={this.state.viewerNestedClassname}>
-          {!this.state.infoAndSidebarViewType
+                    {!this.state.infoAndSidebarViewType
-            ? [
+                        ? [
-                <ViewerInfo key="viewer-info" />,
+                              <ViewerInfo key="viewer-info" />,
-                this.state.pagePlaylistLoaded ? (
+                              !inEmbeddedApp() && this.state.pagePlaylistLoaded ? (
-                  <ViewerSidebar
+                                  <ViewerSidebar
-                    key="viewer-sidebar"
+                                      key="viewer-sidebar"
-                    mediaId={MediaPageStore.get('media-id')}
+                                      mediaId={MediaPageStore.get('media-id')}
-                    playlistData={MediaPageStore.get('playlist-data')}
+                                      playlistData={MediaPageStore.get('playlist-data')}
-                  />
+                                  />
-                ) : null,
+                              ) : null,
-              ]
+                          ]
-            : [
+                        : [
-                this.state.pagePlaylistLoaded ? (
+                              !inEmbeddedApp() && this.state.pagePlaylistLoaded ? (
-                  <ViewerSidebar
+                                  <ViewerSidebar
-                    key="viewer-sidebar"
+                                      key="viewer-sidebar"
-                    mediaId={MediaPageStore.get('media-id')}
+                                      mediaId={MediaPageStore.get('media-id')}
-                    playlistData={MediaPageStore.get('playlist-data')}
+                                      playlistData={MediaPageStore.get('playlist-data')}
-                  />
+                                  />
-                ) : null,
+                              ) : null,
-                <ViewerInfo key="viewer-info" />,
+                              <ViewerInfo key="viewer-info" />,
-              ]}
+                          ]}
-        </div>
+                </div>
-      </div>
+            </div>
-    );
+        );
-  }
+    }
 }

frontend/src/static/js/pages/_VideoMediaPage.js

@@ -2,6 +2,7 @@ import React from 'react';
 // FIXME: 'VideoViewerStore' is used only in case of video media, but is included in every media page code.
 import { PageStore, MediaPageStore, VideoViewerStore } from '../utils/stores/';
 import { MediaPageActions } from '../utils/actions/';
+import { inEmbeddedApp } from '../utils/helpers/';
 import ViewerInfoVideo from '../components/media-page/ViewerInfoVideo';
 import ViewerError from '../components/media-page/ViewerError';
 import ViewerSidebar from '../components/media-page/ViewerSidebar';
@@ -11,118 +12,119 @@ import _MediaPage from './_MediaPage';
 const wideLayoutBreakpoint = 1216;
 
 export class _VideoMediaPage extends Page {
-  constructor(props) {
+    constructor(props) {
-    super(props, 'media');
+        super(props, 'media');
 
-    this.state = {
+        this.state = {
-      wideLayout: wideLayoutBreakpoint <= window.innerWidth,
+            wideLayout: wideLayoutBreakpoint <= window.innerWidth,
-      mediaLoaded: false,
+            mediaLoaded: false,
-      mediaLoadFailed: false,
+            mediaLoadFailed: false,
-      isVideoMedia: false,
+            isVideoMedia: false,
-      theaterMode: false, // FIXME: Used only in case of video media, but is included in every media page code.
+            theaterMode: false, // FIXME: Used only in case of video media, but is included in every media page code.
-      pagePlaylistLoaded: false,
+            pagePlaylistLoaded: false,
-      pagePlaylistData: MediaPageStore.get('playlist-data'),
+            pagePlaylistData: MediaPageStore.get('playlist-data'),
-    };
+        };
 
-    this.onWindowResize = this.onWindowResize.bind(this);
+        this.onWindowResize = this.onWindowResize.bind(this);
-    this.onMediaLoad = this.onMediaLoad.bind(this);
+        this.onMediaLoad = this.onMediaLoad.bind(this);
-    this.onMediaLoadError = this.onMediaLoadError.bind(this);
+        this.onMediaLoadError = this.onMediaLoadError.bind(this);
-    this.onPagePlaylistLoad = this.onPagePlaylistLoad.bind(this);
+        this.onPagePlaylistLoad = this.onPagePlaylistLoad.bind(this);
 
-    MediaPageStore.on('loaded_media_data', this.onMediaLoad);
+        MediaPageStore.on('loaded_media_data', this.onMediaLoad);
-    MediaPageStore.on('loaded_media_error', this.onMediaLoadError);
+        MediaPageStore.on('loaded_media_error', this.onMediaLoadError);
-    MediaPageStore.on('loaded_page_playlist_data', this.onPagePlaylistLoad);
+        MediaPageStore.on('loaded_page_playlist_data', this.onPagePlaylistLoad);
-  }
-
-  componentDidMount() {
-    MediaPageActions.loadMediaData();
-    // FIXME: Is not neccessary to check on every window dimension for changes...
-    PageStore.on('window_resize', this.onWindowResize);
-  }
-
-  onWindowResize() {
-    this.setState({
-      wideLayout: wideLayoutBreakpoint <= window.innerWidth,
-    });
-  }
-
-  onPagePlaylistLoad() {
-    this.setState({
-      pagePlaylistLoaded: true,
-      pagePlaylistData: MediaPageStore.get('playlist-data'),
-    });
-  }
-
-  onMediaLoad() {
-    const isVideoMedia = 'video' === MediaPageStore.get('media-type') || 'audio' === MediaPageStore.get('media-type');
-
-    if (isVideoMedia) {
-      this.onViewerModeChange = this.onViewerModeChange.bind(this);
-
-      VideoViewerStore.on('changed_viewer_mode', this.onViewerModeChange);
-
-      this.setState({
-        mediaLoaded: true,
-        isVideoMedia: isVideoMedia,
-        theaterMode: VideoViewerStore.get('in-theater-mode'),
-      });
-    } else {
-      this.setState({
-        mediaLoaded: true,
-        isVideoMedia: isVideoMedia,
-      });
     }
-  }
 
-  onViewerModeChange() {
+    componentDidMount() {
-    this.setState({ theaterMode: VideoViewerStore.get('in-theater-mode') });
+        MediaPageActions.loadMediaData();
-  }
+        // FIXME: Is not neccessary to check on every window dimension for changes...
+        PageStore.on('window_resize', this.onWindowResize);
+    }
 
-  onMediaLoadError(a) {
+    onWindowResize() {
-    this.setState({ mediaLoadFailed: true });
+        this.setState({
-  }
+            wideLayout: wideLayoutBreakpoint <= window.innerWidth,
+        });
+    }
 
-  pageContent() {
+    onPagePlaylistLoad() {
-    const viewerClassname = 'cf viewer-section' + (this.state.theaterMode ? ' theater-mode' : ' viewer-wide');
+        this.setState({
-    const viewerNestedClassname = 'viewer-section-nested' + (this.state.theaterMode ? ' viewer-section' : '');
+            pagePlaylistLoaded: true,
+            pagePlaylistData: MediaPageStore.get('playlist-data'),
+        });
+    }
 
-    return this.state.mediaLoadFailed ? (
+    onMediaLoad() {
-      <div className={viewerClassname}>
+        const isVideoMedia =
-        <ViewerError />
+            'video' === MediaPageStore.get('media-type') || 'audio' === MediaPageStore.get('media-type');
-      </div>
+
-    ) : (
+        if (isVideoMedia) {
-      <div className={viewerClassname}>
+            this.onViewerModeChange = this.onViewerModeChange.bind(this);
-        {[
+
-          <div className="viewer-container" key="viewer-container">
+            VideoViewerStore.on('changed_viewer_mode', this.onViewerModeChange);
-            {this.state.mediaLoaded && this.state.pagePlaylistLoaded
+
-              ? this.viewerContainerContent(MediaPageStore.get('media-data'))
+            this.setState({
-              : null}
+                mediaLoaded: true,
-          </div>,
+                isVideoMedia: isVideoMedia,
-          <div key="viewer-section-nested" className={viewerNestedClassname}>
+                theaterMode: VideoViewerStore.get('in-theater-mode'),
-            {!this.state.wideLayout || (this.state.isVideoMedia && this.state.theaterMode)
+            });
-              ? [
+        } else {
-                  <ViewerInfoVideo key="viewer-info" />,
+            this.setState({
-                  this.state.pagePlaylistLoaded ? (
+                mediaLoaded: true,
-                    <ViewerSidebar
+                isVideoMedia: isVideoMedia,
-                      key="viewer-sidebar"
+            });
-                      mediaId={MediaPageStore.get('media-id')}
+        }
-                      playlistData={MediaPageStore.get('playlist-data')}
+    }
-                    />
+
-                  ) : null,
+    onViewerModeChange() {
-                ]
+        this.setState({ theaterMode: VideoViewerStore.get('in-theater-mode') });
-              : [
+    }
-                  this.state.pagePlaylistLoaded ? (
+
-                    <ViewerSidebar
+    onMediaLoadError(a) {
-                      key="viewer-sidebar"
+        this.setState({ mediaLoadFailed: true });
-                      mediaId={MediaPageStore.get('media-id')}
+    }
-                      playlistData={MediaPageStore.get('playlist-data')}
+
-                    />
+    pageContent() {
-                  ) : null,
+        const viewerClassname = 'cf viewer-section' + (this.state.theaterMode ? ' theater-mode' : ' viewer-wide');
-                  <ViewerInfoVideo key="viewer-info" />,
+        const viewerNestedClassname = 'viewer-section-nested' + (this.state.theaterMode ? ' viewer-section' : '');
+
+        return this.state.mediaLoadFailed ? (
+            <div className={viewerClassname}>
+                <ViewerError />
+            </div>
+        ) : (
+            <div className={viewerClassname}>
+                {[
+                    <div className="viewer-container" key="viewer-container">
+                        {this.state.mediaLoaded && this.state.pagePlaylistLoaded
+                            ? this.viewerContainerContent(MediaPageStore.get('media-data'))
+                            : null}
+                    </div>,
+                    <div key="viewer-section-nested" className={viewerNestedClassname}>
+                        {!this.state.wideLayout || (this.state.isVideoMedia && this.state.theaterMode)
+                            ? [
+                                  <ViewerInfoVideo key="viewer-info" />,
+                                  !inEmbeddedApp() && this.state.pagePlaylistLoaded ? (
+                                      <ViewerSidebar
+                                          key="viewer-sidebar"
+                                          mediaId={MediaPageStore.get('media-id')}
+                                          playlistData={MediaPageStore.get('playlist-data')}
+                                      />
+                                  ) : null,
+                              ]
+                            : [
+                                  !inEmbeddedApp() && this.state.pagePlaylistLoaded ? (
+                                      <ViewerSidebar
+                                          key="viewer-sidebar"
+                                          mediaId={MediaPageStore.get('media-id')}
+                                          playlistData={MediaPageStore.get('playlist-data')}
+                                      />
+                                  ) : null,
+                                  <ViewerInfoVideo key="viewer-info" />,
+                              ]}
+                    </div>,
                 ]}
-          </div>,
+            </div>
-        ]}
+        );
-      </div>
+    }
-    );
-  }
 }

frontend/src/static/js/utils/contexts/LayoutContext.js

@@ -1,101 +1,103 @@
-import React, { createContext, useContext, useEffect, useState } from 'react';
+import React, { createContext, useContext, useEffect, useMemo, useState } from 'react';
 import { BrowserCache } from '../classes/';
 import { PageStore } from '../stores/';
-import { addClassname, removeClassname } from '../helpers/';
+import { addClassname, removeClassname, inEmbeddedApp } from '../helpers/';
 import SiteContext from './SiteContext';
 
 let slidingSidebarTimeout;
 
 function onSidebarVisibilityChange(visibleSidebar) {
-  clearTimeout(slidingSidebarTimeout);
+    clearTimeout(slidingSidebarTimeout);
 
-  addClassname(document.body, 'sliding-sidebar');
+    addClassname(document.body, 'sliding-sidebar');
-
-  slidingSidebarTimeout = setTimeout(function () {
-    if ('media' === PageStore.get('current-page')) {
-      if (visibleSidebar) {
-        addClassname(document.body, 'overflow-hidden');
-      } else {
-        removeClassname(document.body, 'overflow-hidden');
-      }
-    } else {
-      if (!visibleSidebar || 767 < window.innerWidth) {
-        removeClassname(document.body, 'overflow-hidden');
-      } else {
-        addClassname(document.body, 'overflow-hidden');
-      }
-    }
-
-    if (visibleSidebar) {
-      addClassname(document.body, 'visible-sidebar');
-    } else {
-      removeClassname(document.body, 'visible-sidebar');
-    }
 
     slidingSidebarTimeout = setTimeout(function () {
-      slidingSidebarTimeout = null;
+        if ('media' === PageStore.get('current-page')) {
-      removeClassname(document.body, 'sliding-sidebar');
+            if (visibleSidebar) {
-    }, 220);
+                addClassname(document.body, 'overflow-hidden');
-  }, 20);
+            } else {
+                removeClassname(document.body, 'overflow-hidden');
+            }
+        } else {
+            if (!visibleSidebar || 767 < window.innerWidth) {
+                removeClassname(document.body, 'overflow-hidden');
+            } else {
+                addClassname(document.body, 'overflow-hidden');
+            }
+        }
+
+        if (visibleSidebar) {
+            addClassname(document.body, 'visible-sidebar');
+        } else {
+            removeClassname(document.body, 'visible-sidebar');
+        }
+
+        slidingSidebarTimeout = setTimeout(function () {
+            slidingSidebarTimeout = null;
+            removeClassname(document.body, 'sliding-sidebar');
+        }, 220);
+    }, 20);
 }
 
 export const LayoutContext = createContext();
 
 export const LayoutProvider = ({ children }) => {
-  const site = useContext(SiteContext);
+    const site = useContext(SiteContext);
-  const cache = new BrowserCache('MediaCMS[' + site.id + '][layout]', 86400);
+    const cache = new BrowserCache('MediaCMS[' + site.id + '][layout]', 86400);
 
-  const enabledSidebar = !!(document.getElementById('app-sidebar') || document.querySelector('.page-sidebar'));
+    const isMediaPage = useMemo(() => PageStore.get('current-page') === 'media', []);
+    const isEmbeddedApp = useMemo(() => inEmbeddedApp(), []);
 
-  const [visibleSidebar, setVisibleSidebar] = useState(cache.get('visible-sidebar'));
+    const enabledSidebar = Boolean(document.getElementById('app-sidebar') || document.querySelector('.page-sidebar'));
-  const [visibleMobileSearch, setVisibleMobileSearch] = useState(false);
 
-  const toggleMobileSearch = () => {
+    const [visibleSidebar, setVisibleSidebar] = useState(cache.get('visible-sidebar'));
-    setVisibleMobileSearch(!visibleMobileSearch);
+    const [visibleMobileSearch, setVisibleMobileSearch] = useState(false);
-  };
 
-  const toggleSidebar = () => {
+    const toggleMobileSearch = () => {
-    const newval = !visibleSidebar;
+        setVisibleMobileSearch(!visibleMobileSearch);
-    onSidebarVisibilityChange(newval);
+    };
-    setVisibleSidebar(newval);
-  };
 
-  useEffect(() => {
+    const toggleSidebar = () => {
-    if (visibleSidebar) {
+        const newval = !visibleSidebar;
-      addClassname(document.body, 'visible-sidebar');
+        onSidebarVisibilityChange(newval);
-    } else {
+        setVisibleSidebar(newval);
-      removeClassname(document.body, 'visible-sidebar');
+    };
-    }
-    if ('media' !== PageStore.get('current-page') && 1023 < window.innerWidth) {
-      cache.set('visible-sidebar', visibleSidebar);
-    }
-  }, [visibleSidebar]);
 
-  useEffect(() => {
+    useEffect(() => {
-    PageStore.once('page_init', () => {
+        if (!isEmbeddedApp && visibleSidebar) {
-      if ('media' === PageStore.get('current-page')) {
+            addClassname(document.body, 'visible-sidebar');
-        setVisibleSidebar(false);
+        } else {
-        removeClassname(document.body, 'visible-sidebar');
+            removeClassname(document.body, 'visible-sidebar');
-      }
+        }
-    });
 
-    setVisibleSidebar(
+        if (!isEmbeddedApp && !isMediaPage && 1023 < window.innerWidth) {
-      'media' !== PageStore.get('current-page') &&
+            cache.set('visible-sidebar', visibleSidebar);
-        1023 < window.innerWidth &&
+        }
-        (null === visibleSidebar || visibleSidebar)
+    }, [isEmbeddedApp, isMediaPage, visibleSidebar]);
-    );
-  }, []);
 
-  const value = {
+    useEffect(() => {
-    enabledSidebar,
+        PageStore.once('page_init', () => {
-    visibleSidebar,
+            if (isEmbeddedApp || isMediaPage) {
-    setVisibleSidebar,
+                setVisibleSidebar(false);
-    visibleMobileSearch,
+                removeClassname(document.body, 'visible-sidebar');
-    toggleMobileSearch,
+            }
-    toggleSidebar,
+        });
-  };
 
-  return <LayoutContext.Provider value={value}>{children}</LayoutContext.Provider>;
+        setVisibleSidebar(
+            !isEmbeddedApp && !isMediaPage && 1023 < window.innerWidth && (null === visibleSidebar || visibleSidebar)
+        );
+    }, []);
+
+    const value = {
+        enabledSidebar,
+        visibleSidebar,
+        setVisibleSidebar,
+        visibleMobileSearch,
+        toggleMobileSearch,
+        toggleSidebar,
+    };
+
+    return <LayoutContext.Provider value={value}>{children}</LayoutContext.Provider>;
 };
 
 export const LayoutConsumer = LayoutContext.Consumer;

frontend/src/static/js/utils/helpers/embeddedApp.ts

@@ -0,0 +1,20 @@
+export function inEmbeddedApp() {
+    try {
+        const params = new URL(globalThis.location.href).searchParams;
+        const mode = params.get('mode');
+
+        if (mode === 'embed_mode') {
+            sessionStorage.setItem('media_cms_embed_mode', 'true');
+            return true;
+        }
+        
+        if (mode === 'standard') {
+            sessionStorage.removeItem('media_cms_embed_mode');
+            return false;
+        }
+
+        return sessionStorage.getItem('media_cms_embed_mode') === 'true';
+    } catch (e) {
+        return false;
+    }
+}

frontend/src/static/js/utils/helpers/index.js

@@ -14,3 +14,4 @@ export * from './quickSort';
 export * from './requests';
 export { translateString } from './translate';
 export { replaceString } from './replacementStrings';
+export * from './embeddedApp';

frontend/src/static/js/utils/helpers/propTypeFilters.js

@@ -1,38 +1,41 @@
 import { logErrorAndReturnError } from './errors';
-import { isPositiveInteger, isPositiveIntegerOrZero } from './math';
 
 export const PositiveIntegerOrZero = (function () {
-  return function (obj, key, comp) {
+    const isPositiveIntegerOrZero = (x) => x === Math.trunc(x) && x >= 0;
-    return void 0 === obj[key] || isPositiveIntegerOrZero(obj[key])
+
-      ? null
+    return function (obj, key, comp) {
-      : logErrorAndReturnError([
+        return void 0 === obj[key] || isPositiveIntegerOrZero(obj[key])
-          'Invalid prop `' +
+            ? null
-            key +
+            : logErrorAndReturnError([
-            '` of type `' +
+                  'Invalid prop `' +
-            typeof obj[key] +
+                      key +
-            '` supplied to `' +
+                      '` of type `' +
-            (comp || 'N/A') +
+                      typeof obj[key] +
-            '`, expected `positive integer or zero` (' +
+                      '` supplied to `' +
-            obj[key] +
+                      (comp || 'N/A') +
-            ').',
+                      '`, expected `positive integer or zero` (' +
-        ]);
+                      obj[key] +
-  };
+                      ').',
+              ]);
+    };
 })();
 
 export const PositiveInteger = (function () {
-  return function (obj, key, comp) {
+    const isPositiveInteger = (x) => x === Math.trunc(x) && x > 0;
-    return void 0 === obj[key] || isPositiveInteger(obj[key])
+
-      ? null
+    return function (obj, key, comp) {
-      : logErrorAndReturnError([
+        return void 0 === obj[key] || isPositiveInteger(obj[key])
-          'Invalid prop `' +
+            ? null
-            key +
+            : logErrorAndReturnError([
-            '` of type `' +
+                  'Invalid prop `' +
-            typeof obj[key] +
+                      key +
-            '` supplied to `' +
+                      '` of type `' +
-            (comp || 'N/A') +
+                      typeof obj[key] +
-            '`, expected `positive integer` (' +
+                      '` supplied to `' +
-            obj[key] +
+                      (comp || 'N/A') +
-            ').',
+                      '`, expected `positive integer` (' +
-        ]);
+                      obj[key] +
-  };
+                      ').',
+              ]);
+    };
 })();

frontend/src/static/js/utils/helpers/replacementStrings.js

@@ -1,8 +1,15 @@
 // check templates/config/installation/translations.html for more
 
-export function replaceString(string) {
+export function replaceString(word) {
-    for (const key in window.REPLACEMENTS) {
+    if (!window.REPLACEMENTS) {
-        string = string.replace(key, window.REPLACEMENTS[key]);
+        return word;
     }
-    return string;
+
+    let result = word;
+
+    for (const [search, replacement] of Object.entries(window.REPLACEMENTS)) {
+        result = result.split(search).join(replacement);
+    }
+
+    return result;
 }

frontend/src/static/js/utils/helpers/requests.js

@@ -7,13 +7,13 @@ export async function getRequest(url, sync, callback, errorCallback) {
   };
 
   function responseHandler(result) {
-    if (callback instanceof Function) {
+    if (callback instanceof Function || typeof callback === 'function') {
       callback(result);
     }
   }
 
   function errorHandler(error) {
-    if (errorCallback instanceof Function) {
+    if (errorCallback instanceof Function || typeof errorCallback === 'function') {
       let err = error;
       if (void 0 === error.response) {
         err = {
@@ -58,13 +58,13 @@ export async function postRequest(url, postData, configData, sync, callback, err
   postData = postData || {};
 
   function responseHandler(result) {
-    if (callback instanceof Function) {
+    if (callback instanceof Function || typeof callback === 'function') {
       callback(result);
     }
   }
 
   function errorHandler(error) {
-    if (errorCallback instanceof Function) {
+    if (errorCallback instanceof Function || typeof errorCallback === 'function') {
       errorCallback(error);
     }
   }
@@ -84,13 +84,13 @@ export async function putRequest(url, putData, configData, sync, callback, error
   putData = putData || {};
 
   function responseHandler(result) {
-    if (callback instanceof Function) {
+    if (callback instanceof Function || typeof callback === 'function') {
       callback(result);
     }
   }
 
   function errorHandler(error) {
-    if (errorCallback instanceof Function) {
+    if (errorCallback instanceof Function || typeof errorCallback === 'function') {
       errorCallback(error);
     }
   }
@@ -110,13 +110,13 @@ export async function deleteRequest(url, configData, sync, callback, errorCallba
   configData = configData || {};
 
   function responseHandler(result) {
-    if (callback instanceof Function) {
+    if (callback instanceof Function || typeof callback === 'function') {
       callback(result);
     }
   }
 
   function errorHandler(error) {
-    if (errorCallback instanceof Function) {
+    if (errorCallback instanceof Function || typeof errorCallback === 'function') {
       errorCallback(error);
     }
   }

frontend/src/static/js/utils/helpers/translate.js

@@ -1,9 +1,5 @@
 // check templates/config/installation/translations.html for more
 
-export function translateString(string) {
+export function translateString(str) {
-    if (window.TRANSLATION && window.TRANSLATION[string]) {
+    return window.TRANSLATION?.[str] ?? str;
-        return window.TRANSLATION[string];
-    } else {
-        return string;
-    }
 }

frontend/src/static/js/utils/hoc/withBulkActions.jsx

@@ -0,0 +1,19 @@
+import React from 'react';
+import { useBulkActions } from '../hooks/useBulkActions';
+
+/**
+ * Higher-Order Component that provides bulk actions functionality
+ * to class components via props
+ */
+export function withBulkActions(WrappedComponent) {
+  return function WithBulkActionsComponent(props) {
+    const bulkActions = useBulkActions();
+
+    return (
+      <WrappedComponent
+        {...props}
+        bulkActions={bulkActions}
+      />
+    );
+  };
+}

frontend/src/static/js/utils/renderer.js

@@ -3,64 +3,83 @@ import ReactDOM from 'react-dom';
 import { ThemeProvider } from './contexts/ThemeContext';
 import { LayoutProvider } from './contexts/LayoutContext';
 import { UserProvider } from './contexts/UserContext';
+import { inEmbeddedApp } from './helpers';
 
 const AppProviders = ({ children }) => (
-  <LayoutProvider>
+    <LayoutProvider>
-    <ThemeProvider>
+        <ThemeProvider>
-      <UserProvider>{children}</UserProvider>
+            <UserProvider>{children}</UserProvider>
-    </ThemeProvider>
+        </ThemeProvider>
-  </LayoutProvider>
+    </LayoutProvider>
 );
 
 import { PageHeader, PageSidebar } from '../components/page-layout';
 
 export function renderPage(idSelector, PageComponent) {
-  const appHeader = document.getElementById('app-header');
+    if (inEmbeddedApp()) {
-  const appSidebar = document.getElementById('app-sidebar');
+        globalThis.document.body.classList.add('embedded-app');
-  const appContent = idSelector ? document.getElementById(idSelector) : undefined;
+        globalThis.document.body.classList.remove('visible-sidebar');
 
-  if (appContent && PageComponent) {
+        const appContent = idSelector ? document.getElementById(idSelector) : undefined;
-    ReactDOM.render(
+
-      <AppProviders>
+        if (appContent && PageComponent) {
-        {appHeader ? ReactDOM.createPortal(<PageHeader />, appHeader) : null}
+            ReactDOM.render(
-        {appSidebar ? ReactDOM.createPortal(<PageSidebar />, appSidebar) : null}
+                <AppProviders>
-        <PageComponent />
+                    <PageComponent />
-      </AppProviders>,
+                </AppProviders>,
-      appContent
+                appContent
-    );
+            );
-  } else if (appHeader && appSidebar) {
+        }
-    ReactDOM.render(
+
-      <AppProviders>
+        return;
-        {ReactDOM.createPortal(<PageHeader />, appHeader)}
+    }
-        <PageSidebar />
+
-      </AppProviders>,
+    const appContent = idSelector ? document.getElementById(idSelector) : undefined;
-      appSidebar
+    const appHeader = document.getElementById('app-header');
-    );
+    const appSidebar = document.getElementById('app-sidebar');
-  } else if (appHeader) {
+
-    ReactDOM.render(
+    if (appContent && PageComponent) {
-      <LayoutProvider>
+        ReactDOM.render(
-        <ThemeProvider>
+            <AppProviders>
-          <UserProvider>
+                {appHeader ? ReactDOM.createPortal(<PageHeader />, appHeader) : null}
-            <PageHeader />
+                {appSidebar ? ReactDOM.createPortal(<PageSidebar />, appSidebar) : null}
-          </UserProvider>
+                <PageComponent />
-        </ThemeProvider>
+            </AppProviders>,
-      </LayoutProvider>,
+            appContent
-      appSidebar
+        );
-    );
+    } else if (appHeader && appSidebar) {
-  } else if (appSidebar) {
+        ReactDOM.render(
-    ReactDOM.render(
+            <AppProviders>
-      <AppProviders>
+                {ReactDOM.createPortal(<PageHeader />, appHeader)}
-        <PageSidebar />
+                <PageSidebar />
-      </AppProviders>,
+            </AppProviders>,
-      appSidebar
+            appSidebar
-    );
+        );
-  }
+    } else if (appHeader) {
+        ReactDOM.render(
+            <LayoutProvider>
+                <ThemeProvider>
+                    <UserProvider>
+                        <PageHeader />
+                    </UserProvider>
+                </ThemeProvider>
+            </LayoutProvider>,
+            appSidebar
+        );
+    } else if (appSidebar) {
+        ReactDOM.render(
+            <AppProviders>
+                <PageSidebar />
+            </AppProviders>,
+            appSidebar
+        );
+    }
 }
 
 export function renderEmbedPage(idSelector, PageComponent) {
-  const appContent = idSelector ? document.getElementById(idSelector) : undefined;
+    const appContent = idSelector ? document.getElementById(idSelector) : undefined;
 
-  if (appContent && PageComponent) {
+    if (appContent && PageComponent) {
-    ReactDOM.render(<PageComponent />, appContent);
+        ReactDOM.render(<PageComponent />, appContent);
-  }
+    }
 }

frontend/tests/utils/helpers/csrfToken.test.ts

@@ -0,0 +1,56 @@
+import { csrfToken } from '../../../src/static/js/utils/helpers/csrfToken';
+
+const setupDocumentCookie = () => {
+    if (typeof document === 'undefined') {
+        globalThis.document = { cookie: '' } as unknown as Document;
+    }
+};
+
+const setDocumentCookie = (value: string) => {
+    if (typeof document !== 'undefined') {
+        Object.defineProperty(document, 'cookie', { value, writable: true, configurable: true });
+    }
+};
+
+describe('js/utils/helpers', () => {
+    describe('csrfToken', () => {
+        const originalCookie = document.cookie;
+
+        beforeAll(() => {
+            // Initialize document environment
+            setupDocumentCookie();
+        });
+
+        afterEach(() => {
+            // Restore original cookie string
+            setDocumentCookie(originalCookie);
+        });
+
+        test('Returns null when document.cookie is empty', () => {
+            setDocumentCookie('');
+            expect(csrfToken()).toBeNull();
+        });
+
+        test('Returns null when csrftoken is not present', () => {
+            setDocumentCookie('sessionid=abc; theme=dark');
+            expect(csrfToken()).toBeNull();
+        });
+
+        test('Finds and decodes the csrftoken cookie value', () => {
+            const token = encodeURIComponent('a b+c%20');
+            setDocumentCookie(`sessionid=abc; csrftoken=${token}; theme=dark`);
+            expect(csrfToken()).toBe('a b+c%20');
+        });
+
+        test('Ignores leading spaces and matches exact prefix csrftoken=', () => {
+            setDocumentCookie('  sessionid=xyz;   csrftoken=secure123; other=value');
+            expect(csrfToken()).toBe('secure123');
+        });
+
+        test('Stops scanning once csrftoken is found', () => {
+            // Ensure csrftoken occurs before other long tail cookies
+            setDocumentCookie('csrftoken=first; a=1; b=2; c=3; d=4; e=5');
+            expect(csrfToken()).toBe('first');
+        });
+    });
+});