{{ $t('admin_dash.frontend.wip_notice') }}
{{ $t('admin_dash.frontend.default_frontend_tip') }}
{{ $t('admin_dash.http.web_cache_ttl_description') }}
{{ $t('admin_dash.http.web_push_description') }}
class
rel
{{ $t('admin_dash.other.remote_ip_description') }}
{{ $t('admin_dash.registrations.welcome.description') }}
+ {{ backendDescriptionDescription + ' ' }} +
state?.tuple ? state.tuple[1] + ':' + state.tuple[2] : state +const getSocks = state => state?.tuple + +export default { + ...Setting, + data () { + return { + urlField: '', + socksField: false + } + }, + created () { + Setting.created() + this.urlField = getUrl(this.realDraftMode ? this.draft : this.state) + this.socksField = getSocks(this.realDraftMode ? this.draft : this.state) + }, + computed: { + ...Setting.computed, + // state that we'll show in the UI, i.e. transforming map into list + displayState () { + if (this.visibleState?.tuple) { + return this.visibleState.tuple[1] + ':' + this.visibleState.tuple[2] + } + return this.visibleState + }, + socksState () { + return getSocks(this.visibleState) + } + }, + components: { + ...Setting.components, + Checkbox + }, + methods: { + ...Setting.methods, + getValue ({ event, isProxy}) { + if (isProxy) { + this.socksField = event + } else { + this.urlField = event.target.value + } + + if (this.socksField) { + return { tuple: [ ':socks5', ...this.urlField.split(':') ] } + } else { + return this.urlField + } + } + } +} diff --git a/src/components/settings_modal/helpers/proxy_setting.vue b/src/components/settings_modal/helpers/proxy_setting.vue new file mode 100644 index 000000000..ac4884696 --- /dev/null +++ b/src/components/settings_modal/helpers/proxy_setting.vue @@ -0,0 +1,57 @@ + + + + + {{ backendDescriptionLabel + ' ' }} + + + MISSING LABEL FOR {{ path }} + + + + {{ ' ' }} + + {{ ' ' }} + + {{ $t('admin_dash.http.socks5') }} + {{ ' ' }} + + {{ ' ' }} + + + + + {{ backendDescriptionDescription + ' ' }} + + + + + diff --git a/src/components/settings_modal/helpers/pwa_manifest_icons_setting.js b/src/components/settings_modal/helpers/pwa_manifest_icons_setting.js new file mode 100644 index 000000000..3e6ff23fa --- /dev/null +++ b/src/components/settings_modal/helpers/pwa_manifest_icons_setting.js @@ -0,0 +1,45 @@ +import { clone } from 'lodash' +import Setting from './setting.js' + +export default { + ...Setting, + methods: { + ...Setting.methods, + optionPresent (option) { + return this.valueSet.has(option) + }, + getValue ({ event, field, index, eventType }) { + switch (eventType) { + case 'add': { + const res = [...this.visibleState, {}] + return res + } + + case 'remove': { + const pre = this.visibleState.slice(0, index) + const post = this.visibleState.slice(index + 1) + + return [...pre, ...post] + } + + case 'edit': { + const pre = this.visibleState.slice(0, index) + const post = this.visibleState.slice(index + 1) + const item = clone(this.visibleState[index]) + const string = event.target.value + console.log(item) + + if (!string) { + delete item[field] + } else { + item[field] = string + } + + console.log(item) + + return [...pre, item, ...post] + } + } + } + } +} diff --git a/src/components/settings_modal/helpers/pwa_manifest_icons_setting.vue b/src/components/settings_modal/helpers/pwa_manifest_icons_setting.vue new file mode 100644 index 000000000..ab43a2c1a --- /dev/null +++ b/src/components/settings_modal/helpers/pwa_manifest_icons_setting.vue @@ -0,0 +1,138 @@ + + + + + {{ backendDescriptionLabel + ' ' }} + + + MISSING LABEL FOR {{ path }} + + + + + {{ backendDescriptionDescription + ' ' }} + + + + + + purpose + + + + sizes + + + + src + + + + type + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/settings_modal/helpers/setting.js b/src/components/settings_modal/helpers/setting.js index df137157a..f786a35da 100644 --- a/src/components/settings_modal/helpers/setting.js +++ b/src/components/settings_modal/helpers/setting.js @@ -1,7 +1,7 @@ import ModifiedIndicator from './modified_indicator.vue' import ProfileSettingIndicator from './profile_setting_indicator.vue' import DraftButtons from './draft_buttons.vue' -import { get, set, cloneDeep } from 'lodash' +import { get, set, cloneDeep, isEqual } from 'lodash' export default { components: { @@ -18,6 +18,18 @@ export default { type: [String, Array], required: false }, + descriptionPathOverride: { + type: [String, Array], + required: false + }, + suggestions: { + type: [String, Array], + required: false + }, + subgroup: { + type: String, + required: false + }, disabled: { type: Boolean, default: false @@ -37,12 +49,22 @@ export default { type: String, default: undefined }, + hideDraftButtons: { // this is for the weird backend hybrid (Boolean|String or Boolean|Number) settings + required: false, + type: Boolean + }, + hideLabel: { + type: Boolean + }, hideDescription: { type: Boolean }, swapDescriptionAndLabel: { type: Boolean }, + backendDescriptionPath: { + type: [String, Array] + }, overrideBackendDescription: { type: Boolean }, @@ -73,7 +95,7 @@ export default { }, created () { if (this.realDraftMode && (this.realSource !== 'admin' || this.path == null)) { - this.draft = this.state + this.draft = cloneDeep(this.state) } }, computed: { @@ -114,10 +136,13 @@ export default { return typeof this.draftMode === 'undefined' ? this.defaultDraftMode : this.draftMode }, backendDescription () { - return get(this.$store.state.adminSettings.descriptions, this.path) + return get(this.$store.state.adminSettings.descriptions, this.descriptionPath) }, backendDescriptionLabel () { if (this.realSource !== 'admin') return '' + if (this.overrideBackendDescriptionLabel !== '' && typeof this.overrideBackendDescriptionLabel === 'string') { + return this.overrideBackendDescriptionLabel + } if (!this.backendDescription || this.overrideBackendDescriptionLabel) { return this.$t([ 'admin_dash', @@ -148,13 +173,20 @@ export default { } }, backendDescriptionSuggestions () { - return this.backendDescription?.suggestions + return this.backendDescription?.suggestions || this.suggestions }, shouldBeDisabled () { if (this.path == null) { return this.disabled } - const parentValue = this.parentPath !== undefined ? get(this.configSource, this.parentPath) : null + let parentValue = null + if (this.parentPath !== undefined && this.realSource === 'admin') { + if (this.realDraftMode) { + parentValue = get(this.$store.state.adminSettings.draft, this.parentPath) + } else { + parentValue = get(this.configSource, this.parentPath) + } + } return this.disabled || (parentValue !== null ? (this.parentInvert ? parentValue : !parentValue) : false) }, configSource () { @@ -209,17 +241,29 @@ export default { if (this.path == null) return null return Array.isArray(this.path) ? this.path : this.path.split('.') }, + descriptionPath () { + if (this.path == null) return null + if (this.descriptionPathOverride) return this.descriptionPathOverride + const path = Array.isArray(this.path) ? this.path : this.path.split('.') + if (this.subgroup) { + return [ + ...path.slice(0, path.length - 1), + ':subgroup,' + this.subgroup, + ...path.slice(path.length - 1) + ] + } + return path + }, isDirty () { if (this.path == null) return false if (this.realSource === 'admin' && this.canonPath.length > 3) { return false // should not show draft buttons for "grouped" values } else { - return this.realDraftMode && this.draft !== this.state + return this.realDraftMode && !isEqual(this.draft, this.state) } }, canHardReset () { - return this.realSource === 'admin' && this.$store.state.adminSettings.modifiedPaths && - this.$store.state.adminSettings.modifiedPaths.has(this.canonPath.join(' -> ')) + return this.realSource === 'admin' && this.$store.state.adminSettings.modifiedPaths?.has(this.canonPath.join(' -> ')) }, matchesExpertLevel () { return (this.expert || 0) <= this.$store.state.config.expertLevel > 0 diff --git a/src/components/settings_modal/helpers/string_setting.vue b/src/components/settings_modal/helpers/string_setting.vue index d0c70b150..8fba8b499 100644 --- a/src/components/settings_modal/helpers/string_setting.vue +++ b/src/components/settings_modal/helpers/string_setting.vue @@ -4,6 +4,7 @@ class="StringSetting" > @@ -30,7 +33,7 @@ :onclick="reset" /> - + + + + + {{ backendDescriptionLabel + ' ' }} + + + MISSING LABEL FOR {{ path }} + + + + {{ ' ' }} + + {{ ' ' }} + + {{ ' ' }} + + {{ ' ' }} + + + + + {{ backendDescriptionDescription + ' ' }} + + +
purpose
sizes
src
type
+ + + + {{ backendDescriptionLabel + ' ' }} + + + MISSING LABEL FOR {{ path }} + + + + {{ ' ' }} + + {{ ' ' }} + + {{ ' ' }} + + {{ ' ' }} + + + + + {{ backendDescriptionDescription + ' ' }} + + +