Sitemap editor: nested sitemaps #4206
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| <template> | ||
| <ul class="sitemap-picker-container"> | ||
| <f7-list-item | ||
| v-if="ready" | ||
| :title="title || 'Sitemap'" | ||
| smart-select | ||
| :smart-select-params="smartSelectParams" | ||
| ref="smartSelect" | ||
| :no-chevron="disabled" | ||
| :disabled="disabled"> | ||
| <select :name="name" @change="select" :required="required"> | ||
| <option value="" /> | ||
| <option v-for="sitemap in sitemaps" :value="sitemap.name" :key="sitemap.name" :selected="value === sitemap.name ? true : null"> | ||
| {{ sitemap.label ? sitemap.label + ' (' + sitemap.name + ')' : sitemap.name }} | ||
| </option> | ||
| </select> | ||
| </f7-list-item> | ||
| <!-- for placeholder purposes before sitemaps are loaded --> | ||
| <f7-list-item v-show="!ready" link :title="title" /> | ||
| </ul> | ||
| </template> | ||
|
|
||
| <style lang="stylus"> | ||
| .sitemap-picker-container | ||
| .item-inner:after | ||
| display none | ||
| </style> | ||
|
|
||
| <script> | ||
| import { f7 } from 'framework7-vue' | ||
| import { nextTick } from 'vue' | ||
| import { showToast } from '@/js/dialog-promises' | ||
|
|
||
| import * as api from '@/api' | ||
|
|
||
| export default { | ||
| props: { | ||
| title: String, | ||
| name: String, | ||
| value: String, | ||
| required: Boolean, | ||
| filterType: Array, | ||
| openOnReady: Boolean, | ||
| disabled: Boolean | ||
| }, | ||
| emits: ['sitemapPicked', 'input'], | ||
| data() { | ||
| return { | ||
| ready: false, | ||
| sitemaps: [], | ||
| smartSelectParams: { | ||
| view: f7.view.main, | ||
| openIn: 'popup', | ||
| searchbar: true, | ||
| searchbarPlaceholder: this.$t('dialogs.search.sitemaps') | ||
| } | ||
| } | ||
| }, | ||
| created() { | ||
| this.smartSelectParams.closeOnSelect = true | ||
| api | ||
| .getSitemaps() | ||
| .then((data) => { | ||
| this.sitemaps = data | ||
| .map((sitemap) => { | ||
| return { | ||
| name: sitemap.name, | ||
| label: sitemap.label | ||
| } | ||
| }) | ||
| .sort((a, b) => { | ||
| const labelA = a.label || a.name | ||
| const labelB = b.label || b.name | ||
| return labelA.localeCompare(labelB) | ||
| }) | ||
| if (this.filterType) { | ||
| this.sitemaps = this.sitemaps.filter((i) => this.filterType.indexOf(i.type) >= 0) | ||
| if (this.sitemaps.length < 5) { | ||
| this.smartSelectParams.openIn = 'sheet' | ||
| this.smartSelectParams.searchbar = false | ||
| } | ||
| } | ||
| this.ready = true | ||
| if (this.openOnReady) { | ||
| nextTick(() => { | ||
| this.$refs.smartSelect.$el.children[0].f7SmartSelect.open() | ||
| }) | ||
| } | ||
| }) | ||
| .catch((err) => { | ||
| console.error(err) | ||
| showToast('An error occurred while loading sitemaps: ' + (err?.message || String(err))) | ||
| }) | ||
| }, | ||
| methods: { | ||
| open() { | ||
|
Contributor
There was a problem hiding this comment. I don't see where 'open' is used, is it needed? |
||
| this.$refs.smartSelect.$el.children[0].f7SmartSelect.open() | ||
| }, | ||
| select(e) { | ||
| f7.input.validateInputs(this.$refs.smartSelect.$el) | ||
| this.$emit('input', e.target.value) | ||
| f7.emit('sitemapPicked', e.target.value) | ||
| } | ||
| } | ||
| } | ||
| </script> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -283,6 +283,16 @@ | |
| </option> | ||
| </select> | ||
| </f7-list-item> | ||
| <ul v-if="supports('name')" style="padding-left: 0" class="widget-nested-sitemap"> | ||
| <sitemap-picker | ||
| style="padding-left: 0" | ||
| title="Sitemap" | ||
| :value="widget.name" | ||
| :disabled="!editable" | ||
| @input="(value) => (widget.name = value)" /> | ||
|
Contributor
There was a problem hiding this comment. you can change the emit to be update:value instead of 'input'. That way, you can use vmodel:value="widget.name" which is shorthand for the 2 separate :value and @input lines. |
||
| <f7-link v-if="widget.name" @click="navigateNestedSitemap(widget.name)"> <a>Edit Sitemap</a></f7-link> | ||
| <f7-link v-else-if="!widget.item" @click="navigateNestedSitemap()"> <a>Add Sitemap</a></f7-link> | ||
| </ul> | ||
| </ul> | ||
| </f7-list> | ||
| </f7-card-content> | ||
|
|
@@ -318,6 +328,14 @@ | |
| color var(--f7-block-text-color) | ||
| .widget-persistence .item-after | ||
| color var(--f7-block-text-color) | ||
| .widget-nested-sitemap | ||
| .item-after | ||
| color var(--f7-block-text-color) | ||
| .link | ||
| display flex | ||
| flex-direction column | ||
| align-items flex-end | ||
| padding-right calc(var(--f7-list-item-padding-horizontal) + var(--f7-safe-area-right) - var(--menu-list-offset)) | ||
| #additional:before | ||
| display block !important /* need two selectors to override the important Vue card css */ | ||
|
|
||
|
|
@@ -336,21 +354,23 @@ import { Categories } from '@/assets/categories.js' | |
| import FormatEditor from '@/components/config/controls/format-editor.vue' | ||
| import ItemPicker from '@/components/config/controls/item-picker.vue' | ||
| import PersistencePicker from '@/components/config/controls/persistence-picker.vue' | ||
| import SitemapPicker from '@/components/config/controls/sitemap-picker.vue' | ||
| import SitemapMixin from '@/components/pagedesigner/sitemap/sitemap-mixin' | ||
|
|
||
| export default { | ||
| mixins: [SitemapMixin], | ||
| components: { | ||
| FormatEditor, | ||
| ItemPicker, | ||
| PersistencePicker, | ||
| SitemapPicker | ||
| }, | ||
| props: { | ||
| widget: Object, | ||
| editable: Boolean, | ||
| createMode: Boolean | ||
| }, | ||
| emits: ['sortbuttons', 'moveup', 'movedown', 'duplicate', 'remove', 'navigate-nested-sitemap'], | ||
| data() { | ||
| return { | ||
| iconInputId: '', | ||
|
|
@@ -413,6 +433,9 @@ export default { | |
| } | ||
| } | ||
| }, | ||
| navigateNestedSitemap(target) { | ||
| this.$emit('navigate-nested-sitemap', target) | ||
| }, | ||
| remove() { | ||
| this.$emit('remove') | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
since sitempaPicked is an f7.emit, it shouldn't be listed here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i actually don't see where there is a f7.on sitemapPicked - maybe this is just here for consistency?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This code is copied from persistencePicker I believe, so your feedback also may also apply to that one (and some other pickers). But all you point out is correct.