Skip to content

fix: move download and enable button to outside of details tab #59465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mykh-hailo wants to merge 1 commit into
base: master
Choose a base branch
from
+202 −125
Open

fix: move download and enable button to outside of details tab #59465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
121 changes: 1 addition & 120 deletions apps/settings/src/components/AppStoreSidebar/AppDetailsTab.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,67 +46,6 @@
<span slot="noResult">{{ t('settings', 'No results') }}</span>
</NcSelect>
</div>
<div class="app-details__actions-manage">
<input
v-if="app.update"
class="update primary"
type="button"
:value="t('settings', 'Update to {version}', { version: app.update })"
:disabled="installing || isLoading || isManualInstall"
@click="update(app.id)">
<input
v-if="app.canUnInstall"
class="uninstall"
type="button"
:value="t('settings', 'Remove')"
:disabled="installing || isLoading"
@click="remove(app.id, removeData)">
<input
v-if="app.active"
class="enable"
type="button"
:value="disableButtonText"
:disabled="installing || isLoading || isInitializing || isDeploying"
@click="disable(app.id)">
<input
v-if="!app.active && (app.canInstall || app.isCompatible)"
:title="enableButtonTooltip"
:aria-label="enableButtonTooltip"
class="enable primary"
type="button"
:value="enableButtonText"
:disabled="!app.canInstall || installing || isLoading || !defaultDeployDaemonAccessible || isInitializing || isDeploying"
@click="enableButtonAction">
<input
v-else-if="!app.active && !app.canInstall"
:title="forceEnableButtonTooltip"
:aria-label="forceEnableButtonTooltip"
class="enable force"
type="button"
:value="forceEnableButtonText"
:disabled="installing || isLoading"
@click="forceEnable(app.id)">
<NcButton
v-if="app?.app_api && (app.canInstall || app.isCompatible)"
:aria-label="t('settings', 'Advanced deploy options')"
variant="secondary"
@click="() => showDeployOptionsModal = true">
<template #icon>
<NcIconSvgWrapper :path="mdiToyBrickPlusOutline" />
</template>
{{ t('settings', 'Deploy options') }}
</NcButton>
</div>
<p v-if="!defaultDeployDaemonAccessible" class="warning">
{{ t('settings', 'Default Deploy daemon is not accessible') }}
</p>
<NcCheckboxRadioSwitch
v-if="app.canUnInstall"
:model-value="removeData"
:disabled="installing || isLoading || !defaultDeployDaemonAccessible"
@update:modelValue="toggleRemoveData">
{{ t('settings', 'Delete data on remove') }}
</NcCheckboxRadioSwitch>
</div>

<ul class="app-details__dependencies">
Expand Down Expand Up @@ -208,10 +147,6 @@
</div>
</div>

<AppDeployOptionsModal
v-if="app?.app_api"
:show.sync="showDeployOptionsModal"
:app="app" />
<DaemonSelectionDialog
v-if="app?.app_api"
:show.sync="showSelectDaemonModal"
Expand All @@ -222,16 +157,14 @@
</template>

<script>
import { mdiBugOutline, mdiFeatureSearchOutline, mdiStar, mdiTextBoxOutline, mdiTooltipQuestionOutline, mdiToyBrickPlusOutline } from '@mdi/js'
import { mdiBugOutline, mdiFeatureSearchOutline, mdiStar, mdiTextBoxOutline, mdiTooltipQuestionOutline } from '@mdi/js'
import { subscribe, unsubscribe } from '@nextcloud/event-bus'
import NcAppSidebarTab from '@nextcloud/vue/components/NcAppSidebarTab'
import NcButton from '@nextcloud/vue/components/NcButton'
import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
import NcDateTime from '@nextcloud/vue/components/NcDateTime'
import NcIconSvgWrapper from '@nextcloud/vue/components/NcIconSvgWrapper'
import NcSelect from '@nextcloud/vue/components/NcSelect'
import DaemonSelectionDialog from '../AppAPI/DaemonSelectionDialog.vue'
import AppDeployOptionsModal from './AppDeployOptionsModal.vue'
import AppManagement from '../../mixins/AppManagement.js'
import { useAppApiStore } from '../../store/app-api-store.js'
import { useAppsStore } from '../../store/apps-store.js'
Expand All @@ -245,8 +178,6 @@ export default {
NcDateTime,
NcIconSvgWrapper,
NcSelect,
NcCheckboxRadioSwitch,
AppDeployOptionsModal,
DaemonSelectionDialog,
},

Expand Down Expand Up @@ -274,15 +205,12 @@ export default {
mdiStar,
mdiTextBoxOutline,
mdiTooltipQuestionOutline,
mdiToyBrickPlusOutline,
}
},

