Merge pull request #3525 from nextcloud/small-fixes-and-code-maintenance

fix closing and tidy
nextcloud · May 26, 2024 · 68d7ecc · 68d7ecc
2 parents f4c3eac + 4540e5c
commit 68d7ecc
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 22 deletions.
diff --git a/src/js/components/Base/modules/ConfigBox.vue b/src/js/components/Base/modules/ConfigBox.vue
@@ -106,10 +106,6 @@ export default {
 		display: flex;
 		flex-direction: column;
 		padding-left: 24px;
-
-		// label {
-			// margin: 4px 0;
-		// }
 	}
 }
 

diff --git a/src/js/components/Configuration/ConfigClosing.vue b/src/js/components/Configuration/ConfigClosing.vue
@@ -22,7 +22,7 @@
 
 <template>
 	<div>
-		<NcButton @click="toggleClosed()">
+		<NcButton @click="clickToggleClosed()">
 			<template #icon>
 				<OpenPollIcon v-if="isPollClosed" />
 				<ClosePollIcon v-else />
@@ -39,7 +39,7 @@
 </template>
 
 <script>
-import { mapState, mapGetters } from 'vuex'
+import { mapState, mapGetters, mapActions } from 'vuex'
 import moment from '@nextcloud/moment'
 import { NcButton, NcDateTimePicker, NcCheckboxRadioSwitch } from '@nextcloud/vue'
 import OpenPollIcon from 'vue-material-design-icons/LockOpenVariant.vue'
@@ -113,11 +113,15 @@ export default {
 	},
 
 	methods: {
-		toggleClosed() {
+		...mapActions({
+			closePoll: 'poll/close',
+			reopenPoll: 'poll/reopen',
+		}),
+		clickToggleClosed() {
 			if (this.isPollClosed) {
-				this.$store.dispatch('poll/reopen')
+				this.reopenPoll()
 			} else {
-				this.$store.dispatch('poll/close')
+				this.closePoll()
 			}
 		},
 	},

diff --git a/src/js/components/VoteTable/VoteColumn.vue b/src/js/components/VoteTable/VoteColumn.vue
@@ -155,7 +155,6 @@ export default {
 
 	&:hover {
 		background-color: var(--color-background-dark);
-		// box-shadow: 3px 3px 9px var(--color-background-darker);
 	}
 
 	&.locked:hover {

diff --git a/src/js/components/VoteTable/VoteTable.vue b/src/js/components/VoteTable/VoteTable.vue
@@ -129,7 +129,6 @@ export default {
 		justify-content: center;
 
 		.user-actions {
-			// display: none;
 			visibility: hidden;
 		}
 

diff --git a/src/js/router.js b/src/js/router.js
@@ -36,14 +36,6 @@ import SideBarCombo from './views/SideBarCombo.vue'
 import Navigation from './views/Navigation.vue'
 import Combo from './views/Combo.vue'
 
-// Dynamic loading
-// const List = () => import('./views/PollList.vue')
-// const Administration = () => import('./views/Administration.vue')
-// const NotFound = () => import('./views/NotFound.vue')
-// const SideBarCombo = () => import('./views/SideBarCombo.vue')
-// const Navigation = () => import('./views/Navigation.vue')
-// const Combo = () => import('./views/Combo.vue')
-
 Vue.use(Router)
 
 /**

diff --git a/src/js/store/modules/acl.js b/src/js/store/modules/acl.js
@@ -84,7 +84,6 @@ const actions = {
 			} else {
 				response = await UserSettingsAPI.getAcl()
 			}
-			// context.commit('reset')
 			context.commit('set', { acl: response.data.acl })
 		} catch (error) {
 			if (error?.code === 'ERR_CANCELED') return
@@ -94,7 +93,9 @@ const actions = {
 				// TODO: for some reason unauthorized users first get the root route resulting in a 401 
 				// and after that the publicVote route is called as next route
 				// therefore we just debug the error and reset the acl
+
 				Logger.debug('getAcl failed', error)
+				context.commit('reset')
 			} else {
 				throw error
 			}

diff --git a/src/js/store/modules/appSettings.js b/src/js/store/modules/appSettings.js
@@ -75,7 +75,7 @@ const actions = {
 			const response = await AppSettingsAPI.getAppSettings()
 			context.commit('set', response.data.appSettings)
 		} catch (error) {
-			// context.commit('reset')
+			Logger.debug('Error getting appSettings', { error })
 		}
 	},
 

diff --git a/src/js/store/modules/poll.js b/src/js/store/modules/poll.js
@@ -193,7 +193,7 @@ const getters = {
 	isProposalExpired: (state, getters) => getters.isProposalAllowed && state.configuration.proposalsExpire && moment.unix(state.configuration.proposalsExpire).diff() < 0,
 	isProposalExpirySet: (state, getters) => getters.isProposalAllowed && state.configuration.proposalsExpire,
 	proposalsExpireRelative: (state) => moment.unix(state.configuration.proposalsExpire).fromNow(),
-	isClosed: (state) => (state.expire > 0 && moment.unix(state.expire).diff() < 1000),
+	isClosed: (state) => (state.configuration.expire > 0 && moment.unix(state.configuration.expire).diff() < 1000),
 	getSafeTable: (state, getters, rootState) => !state.revealParticipants && getters.countCells > rootState.settings.user.performanceThreshold,
 	countParticipants: (state, getters) => getters.participants.length,
 	countHiddenParticipants: (state, getters) => getters.participants.length - getters.safeParticipants.length,

diff --git a/src/js/views/Dashboard.vue b/src/js/views/Dashboard.vue
@@ -101,6 +101,7 @@ export default {
 			showError(t('polls', 'Error loading poll list'))
 		})
 	},
+
 	methods: {
 		...mapActions({
 			loadPolls: 'polls/list',