diff options
Diffstat (limited to 'apps/updatenotification/src/components/UpdateNotification.vue')
| -rw-r--r-- | apps/updatenotification/src/components/UpdateNotification.vue | 506 |
1 files changed, 252 insertions, 254 deletions
diff --git a/apps/updatenotification/src/components/UpdateNotification.vue b/apps/updatenotification/src/components/UpdateNotification.vue index 9d18fab2a11..94c58dbdfd9 100644 --- a/apps/updatenotification/src/components/UpdateNotification.vue +++ b/apps/updatenotification/src/components/UpdateNotification.vue @@ -1,23 +1,26 @@ +<!-- + - SPDX-FileCopyrightText: 2019-2024 Nextcloud GmbH and Nextcloud contributors + - SPDX-License-Identifier: AGPL-3.0-or-later +--> <template> - <div id="updatenotification" class="followupsection"> + <NcSettingsSection id="updatenotification" :name="t('updatenotification', 'Update')"> <div class="update"> <template v-if="isNewVersionAvailable"> - <p v-if="versionIsEol"> - <span class="warning"> - <span class="icon icon-error-white" /> - {{ t('updatenotification', 'The version you are running is not maintained anymore. Please make sure to update to a supported version as soon as possible.') }} - </span> - </p> + <NcNoteCard v-if="versionIsEol" type="warning"> + {{ t('updatenotification', 'The version you are running is not maintained anymore. Please make sure to update to a supported version as soon as possible.') }} + </NcNoteCard> <p> + <!-- eslint-disable-next-line vue/no-v-html --> <span v-html="newVersionAvailableString" /><br> <span v-if="!isListFetched" class="icon icon-loading-small" /> + <!-- eslint-disable-next-line vue/no-v-html --> <span v-html="statusText" /> </p> <template v-if="missingAppUpdates.length"> - <h3 @click="toggleHideMissingUpdates"> - {{ t('updatenotification', 'Apps missing updates') }} + <h3 class="clickable" @click="toggleHideMissingUpdates"> + {{ t('updatenotification', 'Apps missing compatible version') }} <span v-if="!hideMissingUpdates" class="icon icon-triangle-n" /> <span v-if="hideMissingUpdates" class="icon icon-triangle-s" /> </h3> @@ -29,8 +32,8 @@ </template> <template v-if="availableAppUpdates.length"> - <h3 @click="toggleHideAvailableUpdates"> - {{ t('updatenotification', 'Apps with available updates') }} + <h3 class="clickable" @click="toggleHideAvailableUpdates"> + {{ t('updatenotification', 'Apps with compatible version') }} <span v-if="!hideAvailableUpdates" class="icon icon-triangle-n" /> <span v-if="hideAvailableUpdates" class="icon icon-triangle-s" /> </h3> @@ -41,8 +44,14 @@ </ul> </template> + <template v-if="!isWebUpdaterRecommended && updaterEnabled && webUpdaterEnabled"> + <h3 class="warning"> + {{ t('updatenotification', 'Please note that the web updater is not recommended with more than 100 accounts! Please use the command line updater instead!') }} + </h3> + </template> + <div> - <a v-if="updaterEnabled" + <a v-if="updaterEnabled && webUpdaterEnabled" href="#" class="button primary" @click="clickUpdaterButton">{{ t('updatenotification', 'Open updater') }}</a> @@ -50,14 +59,29 @@ :href="downloadLink" class="button" :class="{ hidden: !updaterEnabled }">{{ t('updatenotification', 'Download now') }}</a> - <div v-if="whatsNew" class="whatsNew"> - <div class="toggleWhatsNew"> - <a v-click-outside="hideMenu" class="button" @click="toggleMenu">{{ t('updatenotification', 'What\'s new?') }}</a> - <div class="popovermenu" :class="{ 'menu-center': true, open: openedWhatsNew }"> - <PopoverMenu :menu="whatsNew" /> - </div> - </div> - </div> + <span v-if="updaterEnabled && !webUpdaterEnabled"> + {{ t('updatenotification', 'Web updater is disabled. Please use the command line updater or the appropriate update mechanism for your installation method (e.g. Docker pull) to update.') }} + </span> + <NcActions v-if="whatsNewData || changelogURL" + :force-menu="true" + :menu-name="t('updatenotification', 'What\'s new?')" + type="tertiary"> + <template #icon> + <IconNewBox :size="20" /> + </template> + <template #default> + <NcActionCaption v-for="changes,index in whatsNewData" :key="index" :name="changes" /> + <NcActionLink v-if="changelogURL" + :href="changelogURL" + close-after-click + target="_blank"> + {{ t('updatenotification', 'View changelog') }} + <template #icon> + <IconLink :size="20" /> + </template> + </NcActionLink> + </template> + </NcActions> </div> </template> <template v-else-if="!isUpdateChecked"> @@ -65,7 +89,11 @@ </template> <template v-else> {{ t('updatenotification', 'Your version is up to date.') }} - <span v-tooltip.auto="lastCheckedOnString" class="icon-info svg" /> + <a :title="lastCheckedOnString" + :aria-label="lastCheckedOnString" + href="https://nextcloud.com/changelog/" + class="icon-info details" + target="_blank" /> </template> <template v-if="!isDefaultUpdateServerURL"> @@ -75,63 +103,116 @@ </template> </div> - <h3 class="update-channel-selector"> - {{ t('updatenotification', 'Update channel:') }} - <div v-click-outside="closeUpdateChannelMenu" class="update-menu"> - <span class="icon-update-menu" @click="toggleUpdateChannelMenu"> - {{ localizedChannelName }} - <span class="icon-triangle-s" /> - </span> - <div class="popovermenu menu menu-center" :class="{ 'show-menu': openedUpdateChannelMenu}"> - <PopoverMenu :menu="channelList" /> - </div> - </div> - </h3> - <span id="channel_save_msg" class="msg" /><br> + <h3>{{ t('updatenotification', 'Update channel') }}</h3> + <p class="inlineblock"> + {{ t('updatenotification', 'Changing the update channel also affects the apps management page. E.g. after switching to the beta channel, beta app updates will be offered to you in the apps management page.') }} + </p> + <div class="update-channel-selector"> + <span>{{ t('updatenotification', 'Current update channel:') }}</span> + <NcActions :force-menu="true" + :menu-name="localizedChannelName" + type="tertiary"> + <template #icon> + <IconChevronDown :size="20" /> + </template> + <template #default> + <NcActionButton v-for="channel in channelList" + :key="channel.value" + :disabled="channel.disabled" + :name="channel.text" + :value="channel.value" + :model-value="currentChannel" + type="radio" + close-after-click + @update:modelValue="changeReleaseChannel"> + <template #icon> + <component :is="channel.icon" :size="20" /> + </template> + {{ channel.longtext }} + </NcActionButton> + </template> + </NcActions> + </div> <p> <em>{{ t('updatenotification', 'You can always update to a newer version. But you can never downgrade to a more stable version.') }}</em><br> - <em v-html="noteDelayedStableString"></em> + <!-- eslint-disable-next-line vue/no-v-html --> + <em v-html="noteDelayedStableString" /> </p> - <p id="oca_updatenotification_groups"> - {{ t('updatenotification', 'Notify members of the following groups about available updates:') }} - <Multiselect v-model="notifyGroups" - :options="availableGroups" - :multiple="true" - label="label" - track-by="value" - :tag-width="75" /><br> - <em v-if="currentChannel === 'daily' || currentChannel === 'git'">{{ t('updatenotification', 'Only notification for app updates are available.') }}</em> + <NcSelect id="notify-members-settings-select-wrapper" + v-model="notifyGroups" + :input-label="t('updatenotification', 'Notify members of the following groups about available updates:')" + :options="groups" + :multiple="true" + label="displayname" + :loading="loadingGroups" + :close-on-select="false" + @search="searchGroup"> + <template #no-options> + {{ t('updatenotification', 'No groups') }} + </template> + </NcSelect> + <p> + <em v-if="currentChannel === 'daily' || currentChannel === 'git'">{{ t('updatenotification', 'Only notifications for app updates are available.') }}</em> <em v-if="currentChannel === 'daily'">{{ t('updatenotification', 'The selected update channel makes dedicated notifications for the server obsolete.') }}</em> - <em v-if="currentChannel === 'git'">{{ t('updatenotification', 'The selected update channel does not support updates of the server.') }}</em> + <em v-else-if="currentChannel === 'git'">{{ t('updatenotification', 'The selected update channel does not support updates of the server.') }}</em> </p> - </div> + </NcSettingsSection> </template> <script> +import { showSuccess } from '@nextcloud/dialogs' +import { loadState } from '@nextcloud/initial-state' +import { getLoggerBuilder } from '@nextcloud/logger' import { generateUrl, getRootUrl, generateOcsUrl } from '@nextcloud/router' -import PopoverMenu from '@nextcloud/vue/dist/Components/PopoverMenu' -import Multiselect from '@nextcloud/vue/dist/Components/Multiselect' -import { VTooltip } from 'v-tooltip' -import ClickOutside from 'vue-click-outside' -VTooltip.options.defaultHtml = false +import axios from '@nextcloud/axios' +import NcActions from '@nextcloud/vue/components/NcActions' +import NcActionButton from '@nextcloud/vue/components/NcActionButton' +import NcActionCaption from '@nextcloud/vue/components/NcActionCaption' +import NcActionLink from '@nextcloud/vue/components/NcActionLink' +import NcNoteCard from '@nextcloud/vue/components/NcNoteCard' +import NcSelect from '@nextcloud/vue/components/NcSelect' +import NcSettingsSection from '@nextcloud/vue/components/NcSettingsSection' +import IconChevronDown from 'vue-material-design-icons/ChevronDown.vue' +import IconCloudCheckVariant from 'vue-material-design-icons/CloudCheckVariant.vue' +import IconLink from 'vue-material-design-icons/Link.vue' +import IconNewBox from 'vue-material-design-icons/NewBox.vue' +import IconPencil from 'vue-material-design-icons/PencilOutline.vue' +import IconSourceBranch from 'vue-material-design-icons/SourceBranch.vue' +import IconStar from 'vue-material-design-icons/Star.vue' +import IconWeatherNight from 'vue-material-design-icons/WeatherNight.vue' +import IconWrench from 'vue-material-design-icons/Wrench.vue' +import debounce from 'debounce' + +const logger = getLoggerBuilder() + .setApp('updatenotification') + .detectUser() + .build() export default { name: 'UpdateNotification', components: { - Multiselect, - PopoverMenu, - }, - directives: { - ClickOutside, - tooltip: VTooltip, + IconChevronDown, + IconLink, + IconNewBox, + NcActions, + NcActionButton, + NcActionCaption, + NcActionLink, + NcNoteCard, + NcSelect, + NcSettingsSection, }, + data() { return { + loadingGroups: false, newVersionString: '', lastCheckedDate: '', isUpdateChecked: false, + webUpdaterEnabled: true, + isWebUpdaterRecommended: true, updaterEnabled: true, versionIsEol: false, downloadLink: '', @@ -143,7 +224,7 @@ export default { currentChannel: '', channels: [], notifyGroups: '', - availableGroups: [], + groups: [], isDefaultUpdateServerURL: true, enableChangeWatcher: false, @@ -159,9 +240,6 @@ export default { } }, - _$el: null, - _$notifyGroups: null, - computed: { newVersionAvailableString() { return t('updatenotification', 'A new version is available: <strong>{newVersionString}</strong>', { @@ -170,18 +248,19 @@ export default { }, noteDelayedStableString() { - return t('updatenotification', 'Note that after a new release the update only shows up after the first minor release or later. We roll out new versions spread out over time to our users and sometimes skip a version when issues are found. Learn more about updates and release channels at {link}').replace('{link}', '<a href="https://nextcloud.com/release-channels/">https://nextcloud.com/release-channels/</a>') + return t('updatenotification', 'Note that after a new release the update only shows up after the first minor release or later. We roll out new versions spread out over time and sometimes skip a version when issues are found. Learn more about updates and release channels at {link}') + .replace('{link}', '<a href="https://nextcloud.com/release-channels/">https://nextcloud.com/release-channels/</a>') }, lastCheckedOnString() { - return t('updatenotification', 'Checked on {lastCheckedDate}', { + return t('updatenotification', 'Checked on {lastCheckedDate} - Open changelog', { lastCheckedDate: this.lastCheckedDate, }) }, statusText() { if (!this.isListFetched) { - return t('updatenotification', 'Checking apps for compatible updates') + return t('updatenotification', 'Checking apps for compatible versions') } if (this.appStoreDisabled) { @@ -189,32 +268,12 @@ export default { } if (this.appStoreFailed) { - return t('updatenotification', 'Could not connect to the appstore or the appstore returned no updates at all. Search manually for updates or make sure your server has access to the internet and can connect to the appstore.') + return t('updatenotification', 'Could not connect to the App Store or no updates have been returned at all. Search manually for updates or make sure your server has access to the internet and can connect to the App Store.') } return this.missingAppUpdates.length === 0 - ? t('updatenotification', '<strong>All</strong> apps have an update for this version available', this) - : n('updatenotification', '<strong>%n</strong> app has no update for this version available', '<strong>%n</strong> apps have no update for this version available', this.missingAppUpdates.length) - }, - - whatsNew() { - if (this.whatsNewData.length === 0) { - return null - } - const whatsNew = [] - for (const i in this.whatsNewData) { - whatsNew[i] = { icon: 'icon-checkmark', longtext: this.whatsNewData[i] } - } - if (this.changelogURL) { - whatsNew.push({ - href: this.changelogURL, - text: t('updatenotification', 'View changelog'), - icon: 'icon-link', - target: '_blank', - action: '', - }) - } - return whatsNew + ? t('updatenotification', '<strong>All</strong> apps have a compatible version for this Nextcloud version available.', this) + : n('updatenotification', '<strong>%n</strong> app has no compatible version for this Nextcloud version available.', '<strong>%n</strong> apps have no compatible version for this Nextcloud version available.', this.missingAppUpdates.length) }, channelList() { @@ -223,43 +282,41 @@ export default { channelList.push({ text: t('updatenotification', 'Enterprise'), longtext: t('updatenotification', 'For enterprise use. Provides always the latest patch level, but will not update to the next major release immediately. That update happens once Nextcloud GmbH has done additional hardening and testing for large-scale and mission-critical deployments. This channel is only available to customers and provides the Nextcloud Enterprise package.'), - icon: 'icon-star', + icon: IconStar, active: this.currentChannel === 'enterprise', disabled: !this.hasValidSubscription, - action: this.changeReleaseChannelToEnterprise, + value: 'enterprise', }) channelList.push({ text: t('updatenotification', 'Stable'), longtext: t('updatenotification', 'The most recent stable version. It is suited for regular use and will always update to the latest major version.'), - icon: 'icon-checkmark', - active: this.currentChannel === 'stable', - action: this.changeReleaseChannelToStable, + icon: IconCloudCheckVariant, + value: 'stable', }) channelList.push({ text: t('updatenotification', 'Beta'), longtext: t('updatenotification', 'A pre-release version only for testing new features, not for production environments.'), - icon: 'icon-category-customization', - active: this.currentChannel === 'beta', - action: this.changeReleaseChannelToBeta, + icon: IconWrench, + value: 'beta', }) - if (this.isNonDefaultChannel) { + if (this.isNonDefaultChannel(this.currentChannel)) { + const nonDefaultIcons = { + daily: IconWeatherNight, + git: IconSourceBranch, + } channelList.push({ text: this.currentChannel, - icon: 'icon-rename', - active: true, + icon: nonDefaultIcons[this.currentChannel] || IconPencil, + value: this.currentChannel, }) } return channelList }, - isNonDefaultChannel() { - return this.currentChannel !== 'enterprise' && this.currentChannel !== 'stable' && this.currentChannel !== 'beta' - }, - localizedChannelName() { switch (this.currentChannel) { case 'enterprise': @@ -275,53 +332,50 @@ export default { }, watch: { - notifyGroups(selectedOptions) { + notifyGroups() { if (!this.enableChangeWatcher) { + // The first time is when loading the app + this.enableChangeWatcher = true return } - const selectedGroups = [] - _.each(selectedOptions, function(group) { - selectedGroups.push(group.value) + const groups = this.notifyGroups.map(group => { + return group.id }) - OCP.AppConfig.setValue('updatenotification', 'notify_groups', JSON.stringify(selectedGroups)) + OCP.AppConfig.setValue('updatenotification', 'notify_groups', JSON.stringify(groups)) }, isNewVersionAvailable() { if (!this.isNewVersionAvailable) { return } - $.ajax({ - url: generateOcsUrl('apps/updatenotification/api/v1/applist', 2) + this.newVersion, - type: 'GET', - beforeSend(request) { - request.setRequestHeader('Accept', 'application/json') - }, - success: function(response) { - this.availableAppUpdates = response.ocs.data.available - this.missingAppUpdates = response.ocs.data.missing - this.isListFetched = true - this.appStoreFailed = false - }.bind(this), - error: function(xhr) { - this.availableAppUpdates = [] - this.missingAppUpdates = [] - this.appStoreDisabled = xhr.responseJSON.ocs.data.appstore_disabled - this.isListFetched = true - this.appStoreFailed = true - }.bind(this), + axios.get(generateOcsUrl('apps/updatenotification/api/v1/applist/{newVersion}', { + newVersion: this.newVersion, + })).then(({ data }) => { + this.availableAppUpdates = data.ocs.data.available + this.missingAppUpdates = data.ocs.data.missing + this.isListFetched = true + this.appStoreFailed = false + }).catch(({ response }) => { + this.availableAppUpdates = [] + this.missingAppUpdates = [] + this.appStoreDisabled = response.data.ocs.data.appstore_disabled + this.isListFetched = true + this.appStoreFailed = true }) }, }, beforeMount() { // Parse server data - const data = JSON.parse($('#updatenotification').attr('data-json')) + const data = loadState('updatenotification', 'data') this.newVersion = data.newVersion this.newVersionString = data.newVersionString this.lastCheckedDate = data.lastChecked this.isUpdateChecked = data.isUpdateChecked + this.webUpdaterEnabled = data.webUpdaterEnabled + this.isWebUpdaterRecommended = data.isWebUpdaterRecommended this.updaterEnabled = data.updaterEnabled this.downloadLink = data.downloadLink this.isNewVersionAvailable = data.isNewVersionAvailable @@ -342,103 +396,91 @@ export default { this.whatsNewData = this.whatsNewData.concat(data.changes.whatsNew.regular) } }, - mounted() { - this._$el = $(this.$el) - this._$notifyGroups = this._$el.find('#oca_updatenotification_groups_list') - this._$notifyGroups.on('change', function() { - this.$emit('input') - }.bind(this)) - - $.ajax({ - url: generateOcsUrl('cloud', 2) + '/groups', - dataType: 'json', - success: function(data) { - const results = [] - $.each(data.ocs.data.groups, function(i, group) { - results.push({ value: group, label: group }) - }) - this.availableGroups = results - this.enableChangeWatcher = true - }.bind(this), - }) + mounted() { + this.searchGroup() }, methods: { + searchGroup: debounce(async function(query) { + this.loadingGroups = true + try { + const response = await axios.get(generateOcsUrl('cloud/groups/details'), { + search: query, + limit: 20, + offset: 0, + }) + this.groups = response.data.ocs.data.groups.sort(function(a, b) { + return a.displayname.localeCompare(b.displayname) + }) + } catch (err) { + logger.error('Could not fetch groups', err) + } finally { + this.loadingGroups = false + } + }, 500), /** - * Creates a new authentication token and loads the updater URL - */ + * Creates a new authentication token and loads the updater URL + */ clickUpdaterButton() { - $.ajax({ - url: generateUrl('/apps/updatenotification/credentials'), - }).success(function(token) { + axios.get(generateUrl('/apps/updatenotification/credentials')) + .then(({ data }) => { // create a form to send a proper post request to the updater - const form = document.createElement('form') - form.setAttribute('method', 'post') - form.setAttribute('action', getRootUrl() + '/updater/') + const form = document.createElement('form') + form.setAttribute('method', 'post') + form.setAttribute('action', getRootUrl() + '/updater/') - const hiddenField = document.createElement('input') - hiddenField.setAttribute('type', 'hidden') - hiddenField.setAttribute('name', 'updater-secret-input') - hiddenField.setAttribute('value', token) + const hiddenField = document.createElement('input') + hiddenField.setAttribute('type', 'hidden') + hiddenField.setAttribute('name', 'updater-secret-input') + hiddenField.setAttribute('value', data) - form.appendChild(hiddenField) + form.appendChild(hiddenField) - document.body.appendChild(form) - form.submit() - }) - }, - changeReleaseChannelToEnterprise() { - this.changeReleaseChannel('enterprise') - }, - changeReleaseChannelToStable() { - this.changeReleaseChannel('stable') + document.body.appendChild(form) + form.submit() + }) }, - changeReleaseChannelToBeta() { - this.changeReleaseChannel('beta') + + isNonDefaultChannel(channel) { + return !['enterprise', 'stable', 'beta'].includes(channel) }, + changeReleaseChannel(channel) { + if (this.isNonDefaultChannel(channel)) { + return + } + this.currentChannel = channel - $.ajax({ - url: generateUrl('/apps/updatenotification/channel'), - type: 'POST', - data: { - channel: this.currentChannel, - }, - success(data) { - OC.msg.finishedAction('#channel_save_msg', data) - }, + axios.post(generateUrl('/apps/updatenotification/channel'), { + channel: this.currentChannel, + }).then(({ data }) => { + showSuccess(data.data.message) }) this.openedUpdateChannelMenu = false }, - toggleUpdateChannelMenu() { - this.openedUpdateChannelMenu = !this.openedUpdateChannelMenu - }, toggleHideMissingUpdates() { this.hideMissingUpdates = !this.hideMissingUpdates }, toggleHideAvailableUpdates() { this.hideAvailableUpdates = !this.hideAvailableUpdates }, - toggleMenu() { - this.openedWhatsNew = !this.openedWhatsNew - }, - closeUpdateChannelMenu() { - this.openedUpdateChannelMenu = false - }, - hideMenu() { - this.openedWhatsNew = false - }, }, } </script> <style lang="scss" scoped> #updatenotification { - margin-top: -25px; - margin-bottom: 200px; + & > * { + max-width: 900px; + } + + .topMargin { + margin-top: 15px; + } + div.update, p:not(.inlineblock) { margin-bottom: 25px; @@ -447,18 +489,18 @@ export default { margin-top: 25px; } h3 { - cursor: pointer; - .icon { + &.clickable { cursor: pointer; - } - &:first-of-type { - margin-top: 0; - } - &.update-channel-selector { - display: inline-block; - cursor: inherit; + .icon { + cursor: pointer; + } } } + .update-channel-selector { + display: flex; + align-items: center; + gap: 12px; + } .icon { display: inline-block; margin-bottom: -3px; @@ -466,64 +508,20 @@ export default { .icon-triangle-s, .icon-triangle-n { opacity: 0.5; } - .whatsNew { - display: inline-block; - } - .toggleWhatsNew { - position: relative; - } - .popovermenu { - p { - margin-bottom: 0; - width: 100%; - } - margin-top: 5px; - width: 300px; - } .applist { margin-bottom: 25px; } - - .update-menu { - position: relative; - cursor: pointer; - margin-left: 3px; - display: inline-block; - .icon-update-menu { - cursor: inherit; - .icon-triangle-s { - display: inline-block; - vertical-align: middle; - cursor: inherit; - opacity: 1; - } - } - .popovermenu { - display: none; - top: 28px; - &.show-menu { - display: block; - } - } - } } </style> <style lang="scss"> - /* override needed to make menu wider */ - #updatenotification .popovermenu { - p { - margin-top: 5px; - width: 100%; +#updatenotification { + /* override NcSelect styling so that label can have correct width */ + #notify-members-settings-select-wrapper { + width: fit-content; + + .vs__dropdown-toggle { + min-width: 100%; } - margin-top: 5px; - width: 300px; - } - /* override needed to replace yellow hover state with a dark one */ - #updatenotification .update-menu .icon-star:hover, - #updatenotification .update-menu .icon-star:focus { - background-image: var(--icon-star-000); - } - #updatenotification .topMargin { - margin-top: 15px; } +} </style> |