@fy-/fws-vue 2.1.29 → 2.1.31

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -5,7 +5,7 @@ import type { APIPaging } from '../../composables/rest'
5
5
  import { getURL, hasFW } from '@fy-/fws-js'
6
6
  import { ChevronLeftIcon, ChevronRightIcon } from '@heroicons/vue/24/solid'
7
7
  import { useHead } from '@unhead/vue'
8
- import { computed, ref, watch, watchEffect } from 'vue'
8
+ import { ref, watch, watchEffect } from 'vue'
9
9
  import { useRoute } from 'vue-router'
10
10
  import { useEventBus } from '../../composables/event-bus'
11
11
  import { useServerRouter } from '../../stores/serverRouter'
@@ -78,56 +78,57 @@ pageWatcher.value = watch(
78
78
  )
79
79
 
80
80
  watchEffect(() => {
81
- useHead({
82
- link: computed(() => {
83
- const result: any = []
84
- const page = props.items.page_no
85
- const page_max = props.items.page_max
86
-
87
- let next
88
- let prev
89
-
90
- if (hasFW()) {
91
- const url = getURL()
92
- if (url) {
93
- const currentQuery = { ...route.query }
94
- // Remove the existing 'page' parameter to avoid duplicates
95
- delete currentQuery.page
96
-
97
- const baseURL = `${url.Scheme}://${url.Host}${url.Path}`
98
- const hashPart = props.hash !== '' ? `#${props.hash}` : ''
99
-
100
- if (page + 1 <= page_max) {
101
- const nextQuery = { ...currentQuery, page: (page + 1).toString() }
102
- const nextQueryString = new URLSearchParams(nextQuery).toString()
103
- next = `${baseURL}?${nextQueryString}${hashPart}`
104
- }
105
-
106
- if (page - 1 >= 1) {
107
- const prevQuery = { ...currentQuery, page: (page - 1).toString() }
108
- const prevQueryString = new URLSearchParams(prevQuery).toString()
109
- prev = `${baseURL}?${prevQueryString}${hashPart}`
110
- }
111
- }
81
+ const page = props.items.page_no
82
+ const page_max = props.items.page_max
83
+
84
+ let next
85
+ let prev
86
+
87
+ if (hasFW()) {
88
+ const url = getURL()
89
+ if (url) {
90
+ const currentQuery = { ...route.query }
91
+ // Remove the existing 'page' parameter to avoid duplicates
92
+ delete currentQuery.page
93
+
94
+ const baseURL = `${url.Scheme}://${url.Host}${url.Path}`
95
+ const hashPart = props.hash !== '' ? `#${props.hash}` : ''
96
+
97
+ if (page + 1 <= page_max) {
98
+ const nextQuery = { ...currentQuery, page: (page + 1).toString() }
99
+ const nextQueryString = new URLSearchParams(nextQuery).toString()
100
+ next = `${baseURL}?${nextQueryString}${hashPart}`
112
101
  }
113
102
 
114
- if (next) {
115
- result.push({
116
- href: next,
117
- rel: 'next',
118
- key: `paging-next${props.id}`,
119
- })
120
- }
121
- if (prev) {
122
- result.push({
123
- href: prev,
124
- rel: 'prev',
125
- key: `paging-prev${props.id}`,
126
- })
103
+ if (page - 1 >= 1) {
104
+ const prevQuery = { ...currentQuery, page: (page - 1).toString() }
105
+ const prevQueryString = new URLSearchParams(prevQuery).toString()
106
+ prev = `${baseURL}?${prevQueryString}${hashPart}`
127
107
  }
128
-
129
- return result
130
- }),
108
+ }
109
+ }
110
+ const result: any = []
111
+
112
+ if (next) {
113
+ result.push({
114
+ href: next,
115
+ rel: 'next',
116
+ key: `paging-next${props.id}`,
117
+ hid: `paging-next${props.id}`,
118
+ id: `paging-next${props.id}`,
119
+ })
120
+ }
121
+ if (prev) {
122
+ result.push({
123
+ href: prev,
124
+ rel: 'prev',
125
+ key: `paging-prev${props.id}`,
126
+ hid: `paging-prev${props.id}`,
127
+ id: `paging-prev${props.id}`,
128
+ })
129
+ }
130
+ useHead({
131
+ link: result,
131
132
  })
132
133
  })
133
134
  </script>
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fy-/fws-vue",
3
- "version": "2.1.29",
3
+ "version": "2.1.31",
4
4
  "author": "Florian 'Fy' Gasquez <m@fy.to>",
5
5
  "license": "MIT",
6
6
  "homepage": "https://github.com/fy-to/FWJS#readme",