diff options
Diffstat (limited to 'apps/settings/src')
| -rw-r--r-- | apps/settings/src/admin.js | 335 | ||||
| -rw-r--r-- | apps/settings/src/apps.js | 6 | ||||
| -rw-r--r-- | apps/settings/src/mixins/AppManagement.js | 27 | ||||
| -rw-r--r-- | apps/settings/src/router.js | 2 | ||||
| -rw-r--r-- | apps/settings/src/service/rebuild-navigation.js | 130 | ||||
| -rw-r--r-- | apps/settings/src/store/apps.js | 16 |
6 files changed, 496 insertions, 20 deletions
diff --git a/apps/settings/src/admin.js b/apps/settings/src/admin.js new file mode 100644 index 00000000000..24f95ccb2a6 --- /dev/null +++ b/apps/settings/src/admin.js @@ -0,0 +1,335 @@ +import $ from 'jquery' +import 'jquery-ui-dist/jquery-ui' + +window.addEventListener('DOMContentLoaded', () => { + $('#excludedGroups,#linksExcludedGroups').each((index, element) => { + OC.Settings.setupGroupsSelect($(element)) + $(element).change((ev) => { + let groups = ev.val || [] + groups = JSON.stringify(groups) + OCP.AppConfig.setValue('core', $(this).attr('name'), groups) + }) + }) + + $('#loglevel').change(() => { + $.post(OC.generateUrl('/settings/admin/log/level'), { level: $(this).val() }, () => { + OC.Log.reload() + }) + }) + + $('#backgroundjobs span.crondate').tooltip({ placement: 'top' }) + + $('#backgroundjobs input').change(() => { + if ($(this).is(':checked')) { + const mode = $(this).val() + if (mode === 'ajax' || mode === 'webcron' || mode === 'cron') { + OCP.AppConfig.setValue('core', 'backgroundjobs_mode', mode, { + success: () => { + // clear cron errors on background job mode change + OCP.AppConfig.deleteKey('core', 'cronErrors') + } + }) + } + } + }) + + $('#shareAPIEnabled').change(() => { + $('#shareAPI p:not(#enable)').toggleClass('hidden', !this.checked) + }) + + $('#enableEncryption').change(() => { + $('#encryptionAPI div#EncryptionWarning').toggleClass('hidden') + }) + + $('#reallyEnableEncryption').click(() => { + $('#encryptionAPI div#EncryptionWarning').toggleClass('hidden') + $('#encryptionAPI div#EncryptionSettingsArea').toggleClass('hidden') + OCP.AppConfig.setValue('core', 'encryption_enabled', 'yes') + $('#enableEncryption').attr('disabled', 'disabled') + }) + + $('#startmigration').click((event) => { + $(window).on('beforeunload.encryption', (e) => { + return t('settings', 'Migration in progress. Please wait until the migration is finished') + }) + event.preventDefault() + $('#startmigration').prop('disabled', true) + OC.msg.startAction('#startmigration_msg', t('settings', 'Migration started …')) + $.post(OC.generateUrl('/settings/admin/startmigration'), '', function(data) { + OC.msg.finishedAction('#startmigration_msg', data) + if (data.status === 'success') { + $('#encryptionAPI div#selectEncryptionModules').toggleClass('hidden') + $('#encryptionAPI div#migrationWarning').toggleClass('hidden') + } else { + $('#startmigration').prop('disabled', false) + } + $(window).off('beforeunload.encryption') + + }) + }) + + $('#shareapiExpireAfterNDays').on('input', function() { + this.value = this.value.replace(/\D/g, '') + }) + + $('#shareAPI input:not(.noJSAutoUpdate)').change(function() { + let value = $(this).val() + if ($(this).attr('type') === 'checkbox') { + if (this.checked) { + value = 'yes' + } else { + value = 'no' + } + } + OCP.AppConfig.setValue('core', $(this).attr('name'), value) + }) + + $('#shareapiDefaultExpireDate').change(function() { + $('setDefaultExpireDate').toggleClass('hidden', !this.checked) + }) + + $('#shareapiDefaultInternalExpireDate').change(function() { + $('#setDefaultInternalExpireDate').toggleClass('hidden', !this.checked) + }) + + $('#shareapiDefaultRemoteExpireDate').change(function() { + $('#setDefaultRemoteExpireDate').toggleClass('hidden', !this.checked) + }) + + $('#publicShareDisclaimer').change(function() { + $('#publicShareDisclaimerText').toggleClass('hidden', !this.checked) + if (!this.checked) { + savePublicShareDisclaimerText('') + } + }) + + $('#shareApiDefaultPermissionsSection input').change(function(ev) { + const $el = $('#shareApiDefaultPermissions') + const $target = $(ev.target) + + let value = $el.val() + if ($target.is(':checked')) { + value = value | $target.val() + } else { + value = value & ~$target.val() + } + + // always set read permission + value |= OC.PERMISSION_READ + + // this will trigger the field's change event and will save it + $el.val(value).change() + + ev.preventDefault() + + return false + }) + + const savePublicShareDisclaimerText = _.debounce(function(value) { + const options = { + success: () => { + OC.msg.finishedSuccess('#publicShareDisclaimerStatus', t('settings', 'Saved')) + }, + error: () => { + OC.msg.finishedError('#publicShareDisclaimerStatus', t('settings', 'Not saved')) + } + } + + OC.msg.startSaving('#publicShareDisclaimerStatus') + if (_.isString(value) && value !== '') { + OCP.AppConfig.setValue('core', 'shareapi_public_link_disclaimertext', value, options) + } else { + $('#publicShareDisclaimerText').val('') + OCP.AppConfig.deleteKey('core', 'shareapi_public_link_disclaimertext', options) + } + }, 500) + + $('#publicShareDisclaimerText').on('change, keyup', function() { + savePublicShareDisclaimerText(this.value) + }) + + $('#shareapi_allow_share_dialog_user_enumeration').on('change', function() { + $('#shareapi_restrict_user_enumeration_to_group_setting').toggleClass('hidden', !this.checked) + $('#shareapi_restrict_user_enumeration_to_phone_setting').toggleClass('hidden', !this.checked) + $('#shareapi_restrict_user_enumeration_combinewarning_setting').toggleClass('hidden', !this.checked) + }) + + $('#allowLinks').change(function() { + $('#publicLinkSettings').toggleClass('hidden', !this.checked) + $('#setDefaultExpireDate').toggleClass('hidden', !(this.checked && $('#shareapiDefaultExpireDate')[0].checked)) + }) + + $('#mail_smtpauth').change(function() { + if (!this.checked) { + $('#mail_credentials').addClass('hidden') + } else { + $('#mail_credentials').removeClass('hidden') + } + }) + + $('#mail_smtpmode').change(function() { + if ($(this).val() !== 'smtp') { + $('#setting_smtpauth').addClass('hidden') + $('#setting_smtphost').addClass('hidden') + $('#mail_smtpsecure_label').addClass('hidden') + $('#mail_smtpsecure').addClass('hidden') + $('#mail_credentials').addClass('hidden') + $('#mail_sendmailmode_label, #mail_sendmailmode').removeClass('hidden') + } else { + $('#setting_smtpauth').removeClass('hidden') + $('#setting_smtphost').removeClass('hidden') + $('#mail_smtpsecure_label').removeClass('hidden') + $('#mail_smtpsecure').removeClass('hidden') + if ($('#mail_smtpauth').is(':checked')) { + $('#mail_credentials').removeClass('hidden') + } + $('#mail_sendmailmode_label, #mail_sendmailmode').addClass('hidden') + } + }) + + const changeEmailSettings = function() { + if (OC.PasswordConfirmation.requiresPasswordConfirmation()) { + OC.PasswordConfirmation.requirePasswordConfirmation(changeEmailSettings) + return + } + + OC.msg.startSaving('#mail_settings_msg') + $.ajax({ + url: OC.generateUrl('/settings/admin/mailsettings'), + type: 'POST', + data: $('#mail_general_settings_form').serialize(), + success: () => { + OC.msg.finishedSuccess('#mail_settings_msg', t('settings', 'Saved')) + }, + error: (xhr) => { + OC.msg.finishedError('#mail_settings_msg', xhr.responseJSON) + } + }) + } + + const toggleEmailCredentials = function() { + if (OC.PasswordConfirmation.requiresPasswordConfirmation()) { + OC.PasswordConfirmation.requirePasswordConfirmation(toggleEmailCredentials) + return + } + + OC.msg.startSaving('#mail_settings_msg') + $.ajax({ + url: OC.generateUrl('/settings/admin/mailsettings/credentials'), + type: 'POST', + data: $('#mail_credentials_settings').serialize(), + success: () => { + OC.msg.finishedSuccess('#mail_settings_msg', t('settings', 'Saved')) + }, + error: (xhr) => { + OC.msg.finishedError('#mail_settings_msg', xhr.responseJSON) + } + }) + } + + $('#mail_general_settings_form').change(changeEmailSettings) + $('#mail_credentials_settings_submit').click(toggleEmailCredentials) + $('#mail_smtppassword').click(() => { + if (this.type === 'text' && this.value === '********') { + this.type = 'password' + this.value = '' + } + }) + + $('#sendtestemail').click((event) => { + event.preventDefault() + OC.msg.startAction('#sendtestmail_msg', t('settings', 'Sending…')) + + $.ajax({ + url: OC.generateUrl('/settings/admin/mailtest'), + type: 'POST', + success: () => { + OC.msg.finishedSuccess('#sendtestmail_msg', t('settings', 'Email sent')) + }, + error: (xhr) => { + OC.msg.finishedError('#sendtestmail_msg', xhr.responseJSON) + } + }) + }) + + $('#allowGroupSharing').change(() => { + $('#allowGroupSharing').toggleClass('hidden', !this.checked) + }) + + $('#shareapiExcludeGroups').change(() => { + $('#selectExcludedGroups').toggleClass('hidden', !this.checked) + }) + + const setupChecks = () => { + // run setup checks then gather error messages + $.when( + OC.SetupChecks.checkWebDAV(), + OC.SetupChecks.checkWellKnownUrl('GET', '/.well-known/webfinger', OC.theme.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true, [200, 404], true), + OC.SetupChecks.checkWellKnownUrl('GET', '/.well-known/nodeinfo', OC.theme.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true, [200, 404], true), + OC.SetupChecks.checkWellKnownUrl('PROPFIND', '/.well-known/caldav', OC.theme.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true), + OC.SetupChecks.checkWellKnownUrl('PROPFIND', '/.well-known/carddav', OC.theme.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true), + OC.SetupChecks.checkProviderUrl(OC.getRootPath() + '/ocm-provider/', OC.theme.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true), + OC.SetupChecks.checkProviderUrl(OC.getRootPath() + '/ocs-provider/', OC.theme.docPlaceholderUrl, $('#postsetupchecks').data('check-wellknown') === true), + OC.SetupChecks.checkSetup(), + OC.SetupChecks.checkGeneric(), + OC.SetupChecks.checkWOFF2Loading(OC.filePath('core', '', 'fonts/NotoSans-Regular-latin.woff2'), OC.theme.docPlaceholderUrl), + OC.SetupChecks.checkDataProtected() + ).then((check1, check2, check3, check4, check5, check6, check7, check8, check9, check10, check11) => { + const messages = [].concat(check1, check2, check3, check4, check5, check6, check7, check8, check9, check10, check11) + const $el = $('#postsetupchecks') + $('#security-warning-state-loading').addClass('hidden') + + let hasMessages = false + const $errorsEl = $el.find('.errors') + const $warningsEl = $el.find('.warnings') + const $infoEl = $el.find('.info') + + for (let i = 0; i < messages.length; i++) { + switch (messages[i].type) { + case OC.SetupChecks.MESSAGE_TYPE_INFO: + $infoEl.append('<li>' + messages[i].msg + '</li>') + break + case OC.SetupChecks.MESSAGE_TYPE_WARNING: + $warningsEl.append('<li>' + messages[i].msg + '</li>') + break + case OC.SetupChecks.MESSAGE_TYPE_ERROR: + default: + $errorsEl.append('<li>' + messages[i].msg + '</li>') + } + } + + if ($errorsEl.find('li').length > 0) { + $errorsEl.removeClass('hidden') + hasMessages = true + } + if ($warningsEl.find('li').length > 0) { + $warningsEl.removeClass('hidden') + hasMessages = true + } + if ($infoEl.find('li').length > 0) { + $infoEl.removeClass('hidden') + hasMessages = true + } + + if (hasMessages) { + $('#postsetupchecks-hint').removeClass('hidden') + if ($errorsEl.find('li').length > 0) { + $('#security-warning-state-failure').removeClass('hidden') + } else { + $('#security-warning-state-warning').removeClass('hidden') + } + } else { + const securityWarning = $('#security-warning') + if (securityWarning.children('ul').children().length === 0) { + $('#security-warning-state-ok').removeClass('hidden') + } else { + $('#security-warning-state-failure').removeClass('hidden') + } + } + }) + } + + if (document.getElementById('security-warning') !== null) { + setupChecks() + } +}) diff --git a/apps/settings/src/apps.js b/apps/settings/src/apps.js new file mode 100644 index 00000000000..fafdb531399 --- /dev/null +++ b/apps/settings/src/apps.js @@ -0,0 +1,6 @@ +import rebuildNavigation from './service/rebuild-navigation.js' + +window.OC.Settings = window.OC.Settings || {} +window.OC.Settings.Apps = window.OC.Settings.Apps || { + rebuildNavigation +} diff --git a/apps/settings/src/mixins/AppManagement.js b/apps/settings/src/mixins/AppManagement.js index 96f2c1dad4a..cf44a37a53f 100644 --- a/apps/settings/src/mixins/AppManagement.js +++ b/apps/settings/src/mixins/AppManagement.js @@ -20,6 +20,9 @@ * */ +import { showError } from '@nextcloud/dialogs' +import rebuildNavigation from '../service/rebuild-navigation.js' + export default { computed: { appGroups() { @@ -109,33 +112,33 @@ export default { }, forceEnable(appId) { this.$store.dispatch('forceEnableApp', { appId, groups: [] }) - .then((response) => { OC.Settings.Apps.rebuildNavigation() }) - .catch((error) => { OC.Notification.show(error) }) + .then((response) => { rebuildNavigation() }) + .catch((error) => { showError(error) }) }, enable(appId) { this.$store.dispatch('enableApp', { appId, groups: [] }) - .then((response) => { OC.Settings.Apps.rebuildNavigation() }) - .catch((error) => { OC.Notification.show(error) }) + .then((response) => { rebuildNavigation() }) + .catch((error) => { showError(error) }) }, disable(appId) { this.$store.dispatch('disableApp', { appId }) - .then((response) => { OC.Settings.Apps.rebuildNavigation() }) - .catch((error) => { OC.Notification.show(error) }) + .then((response) => { rebuildNavigation() }) + .catch((error) => { showError(error) }) }, remove(appId) { this.$store.dispatch('uninstallApp', { appId }) - .then((response) => { OC.Settings.Apps.rebuildNavigation() }) - .catch((error) => { OC.Notification.show(error) }) + .then((response) => { rebuildNavigation() }) + .catch((error) => { showError(error) }) }, install(appId) { this.$store.dispatch('enableApp', { appId }) - .then((response) => { OC.Settings.Apps.rebuildNavigation() }) - .catch((error) => { OC.Notification.show(error) }) + .then((response) => { rebuildNavigation() }) + .catch((error) => { showError(error) }) }, update(appId) { this.$store.dispatch('updateApp', { appId }) - .then((response) => { OC.Settings.Apps.rebuildNavigation() }) - .catch((error) => { OC.Notification.show(error) }) + .then((response) => { rebuildNavigation() }) + .catch((error) => { showError(error) }) }, }, } diff --git a/apps/settings/src/router.js b/apps/settings/src/router.js index 202702a94df..912e031c0d7 100644 --- a/apps/settings/src/router.js +++ b/apps/settings/src/router.js @@ -28,7 +28,7 @@ import { generateUrl } from '@nextcloud/router' // Dynamic loading const Users = () => import(/* webpackChunkName: 'settings-users' */'./views/Users') -const Apps = () => import(/* webpackChunkName: 'settings-apps' */'./views/Apps') +const Apps = () => import(/* webpackChunkName: 'settings-apps-view' */'./views/Apps') Vue.use(Router) diff --git a/apps/settings/src/service/rebuild-navigation.js b/apps/settings/src/service/rebuild-navigation.js new file mode 100644 index 00000000000..57cb1e439bd --- /dev/null +++ b/apps/settings/src/service/rebuild-navigation.js @@ -0,0 +1,130 @@ +import axios from '@nextcloud/axios' +import { generateOcsUrl } from '@nextcloud/router' + +export default () => { + return axios.get(generateOcsUrl('core/navigation', 2) + '/apps?format=json') + .then(({ data }) => { + if (data.ocs.meta.statuscode !== 200) { + return + } + + const addedApps = {} + const navEntries = data.ocs.data + const container = document.querySelector('#navigation #apps ul') + + // remove disabled apps + navEntries.forEach((entry) => { + if (!container.querySelector('li[data-id="' + entry.id + '"]')) { + addedApps[entry.id] = true + } + }) + + container.querySelectorAll('li[data-id]').forEach((el, index) => { + const id = el.dataset.id + // remove all apps that are not in the correct order + if (!navEntries[index] || (navEntries[index] && navEntries[index].id !== id)) { + el.remove() + document.querySelector(`#appmenu li[data-id=${id}]`).remove() + } + }) + + let previousEntry = {} + // add enabled apps to #navigation and #appmenu + navEntries.forEach((entry) => { + if (container.querySelector(`li[data-id="${entry.id}"]`) === null) { + const li = document.createElement('li') + li.dataset.id = entry.id + const img = `<svg width="20" height="20" viewBox="0 0 20 20" alt=""> + <defs> + <filter id="invertMenuMore-${entry.id}"><feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"></feColorMatrix></filter> + <mask id="hole"> + <rect width="100%" height="100%" fill="white"></rect> + <circle r="4.5" cx="17" cy="3" fill="black"></circle> + </mask> + </defs> + <image x="0" y="0" width="16" height="16" filter="url(#invertMenuMore-${entry.id})" preserveAspectRatio="xMinYMin meet" xlink:href="${entry.icon}" class="app-icon" /> + </svg>` + + const imgElement = document.createElement('template') + imgElement.innerHTML = img + + const a = document.createElement('a') + a.setAttribute('href', entry.href) + + const filename = document.createElement('span') + filename.appendChild(document.createTextNode(entry.name)) + + const loading = document.createElement('div') + loading.setAttribute('class', 'unread-counter') + loading.style.display = 'none' + + // draw attention to the newly added app entry + // by flashing twice the more apps menu + if (addedApps[entry.id]) { + a.classList.add('animated') + } + + a.prepend(imgElement.content.firstChild, loading, filename) + li.append(a) + + // add app icon to the navigation + const previousElement = document.querySelector(`#navigation li[data-id=${previousEntry.id}]`) + if (previousElement) { + previousElement.insertAdjacentElement('afterend', li) + } else { + document.querySelector('#navigation #apps ul').prepend(li) + } + } + + if (document.getElementById('appmenu').querySelector(`li[data-id="${entry.id}"]`) === null) { + const li = document.createElement('li') + li.dataset.id = entry.id + // Generating svg embedded image (see layout.user.php) + let img + if (OCA.Theming && OCA.Theming.inverted) { + img = `<svg width="20" height="20" viewBox="0 0 20 20" alt=""> + <defs> + <filter id="invert"><feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0" /></filter> + </defs> + <image x="0" y="0" width="20" height="20" preserveAspectRatio="xMinYMin meet" filter="url(#invert)" xlink:href="${entry.icon}" class="app-icon" /> + </svg>` + } else { + img = `<svg width="20" height="20" viewBox="0 0 20 20" alt=""> + <image x="0" y="0" width="20" height="20" preserveAspectRatio="xMinYMin meet" xlink:href="${entry.icon}" class="app-icon" /> + </svg>` + } + const imgElement = document.createElement('template') + imgElement.innerHTML = img + + const a = document.createElement('a') + a.setAttribute('href', entry.href) + + const filename = document.createElement('span') + filename.appendChild(document.createTextNode(entry.name)) + + const loading = document.createElement('div') + loading.setAttribute('class', 'icon-loading-dark') + loading.style.display = 'none' + + // draw attention to the newly added app entry + // by flashing twice the more apps menu + if (addedApps[entry.id]) { + a.classList.add('animated') + } + + a.prepend(loading, filename, imgElement.content.firstChild) + li.append(a) + + // add app icon to the navigation + const previousElement = document.querySelector('#appmenu li[data-id=' + previousEntry.id + ']') + if (previousElement) { + previousElement.insertAdjacentElement('afterend', li) + } else { + document.queryElementById('appmenu').prepend(li) + } + } + previousEntry = entry + }) + window.dispatchEvent(new Event('resize')) + }) +} diff --git a/apps/settings/src/store/apps.js b/apps/settings/src/store/apps.js index 038b42e64c9..1efed274b32 100644 --- a/apps/settings/src/store/apps.js +++ b/apps/settings/src/store/apps.js @@ -25,6 +25,8 @@ import api from './api' import Vue from 'vue' import { generateUrl } from '@nextcloud/router' +import { showError, showInfo } from '@nextcloud/dialogs' +import '@nextcloud/dialogs/styles/toast.scss' const state = { apps: [], @@ -37,7 +39,7 @@ const state = { const mutations = { APPS_API_FAILURE(state, error) { - OC.Notification.showHtml(t('settings', 'An error occured during the request. Unable to proceed.') + '<br>' + error.error.response.data.data.message, { timeout: 7 }) + showError(t('settings', 'An error occured during the request. Unable to proceed.') + '<br>' + error.error.response.data.data.message, { timeout: 7, isHTML: true }) console.error(state, error) }, @@ -180,16 +182,16 @@ const actions = { return api.get(generateUrl('apps/files')) .then(() => { if (response.data.update_required) { - OC.dialogs.info( + showInfo( t( 'settings', 'The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds.' ), - t('settings', 'App update'), - function() { - window.location.reload() - }, - true + { + onClick: () => window.location.reload(), + close: false, + + } ) setTimeout(function() { location.reload() |