diff --git a/.babelrc.js b/.babelrc.js
index 5cfbddd7a0..004c14b511 100644
--- a/.babelrc.js
+++ b/.babelrc.js
@@ -1,5 +1,8 @@
module.exports = {
- plugins: ['@babel/plugin-syntax-dynamic-import'],
+ plugins: [
+ '@babel/plugin-syntax-dynamic-import',
+ ['@babel/plugin-proposal-class-properties', { loose: true }]
+ ],
presets: [
[
'@babel/preset-env',
diff --git a/Makefile b/Makefile
index a3e1d4eab6..0de4d002ee 100644
--- a/Makefile
+++ b/Makefile
@@ -30,6 +30,7 @@ lint-fix-watch:
clean:
rm -rf apps/accessibility/js/
rm -rf apps/comments/js/
+ rm -rf apps/files/js/dist/
rm -rf apps/files_sharing/js/dist/
rm -rf apps/files_trashbin/js/
rm -rf apps/files_versions/js/
@@ -47,6 +48,7 @@ clean-dev:
clean-git: clean
git checkout -- apps/accessibility/js/
git checkout -- apps/comments/js/
+ git checkout -- apps/files/js/dist/
git checkout -- apps/files_sharing/js/dist/
git checkout -- apps/files_trashbin/js/
git checkout -- apps/files_versions/js/
diff --git a/apps/comments/src/filesplugin.js b/apps/comments/src/filesplugin.js
index e315dd2fef..3e0cdd7f70 100644
--- a/apps/comments/src/filesplugin.js
+++ b/apps/comments/src/filesplugin.js
@@ -104,7 +104,7 @@
actionHandler: function(fileName, context) {
context.$file.find('.action-comment').tooltip('hide')
// open sidebar in comments section
- context.fileList.showDetailsView(fileName, 'commentsTabView')
+ context.fileList.showDetailsView(fileName, 'comments')
}
})
diff --git a/apps/files/css/files.scss b/apps/files/css/files.scss
index 54f83f25be..9c1869d1ff 100644
--- a/apps/files/css/files.scss
+++ b/apps/files/css/files.scss
@@ -85,8 +85,9 @@
}
/* fit app list view heights */
-.app-files #app-content>.viewcontainer {
+.app-files #app-content > .viewcontainer {
min-height: 0%;
+ width: 100%;
}
.app-files #app-content {
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index d800f2b8eb..571cdcf6c3 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -704,6 +704,12 @@
}
context.fileList.do_delete(fileName, context.dir);
$('.tipsy').remove();
+
+ // close sidebar on delete
+ const path = context.dir + '/' + fileName
+ if (OCA.Files.Sidebar && OCA.Files.Sidebar.file === path) {
+ OCA.Files.Sidebar.file = undefined
+ }
}
});
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 58e2bfae7f..8cca43d574 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -610,11 +610,11 @@
* @param {string} [tabId] optional tab id to select
*/
showDetailsView: function(fileName, tabId) {
+ console.warn('showDetailsView is deprecated! Use OCA.Files.Sidebar.activeTab. It will be removed in nextcloud 20.');
this._updateDetailsView(fileName);
if (tabId) {
- this._detailsView.selectTab(tabId);
+ OCA.Files.Sidebar.activeTab = tabId;
}
- OC.Apps.showAppSidebar(this._detailsView.$el);
},
/**
@@ -623,48 +623,23 @@
* @param {string|OCA.Files.FileInfoModel} fileName file name from the current list or a FileInfoModel object
* @param {boolean} [show=true] whether to open the sidebar if it was closed
*/
- _updateDetailsView: function(fileName, show) {
- if (!this._detailsView) {
+ _updateDetailsView: function(fileName) {
+ if (!(OCA.Files && OCA.Files.Sidebar)) {
+ console.error('No sidebar available');
return;
}
- // show defaults to true
- show = _.isUndefined(show) || !!show;
- var oldFileInfo = this._detailsView.getFileInfo();
- if (oldFileInfo) {
- // TODO: use more efficient way, maybe track the highlight
- this.$fileList.children().filterAttr('data-id', '' + oldFileInfo.get('id')).removeClass('highlighted');
- oldFileInfo.off('change', this._onSelectedModelChanged, this);
- }
-
if (!fileName) {
- this._detailsView.setFileInfo(null);
- if (this._currentFileModel) {
- this._currentFileModel.off();
- }
- this._currentFileModel = null;
- OC.Apps.hideAppSidebar(this._detailsView.$el);
- return;
+ OCA.Files.Sidebar.file = null
+ return
+ } else if (typeof fileName !== 'string') {
+ fileName = ''
}
- if (show && this._detailsView.$el.hasClass('disappear')) {
- OC.Apps.showAppSidebar(this._detailsView.$el);
- }
-
- if (fileName instanceof OCA.Files.FileInfoModel) {
- var model = fileName;
- } else {
- var $tr = this.findFileEl(fileName);
- var model = this.getModelForFile($tr);
- $tr.addClass('highlighted');
- }
-
- this._currentFileModel = model;
-
- this._replaceDetailsViewElementIfNeeded();
-
- this._detailsView.setFileInfo(model);
- this._detailsView.$el.scrollTop(0);
+ // open sidebar and set file
+ const dir = `${this.dirInfo.path}/${this.dirInfo.name}`
+ const path = `${dir}/${fileName}`
+ OCA.Files.Sidebar.file = path.replace('//', '/')
},
/**
@@ -1404,6 +1379,13 @@
return OC.MimeType.getIconUrl('dir-external');
} else if (fileInfo.mountType !== undefined && fileInfo.mountType !== '') {
return OC.MimeType.getIconUrl('dir-' + fileInfo.mountType);
+ } else if (fileInfo.shareTypes && (
+ fileInfo.shareTypes.indexOf(OC.Share.SHARE_TYPE_LINK) > -1
+ || fileInfo.shareTypes.indexOf(OC.Share.SHARE_TYPE_EMAIL) > -1)
+ ) {
+ return OC.MimeType.getIconUrl('dir-public')
+ } else if (fileInfo.shareTypes && fileInfo.shareTypes.length > 0) {
+ return OC.MimeType.getIconUrl('dir-shared')
}
return OC.MimeType.getIconUrl('dir');
}
@@ -3654,8 +3636,10 @@
* Register a tab view to be added to all views
*/
registerTabView: function(tabView) {
- if (this._detailsView) {
- this._detailsView.addTabView(tabView);
+ console.warn('registerTabView is deprecated! It will be removed in nextcloud 20.');
+ const name = tabView.getLabel()
+ if (name) {
+ OCA.Files.Sidebar.registerTab(new OCA.Files.Sidebar.Tab(name, tabView, true))
}
},
@@ -3663,8 +3647,9 @@
* Register a detail view to be added to all views
*/
registerDetailView: function(detailView) {
- if (this._detailsView) {
- this._detailsView.addDetailView(detailView);
+ console.warn('registerDetailView is deprecated! It will be removed in nextcloud 20.');
+ if (detailView.el) {
+ OCA.Files.Sidebar.registerSecondaryView(detailView)
}
},
diff --git a/apps/files/js/merged-index.json b/apps/files/js/merged-index.json
index 8d25daa6b3..b673da858c 100644
--- a/apps/files/js/merged-index.json
+++ b/apps/files/js/merged-index.json
@@ -1,33 +1,34 @@
[
+ "dist/sidebar.js",
"app.js",
- "templates.js",
- "file-upload.js",
- "newfilemenu.js",
- "jquery.fileupload.js",
- "jquery-visibility.js",
- "fileinfomodel.js",
- "filesummary.js",
- "filemultiselectmenu.js",
"breadcrumb.js",
- "filelist.js",
- "search.js",
- "favoritesfilelist.js",
- "recentfilelist.js",
- "tagsplugin.js",
- "gotoplugin.js",
- "favoritesplugin.js",
- "recentplugin.js",
"detailfileinfoview.js",
- "sidebarpreviewmanager.js",
- "sidebarpreviewtext.js",
- "detailtabview.js",
- "semaphore.js",
- "mainfileinfodetailview.js",
- "operationprogressbar.js",
"detailsview.js",
+ "detailtabview.js",
+ "favoritesfilelist.js",
+ "favoritesplugin.js",
+ "file-upload.js",
"fileactions.js",
"fileactionsmenu.js",
+ "fileinfomodel.js",
+ "filelist.js",
+ "filemultiselectmenu.js",
"files.js",
+ "filesummary.js",
+ "gotoplugin.js",
+ "jquery-visibility.js",
+ "jquery.fileupload.js",
"keyboardshortcuts.js",
- "navigation.js"
+ "mainfileinfodetailview.js",
+ "navigation.js",
+ "newfilemenu.js",
+ "operationprogressbar.js",
+ "recentfilelist.js",
+ "recentplugin.js",
+ "search.js",
+ "semaphore.js",
+ "sidebarpreviewmanager.js",
+ "sidebarpreviewtext.js",
+ "tagsplugin.js",
+ "templates.js"
]
diff --git a/apps/files/src/components/LegacyTab.vue b/apps/files/src/components/LegacyTab.vue
new file mode 100644
index 0000000000..9a85ee7f07
--- /dev/null
+++ b/apps/files/src/components/LegacyTab.vue
@@ -0,0 +1,89 @@
+
+
+
+
+
+
+
diff --git a/apps/files/src/components/LegacyView.vue b/apps/files/src/components/LegacyView.vue
new file mode 100644
index 0000000000..e4a07ac3e5
--- /dev/null
+++ b/apps/files/src/components/LegacyView.vue
@@ -0,0 +1,59 @@
+
+
+
+
+
+
+
diff --git a/apps/files/src/models/Tab.js b/apps/files/src/models/Tab.js
new file mode 100644
index 0000000000..28902b0e75
--- /dev/null
+++ b/apps/files/src/models/Tab.js
@@ -0,0 +1,59 @@
+/**
+ * @copyright Copyright (c) 2019 John Molakvoæ
+ *
+ * @author John Molakvoæ
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ *
+ */
+
+export default class Tab {
+
+ #component;
+ #legacy;
+ #name;
+
+ /**
+ * Create a new tab instance
+ *
+ * @param {string} name the name of this tab
+ * @param {Object} component the vue component
+ * @param {boolean} [legacy] is this a legacy tab
+ */
+ constructor(name, component, legacy) {
+ this.#name = name
+ this.#component = component
+ this.#legacy = legacy === true
+
+ if (this.#legacy) {
+ console.warn('Legacy tabs are deprecated! They will be removed in nextcloud 20.')
+ }
+
+ }
+
+ get name() {
+ return this.#name
+ }
+
+ get component() {
+ return this.#component
+ }
+
+ get isLegacyTab() {
+ return this.#legacy === true
+ }
+
+}
diff --git a/apps/files/src/services/FileInfo.js b/apps/files/src/services/FileInfo.js
new file mode 100644
index 0000000000..aa026df144
--- /dev/null
+++ b/apps/files/src/services/FileInfo.js
@@ -0,0 +1,67 @@
+/**
+ * @copyright Copyright (c) 2019 John Molakvoæ
+ *
+ * @author John Molakvoæ
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ *
+ */
+
+import axios from '@nextcloud/axios'
+
+export default async function(url) {
+ const response = await axios({
+ method: 'PROPFIND',
+ url,
+ data: `
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ `
+ })
+
+ // TODO: create new parser or use cdav-lib when available
+ const file = OCA.Files.App.fileList.filesClient._client.parseMultiStatus(response.data)
+ // TODO: create new parser or use cdav-lib when available
+ const fileInfo = OCA.Files.App.fileList.filesClient._parseFileInfo(file[0])
+
+ // TODO remove when no more legacy backbone is used
+ fileInfo.get = (key) => fileInfo[key]
+ fileInfo.isDirectory = () => fileInfo.mimetype === 'httpd/unix-directory'
+
+ return fileInfo
+}
diff --git a/apps/files/src/services/Sidebar.js b/apps/files/src/services/Sidebar.js
new file mode 100644
index 0000000000..8f02a1b51a
--- /dev/null
+++ b/apps/files/src/services/Sidebar.js
@@ -0,0 +1,109 @@
+/**
+ * @copyright Copyright (c) 2019 John Molakvoæ
+ *
+ * @author John Molakvoæ
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ *
+ */
+
+export default class Sidebar {
+
+ #state;
+ #view;
+
+ constructor() {
+ // init empty state
+ this.#state = {}
+
+ // init default values
+ this.#state.tabs = []
+ this.#state.views = []
+ this.#state.file = ''
+ this.#state.activeTab = ''
+ console.debug('OCA.Files.Sidebar initialized')
+ }
+
+ /**
+ * Get the sidebar state
+ *
+ * @readonly
+ * @memberof Sidebar
+ * @returns {Object} the data state
+ */
+ get state() {
+ return this.#state
+ }
+
+ /**
+ * @memberof Sidebar
+ * Register a new tab view
+ *
+ * @param {Object} tab a new unregistered tab
+ * @memberof Sidebar
+ * @returns {Boolean}
+ */
+ registerTab(tab) {
+ const hasDuplicate = this.#state.tabs.findIndex(check => check.name === tab.name) > -1
+ if (!hasDuplicate) {
+ this.#state.tabs.push(tab)
+ return true
+ }
+ console.error(`An tab with the same name ${tab.name} already exists`, tab)
+ return false
+ }
+
+ registerSecondaryView(view) {
+ const hasDuplicate = this.#state.views.findIndex(check => check.cid === view.cid) > -1
+ if (!hasDuplicate) {
+ this.#state.views.push(view)
+ return true
+ }
+ console.error(`A similar view already exists`, view)
+ return false
+ }
+
+ /**
+ * Set the current sidebar file data
+ *
+ * @param {string} path the file path to load
+ * @memberof Sidebar
+ */
+ set file(path) {
+ this.#state.file = path
+ }
+
+ /**
+ * Set the current sidebar file data
+ *
+ * @returns {String} the current opened file
+ * @memberof Sidebar
+ */
+ get file() {
+ return this.#state.file
+ }
+
+ /**
+ * Set the current sidebar tab
+ *
+ * @param {string} id the tab unique id
+ * @memberof Sidebar
+ */
+ set activeTab(id) {
+ this.#state.activeTab = id
+ }
+
+}
diff --git a/apps/files/src/sidebar.js b/apps/files/src/sidebar.js
new file mode 100644
index 0000000000..b508e8aee2
--- /dev/null
+++ b/apps/files/src/sidebar.js
@@ -0,0 +1,59 @@
+/**
+ * @copyright Copyright (c) 2019 John Molakvoæ
+ *
+ * @author John Molakvoæ
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ *
+ */
+
+import Vue from 'vue'
+import SidebarView from './views/Sidebar.vue'
+import Sidebar from './services/Sidebar'
+import Tab from './models/Tab'
+import VueClipboard from 'vue-clipboard2'
+
+Vue.use(VueClipboard)
+
+Vue.prototype.t = t
+
+window.addEventListener('DOMContentLoaded', () => {
+ // Init Sidebar Service
+ if (window.OCA && window.OCA.Files) {
+ Object.assign(window.OCA.Files, { Sidebar: new Sidebar() })
+ Object.assign(window.OCA.Files.Sidebar, { Tab })
+ }
+
+ // Make sure we have a proper layout
+ if (document.getElementById('content')) {
+
+ // Make sure we have a mountpoint
+ if (!document.getElementById('app-sidebar')) {
+ var contentElement = document.getElementById('content')
+ var sidebarElement = document.createElement('div')
+ sidebarElement.id = 'app-sidebar'
+ contentElement.appendChild(sidebarElement)
+ }
+ }
+
+ // Init vue app
+ const AppSidebar = new Vue({
+ // eslint-disable-next-line vue/match-component-file-name
+ name: 'SidebarRoot',
+ render: h => h(SidebarView)
+ })
+ AppSidebar.$mount('#app-sidebar')
+})
diff --git a/apps/files/src/views/Sidebar.vue b/apps/files/src/views/Sidebar.vue
new file mode 100644
index 0000000000..9a00df1737
--- /dev/null
+++ b/apps/files/src/views/Sidebar.vue
@@ -0,0 +1,345 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/files/webpack.js b/apps/files/webpack.js
new file mode 100644
index 0000000000..4007722031
--- /dev/null
+++ b/apps/files/webpack.js
@@ -0,0 +1,13 @@
+const path = require('path');
+
+module.exports = {
+ entry: {
+ 'sidebar': path.join(__dirname, 'src', 'sidebar.js'),
+ },
+ output: {
+ path: path.resolve(__dirname, './js/dist/'),
+ publicPath: '/js/',
+ filename: '[name].js',
+ chunkFilename: 'files.[id].js'
+ }
+}
diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index 747c202074..32159f7b97 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -43,6 +43,7 @@ $eventDispatcher->addListener(
'OCA\Files::loadAdditionalScripts',
function() {
\OCP\Util::addScript('files_sharing', 'dist/additionalScripts');
+ \OCP\Util::addStyle('files_sharing', 'icons');
}
);
\OC::$server->getEventDispatcher()->addListener('\OCP\Collaboration\Resources::loadAdditionalScripts', function () {
diff --git a/apps/files_sharing/css/icons.scss b/apps/files_sharing/css/icons.scss
new file mode 100644
index 0000000000..002235b6e3
--- /dev/null
+++ b/apps/files_sharing/css/icons.scss
@@ -0,0 +1,32 @@
+/**
+ * @copyright Copyright (c) 2019 John Molakvoæ
+ *
+ * @author John Molakvoæ
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ *
+ */
+
+// This is the icons used in the sharing ui (multiselect)
+.icon-room {
+ @include icon-color('app', 'spreed', $color-black);
+}
+.icon-circle {
+ @include icon-color('circles', 'circles', $color-black, 3, false);
+}
+.icon-guests {
+ @include icon-color('app', 'guests', $color-black);
+}
\ No newline at end of file
diff --git a/apps/files_sharing/list.php b/apps/files_sharing/list.php
index 219fe2863e..5517c39971 100644
--- a/apps/files_sharing/list.php
+++ b/apps/files_sharing/list.php
@@ -33,6 +33,7 @@ $tmpl = new OCP\Template('files_sharing', 'list', '');
$tmpl->assign('showgridview', $showgridview && !$isIE);
OCP\Util::addScript('files_sharing', 'dist/files_sharing');
+OCP\Util::addScript('files_sharing', 'dist/files_sharing_tab');
\OC::$server->getEventDispatcher()->dispatch('\OCP\Collaboration\Resources::loadAdditionalScripts');
$tmpl->printPage();
diff --git a/apps/files_sharing/src/components/SharingEntry.vue b/apps/files_sharing/src/components/SharingEntry.vue
new file mode 100644
index 0000000000..857b57adbd
--- /dev/null
+++ b/apps/files_sharing/src/components/SharingEntry.vue
@@ -0,0 +1,249 @@
+
+
+
+
+
+
+
{{ title }}
+
+
+
+
+ {{ t('files_sharing', 'Allow editing') }}
+
+
+
+
+ {{ t('files_sharing', 'Can reshare') }}
+
+
+
+
+ {{ config.isDefaultExpireDateEnforced
+ ? t('files_sharing', 'Expiration date enforced')
+ : t('files_sharing', 'Set expiration date') }}
+
+
+ {{ t('files_sharing', 'Enter a date') }}
+
+
+
+
+
+ {{ t('files_sharing', 'Note to recipient') }}
+
+
+
+
+
+ {{ t('files_sharing', 'Unshare') }}
+
+
+
+
+
+
+
+
diff --git a/apps/files_sharing/src/components/SharingEntryInternal.vue b/apps/files_sharing/src/components/SharingEntryInternal.vue
new file mode 100644
index 0000000000..720c016b82
--- /dev/null
+++ b/apps/files_sharing/src/components/SharingEntryInternal.vue
@@ -0,0 +1,117 @@
+
+
+
+
+
+
+
+
+ {{ clipboardTooltip }}
+
+
+
+
+
+
+
diff --git a/apps/files_sharing/src/components/SharingEntryLink.vue b/apps/files_sharing/src/components/SharingEntryLink.vue
new file mode 100644
index 0000000000..afeaee06bd
--- /dev/null
+++ b/apps/files_sharing/src/components/SharingEntryLink.vue
@@ -0,0 +1,769 @@
+
+
+
+
+
+
+
{{ title }}
+
+
+
+
+
+ {{ clipboardTooltip }}
+
+
+
+
+
+
+
+ {{ errors.pending }}
+
+
+ {{ t('files_sharing', 'Please enter the following required information before creating the share') }}
+
+
+
+
+ {{ t('files_sharing', 'Password protection (enforced)') }}
+
+
+ {{ t('files_sharing', 'Password protection') }}
+
+
+ {{ t('files_sharing', 'Enter a password') }}
+
+
+
+
+ {{ t('files_sharing', 'Expiration date (enforced)') }}
+
+
+
+ {{ t('files_sharing', 'Enter a date') }}
+
+
+
+ {{ t('files_sharing', 'Cancel') }}
+
+
+
+
+
+
+
+
+
+
+ {{ t('files_sharing', 'Read only') }}
+
+
+ {{ t('files_sharing', 'Allow upload and editing') }}
+
+
+ {{ t('files_sharing', 'File drop (upload only)') }}
+
+
+
+
+
+ {{ t('files_sharing', 'Allow editing') }}
+
+
+
+ {{ t('files_sharing', 'Hide download') }}
+
+
+
+
+ {{ config.enforcePasswordForPublicLink
+ ? t('files_sharing', 'Password protection (enforced)')
+ : t('files_sharing', 'Password protect') }}
+
+
+ {{ t('files_sharing', 'Enter a password') }}
+
+
+
+
+ {{ config.isDefaultExpireDateEnforced
+ ? t('files_sharing', 'Expiration date (enforced)')
+ : t('files_sharing', 'Set expiration date') }}
+
+
+ {{ t('files_sharing', 'Enter a date') }}
+
+
+
+
+ {{ t('files_sharing', 'Note to recipient') }}
+
+
+
+
+
+
+
+ {{ t('files_sharing', 'Delete share') }}
+
+
+ {{ t('files_sharing', 'Add another link') }}
+
+
+
+
+
+ {{ t('files_sharing', 'Create a new share link') }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/files_sharing/src/components/SharingEntrySimple.vue b/apps/files_sharing/src/components/SharingEntrySimple.vue
new file mode 100644
index 0000000000..4538950a83
--- /dev/null
+++ b/apps/files_sharing/src/components/SharingEntrySimple.vue
@@ -0,0 +1,97 @@
+
+
+
+
+
+
+
{{ title }}
+
+ {{ subtitle }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/files_sharing/src/components/SharingInput.vue b/apps/files_sharing/src/components/SharingInput.vue
new file mode 100644
index 0000000000..df222eafe0
--- /dev/null
+++ b/apps/files_sharing/src/components/SharingInput.vue
@@ -0,0 +1,444 @@
+
+
+
+
+
+ {{ t('files_sharing', 'No recommendations. Start typing.') }}
+
+
+ {{ noResultText }}
+
+
+
+
+
+
+
diff --git a/apps/files_sharing/src/files_sharing_tab.js b/apps/files_sharing/src/files_sharing_tab.js
new file mode 100644
index 0000000000..18b4f4d7d1
--- /dev/null
+++ b/apps/files_sharing/src/files_sharing_tab.js
@@ -0,0 +1,39 @@
+/**
+ * @copyright Copyright (c) 2019 John Molakvoæ
+ *
+ * @author John Molakvoæ
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ *
+ */
+
+import SharingTab from './views/SharingTab'
+import ShareSearch from './services/ShareSearch'
+import ExternalLinkActions from './services/ExternalLinkActions'
+
+if (window.OCA && window.OCA.Sharing) {
+ Object.assign(window.OCA.Sharing, { ShareSearch: new ShareSearch() })
+}
+
+if (window.OCA && window.OCA.Sharing) {
+ Object.assign(window.OCA.Sharing, { ExternalLinkActions: new ExternalLinkActions() })
+}
+
+window.addEventListener('DOMContentLoaded', () => {
+ if (OCA.Files && OCA.Files.Sidebar) {
+ OCA.Files.Sidebar.registerTab(new OCA.Files.Sidebar.Tab('sharing', SharingTab))
+ }
+})
diff --git a/apps/files_sharing/src/mixins/ShareRequests.js b/apps/files_sharing/src/mixins/ShareRequests.js
new file mode 100644
index 0000000000..c534e86070
--- /dev/null
+++ b/apps/files_sharing/src/mixins/ShareRequests.js
@@ -0,0 +1,114 @@
+/**
+ * @copyright Copyright (c) 2019 John Molakvoæ
+ *
+ * @author John Molakvoæ
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ *
+ */
+
+// TODO: remove when ie not supported
+import 'url-search-params-polyfill'
+
+import { generateOcsUrl } from '@nextcloud/router'
+import axios from '@nextcloud/axios'
+import Share from '../models/Share'
+
+const shareUrl = generateOcsUrl('apps/files_sharing/api/v1', 2) + 'shares'
+const headers = {
+ 'Content-Type': 'application/x-www-form-urlencoded;charset=UTF-8'
+}
+
+export default {
+ methods: {
+ /**
+ * Create a new share
+ *
+ * @param {Object} data destructuring object
+ * @param {string} data.path path to the file/folder which should be shared
+ * @param {number} data.shareType 0 = user; 1 = group; 3 = public link; 6 = federated cloud share
+ * @param {string} data.shareWith user/group id with which the file should be shared (optional for shareType > 1)
+ * @param {boolean} [data.publicUpload=false] allow public upload to a public shared folder
+ * @param {string} [data.password] password to protect public link Share with
+ * @param {number} [data.permissions=31] 1 = read; 2 = update; 4 = create; 8 = delete; 16 = share; 31 = all (default: 31, for public shares: 1)
+ * @param {boolean} [data.sendPasswordByTalk=false] send the password via a talk conversation
+ * @param {string} [data.expireDate=''] expire the shareautomatically after
+ * @param {string} [data.label=''] custom label
+ * @returns {Share} the new share
+ * @throws {Error}
+ */
+ async createShare({ path, permissions, shareType, shareWith, publicUpload, password, sendPasswordByTalk, expireDate, label }) {
+ try {
+ const request = await axios.post(shareUrl, { path, permissions, shareType, shareWith, publicUpload, password, sendPasswordByTalk, expireDate, label })
+ if (!('ocs' in request.data)) {
+ throw request
+ }
+ return new Share(request.data.ocs.data)
+ } catch (error) {
+ console.error('Error while creating share', error)
+ OC.Notification.showTemporary(t('files_sharing', 'Error creating the share'), { type: 'error' })
+ throw error
+ }
+ },
+
+ /**
+ * Delete a share
+ *
+ * @param {number} id share id
+ * @throws {Error}
+ */
+ async deleteShare(id) {
+ try {
+ const request = await axios.delete(shareUrl + `/${id}`)
+ if (!('ocs' in request.data)) {
+ throw request
+ }
+ return true
+ } catch (error) {
+ console.error('Error while deleting share', error)
+ OC.Notification.showTemporary(t('files_sharing', 'Error deleting the share'), { type: 'error' })
+ throw error
+ }
+ },
+
+ /**
+ * Update a share
+ *
+ * @param {number} id share id
+ * @param {Object} data destructuring object
+ * @param {string} data.property property to update
+ * @param {any} data.value value to set
+ */
+ async updateShare(id, { property, value }) {
+ try {
+ // ocs api requires x-www-form-urlencoded
+ const data = new URLSearchParams()
+ data.append(property, value)
+
+ const request = await axios.put(shareUrl + `/${id}`, { [property]: value }, headers)
+ if (!('ocs' in request.data)) {
+ throw request
+ }
+ return true
+ } catch (error) {
+ console.error('Error while updating share', error)
+ OC.Notification.showTemporary(t('files_sharing', 'Error updating the share'), { type: 'error' })
+ const message = error.response.data.ocs.meta.message
+ throw new Error(`${property}, ${message}`)
+ }
+ }
+ }
+}
diff --git a/apps/files_sharing/src/mixins/ShareTypes.js b/apps/files_sharing/src/mixins/ShareTypes.js
new file mode 100644
index 0000000000..81e6af7d97
--- /dev/null
+++ b/apps/files_sharing/src/mixins/ShareTypes.js
@@ -0,0 +1,39 @@
+/**
+ * @copyright Copyright (c) 2019 John Molakvoæ
+ *
+ * @author John Molakvoæ
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ *
+ */
+
+export default {
+ data() {
+ return {
+ SHARE_TYPES: {
+ SHARE_TYPE_USER: OC.Share.SHARE_TYPE_USER,
+ SHARE_TYPE_GROUP: OC.Share.SHARE_TYPE_GROUP,
+ SHARE_TYPE_LINK: OC.Share.SHARE_TYPE_LINK,
+ SHARE_TYPE_EMAIL: OC.Share.SHARE_TYPE_EMAIL,
+ SHARE_TYPE_REMOTE: OC.Share.SHARE_TYPE_REMOTE,
+ SHARE_TYPE_CIRCLE: OC.Share.SHARE_TYPE_CIRCLE,
+ SHARE_TYPE_GUEST: OC.Share.SHARE_TYPE_GUEST,
+ SHARE_TYPE_REMOTE_GROUP: OC.Share.SHARE_TYPE_REMOTE_GROUP,
+ SHARE_TYPE_ROOM: OC.Share.SHARE_TYPE_ROOM
+ }
+ }
+ }
+}
diff --git a/apps/files_sharing/src/mixins/SharesMixin.js b/apps/files_sharing/src/mixins/SharesMixin.js
new file mode 100644
index 0000000000..d012f35591
--- /dev/null
+++ b/apps/files_sharing/src/mixins/SharesMixin.js
@@ -0,0 +1,303 @@
+/**
+ * @copyright Copyright (c) 2019 John Molakvoæ
+ *
+ * @author John Molakvoæ
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ *
+ */
+
+import PQueue from 'p-queue'
+import debounce from 'debounce'
+
+import Share from '../models/Share'
+import SharesRequests from './ShareRequests'
+import ShareTypes from './ShareTypes'
+import Config from '../services/ConfigService'
+import { getCurrentUser } from '@nextcloud/auth'
+
+export default {
+ mixins: [SharesRequests, ShareTypes],
+
+ props: {
+ fileInfo: {
+ type: Object,
+ default: () => {},
+ required: true
+ },
+ share: {
+ type: Share,
+ default: null
+ }
+ },
+
+ data() {
+ return {
+ config: new Config(),
+
+ // errors helpers
+ errors: {},
+
+ // component status toggles
+ loading: false,
+ saving: false,
+ open: false,
+
+ // concurrency management queue
+ // we want one queue per share
+ updateQueue: new PQueue({ concurrency: 1 }),
+
+ /**
+ * ! This allow vue to make the Share class state reactive
+ * ! do not remove it ot you'll lose all reactivity here
+ */
+ reactiveState: this.share && this.share.state,
+
+ SHARE_TYPES: {
+ SHARE_TYPE_USER: OC.Share.SHARE_TYPE_USER,
+ SHARE_TYPE_GROUP: OC.Share.SHARE_TYPE_GROUP,
+ SHARE_TYPE_LINK: OC.Share.SHARE_TYPE_LINK,
+ SHARE_TYPE_EMAIL: OC.Share.SHARE_TYPE_EMAIL,
+ SHARE_TYPE_REMOTE: OC.Share.SHARE_TYPE_REMOTE,
+ SHARE_TYPE_CIRCLE: OC.Share.SHARE_TYPE_CIRCLE,
+ SHARE_TYPE_GUEST: OC.Share.SHARE_TYPE_GUEST,
+ SHARE_TYPE_REMOTE_GROUP: OC.Share.SHARE_TYPE_REMOTE_GROUP,
+ SHARE_TYPE_ROOM: OC.Share.SHARE_TYPE_ROOM
+ }
+ }
+ },
+
+ computed: {
+
+ /**
+ * Does the current share have an expiration date
+ * @returns {boolean}
+ */
+ hasExpirationDate: {
+ get: function() {
+ return this.config.isDefaultExpireDateEnforced || !!this.share.expireDate
+ },
+ set: function(enabled) {
+ this.share.expireDate = enabled
+ ? this.config.defaultExpirationDateString !== ''
+ ? this.config.defaultExpirationDateString
+ : moment().format('YYYY-MM-DD')
+ : ''
+ }
+ },
+
+ /**
+ * Does the current share have a note
+ * @returns {boolean}
+ */
+ hasNote: {
+ get: function() {
+ return !!this.share.note
+ },
+ set: function(enabled) {
+ this.share.note = enabled
+ ? t('files_sharing', 'Enter a note for the share recipient')
+ : ''
+ }
+ },
+
+ dateTomorrow() {
+ return moment().add(1, 'days')
+ },
+
+ dateMaxEnforced() {
+ return this.config.isDefaultExpireDateEnforced
+ && moment().add(1 + this.config.defaultExpireDate, 'days')
+ },
+
+ /**
+ * Datepicker lang values
+ * https://github.com/nextcloud/nextcloud-vue/pull/146
+ * TODO: have this in vue-components
+ *
+ * @returns {int}
+ */
+ firstDay() {
+ return window.firstDay
+ ? window.firstDay
+ : 0 // sunday as default
+ },
+ lang() {
+ // fallback to default in case of unavailable data
+ return {
+ days: window.dayNamesShort
+ ? window.dayNamesShort // provided by nextcloud
+ : ['Sun.', 'Mon.', 'Tue.', 'Wed.', 'Thu.', 'Fri.', 'Sat.'],
+ months: window.monthNamesShort
+ ? window.monthNamesShort // provided by nextcloud
+ : ['Jan.', 'Feb.', 'Mar.', 'Apr.', 'May.', 'Jun.', 'Jul.', 'Aug.', 'Sep.', 'Oct.', 'Nov.', 'Dec.'],
+ placeholder: {
+ date: 'Select Date' // TODO: Translate
+ }
+ }
+ },
+
+ isShareOwner() {
+ return this.share && this.share.owner === getCurrentUser().uid
+ }
+
+ },
+
+ methods: {
+ /**
+ * Check if a share is valid before
+ * firing the request
+ *
+ * @param {Share} share the share to check
+ * @returns {Boolean}
+ */
+ checkShare(share) {
+ if (share.password) {
+ if (typeof share.password !== 'string' || share.password.trim() === '') {
+ return false
+ }
+ }
+ if (share.expirationDate) {
+ const date = moment(share.expirationDate)
+ if (!date.isValid()) {
+ return false
+ }
+ }
+ return true
+ },
+
+ /**
+ * ActionInput can be a little tricky to work with.
+ * Since we expect a string and not a Date,
+ * we need to process the value here
+ *
+ * @param {Date} date js date to be parsed by moment.js
+ */
+ onExpirationChange(date) {
+ // format to YYYY-MM-DD
+ const value = moment(date).format('YYYY-MM-DD')
+ this.share.expireDate = value
+ this.queueUpdate('expireDate')
+ },
+
+ /**
+ * Uncheck expire date
+ * We need this method because @update:checked
+ * is ran simultaneously as @uncheck, so
+ * so we cannot ensure data is up-to-date
+ */
+ onExpirationDisable() {
+ this.share.expireDate = ''
+ this.queueUpdate('expireDate')
+ },
+
+ /**
+ * Delete share button handler
+ */
+ async onDelete() {
+ try {
+ this.loading = true
+ this.open = false
+ await this.deleteShare(this.share.id)
+ console.debug('Share deleted', this.share.id)
+ this.$emit('remove:share', this.share)
+ } catch (error) {
+ // re-open menu if error
+ this.open = true
+ } finally {
+ this.loading = false
+ }
+ },
+
+ /**
+ * Send an update of the share to the queue
+ *
+ * @param {string} property the property to sync
+ */
+ queueUpdate(property) {
+ if (this.share.id) {
+ // force value to string because that is what our
+ // share api controller accepts
+ const value = this.share[property].toString()
+
+ this.updateQueue.add(async() => {
+ this.saving = true
+ this.errors = {}
+ try {
+ await this.updateShare(this.share.id, {
+ property,
+ value
+ })
+
+ // clear any previous errors
+ this.$delete(this.errors, property)
+
+ // reset password state after sync
+ this.$delete(this.share, 'newPassword')
+ } catch ({ property, message }) {
+ this.onSyncError(property, message)
+ } finally {
+ this.saving = false
+ }
+ })
+ } else {
+ console.error('Cannot update share.', this.share, 'No valid id')
+ }
+ },
+
+ /**
+ * Manage sync errors
+ * @param {string} property the errored property, e.g. 'password'
+ * @param {string} message the error message
+ */
+ onSyncError(property, message) {
+ // re-open menu if closed
+ this.open = true
+ switch (property) {
+ case 'password':
+ case 'pending':
+ case 'expireDate':
+ case 'note': {
+ // show error
+ this.$set(this.errors, property, message)
+
+ let propertyEl = this.$refs[property]
+ if (propertyEl) {
+ if (propertyEl.$el) {
+ propertyEl = propertyEl.$el
+ }
+ // focus if there is a focusable action element
+ const focusable = propertyEl.querySelector('.focusable')
+ if (focusable) {
+ focusable.focus()
+ }
+ }
+ break
+ }
+ }
+ },
+
+ /**
+ * Debounce queueUpdate to avoid requests spamming
+ * more importantly for text data
+ *
+ * @param {string} property the property to sync
+ */
+ debounceQueueUpdate: debounce(function(property) {
+ this.queueUpdate(property)
+ }, 500)
+ }
+}
diff --git a/apps/files_sharing/src/models/Share.js b/apps/files_sharing/src/models/Share.js
new file mode 100644
index 0000000000..e9d84fb555
--- /dev/null
+++ b/apps/files_sharing/src/models/Share.js
@@ -0,0 +1,444 @@
+/**
+ * @copyright Copyright (c) 2019 John Molakvoæ
+ *
+ * @author John Molakvoæ
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ *
+ */
+
+export default class Share {
+
+ #share;
+
+ /**
+ * Create the share object
+ *
+ * @param {Object} ocsData ocs request response
+ */
+ constructor(ocsData) {
+ if (ocsData.ocs && ocsData.ocs.data && ocsData.ocs.data[0]) {
+ ocsData = ocsData.ocs.data[0]
+ }
+
+ // convert int into boolean
+ ocsData.hide_download = !!ocsData.hide_download
+ ocsData.mail_send = !!ocsData.mail_send
+
+ // store state
+ this.#share = ocsData
+ }
+
+ /**
+ * Get the share state
+ * ! used for reactivity purpose
+ * Do not remove. It allow vuejs to
+ * inject its watchers into the #share
+ * state and make the whole class reactive
+ *
+ * @returns {Object} the share raw state
+ * @readonly
+ * @memberof Sidebar
+ */
+ get state() {
+ return this.#share
+ }
+
+ /**
+ * get the share id
+ *
+ * @returns {int}
+ * @readonly
+ * @memberof Share
+ */
+ get id() {
+ return this.#share.id
+ }
+
+ /**
+ * Get the share type
+ *
+ * @returns {int}
+ * @readonly
+ * @memberof Share
+ */
+ get type() {
+ return this.#share.share_type
+ }
+
+ /**
+ * Get the share permissions
+ * See OC.PERMISSION_* variables
+ *
+ * @returns {int}
+ * @readonly
+ * @memberof Share
+ */
+ get permissions() {
+ return this.#share.permissions
+ }
+
+ /**
+ * Set the share permissions
+ * See OC.PERMISSION_* variables
+ *
+ * @param {int} permissions valid permission, See OC.PERMISSION_* variables
+ * @memberof Share
+ */
+ set permissions(permissions) {
+ this.#share.permissions = permissions
+ }
+
+ // SHARE OWNER --------------------------------------------------
+ /**
+ * Get the share owner uid
+ *
+ * @returns {string}
+ * @readonly
+ * @memberof Share
+ */
+ get owner() {
+ return this.#share.uid_owner
+ }
+
+ /**
+ * Get the share owner's display name
+ *
+ * @returns {string}
+ * @readonly
+ * @memberof Share
+ */
+ get ownerDisplayName() {
+ return this.#share.displayname_owner
+ }
+
+ // SHARED WITH --------------------------------------------------
+ /**
+ * Get the share with entity uid
+ *
+ * @returns {string}
+ * @readonly
+ * @memberof Share
+ */
+ get shareWith() {
+ return this.#share.share_with
+ }
+
+ /**
+ * Get the share with entity display name
+ * fallback to its uid if none
+ *
+ * @returns {string}
+ * @readonly
+ * @memberof Share
+ */
+ get shareWithDisplayName() {
+ return this.#share.share_with_displayname
+ || this.#share.share_with
+ }
+
+ /**
+ * Get the share with avatar if any
+ *
+ * @returns {string}
+ * @readonly
+ * @memberof Share
+ */
+ get shareWithAvatar() {
+ return this.#share.share_with_avatar
+ }
+
+ // SHARED FILE OR FOLDER OWNER ----------------------------------
+ /**
+ * Get the shared item owner uid
+ *
+ * @returns {string}
+ * @readonly
+ * @memberof Share
+ */
+ get uidFileOwner() {
+ return this.#share.uid_file_owner
+ }
+
+ /**
+ * Get the shared item display name
+ * fallback to its uid if none
+ *
+ * @returns {string}
+ * @readonly
+ * @memberof Share
+ */
+ get displaynameFileOwner() {
+ return this.#share.displayname_file_owner
+ || this.#share.uid_file_owner
+ }
+
+ // TIME DATA ----------------------------------------------------
+ /**
+ * Get the share creation timestamp
+ *
+ * @returns {int}
+ * @readonly
+ * @memberof Share
+ */
+ get createdTime() {
+ return this.#share.stime
+ }
+
+ /**
+ * Get the expiration date as a string format
+ *
+ * @returns {string}
+ * @readonly
+ * @memberof Share
+ */
+ get expireDate() {
+ return this.#share.expiration
+ }
+
+ /**
+ * Set the expiration date as a string format
+ * e.g. YYYY-MM-DD
+ *
+ * @param {string} date the share expiration date
+ * @memberof Share
+ */
+ set expireDate(date) {
+ this.#share.expiration = date
+ }
+
+ // EXTRA DATA ---------------------------------------------------
+ /**
+ * Get the public share token
+ *
+ * @returns {string} the token
+ * @readonly
+ * @memberof Share
+ */
+ get token() {
+ return this.#share.token
+ }
+
+ /**
+ * Get the share note if any
+ *
+ * @returns {string}
+ * @readonly
+ * @memberof Share
+ */
+ get note() {
+ return this.#share.note
+ }
+
+ /**
+ * Set the share note if any
+ *
+ * @param {string} note the note
+ * @memberof Share
+ */
+ set note(note) {
+ this.#share.note = note.trim()
+ }
+
+ /**
+ * Have a mail been sent
+ *
+ * @returns {boolean}
+ * @readonly
+ * @memberof Share
+ */
+ get mailSend() {
+ return this.#share.mail_send === true
+ }
+
+ /**
+ * Hide the download button on public page
+ *
+ * @returns {boolean}
+ * @readonly
+ * @memberof Share
+ */
+ get hideDownload() {
+ return this.#share.hide_download === true
+ }
+
+ /**
+ * Hide the download button on public page
+ *
+ * @param {boolean} state hide the button ?
+ * @memberof Share
+ */
+ set hideDownload(state) {
+ this.#share.hide_download = state === true
+ }
+
+ /**
+ * Password protection of the share
+ *
+ * @returns {string}
+ * @readonly
+ * @memberof Share
+ */
+ get password() {
+ return this.#share.password
+ }
+
+ /**
+ * Password protection of the share
+ *
+ * @param {string} password the share password
+ * @memberof Share
+ */
+ set password(password) {
+ this.#share.password = password.trim()
+ }
+
+ // SHARED ITEM DATA ---------------------------------------------
+ /**
+ * Get the shared item absolute full path
+ *
+ * @returns {string}
+ * @readonly
+ * @memberof Share
+ */
+ get path() {
+ return this.#share.path
+ }
+
+ /**
+ * Return the item type: file or folder
+ *
+ * @returns {string} 'folder' or 'file'
+ * @readonly
+ * @memberof Share
+ */
+ get itemType() {
+ return this.#share.item_type
+ }
+
+ /**
+ * Get the shared item mimetype
+ *
+ * @returns {string}
+ * @readonly
+ * @memberof Share
+ */
+ get mimetype() {
+ return this.#share.mimetype
+ }
+
+ /**
+ * Get the shared item id
+ *
+ * @returns {int}
+ * @readonly
+ * @memberof Share
+ */
+ get fileSource() {
+ return this.#share.file_source
+ }
+
+ /**
+ * Get the target path on the receiving end
+ * e.g the file /xxx/aaa will be shared in
+ * the receiving root as /aaa, the fileTarget is /aaa
+ *
+ * @returns {string}
+ * @readonly
+ * @memberof Share
+ */
+ get fileTarget() {
+ return this.#share.file_target
+ }
+
+ /**
+ * Get the parent folder id if any
+ *
+ * @returns {int}
+ * @readonly
+ * @memberof Share
+ */
+ get fileParent() {
+ return this.#share.file_parent
+ }
+
+ // PERMISSIONS Shortcuts
+ /**
+ * Does this share have CREATE permissions
+ *
+ * @returns {boolean}
+ * @readonly
+ * @memberof Share
+ */
+ get hasCreatePermission() {
+ return !!((this.permissions & OC.PERMISSION_CREATE))
+ }
+
+ /**
+ * Does this share have DELETE permissions
+ *
+ * @returns {boolean}
+ * @readonly
+ * @memberof Share
+ */
+ get hasDeletePermission() {
+ return !!((this.permissions & OC.PERMISSION_DELETE))
+ }
+
+ /**
+ * Does this share have UPDATE permissions
+ *
+ * @returns {boolean}
+ * @readonly
+ * @memberof Share
+ */
+ get hasUpdatePermission() {
+ return !!((this.permissions & OC.PERMISSION_UPDATE))
+ }
+
+ /**
+ * Does this share have SHARE permissions
+ *
+ * @returns {boolean}
+ * @readonly
+ * @memberof Share
+ */
+ get hasSharePermission() {
+ return !!((this.permissions & OC.PERMISSION_SHARE))
+ }
+
+ // TODO: SORT THOSE PROPERTIES
+ get label() {
+ return this.#share.label
+ }
+
+ get parent() {
+ return this.#share.parent
+ }
+
+ get storageId() {
+ return this.#share.storage_id
+ }
+
+ get storage() {
+ return this.#share.storage
+ }
+
+ get itemSource() {
+ return this.#share.item_source
+ }
+
+}
diff --git a/apps/files_sharing/src/services/ConfigService.js b/apps/files_sharing/src/services/ConfigService.js
new file mode 100644
index 0000000000..7058c71477
--- /dev/null
+++ b/apps/files_sharing/src/services/ConfigService.js
@@ -0,0 +1,223 @@
+/**
+ * @copyright Copyright (c) 2019 John Molakvoæ
+ *
+ * @author John Molakvoæ
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ *
+ */
+
+export default class Config {
+
+ /**
+ * Is public upload allowed on link shares ?
+ *
+ * @returns {boolean}
+ * @readonly
+ * @memberof Config
+ */
+ get isPublicUploadEnabled() {
+ return document.getElementById('filestable')
+ && document.getElementById('filestable').dataset.allowPublicUpload === 'yes'
+ }
+
+ /**
+ * Are link share allowed ?
+ *
+ * @returns {boolean}
+ * @readonly
+ * @memberof Config
+ */
+ get isShareWithLinkAllowed() {
+ return document.getElementById('allowShareWithLink')
+ && document.getElementById('allowShareWithLink').value === 'yes'
+ }
+
+ /**
+ * Get the federated sharing documentation link
+ *
+ * @returns {string}
+ * @readonly
+ * @memberof Config
+ */
+ get federatedShareDocLink() {
+ return OC.appConfig.core.federatedCloudShareDoc
+ }
+
+ /**
+ * Get the default expiration date as string
+ *
+ * @returns {string}
+ * @readonly
+ * @memberof Config
+ */
+ get defaultExpirationDateString() {
+ let expireDateString = ''
+ if (this.isDefaultExpireDateEnabled) {
+ const date = window.moment.utc()
+ const expireAfterDays = this.defaultExpireDate
+ date.add(expireAfterDays, 'days')
+ expireDateString = date.format('YYYY-MM-DD')
+ }
+ return expireDateString
+ }
+
+ /**
+ * Are link shares password-enforced ?
+ *
+ * @returns {boolean}
+ * @readonly
+ * @memberof Config
+ */
+ get enforcePasswordForPublicLink() {
+ return OC.appConfig.core.enforcePasswordForPublicLink === true
+ }
+
+ /**
+ * Is password asked by default on link shares ?
+ *
+ * @returns {boolean}
+ * @readonly
+ * @memberof Config
+ */
+ get enableLinkPasswordByDefault() {
+ return OC.appConfig.core.enableLinkPasswordByDefault === true
+ }
+
+ /**
+ * Is link shares expiration enforced ?
+ *
+ * @returns {boolean}
+ * @readonly
+ * @memberof Config
+ */
+ get isDefaultExpireDateEnforced() {
+ return OC.appConfig.core.defaultExpireDateEnforced === true
+ }
+
+ /**
+ * Is there a default expiration date for new link shares ?
+ *
+ * @returns {boolean}
+ * @readonly
+ * @memberof Config
+ */
+ get isDefaultExpireDateEnabled() {
+ return OC.appConfig.core.defaultExpireDateEnabled === true
+ }
+
+ /**
+ * Are users on this server allowed to send shares to other servers ?
+ *
+ * @returns {boolean}
+ * @readonly
+ * @memberof Config
+ */
+ get isRemoteShareAllowed() {
+ return OC.appConfig.core.remoteShareAllowed === true
+ }
+
+ /**
+ * Is sharing my mail (link share) enabled ?
+ *
+ * @returns {boolean}
+ * @readonly
+ * @memberof Config
+ */
+ get isMailShareAllowed() {
+ return OC.appConfig.shareByMailEnabled !== undefined
+ }
+
+ /**
+ * Get the default days to expiration
+ *
+ * @returns {int}
+ * @readonly
+ * @memberof Config
+ */
+ get defaultExpireDate() {
+ return OC.appConfig.core.defaultExpireDate
+ }
+
+ /**
+ * Is resharing allowed ?
+ *
+ * @returns {boolean}
+ * @readonly
+ * @memberof Config
+ */
+ get isResharingAllowed() {
+ return OC.appConfig.core.resharingAllowed === true
+ }
+
+ /**
+ * Is password enforced for mail shares ?
+ *
+ * @returns {boolean}
+ * @readonly
+ * @memberof Config
+ */
+ get isPasswordForMailSharesRequired() {
+ return (OC.appConfig.shareByMail === undefined) ? false : OC.appConfig.shareByMail.enforcePasswordProtection === true
+ }
+
+ /**
+ * Is sharing with groups allowed ?
+ *
+ * @returns {boolean}
+ * @readonly
+ * @memberof Config
+ */
+ get allowGroupSharing() {
+ return OC.appConfig.core.allowGroupSharing === true
+ }
+
+ /**
+ * Get the maximum results of a share search
+ *
+ * @returns {int}
+ * @readonly
+ * @memberof Config
+ */
+ get maxAutocompleteResults() {
+ return parseInt(OC.config['sharing.maxAutocompleteResults'], 10) || 200
+ }
+
+ /**
+ * Get the minimal string length
+ * to initiate a share search
+ *
+ * @returns {int}
+ * @readonly
+ * @memberof Config
+ */
+ get minSearchStringLength() {
+ return parseInt(OC.config['sharing.minSearchStringLength'], 10) || 0
+ }
+
+ /**
+ * Get the password policy config
+ *
+ * @returns {Object}
+ * @readonly
+ * @memberof Config
+ */
+ get passwordPolicy() {
+ const capabilities = OC.getCapabilities()
+ return capabilities.password_policy ? capabilities.password_policy : {}
+ }
+
+}
diff --git a/apps/files_sharing/src/services/ExternalLinkActions.js b/apps/files_sharing/src/services/ExternalLinkActions.js
new file mode 100644
index 0000000000..f67a1cb115
--- /dev/null
+++ b/apps/files_sharing/src/services/ExternalLinkActions.js
@@ -0,0 +1,63 @@
+/**
+ * @copyright Copyright (c) 2019 John Molakvoæ
+ *
+ * @author John Molakvoæ
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ *
+ */
+
+export default class ExternalLinkActions {
+
+ #state;
+
+ constructor() {
+ // init empty state
+ this.#state = {}
+
+ // init default values
+ this.#state.actions = []
+ console.debug('OCA.Sharing.ExternalLinkActions initialized')
+ }
+
+ /**
+ * Get the state
+ *
+ * @readonly
+ * @memberof ExternalLinkActions
+ * @returns {Object} the data state
+ */
+ get state() {
+ return this.#state
+ }
+
+ /**
+ * Register a new action for the link share
+ * Mostly used by the social sharing app.
+ *
+ * @param {Object} action new action component to register
+ * @returns {boolean}
+ */
+ registerAction(action) {
+ if (typeof action === 'object' && action.render && action.components) {
+ this.#state.actions.push(action)
+ return true
+ }
+ console.error(`Invalid action component provided`, action)
+ return false
+ }
+
+}
diff --git a/apps/files_sharing/src/services/ShareSearch.js b/apps/files_sharing/src/services/ShareSearch.js
new file mode 100644
index 0000000000..dda1feb30a
--- /dev/null
+++ b/apps/files_sharing/src/services/ShareSearch.js
@@ -0,0 +1,71 @@
+/**
+ * @copyright Copyright (c) 2019 John Molakvoæ
+ *
+ * @author John Molakvoæ
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ *
+ */
+
+export default class ShareSearch {
+
+ #state;
+
+ constructor() {
+ // init empty state
+ this.#state = {}
+
+ // init default values
+ this.#state.results = []
+ console.debug('OCA.Sharing.ShareSearch initialized')
+ }
+
+ /**
+ * Get the state
+ *
+ * @readonly
+ * @memberof ShareSearch
+ * @returns {Object} the data state
+ */
+ get state() {
+ return this.#state
+ }
+
+ /**
+ * Register a new result
+ * Mostly used by the guests app.
+ * We should consider deprecation and add results via php ?
+ *
+ * @param {Object} result entry to append
+ * @param {string} [result.user] entry user
+ * @param {string} result.displayName entry first line
+ * @param {string} [result.desc] entry second line
+ * @param {string} [result.icon] entry icon
+ * @param {function} result.handler function to run on entry selection
+ * @param {function} [result.condition] condition to add entry or not
+ * @returns {boolean}
+ */
+ addNewResult(result) {
+ if (result.displayName.trim() !== ''
+ && typeof result.handler === 'function') {
+ this.#state.results.push(result)
+ return true
+ }
+ console.error(`Invalid search result provided`, result)
+ return false
+ }
+
+}
diff --git a/apps/files_sharing/src/share.js b/apps/files_sharing/src/share.js
index a66f166759..46e46e3755 100644
--- a/apps/files_sharing/src/share.js
+++ b/apps/files_sharing/src/share.js
@@ -195,7 +195,7 @@
// do not open sidebar if permission is set and equal to 0
var permissions = parseInt(context.$file.data('share-permissions'), 10)
if (isNaN(permissions) || permissions > 0) {
- fileList.showDetailsView(fileName, 'shareTabView')
+ fileList.showDetailsView(fileName, 'sharing')
}
},
render: function(actionSpec, isDefault, context) {
@@ -209,37 +209,37 @@
}
})
- var shareTab = new OCA.Sharing.ShareTabView('shareTabView', { order: -20 })
- // detect changes and change the matching list entry
- shareTab.on('sharesChanged', function(shareModel) {
- var fileInfoModel = shareModel.fileInfoModel
- var $tr = fileList.findFileEl(fileInfoModel.get('name'))
+ var shareTab = new OCA.Sharing.ShareTabView('sharing', {order: -20})
+ // // detect changes and change the matching list entry
+ // shareTab.on('sharesChanged', function(shareModel) {
+ // var fileInfoModel = shareModel.fileInfoModel
+ // var $tr = fileList.findFileEl(fileInfoModel.get('name'))
- // We count email shares as link share
- var hasLinkShares = shareModel.hasLinkShares()
- shareModel.get('shares').forEach(function(share) {
- if (share.share_type === OC.Share.SHARE_TYPE_EMAIL) {
- hasLinkShares = true
- }
- })
+ // // We count email shares as link share
+ // var hasLinkShares = shareModel.hasLinkShares();
+ // shareModel.get('shares').forEach(function (share) {
+ // if (share.share_type === OC.Share.SHARE_TYPE_EMAIL) {
+ // hasLinkShares = true;
+ // }
+ // })
- OCA.Sharing.Util._updateFileListDataAttributes(fileList, $tr, shareModel)
- if (!OCA.Sharing.Util._updateFileActionIcon($tr, shareModel.hasUserShares(), hasLinkShares)) {
- // remove icon, if applicable
- OC.Share.markFileAsShared($tr, false, false)
- }
+ // OCA.Sharing.Util._updateFileListDataAttributes(fileList, $tr, shareModel);
+ // if (!OCA.Sharing.Util._updateFileActionIcon($tr, shareModel.hasUserShares(), hasLinkShares)) {
+ // // remove icon, if applicable
+ // OC.Share.markFileAsShared($tr, false, false)
+ // }
- // FIXME: this is too convoluted. We need to get rid of the above updates
- // and only ever update the model and let the events take care of rerendering
- fileInfoModel.set({
- shareTypes: shareModel.getShareTypes(),
- // in case markFileAsShared decided to change the icon,
- // we need to modify the model
- // (FIXME: yes, this is hacky)
- icon: $tr.attr('data-icon')
- })
- })
- fileList.registerTabView(shareTab)
+ // // FIXME: this is too convoluted. We need to get rid of the above updates
+ // // and only ever update the model and let the events take care of rerendering
+ // fileInfoModel.set({
+ // shareTypes: shareModel.getShareTypes(),
+ // // in case markFileAsShared decided to change the icon,
+ // // we need to modify the model
+ // // (FIXME: yes, this is hacky)
+ // icon: $tr.attr('data-icon')
+ // })
+ // })
+ // fileList.registerTabView(shareTab)
var breadCrumbSharingDetailView = new OCA.Sharing.ShareBreadCrumbView({ shareTab: shareTab })
fileList.registerBreadCrumbDetailView(breadCrumbSharingDetailView)
diff --git a/apps/files_sharing/src/sharebreadcrumbview.js b/apps/files_sharing/src/sharebreadcrumbview.js
index a90c94b6d7..c712229b2e 100644
--- a/apps/files_sharing/src/sharebreadcrumbview.js
+++ b/apps/files_sharing/src/sharebreadcrumbview.js
@@ -93,7 +93,7 @@
dirInfo: self._dirInfo
})
})
- OCA.Files.App.fileList.showDetailsView(fileInfoModel, 'shareTabView')
+ OCA.Files.App.fileList.showDetailsView(fileInfoModel, 'sharing')
}
})
diff --git a/apps/files_sharing/src/utils/SharedWithMe.js b/apps/files_sharing/src/utils/SharedWithMe.js
new file mode 100644
index 0000000000..b2e2e34a9b
--- /dev/null
+++ b/apps/files_sharing/src/utils/SharedWithMe.js
@@ -0,0 +1,86 @@
+/**
+ * @copyright Copyright (c) 2019 John Molakvoæ
+ *
+ * @author John Molakvoæ
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
+ *
+ */
+
+/**
+ * Get the shared with me title
+ *
+ * @param {Share} share current share
+ * @returns {string} the title
+ */
+const shareWithTitle = function(share) {
+ if (share.type === OC.Share.type_GROUP) {
+ return t(
+ 'files_sharing',
+ 'Shared with you and the group {group} by {owner}',
+ {
+ group: share.shareWithDisplayName,
+ owner: share.ownerDisplayName
+ },
+ undefined,
+ { escape: false }
+ )
+ } else if (share.type === OC.Share.type_CIRCLE) {
+ return t(
+ 'files_sharing',
+ 'Shared with you and {circle} by {owner}',
+ {
+ circle: share.shareWithDisplayName,
+ owner: share.ownerDisplayName
+ },
+ undefined,
+ { escape: false }
+ )
+ } else if (share.type === OC.Share.type_ROOM) {
+ if (this.model.get('reshare').share_with_displayname) {
+ return t(
+ 'files_sharing',
+ 'Shared with you and the conversation {conversation} by {owner}',
+ {
+ conversation: share.shareWithDisplayName,
+ owner: share.ownerDisplayName
+ },
+ undefined,
+ { escape: false }
+ )
+ } else {
+ return t(
+ 'files_sharing',
+ 'Shared with you in a conversation by {owner}',
+ {
+ owner: share.ownerDisplayName
+ },
+ undefined,
+ { escape: false }
+ )
+ }
+ } else {
+ return t(
+ 'files_sharing',
+ 'Shared with you by {owner}',
+ { owner: share.ownerDisplayName },
+ undefined,
+ { escape: false }
+ )
+ }
+}
+
+export { shareWithTitle }
diff --git a/apps/files_sharing/src/views/SharingLinkList.vue b/apps/files_sharing/src/views/SharingLinkList.vue
new file mode 100644
index 0000000000..1c01886ca4
--- /dev/null
+++ b/apps/files_sharing/src/views/SharingLinkList.vue
@@ -0,0 +1,141 @@
+
+
+
+
+
+
+
diff --git a/apps/files_sharing/src/views/SharingList.vue b/apps/files_sharing/src/views/SharingList.vue
new file mode 100644
index 0000000000..c2ecbbbd1a
--- /dev/null
+++ b/apps/files_sharing/src/views/SharingList.vue
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+
diff --git a/apps/files_sharing/src/views/SharingTab.vue b/apps/files_sharing/src/views/SharingTab.vue
new file mode 100644
index 0000000000..5a9b24c36b
--- /dev/null
+++ b/apps/files_sharing/src/views/SharingTab.vue
@@ -0,0 +1,318 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/files_sharing/webpack.js b/apps/files_sharing/webpack.js
index 3fc0628b20..43a34559d4 100644
--- a/apps/files_sharing/webpack.js
+++ b/apps/files_sharing/webpack.js
@@ -4,6 +4,7 @@ module.exports = {
entry: {
'additionalScripts': path.join(__dirname, 'src', 'additionalScripts.js'),
'files_sharing': path.join(__dirname, 'src', 'files_sharing.js'),
+ 'files_sharing_tab': path.join(__dirname, 'src', 'files_sharing_tab.js'),
'collaboration': path.join(__dirname, 'src', 'collaborationresourceshandler.js'),
},
output: {
diff --git a/core/js/files/client.js b/core/js/files/client.js
index 98874d165b..0daf7c9dc3 100644
--- a/core/js/files/client.js
+++ b/core/js/files/client.js
@@ -323,6 +323,13 @@
data.isEncrypted = false;
}
+ var isFavouritedProp = props['{' + Client.NS_OWNCLOUD + '}favorite'];
+ if (!_.isUndefined(isFavouritedProp)) {
+ data.isFavourited = isFavouritedProp === '1';
+ } else {
+ data.isFavourited = false;
+ }
+
var contentType = props[Client.PROPERTY_GETCONTENTTYPE];
if (!_.isUndefined(contentType)) {
data.mimetype = contentType;
diff --git a/core/src/Polyfill/closest.js b/core/src/Polyfill/closest.js
new file mode 100644
index 0000000000..1c60864612
--- /dev/null
+++ b/core/src/Polyfill/closest.js
@@ -0,0 +1,19 @@
+// https://developer.mozilla.org/en-US/docs/Web/API/Element/closest#Polyfill
+
+if (!Element.prototype.matches) {
+ Element.prototype.matches
+ = Element.prototype.msMatchesSelector
+ || Element.prototype.webkitMatchesSelector
+}
+
+if (!Element.prototype.closest) {
+ Element.prototype.closest = function(s) {
+ var el = this
+
+ do {
+ if (el.matches(s)) return el
+ el = el.parentElement || el.parentNode
+ } while (el !== null && el.nodeType === 1)
+ return null
+ }
+}
diff --git a/core/src/Polyfill/index.js b/core/src/Polyfill/index.js
index 055ab6343a..306c72a077 100644
--- a/core/src/Polyfill/index.js
+++ b/core/src/Polyfill/index.js
@@ -1,4 +1,4 @@
-/*
+/**
* @copyright 2019 Christoph Wurst
*
* @author 2019 Christoph Wurst
@@ -20,4 +20,5 @@
*/
import './console'
+import './closest'
import './windows-phone'
diff --git a/core/src/main.js b/core/src/main.js
index 29c657f5db..3f0e82df95 100644
--- a/core/src/main.js
+++ b/core/src/main.js
@@ -1,4 +1,4 @@
-/*
+/**
* @copyright 2018 Christoph Wurst
*
* @author 2018 Christoph Wurst
@@ -20,8 +20,8 @@
*/
import $ from 'jquery'
-import '@babel/polyfill'
import './Polyfill/index'
+import '@babel/polyfill'
// If you remove the line below, tests won't pass
// eslint-disable-next-line no-unused-vars
diff --git a/core/src/views/Login.vue b/core/src/views/Login.vue
index 08538ec2fe..c7958aac15 100644
--- a/core/src/views/Login.vue
+++ b/core/src/views/Login.vue
@@ -27,7 +27,7 @@
=10.0.0"
+ }
}
diff --git a/webpack.common.js b/webpack.common.js
index 3264514606..53c5d5e676 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -3,10 +3,10 @@ const path = require('path')
const merge = require('webpack-merge')
const { VueLoaderPlugin } = require('vue-loader')
-const core = require('./core/webpack')
-
const accessibility = require('./apps/accessibility/webpack')
const comments = require('./apps/comments/webpack')
+const core = require('./core/webpack')
+const files = require('./apps/files/webpack')
const files_sharing = require('./apps/files_sharing/webpack')
const files_trashbin = require('./apps/files_trashbin/webpack')
const files_versions = require('./apps/files_versions/webpack')
@@ -18,14 +18,15 @@ const updatenotifications = require('./apps/updatenotification/webpack')
const workflowengine = require('./apps/workflowengine/webpack')
const modules = {
- core,
- settings,
accessibility,
comments,
+ core,
+ files,
files_sharing,
files_trashbin,
files_versions,
oauth2,
+ settings,
systemtags,
twofactor_backupscodes,
updatenotifications,