data() {
return {
groupCheckedAppsData: false,
removeData: false,
showDeployOptionsModal: false,
showSelectDaemonModal: false,
deployOptions: null,
}
Expand Down Expand Up @@ -409,29 +337,10 @@ export default {
},

methods: {
toggleRemoveData() {
this.removeData = !this.removeData
},

showSelectionModal(deployOptions = null) {
this.deployOptions = deployOptions
this.showSelectDaemonModal = true
},

async enableButtonAction() {
if (!this.app?.app_api) {
this.enable(this.app.id)
return
}
await this.appApiStore.fetchDockerDaemons()
if (this.appApiStore.dockerDaemons.length === 1 && this.app.needsDownload) {
this.enable(this.app.id, this.appApiStore.dockerDaemons[0])
} else if (this.app.needsDownload) {
this.showSelectionModal()
} else {
this.enable(this.app.id, this.app.daemon)
}
},
},
}
</script>
Expand All @@ -440,21 +349,6 @@ export default {
.app-details {
padding: 20px;

&__actions {
// app management
&-manage {
// if too many, shrink them and ellipsis
display: flex;
align-items: center;
input {
flex: 0 1 auto;
min-width: 0;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
}
}
&__authors {
color: var(--color-text-maxcontrast);
}
Expand Down Expand Up @@ -498,19 +392,6 @@ export default {
}
}

.force {
color: var(--color-text-error);
border-color: var(--color-border-error);
background: var(--color-main-background);
}

.force:hover,
.force:active {
color: var(--color-main-background);
border-color: var(--color-border-error) !important;
background: var(--color-error);
}

.missing-dependencies {
list-style: initial;
list-style-type: initial;
Expand Down
178 changes: 178 additions & 0 deletions apps/settings/src/components/AppStoreSidebar/AppStoreSidebarManageActions.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,178 @@
<!--
- SPDX-FileCopyrightText: 2018 Nextcloud GmbH and Nextcloud contributors
- SPDX-License-Identifier: AGPL-3.0-or-later
-->

<template>
<div class="app-sidebar-manage">
<div class="app-sidebar-manage__actions">
<input
v-if="app.update"
class="update primary"
type="button"
:value="t('settings', 'Update to {version}', { version: app.update })"
:disabled="installing || isLoading || isManualInstall"
@click="update(app.id)">
<input
v-if="app.canUnInstall"
class="uninstall"
type="button"
:value="t('settings', 'Remove')"
:disabled="installing || isLoading"
@click="remove(app.id, removeData)">
<input
v-if="app.active"
class="enable"
type="button"
:value="disableButtonText"
:disabled="installing || isLoading || isInitializing || isDeploying"
@click="disable(app.id)">
<input
v-if="!app.active && (app.canInstall || app.isCompatible)"
:title="enableButtonTooltip"
:aria-label="enableButtonTooltip"
class="enable primary"
type="button"
:value="enableButtonText"
:disabled="!app.canInstall || installing || isLoading || !defaultDeployDaemonAccessible || isInitializing || isDeploying"
@click="enableButtonAction">
<input
v-else-if="!app.active && !app.canInstall"
:title="forceEnableButtonTooltip"
:aria-label="forceEnableButtonTooltip"
class="enable force"
type="button"
:value="forceEnableButtonText"
:disabled="installing || isLoading"
@click="forceEnable(app.id)">
<NcButton
v-if="app?.app_api && (app.canInstall || app.isCompatible)"
:aria-label="t('settings', 'Advanced deploy options')"
variant="secondary"
@click="() => showDeployOptionsModal = true">
<template #icon>
<NcIconSvgWrapper :path="mdiToyBrickPlusOutline" />
</template>
{{ t('settings', 'Deploy options') }}
</NcButton>
</div>
<p v-if="!defaultDeployDaemonAccessible" class="warning">
{{ t('settings', 'Default Deploy daemon is not accessible') }}
</p>
<NcCheckboxRadioSwitch
v-if="app.canUnInstall"
:model-value="removeData"
:disabled="installing || isLoading || !defaultDeployDaemonAccessible"
@update:modelValue="toggleRemoveData">
{{ t('settings', 'Delete data on remove') }}
</NcCheckboxRadioSwitch>
<AppDeployOptionsModal
v-if="app?.app_api"
:show.sync="showDeployOptionsModal"
:app="app" />
</div>
</template>

<script>
import { mdiToyBrickPlusOutline } from '@mdi/js'
import { emit } from '@nextcloud/event-bus'
import { translate as t } from '@nextcloud/l10n'
import NcButton from '@nextcloud/vue/components/NcButton'
import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
import NcIconSvgWrapper from '@nextcloud/vue/components/NcIconSvgWrapper'
import AppDeployOptionsModal from './AppDeployOptionsModal.vue'
import AppManagement from '../../mixins/AppManagement.js'
import { useAppApiStore } from '../../store/app-api-store.js'
import { useAppsStore } from '../../store/apps-store.js'

export default {
name: 'AppStoreSidebarManageActions',

components: {
NcButton,
NcCheckboxRadioSwitch,
NcIconSvgWrapper,
AppDeployOptionsModal,
},

mixins: [AppManagement],

props: {
app: {
type: Object,
required: true,
},
},

setup() {
const store = useAppsStore()
const appApiStore = useAppApiStore()
return {
store,
appApiStore,
t,
mdiToyBrickPlusOutline,
}
},

data() {
return {
removeData: false,
showDeployOptionsModal: false,
}
},

methods: {
toggleRemoveData() {
this.removeData = !this.removeData
},

async enableButtonAction() {
if (!this.app?.app_api) {
this.enable(this.app.id)
return
}
await this.appApiStore.fetchDockerDaemons()
if (this.appApiStore.dockerDaemons.length === 1 && this.app.needsDownload) {
this.enable(this.app.id, this.appApiStore.dockerDaemons[0])
} else if (this.app.needsDownload) {
emit('showDaemonSelectionModal')
} else {
this.enable(this.app.id, this.app.daemon)
}
},
},
}
</script>

<style scoped lang="scss">
.app-sidebar-manage {
&__actions {
display: flex;
align-items: center;
flex-wrap: wrap;
gap: 4px;

input {
flex: 0 1 auto;
min-width: 0;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
}
}

.force {
color: var(--color-text-error);
border-color: var(--color-border-error);
background: var(--color-main-background);
}

.force:hover,
.force:active {
color: var(--color-main-background);
border-color: var(--color-border-error) !important;
background: var(--color-error);
}
</style>
Loading