[full-ci] Support audio formats in MediaViewer App & rename it to Preview

.github/settings.yml

@@ -20,7 +20,7 @@ labels:
     color: "#d4c5f9"
   - name: feature:pdf-viewer
     color: "#d4c5f9"
-  - name: feature:media-viewer
+  - name: feature:preview
     color: "#d4c5f9"
 
 ...

changelog/unreleased/enhancement-preview-audio-support

@@ -0,0 +1,5 @@
+Enhancement: Audio support in preview app
+
+We've added support for audio file playback into the preview app (namely flac, mp3, wav and ogg).
+
+https://github.com/owncloud/web/pull/6514

changelog/unreleased/enhancement-rename-mediaviewer

@@ -0,0 +1,7 @@
+Enhancement: Rename mediaviewer to preview
+
+We've renamed the media-viewer app to preview because that describes the purpose of the app better and doesn't mislead users into thinking that it's a full blown media viewer.
+
+For the time being we've added an app alias handling to ownCloud Web which prints a deprecation warning if the preview app is tried to be loaded as `media-viewer`.
+
+https://github.com/owncloud/web/pull/6514

config/config.json.dist

@@ -10,9 +10,9 @@
   "apps" : [
     "files",
     "draw-io",
-    "media-viewer",
+    "preview",
     "user-management",
-    "pdf-viewer", 
+    "pdf-viewer",
     "search"
   ],
   "applications" : []

config/config.json.sample-oc10

@@ -9,7 +9,7 @@
   },
   "apps": [
     "files",
-    "media-viewer",
+    "preview",
     "pdf-viewer",
     "search"
   ],

config/config.json.sample-ocis

@@ -11,7 +11,7 @@
   },
   "apps": [
     "files",
-    "media-viewer",
+    "preview",
     "pdf-viewer",
     "search",
     "external",

dev/docker/oc10.web.config.json

@@ -7,7 +7,7 @@
   },
   "apps": [
     "files",
-    "media-viewer",
+    "preview",
     "markdown-editor",
     "pdf-viewer",
     "search"

dev/docker/ocis.web.config.json

@@ -17,7 +17,7 @@
   "apps": [
     "files",
     "markdown-editor",
-    "media-viewer",
+    "preview",
     "pdf-viewer",
     "search",
     "external",

docs/custom-apps/_index.md

@@ -70,7 +70,7 @@ To be defined/documented (Bundling, CDN, app store, ...)
 ```
 To be defined/documented
 - Application (renderable), e.g. iFrame
-- Extension, e.g. media-viewer
+- Extension, e.g. preview
 - Quick action, e.g. based on WOPI/Appserver
 - ...
 ```

docs/deployments/oc10-app.md

@@ -76,7 +76,7 @@ There are a few config values which need to be set in order for ownCloud Web to
   },
   "apps" : [
     "files",
-    "media-viewer",
+    "preview",
     "draw-io"
   ],
   "applications" : [

package.json

@@ -9,7 +9,7 @@
     "packages/web-app-external",
     "packages/web-app-files",
     "packages/web-app-markdown-editor",
-    "packages/web-app-media-viewer",
+    "packages/web-app-preview",
     "packages/web-app-user-management",
     "packages/web-app-pdf-viewer",
     "packages/web-app-search",

packages/web-app-files/src/mixins/fileActions.js

@@ -69,6 +69,9 @@ export default {
         .map((editor) => {
           return {
             label: () => {
+              if (editor.label) {
+                return this.$gettext(editor.label)
+              }
               const translated = this.$gettext('Open in %{app}')
               return this.$gettextInterpolate(
                 translated,
@@ -77,6 +80,9 @@ export default {
               )
             },
             icon: this.apps.meta[editor.app].icon,
+            ...(this.apps.meta[editor.app].iconFillType && {
+              iconFillType: this.apps.meta[editor.app].iconFillType
+            }),
             img: this.apps.meta[editor.app].img,
             handler: ({ resources }) =>
               this.$_fileActions_openEditor(
@@ -90,7 +96,19 @@ export default {
                 return false
               }
 
-              return resources[0].extension.toLowerCase() === editor.extension.toLowerCase()
+              if (resources[0].extension && editor.extension) {
+                return resources[0].extension.toLowerCase() === editor.extension.toLowerCase()
+              }
+
+              if (resources[0].mimeType && editor.mimeType) {
+                return (
+                  resources[0].mimeType.toLowerCase() === editor.mimeType.toLowerCase() ||
+                  resources[0].mimeType.split('/')[0].toLowerCase() ===
+                    editor.mimeType.toLowerCase()
+                )
+              }
+
+              return false
             },
             canBeDefault: editor.canBeDefault,
             componentType: 'oc-button',

packages/web-app-files/tests/__fixtures__/fileActions.js

@@ -4,9 +4,9 @@ const meta = {
     id: 'files',
     icon: 'folder'
   },
-  mediaviewer: {
-    name: 'Mediaviewer',
-    id: 'mediaviewer',
+  preview: {
+    name: 'Preview',
+    id: 'preview',
     icon: 'image'
   },
   'draw-io': {
@@ -40,12 +40,12 @@ const editors = [
     routes
   },
   {
-    app: 'mediaviewer',
+    app: 'preview',
     extension: 'png',
     handler: null,
     icon: null,
     newTab: false,
-    routeName: 'mediaviewer-media',
+    routeName: 'preview-media',
     routes
   },
   {
@@ -145,11 +145,11 @@ const fileActions = {
     selector: '.oc-files-actions-draw-io-trigger',
     opensInNewWindow: true
   },
-  mediaviewer: {
+  preview: {
     handler: jest.fn(),
-    label: () => 'Open in MediaViewer',
-    class: 'oc-files-actions-mediaviewer-trigger',
-    selector: '.oc-files-actions-mediaviewer-trigger'
+    label: () => 'Open in Preview',
+    class: 'oc-files-actions-preview-trigger',
+    selector: '.oc-files-actions-preview-trigger'
   },
   navigate: {
     name: 'navigate',
@@ -165,7 +165,7 @@ const fileActions = {
 exports.fileActions = fileActions
 
 exports.getActions = function (actions = []) {
-  const defaultActions = ['download', 'markdown-editor', 'draw-io', 'mediaviewer', 'navigate']
+  const defaultActions = ['download', 'markdown-editor', 'draw-io', 'preview', 'navigate']
 
   const res = []
   for (const key of actions) {

packages/web-app-pdf-viewer/src/index.js

@@ -22,7 +22,8 @@ const routes = [
 const appInfo = {
   name: $gettext('PDF Viewer'),
   id: 'pdf-viewer',
-  icon: 'eye',
+  icon: 'resource-type-pdf',
+  iconFillType: 'fill',
   extensions: [
     {
       extension: 'pdf',

packages/web-app-media-viewer/l10n/.tx/config → packages/web-app-preview/l10n/.tx/config

@@ -1,7 +1,7 @@
 [main]
 host = https://www.transifex.com
 
-[owncloud-web.media-viewer]
+[owncloud-web.preview]
 file_filter = locale/<lang>/LC_MESSAGES/app.po
 minimum_perc = 0
 source_file = template.pot

packages/web-app-preview/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "preview",
+  "version": "0.0.0",
+  "description": "ownCloud Web Preview",
+  "license": "AGPL-3.0"
+}