no selection modal when only one daemon

Signed-off-by: janepie <[email protected]>
nextcloud · Sep 27, 2024 · 64a8d39 · 64a8d39
1 parent 482bde2
commit 64a8d39
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 45 deletions.
diff --git a/js/app_api-main.js b/js/app_api-main.js
@@ -143345,7 +143345,7 @@ module.exports = /*#__PURE__*/JSON.parse('{"compressed":true,"categories":[{"id"
 /******/ 		// This function allow to reference async chunks
 /******/ 		__webpack_require__.u = (chunkId) => {
 /******/ 			// return url for filenames based on template
-/******/ 			return "app_api-" + chunkId + ".js?v=" + {"node_modules_nextcloud_dialogs_dist_chunks_index-C1azEbgd_mjs":"ce0d37e24678dfb5ef24","vendors-node_modules_vue-material-design-icons_Alert_vue-node_modules_vue-material-design-ico-b44ec1":"276c7b3da988dc665f35","src_views_Apps_vue":"c83d1d4fb9f3473331b9","vendors-node_modules_nextcloud_dialogs_dist_chunks_FilePicker-CDU2njOJ_mjs":"5cd69d99367c861809dd"}[chunkId] + "";
+/******/ 			return "app_api-" + chunkId + ".js?v=" + {"node_modules_nextcloud_dialogs_dist_chunks_index-C1azEbgd_mjs":"ce0d37e24678dfb5ef24","vendors-node_modules_vue-material-design-icons_Alert_vue-node_modules_vue-material-design-ico-b44ec1":"276c7b3da988dc665f35","src_views_Apps_vue":"1db7dec7e96ddf8caad3","vendors-node_modules_nextcloud_dialogs_dist_chunks_FilePicker-CDU2njOJ_mjs":"5cd69d99367c861809dd"}[chunkId] + "";
 /******/ 		};
 /******/ 	})();
 /******/ 	

diff --git a/js/app_api-main.js.map b/js/app_api-main.js.map
diff --git a/js/app_api-src_views_Apps_vue.js b/js/app_api-src_views_Apps_vue.js
diff --git a/js/app_api-src_views_Apps_vue.js.map b/js/app_api-src_views_Apps_vue.js.map
diff --git a/src/components/Apps/AppItem.vue b/src/components/Apps/AppItem.vue
@@ -92,7 +92,7 @@
 				:aria-label="enableButtonTooltip"
 				type="primary"
 				:disabled="!app.canInstall || installing || isLoading || !defaultDeployDaemonAccessible || isInitializing || isDeploying"
-				@click="showSelectionModal">
+				@click="enableButtonAction">
 				{{ enableButtonText }}
 			</NcButton>
 			<NcButton v-else-if="!app.active"
@@ -106,6 +106,7 @@
 			<DaemonSelectionModal
 				v-if="selectDaemonModal"
 				:show.sync="selectDaemonModal"
+				:daemons="dockerDaemons"
 				:app="app" />
 		</component>
 	</component>
@@ -118,6 +119,9 @@ import SvgFilterMixin from './SvgFilterMixin.vue'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import DaemonSelectionModal from './DaemonSelectionModal.vue'
 
+import axios from '@nextcloud/axios'
+import { generateUrl } from '@nextcloud/router'
+
 export default {
 	name: 'AppItem',
 	components: {
@@ -157,6 +161,7 @@ export default {
 			scrolled: false,
 			screenshotLoaded: false,
 			selectDaemonModal: false,
+			dockerDaemons: [],
 		}
 	},
 	computed: {
@@ -181,6 +186,7 @@ export default {
 			}
 			image.src = this.app.screenshot
 		}
+		this.getAllDockerDaemons()
 	},
 	methods: {
 		async showAppDetails(event) {
@@ -206,6 +212,21 @@ export default {
 		showSelectionModal() {
 			this.selectDaemonModal = true
 		},
+		getAllDockerDaemons() {
+			return axios.get(generateUrl('/apps/app_api/daemons'))
+				.then(res => {
+					this.dockerDaemons = res.data.daemons.filter(function(daemon) {
+						return daemon.accepts_deploy_id === 'docker-install'
+					})
+				})
+		},
+		enableButtonAction() {
+			if (this.dockerDaemons.length === 1) {
+				this.enable(this.app.id, this.dockerDaemons[0])
+			} else {
+				this.showSelectionModal()
+			}
+		},
 	},
 }
 </script>

diff --git a/src/components/Apps/DaemonSelectionList.vue b/src/components/Apps/DaemonSelectionList.vue
@@ -59,7 +59,6 @@ export default {
 	},
 	methods: {
 		closeModal() {
-			console.warn(this.daemons)
 			this.$emit('close')
 		},
 	},

diff --git a/src/components/Apps/DaemonSelectionModal.vue b/src/components/Apps/DaemonSelectionModal.vue
@@ -4,7 +4,7 @@
 			<div class="select-modal-body">
 				<h3>{{ t('app_api', 'Choose Deploy Daemon for {appName}', {appName: app.name }) }}</h3>
 				<DaemonSelectionList
-					:daemons.sync="daemons"
+					:daemons="daemons"
 					:default-daemon.sync="default_daemon_config"
 					:app-id="app.id"
 					@close="closeModal" />
@@ -16,8 +16,6 @@
 <script>
 import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
 
-import axios from '@nextcloud/axios'
-import { generateUrl } from '@nextcloud/router'
 import DaemonSelectionList from './DaemonSelectionList.vue'
 
 export default {
@@ -36,31 +34,24 @@ export default {
 			type: Object,
 			required: true,
 		},
+		daemons: {
+			type: Array,
+			required: true,
+		},
 	},
 	data() {
 		return {
 			selectDaemonModal: false,
-			selectedDaemon: 'Cheese',
-			daemons: [],
-			default_daemon_config: '',
 		}
 	},
 
 	mounted() {
-		this.getAllDaemons()
 
 	},
 	methods: {
 		closeModal() {
 			this.$emit('update:show', false)
 		},
-		getAllDaemons() {
-			return axios.get(generateUrl('/apps/app_api/daemons'))
-				.then(res => {
-					this.daemons = res.data.daemons
-					this.default_daemon_config = res.data.default_daemon_config
-				})
-		},
 	},
 }
 </script>