Merge pull request #763 from nextcloud/bugfix/631/allow-changing-the-settings-from-ui

Allow changing the settings from UI

Author: nickvergessen

js/terms_of_service-admin.js

@@ -65,6 +65,8 @@
 * @license MIT, https://github.com/focus-trap/tabbable/blob/master/LICENSE
 */
 
+/*! For license information please see NcCheckboxRadioSwitch.js.LICENSE.txt */
+
 /*! For license information please see NcMultiselect.js.LICENSE.txt */
 
 /*! ieee754. BSD-3-Clause License. Feross Aboukhadijeh <https://feross.org/opensource> */

js/terms_of_service-admin.js.LICENSE.txt

@@ -105,6 +105,8 @@ public function getAdminFormData(): JSONResponse {
 			'terms' => $this->termsMapper->getTerms(),
 			'countries' => $this->countryMapper->getCountries(),
 			'languages' => $this->languageMapper->getLanguages(),
+			'tos_on_public_shares' => $this->config->getAppValue(Application::APPNAME, 'tos_on_public_shares', '0'),
+			'tos_for_users' => $this->config->getAppValue(Application::APPNAME, 'tos_for_users', '1'),
 		];
 		return new JSONResponse($response);
 	}

js/terms_of_service-admin.js.map

@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * @copyright Copyright (c) 2017 Lukas Reschke <[email protected]>
  *
@@ -21,35 +24,15 @@
 
 namespace OCA\TermsOfService\Settings;
 
