make it possible to force de display of the rules from the URL

Ragnar-Oock · Mar 31, 2021 · 23a326d · 23a326d
1 parent 002be1f
commit 23a326d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/src/App.vue b/src/App.vue
@@ -7,7 +7,7 @@
 		<TopBar :is-search-bar-docked="isSearchBarDocked" />
 		<main>
 			<RulesPage
-				v-if="!isLastRuleVersionAccepted"
+				v-if="enableRules"
 				:show="!isWelcomeScreenVisible"
 			/>
 
@@ -129,8 +129,13 @@ export default {
 		}),
 		...mapGetters([
 			'getPage',
-			'isLastRuleVersionAccepted'
-		])
+			'isLastRuleVersionAccepted',
+			'isForceShowRulesUp'
+		]),
+		enableRules() {
+			return !this.isLastRuleVersionAccepted || this.isForceShowRulesUp;
+		}
+
 	},
 	watch: {
 		isDarkModeOn() {

diff --git a/src/components/RulesPage.vue b/src/components/RulesPage.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script lang="js">
-import { mapState } from 'vuex';
+import { mapGetters } from 'vuex';
 import { Fragment } from 'vue-fragment';
 
 export default {
@@ -19,13 +19,14 @@ export default {
 		}
 	},
 	computed:{
-		...mapState({
-			lastAcceptedRuleVersion: state => state.percist.lastAcceptedRuleVersion
-		})
+		...mapGetters([
+			'isLastRuleVersionAccepted',
+			'isForceShowRulesUp'
+		])
 	},
 	watch:{
 		show(newValue) {
-			if (newValue && this.lastAcceptedRuleVersion < process.env.VUE_APP_RULES_VERSION) {
+			if (newValue && (!this.isLastRuleVersionAccepted || this.isForceShowRulesUp)) {
 				this.showAlert();
 			}
 		}

diff --git a/src/store/getters.js b/src/store/getters.js
@@ -1,6 +1,7 @@
 import { getField } from 'vuex-map-fields';
 import { getDiffKeys, compareKeys } from '@/helpers/methods';
 import { getDefaultState } from './state';
+import { getUrlPrameters } from '@/helpers/methods';
 
 
 const getters = {
@@ -75,6 +76,7 @@ const getters = {
 	isSearch: state => !compareKeys(getDefaultState().searchSettings, state.searchSettings),
 	isLastPage: state => state.isLastPage,
 	isLastRuleVersionAccepted: state => state.percist.lastAcceptedRuleVersion >= process.env.VUE_APP_RULES_VERSION,
+	isForceShowRulesUp: () => Object.prototype.hasOwnProperty.call(getUrlPrameters(), 'showRules'),
 
 	getField
 };