-use OCA\TermsOfService\Db\Mapper\CountryMapper;
-use OCA\TermsOfService\Db\Mapper\LanguageMapper;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\Settings\ISettings;
 
 class Admin implements ISettings {
-	/** @var CountryMapper */
-	private $countryMapper;
-	/** @var LanguageMapper */
-	private $languageMapper;
-
-	public function __construct(CountryMapper $countryMapper,
-								LanguageMapper $languageMapper) {
-		$this->countryMapper = $countryMapper;
-		$this->languageMapper = $languageMapper;
-	}
-
 	/**
 	 * {@inheritdoc}
 	 */
 	public function getForm(): TemplateResponse {
-		return new TemplateResponse(
-			'terms_of_service',
-			'settings',
-			[
-				'countries' => $this->countryMapper->getCountries(),
-				'languages' => $this->languageMapper->getLanguages(),
-			],
-			''
+		return new TemplateResponse('terms_of_service', 'settings', [], TemplateResponse::RENDER_AS_BLANK
 		);
 	}
 

lib/Controller/TermsController.php

@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * @copyright Copyright (c) 2016 Bjoern Schiessle <[email protected]>
  *
@@ -19,20 +22,15 @@
  *
  */
 
-
 namespace OCA\TermsOfService\Settings;
 
-
 use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\Settings\IIconSection;
 
 class AdminSection implements IIconSection {
-
-	/** @var IL10N */
-	private $l;
-	/** @var IURLGenerator */
-	private $url;
+	private IL10N $l;
+	private IURLGenerator $url;
 
 	public function __construct(IL10N $l, IURLGenerator $url) {
 		$this->l = $l;

lib/Settings/Admin.php

@@ -20,6 +20,7 @@
 		"@nextcloud/router": "^2.0.0",
 		"@nextcloud/vue": "^7.0.1",
 		"vue": "^2.7.13",
+		"vue-frag": "^1.4.1",
 		"vue-material-design-icons": "^5.1.2"
 	},
 	"browserslist": [

lib/Settings/AdminSection.php

@@ -22,58 +22,69 @@
  -->
 
 <template>
-	<NcSettingsSection :title="t('terms_of_service', 'Terms of service')"
-		:description="t('terms_of_service', 'Require users to accept the terms of service before accessing the service.')">
-		<p class="settings-hint">
-			{{ t('terms_of_service', 'For formatting purposes Markdown is supported.') }}
-		</p>
-
-		<span>
-			<NcMultiselect v-model="country"
-				:options="countryOptions"
-				:placeholder="t('terms_of_service', 'Select a region')"
-				label="label"
-				track-by="value" />
-			<NcMultiselect v-model="language"
-				:options="languageOptions"
-				:placeholder="t('terms_of_service', 'Select a language')"
-				label="label"
-				track-by="value" />
-		</span>
-
-		<textarea v-model="body"
-			:placeholder="t('terms_of_service', 'By using this service …')"
-			class="terms__textarea" />
-
-		<NcButton :disabled="saveButtonDisabled"
-			@click="onSubmit">
-			{{ saveButtonText }}
-		</NcButton>
-
-		<template v-if="hasTerms">
-			<h2>
-				{{ t('terms_of_service', 'Existing terms of service') }}
-			</h2>
+	<Fragment>
+		<NcSettingsSection :title="t('terms_of_service', 'Terms of service')"
+			:description="t('terms_of_service', 'Require users to accept the terms of service before accessing the service.')">
+			<NcCheckboxRadioSwitch type="switch"
+				:checked.sync="showForLoggedInUser">
+				{{ t('terms_of_service', 'Show for logged-in users') }}
+			</NcCheckboxRadioSwitch>
+
+			<NcCheckboxRadioSwitch type="switch"
+				:checked.sync="showOnPublicShares">
+				{{ t('terms_of_service', 'Show on public shares') }}
+			</NcCheckboxRadioSwitch>
+
+			<span class="form">
+				<NcMultiselect v-model="country"
+					:options="countryOptions"
+					:placeholder="t('terms_of_service', 'Select a region')"
+					label="label"
+					track-by="value" />
+				<NcMultiselect v-model="language"
+					:options="languageOptions"
+					:placeholder="t('terms_of_service', 'Select a language')"
+					label="label"
+					track-by="value" />
+			</span>
+
+			<textarea v-model="body"
+				:placeholder="t('terms_of_service', 'By using this service …')"
+				class="terms__textarea" />
+
+			<p class="settings-hint">
+				{{ t('terms_of_service', 'For formatting purposes Markdown is supported.') }}
+			</p>
+
+			<NcButton :disabled="saveButtonDisabled"
+				@click="onSubmit">
+				{{ saveButtonText }}
+			</NcButton>
+		</NcSettingsSection>
 
+		<NcSettingsSection v-if="hasTerms"
+			:title="t('terms_of_service', 'Existing terms of service')">
 			<NcButton :disabled="resetButtonDisabled"
 				type="error"
 				@click="onResetSignatories">
 				{{ resetButtonText }}
 			</NcButton>
 
-			<ul v-if="hasTerms" id="terms_of_service-countryspecific-list">
+			<ul v-if="hasTerms">
 				<Term v-for="term in terms"
 					:key="term.id"
 					v-bind="term" />
 			</ul>
-		</template>
-	</NcSettingsSection>
+		</NcSettingsSection>
+	</Fragment>
 </template>
 
 <script>
+import { Fragment } from 'vue-frag'
 import Term from './components/Term.vue'
 import axios from '@nextcloud/axios'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
+import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 import NcMultiselect from '@nextcloud/vue/dist/Components/NcMultiselect.js'
 import NcSettingsSection from '@nextcloud/vue/dist/Components/NcSettingsSection.js'
 import { showError, showSuccess } from '@nextcloud/dialogs'
@@ -85,7 +96,9 @@ export default {
 
 	components: {
 		Term,
+		Fragment,
 		NcButton,
+		NcCheckboxRadioSwitch,
 		NcMultiselect,
 		NcSettingsSection,
 	},
@@ -104,6 +117,8 @@ export default {
 			saveButtonDisabled: true,
 			resetButtonText: '',
 			resetButtonDisabled: false,
+			showOnPublicShares: false,
+			showForLoggedInUser: true,
 		}
 	},
 
@@ -113,6 +128,27 @@ export default {
 		},
 	},
 
+	watch: {
+		showOnPublicShares(value) {
+			if (!this.saveButtonDisabled) {
+				OCP.AppConfig.setValue(
+					'terms_of_service',
+					'tos_on_public_shares',
+					value ? '1' : '0'
+				)
+			}
+		},
+		showForLoggedInUser(value) {
+			if (!this.saveButtonDisabled) {
+				OCP.AppConfig.setValue(
+					'terms_of_service',
+					'tos_for_users',
+					value ? '1' : '0'
+				)
+			}
+		},
+	},
+
 	mounted() {
 		this.saveButtonText = t('terms_of_service', 'Loading …')
 		this.resetButtonText = t('terms_of_service', 'Reset all signatories')
@@ -124,6 +160,8 @@ export default {
 				}
 				this.countries = response.data.countries
 				this.languages = response.data.languages
+				this.showOnPublicShares = response.data.tos_on_public_shares === '1'
+				this.showForLoggedInUser = response.data.tos_for_users === '1'
 				Object.keys(this.countries).forEach((countryCode) => {
 					this.countryOptions.push({
 						value: countryCode,
@@ -138,7 +176,9 @@ export default {
 				})
 
 				this.saveButtonText = t('terms_of_service', 'Save')
-				this.saveButtonDisabled = false
+				this.$nextTick(() => {
+					this.saveButtonDisabled = false
+				})
 			})
 	},
 
@@ -185,6 +225,15 @@ export default {
 	display: block;
 }
 
+.form {
+	margin-top: 30px;
+	display: block;
+}
+
+.settings-hint {
+	margin-top: 0;
+}
+
 label span {
 	display: inline-block;
 	min-width: 120px;

package-lock.json

@@ -70,11 +70,11 @@ export default {
 
 	computed: {
 		country() {
-			return this.$parent.$parent.countries[this.countryCode]
+			return this.$parent.$parent.$parent.countries[this.countryCode]
 		},
 
 		language() {
-			return this.$parent.$parent.languages[this.languageCode]
+			return this.$parent.$parent.$parent.languages[this.languageCode]
 		},
 
 		editButtonLabel() {
@@ -92,23 +92,23 @@ export default {
 
 	methods: {
 		onEdit() {
-			this.$parent.$parent.country = {
+			this.$parent.$parent.$parent.country = {
 				value: this.countryCode,
-				label: this.$parent.$parent.countries[this.countryCode] + ' (' + this.countryCode + ')',
+				label: this.$parent.$parent.$parent.countries[this.countryCode] + ' (' + this.countryCode + ')',
 			}
-			this.$parent.$parent.language = {
+			this.$parent.$parent.$parent.language = {
 				value: this.languageCode,
-				label: this.$parent.$parent.languages[this.languageCode] + ' (' + this.languageCode + ')',
+				label: this.$parent.$parent.$parent.languages[this.languageCode] + ' (' + this.languageCode + ')',
 			}
-			this.$parent.$parent.body = this.body
+			this.$parent.$parent.$parent.body = this.body
 		},
 
 		onDelete() {
 			this.deleteButtonDisabled = true
 			axios
 				.delete(generateUrl('/apps/terms_of_service/terms/' + this.id))
 				.then(() => {
-					this.$delete(this.$parent.$parent.terms, this.id)
+					this.$delete(this.$parent.$parent.$parent.terms, this.id)
 				})
 		},
 	},