Fixes loading issues with advanced search and duplicated routing.
This commit is contained in:
parent
0de8e09e30
commit
156ea885d9
|
@ -452,7 +452,8 @@
|
||||||
"@babel/parser": {
|
"@babel/parser": {
|
||||||
"version": "7.23.6",
|
"version": "7.23.6",
|
||||||
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz",
|
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.6.tgz",
|
||||||
"integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ=="
|
"integrity": "sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==",
|
||||||
|
"dev": true
|
||||||
},
|
},
|
||||||
"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
|
"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
|
||||||
"version": "7.23.3",
|
"version": "7.23.3",
|
||||||
|
@ -1323,9 +1324,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"@babel/runtime-corejs3": {
|
"@babel/runtime-corejs3": {
|
||||||
"version": "7.23.8",
|
"version": "7.23.9",
|
||||||
"resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.23.8.tgz",
|
"resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.23.9.tgz",
|
||||||
"integrity": "sha512-2ZzmcDugdm0/YQKFVYsXiwUN7USPX8PM7cytpb4PFl87fM+qYPSvTZX//8tyeJB1j0YDmafBJEbl5f8NfLyuKw==",
|
"integrity": "sha512-oeOFTrYWdWXCvXGB5orvMTJ6gCZ9I6FBjR+M38iKNXCsPxr4xT0RTdg5uz1H7QP8pp74IzPtwritEr+JscqHXQ==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"core-js-pure": "^3.30.2",
|
"core-js-pure": "^3.30.2",
|
||||||
"regenerator-runtime": "^0.14.0"
|
"regenerator-runtime": "^0.14.0"
|
||||||
|
@ -1467,11 +1468,11 @@
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"@floating-ui/core": {
|
"@floating-ui/core": {
|
||||||
"version": "1.5.3",
|
"version": "1.6.0",
|
||||||
"resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.5.3.tgz",
|
"resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.0.tgz",
|
||||||
"integrity": "sha512-O0WKDOo0yhJuugCx6trZQj5jVJ9yR0ystG2JaNAemYUWce+pmM6WUEFIibnWyEJKdrDxhm75NoSRME35FNaM/Q==",
|
"integrity": "sha512-PcF++MykgmTj3CIyOQbKA/hDzOAiqI3mhuoN44WRCopIs1sgoDoU4oty4Jtqaj/y3oDU6fnVSm4QG0a3t5i0+g==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"@floating-ui/utils": "^0.2.0"
|
"@floating-ui/utils": "^0.2.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"@floating-ui/dom": {
|
"@floating-ui/dom": {
|
||||||
|
@ -2019,96 +2020,101 @@
|
||||||
"integrity": "sha512-+KpckaAQyfbvshdDW5xQylLni1asvNSGme1JFs8I1+/H5pHEhqUKMEQD/qn3Nx5+/nycBq11qAEi8lk+LXI2dA=="
|
"integrity": "sha512-+KpckaAQyfbvshdDW5xQylLni1asvNSGme1JFs8I1+/H5pHEhqUKMEQD/qn3Nx5+/nycBq11qAEi8lk+LXI2dA=="
|
||||||
},
|
},
|
||||||
"@vue/reactivity": {
|
"@vue/reactivity": {
|
||||||
"version": "3.4.15",
|
"version": "3.4.16",
|
||||||
"resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.15.tgz",
|
"resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.16.tgz",
|
||||||
"integrity": "sha512-55yJh2bsff20K5O84MxSvXKPHHt17I2EomHznvFiJCAZpJTNW8IuLj1xZWMLELRhBK3kkFV/1ErZGHJfah7i7w==",
|
"integrity": "sha512-XTWRMBG10PGs4MxDoUdBEhMacS5QBUAlGeb5AmQysTQ16tXxQ0lymgbSTmR2h79v5dJDFuULuLWUbwc0uj6zqQ==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"@vue/shared": "3.4.15"
|
"@vue/shared": "3.4.16"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@vue/shared": {
|
"@vue/shared": {
|
||||||
"version": "3.4.15",
|
"version": "3.4.16",
|
||||||
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.15.tgz",
|
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.16.tgz",
|
||||||
"integrity": "sha512-KzfPTxVaWfB+eGcGdbSf4CWdaXcGDqckoeXUh7SB3fZdEtzPCK2Vq9B/lRRL3yutax/LWITz+SwvgyOxz5V75g=="
|
"integrity": "sha512-HKCjeaxR+R95dCw1BDaytcHdlzZj9lxj7RlFnxWtcKq670t8oSeMsbPlkzkNc2V6IUzHaMtUxdBcdREAhb+7NA=="
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"@vue/runtime-core": {
|
"@vue/runtime-core": {
|
||||||
"version": "3.4.15",
|
"version": "3.4.16",
|
||||||
"resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.15.tgz",
|
"resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.16.tgz",
|
||||||
"integrity": "sha512-6E3by5m6v1AkW0McCeAyhHTw+3y17YCOKG0U0HDKDscV4Hs0kgNT5G+GCHak16jKgcCDHpI9xe5NKb8sdLCLdw==",
|
"integrity": "sha512-vgS25M79AOY2EsBWxBcy9yAou10x2WHJhGN0FM/Ii8yum0a+KBfg8ehzq/cuDqfOPrtVrDPW+QkH3WNJNakfRw==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"@vue/reactivity": "3.4.15",
|
"@vue/reactivity": "3.4.16",
|
||||||
"@vue/shared": "3.4.15"
|
"@vue/shared": "3.4.16"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@vue/shared": {
|
"@vue/shared": {
|
||||||
"version": "3.4.15",
|
"version": "3.4.16",
|
||||||
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.15.tgz",
|
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.16.tgz",
|
||||||
"integrity": "sha512-KzfPTxVaWfB+eGcGdbSf4CWdaXcGDqckoeXUh7SB3fZdEtzPCK2Vq9B/lRRL3yutax/LWITz+SwvgyOxz5V75g=="
|
"integrity": "sha512-HKCjeaxR+R95dCw1BDaytcHdlzZj9lxj7RlFnxWtcKq670t8oSeMsbPlkzkNc2V6IUzHaMtUxdBcdREAhb+7NA=="
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"@vue/runtime-dom": {
|
"@vue/runtime-dom": {
|
||||||
"version": "3.4.15",
|
"version": "3.4.16",
|
||||||
"resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.15.tgz",
|
"resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.16.tgz",
|
||||||
"integrity": "sha512-EVW8D6vfFVq3V/yDKNPBFkZKGMFSvZrUQmx196o/v2tHKdwWdiZjYUBS+0Ez3+ohRyF8Njwy/6FH5gYJ75liUw==",
|
"integrity": "sha512-X+knHfhefB8tX0rJG3d14U8p1CpeZ/qZxol9rN8ZAD9UalTInIsKXlBTd/xLC8GwO2aXVXxjaSIiTU5th5wj9Q==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"@vue/runtime-core": "3.4.15",
|
"@vue/runtime-core": "3.4.16",
|
||||||
"@vue/shared": "3.4.15",
|
"@vue/shared": "3.4.16",
|
||||||
"csstype": "^3.1.3"
|
"csstype": "^3.1.3"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@vue/shared": {
|
"@vue/shared": {
|
||||||
"version": "3.4.15",
|
"version": "3.4.16",
|
||||||
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.15.tgz",
|
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.16.tgz",
|
||||||
"integrity": "sha512-KzfPTxVaWfB+eGcGdbSf4CWdaXcGDqckoeXUh7SB3fZdEtzPCK2Vq9B/lRRL3yutax/LWITz+SwvgyOxz5V75g=="
|
"integrity": "sha512-HKCjeaxR+R95dCw1BDaytcHdlzZj9lxj7RlFnxWtcKq670t8oSeMsbPlkzkNc2V6IUzHaMtUxdBcdREAhb+7NA=="
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"@vue/server-renderer": {
|
"@vue/server-renderer": {
|
||||||
"version": "3.4.15",
|
"version": "3.4.16",
|
||||||
"resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.15.tgz",
|
"resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.16.tgz",
|
||||||
"integrity": "sha512-3HYzaidu9cHjrT+qGUuDhFYvF/j643bHC6uUN9BgM11DVy+pM6ATsG6uPBLnkwOgs7BpJABReLmpL3ZPAsUaqw==",
|
"integrity": "sha512-e0PZDpk/eZgICYb0DTQ+OeBlgt0FYGo+2DEcUkZxw+pDgF1qL0aYaOqmPcSbL5KK0nizvuSd7k5HZOkSwSaC2g==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"@vue/compiler-ssr": "3.4.15",
|
"@vue/compiler-ssr": "3.4.16",
|
||||||
"@vue/shared": "3.4.15"
|
"@vue/shared": "3.4.16"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@babel/parser": {
|
||||||
|
"version": "7.23.9",
|
||||||
|
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.9.tgz",
|
||||||
|
"integrity": "sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA=="
|
||||||
|
},
|
||||||
"@vue/compiler-core": {
|
"@vue/compiler-core": {
|
||||||
"version": "3.4.15",
|
"version": "3.4.16",
|
||||||
"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.15.tgz",
|
"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.16.tgz",
|
||||||
"integrity": "sha512-XcJQVOaxTKCnth1vCxEChteGuwG6wqnUHxAm1DO3gCz0+uXKaJNx8/digSz4dLALCy8n2lKq24jSUs8segoqIw==",
|
"integrity": "sha512-HXgyy7gen4FNJS8Hz2q/NNBEdzD3QInhDTWaP2/mS0TlmV9CnjmXip7TZ0ROYiQM4FgXZCCJvh74yDikFkPpkQ==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"@babel/parser": "^7.23.6",
|
"@babel/parser": "^7.23.9",
|
||||||
"@vue/shared": "3.4.15",
|
"@vue/shared": "3.4.16",
|
||||||
"entities": "^4.5.0",
|
"entities": "^4.5.0",
|
||||||
"estree-walker": "^2.0.2",
|
"estree-walker": "^2.0.2",
|
||||||
"source-map-js": "^1.0.2"
|
"source-map-js": "^1.0.2"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"@vue/compiler-dom": {
|
"@vue/compiler-dom": {
|
||||||
"version": "3.4.15",
|
"version": "3.4.16",
|
||||||
"resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.15.tgz",
|
"resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.16.tgz",
|
||||||
"integrity": "sha512-wox0aasVV74zoXyblarOM3AZQz/Z+OunYcIHe1OsGclCHt8RsRm04DObjefaI82u6XDzv+qGWZ24tIsRAIi5MQ==",
|
"integrity": "sha512-lvs9ankPzLEuIC5aB72ntLUcwVGmgY7ASkXDRvo9+lUMWOOCqnAmM/64AZPeVAZ4EnjocCE40OUN+ZboNe4ygA==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"@vue/compiler-core": "3.4.15",
|
"@vue/compiler-core": "3.4.16",
|
||||||
"@vue/shared": "3.4.15"
|
"@vue/shared": "3.4.16"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"@vue/compiler-ssr": {
|
"@vue/compiler-ssr": {
|
||||||
"version": "3.4.15",
|
"version": "3.4.16",
|
||||||
"resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.15.tgz",
|
"resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.16.tgz",
|
||||||
"integrity": "sha512-1jdeQyiGznr8gjFDadVmOJqZiLNSsMa5ZgqavkPZ8O2wjHv0tVuAEsw5hTdUoUW4232vpBbL/wJhzVW/JwY1Uw==",
|
"integrity": "sha512-1kNF+fHdEB+5aTcPZ0hh/gzi9Ezq5IBO4bl/hV4Dg4fub6t12W6VGlsERtvdUaEowL35M3pojv0hOvLaq0FbdQ==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"@vue/compiler-dom": "3.4.15",
|
"@vue/compiler-dom": "3.4.16",
|
||||||
"@vue/shared": "3.4.15"
|
"@vue/shared": "3.4.16"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"@vue/shared": {
|
"@vue/shared": {
|
||||||
"version": "3.4.15",
|
"version": "3.4.16",
|
||||||
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.15.tgz",
|
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.16.tgz",
|
||||||
"integrity": "sha512-KzfPTxVaWfB+eGcGdbSf4CWdaXcGDqckoeXUh7SB3fZdEtzPCK2Vq9B/lRRL3yutax/LWITz+SwvgyOxz5V75g=="
|
"integrity": "sha512-HKCjeaxR+R95dCw1BDaytcHdlzZj9lxj7RlFnxWtcKq670t8oSeMsbPlkzkNc2V6IUzHaMtUxdBcdREAhb+7NA=="
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -2516,9 +2522,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"axios": {
|
"axios": {
|
||||||
"version": "1.6.5",
|
"version": "1.6.7",
|
||||||
"resolved": "https://registry.npmjs.org/axios/-/axios-1.6.5.tgz",
|
"resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz",
|
||||||
"integrity": "sha512-Ii012v05KEVuUoFWmMW/UQv9aRIc3ZwkWDcM+h5Il8izZCtRVpDUfwpoFf7eOtajT3QiGR4yDUx7lPqHJULgbg==",
|
"integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"follow-redirects": "^1.15.4",
|
"follow-redirects": "^1.15.4",
|
||||||
"form-data": "^4.0.0",
|
"form-data": "^4.0.0",
|
||||||
|
@ -3931,9 +3937,9 @@
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"floating-vue": {
|
"floating-vue": {
|
||||||
"version": "5.2.0",
|
"version": "5.2.2",
|
||||||
"resolved": "https://registry.npmjs.org/floating-vue/-/floating-vue-5.2.0.tgz",
|
"resolved": "https://registry.npmjs.org/floating-vue/-/floating-vue-5.2.2.tgz",
|
||||||
"integrity": "sha512-CeApC0dUU8Mye6mjH3ZB7FXoUjIRduNuz8QW4nj3ZUweaFqv7PwxfN9klTuRQe9MeZXxbIHJHBTNl9t/bv+SUA==",
|
"integrity": "sha512-afW+h2CFafo+7Y9Lvw/xsqjaQlKLdJV7h1fCHfcYQ1C4SVMlu7OAekqWgu5d4SgvkBVU0pVpLlVsrSTBURFRkg==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"@floating-ui/dom": "~1.1.1",
|
"@floating-ui/dom": "~1.1.1",
|
||||||
"vue-resize": "^2.0.0-alpha.1"
|
"vue-resize": "^2.0.0-alpha.1"
|
||||||
|
@ -4410,11 +4416,11 @@
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"imask": {
|
"imask": {
|
||||||
"version": "7.3.0",
|
"version": "7.4.0",
|
||||||
"resolved": "https://registry.npmjs.org/imask/-/imask-7.3.0.tgz",
|
"resolved": "https://registry.npmjs.org/imask/-/imask-7.4.0.tgz",
|
||||||
"integrity": "sha512-TG+/rfb62JaQDM2KVrzEHMb4lv2srbsby7vHndXhqgQFB1MgPIXl60VQUfly/Xv5iWfA9ytB+rfQ+skUgINw7A==",
|
"integrity": "sha512-fU6mCo5YiTeDI8aVreuOKLOWxXIrRVnuQhZQXbjhwHxQb3GOQyCtlDGMyHxu2gq//LnKDxTwDBq1teRHmkzA3Q==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"@babel/runtime-corejs3": "^7.23.6"
|
"@babel/runtime-corejs3": "^7.23.9"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"import-fresh": {
|
"import-fresh": {
|
||||||
|
@ -4812,6 +4818,7 @@
|
||||||
"version": "0.30.5",
|
"version": "0.30.5",
|
||||||
"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz",
|
"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz",
|
||||||
"integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==",
|
"integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==",
|
||||||
|
"dev": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"@jridgewell/sourcemap-codec": "^1.4.15"
|
"@jridgewell/sourcemap-codec": "^1.4.15"
|
||||||
}
|
}
|
||||||
|
@ -6654,9 +6661,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"swiper": {
|
"swiper": {
|
||||||
"version": "11.0.5",
|
"version": "11.0.6",
|
||||||
"resolved": "https://registry.npmjs.org/swiper/-/swiper-11.0.5.tgz",
|
"resolved": "https://registry.npmjs.org/swiper/-/swiper-11.0.6.tgz",
|
||||||
"integrity": "sha512-rhCwupqSyRnWrtNzWzemnBLMoyYuoDgGgspAm/8iBD3jCvAWycPLH4Z3TB0O5520DHLzMx94yUMH/B9Efpa48w=="
|
"integrity": "sha512-W/Me7MQl5rNgdM5x9i3Gll76WsyVpnHn91GhBOyL7RCFUeg62aVnflzlVfIpXzZ/87FtJOfAoDH79ZH2Yq76zA=="
|
||||||
},
|
},
|
||||||
"tapable": {
|
"tapable": {
|
||||||
"version": "2.2.1",
|
"version": "2.2.1",
|
||||||
|
@ -6947,67 +6954,80 @@
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"vue": {
|
"vue": {
|
||||||
"version": "3.4.15",
|
"version": "3.4.16",
|
||||||
"resolved": "https://registry.npmjs.org/vue/-/vue-3.4.15.tgz",
|
"resolved": "https://registry.npmjs.org/vue/-/vue-3.4.16.tgz",
|
||||||
"integrity": "sha512-jC0GH4KkWLWJOEQjOpkqU1bQsBwf4R1rsFtw5GQJbjHVKWDzO6P0nWWBTmjp1xSemAioDFj1jdaK1qa3DnMQoQ==",
|
"integrity": "sha512-l5/KcZRp3GbsFXQGeCL9ll1JfRU285K/7l8mZM+dEO+CnE1j26MvfBKJi17iCRRwstl+Jz7KSLlzj9L79fB6WA==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"@vue/compiler-dom": "3.4.15",
|
"@vue/compiler-dom": "3.4.16",
|
||||||
"@vue/compiler-sfc": "3.4.15",
|
"@vue/compiler-sfc": "3.4.16",
|
||||||
"@vue/runtime-dom": "3.4.15",
|
"@vue/runtime-dom": "3.4.16",
|
||||||
"@vue/server-renderer": "3.4.15",
|
"@vue/server-renderer": "3.4.16",
|
||||||
"@vue/shared": "3.4.15"
|
"@vue/shared": "3.4.16"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@babel/parser": {
|
||||||
|
"version": "7.23.9",
|
||||||
|
"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.9.tgz",
|
||||||
|
"integrity": "sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA=="
|
||||||
|
},
|
||||||
"@vue/compiler-core": {
|
"@vue/compiler-core": {
|
||||||
"version": "3.4.15",
|
"version": "3.4.16",
|
||||||
"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.15.tgz",
|
"resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.16.tgz",
|
||||||
"integrity": "sha512-XcJQVOaxTKCnth1vCxEChteGuwG6wqnUHxAm1DO3gCz0+uXKaJNx8/digSz4dLALCy8n2lKq24jSUs8segoqIw==",
|
"integrity": "sha512-HXgyy7gen4FNJS8Hz2q/NNBEdzD3QInhDTWaP2/mS0TlmV9CnjmXip7TZ0ROYiQM4FgXZCCJvh74yDikFkPpkQ==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"@babel/parser": "^7.23.6",
|
"@babel/parser": "^7.23.9",
|
||||||
"@vue/shared": "3.4.15",
|
"@vue/shared": "3.4.16",
|
||||||
"entities": "^4.5.0",
|
"entities": "^4.5.0",
|
||||||
"estree-walker": "^2.0.2",
|
"estree-walker": "^2.0.2",
|
||||||
"source-map-js": "^1.0.2"
|
"source-map-js": "^1.0.2"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"@vue/compiler-dom": {
|
"@vue/compiler-dom": {
|
||||||
"version": "3.4.15",
|
"version": "3.4.16",
|
||||||
"resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.15.tgz",
|
"resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.16.tgz",
|
||||||
"integrity": "sha512-wox0aasVV74zoXyblarOM3AZQz/Z+OunYcIHe1OsGclCHt8RsRm04DObjefaI82u6XDzv+qGWZ24tIsRAIi5MQ==",
|
"integrity": "sha512-lvs9ankPzLEuIC5aB72ntLUcwVGmgY7ASkXDRvo9+lUMWOOCqnAmM/64AZPeVAZ4EnjocCE40OUN+ZboNe4ygA==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"@vue/compiler-core": "3.4.15",
|
"@vue/compiler-core": "3.4.16",
|
||||||
"@vue/shared": "3.4.15"
|
"@vue/shared": "3.4.16"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"@vue/compiler-sfc": {
|
"@vue/compiler-sfc": {
|
||||||
"version": "3.4.15",
|
"version": "3.4.16",
|
||||||
"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.15.tgz",
|
"resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.16.tgz",
|
||||||
"integrity": "sha512-LCn5M6QpkpFsh3GQvs2mJUOAlBQcCco8D60Bcqmf3O3w5a+KWS5GvYbrrJBkgvL1BDnTp+e8q0lXCLgHhKguBA==",
|
"integrity": "sha512-zVYC42Q/NmbB4nigGcQeIvsLpBlq6K9wJP5jTFCqfpXWnkodxfLFQHDu2GntZ7yKOgwAjxuvLwrPx+I6LPL2vg==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"@babel/parser": "^7.23.6",
|
"@babel/parser": "^7.23.9",
|
||||||
"@vue/compiler-core": "3.4.15",
|
"@vue/compiler-core": "3.4.16",
|
||||||
"@vue/compiler-dom": "3.4.15",
|
"@vue/compiler-dom": "3.4.16",
|
||||||
"@vue/compiler-ssr": "3.4.15",
|
"@vue/compiler-ssr": "3.4.16",
|
||||||
"@vue/shared": "3.4.15",
|
"@vue/shared": "3.4.16",
|
||||||
"estree-walker": "^2.0.2",
|
"estree-walker": "^2.0.2",
|
||||||
"magic-string": "^0.30.5",
|
"magic-string": "^0.30.6",
|
||||||
"postcss": "^8.4.33",
|
"postcss": "^8.4.33",
|
||||||
"source-map-js": "^1.0.2"
|
"source-map-js": "^1.0.2"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"@vue/compiler-ssr": {
|
"@vue/compiler-ssr": {
|
||||||
"version": "3.4.15",
|
"version": "3.4.16",
|
||||||
"resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.15.tgz",
|
"resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.16.tgz",
|
||||||
"integrity": "sha512-1jdeQyiGznr8gjFDadVmOJqZiLNSsMa5ZgqavkPZ8O2wjHv0tVuAEsw5hTdUoUW4232vpBbL/wJhzVW/JwY1Uw==",
|
"integrity": "sha512-1kNF+fHdEB+5aTcPZ0hh/gzi9Ezq5IBO4bl/hV4Dg4fub6t12W6VGlsERtvdUaEowL35M3pojv0hOvLaq0FbdQ==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"@vue/compiler-dom": "3.4.15",
|
"@vue/compiler-dom": "3.4.16",
|
||||||
"@vue/shared": "3.4.15"
|
"@vue/shared": "3.4.16"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"@vue/shared": {
|
"@vue/shared": {
|
||||||
"version": "3.4.15",
|
"version": "3.4.16",
|
||||||
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.15.tgz",
|
"resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.4.16.tgz",
|
||||||
"integrity": "sha512-KzfPTxVaWfB+eGcGdbSf4CWdaXcGDqckoeXUh7SB3fZdEtzPCK2Vq9B/lRRL3yutax/LWITz+SwvgyOxz5V75g=="
|
"integrity": "sha512-HKCjeaxR+R95dCw1BDaytcHdlzZj9lxj7RlFnxWtcKq670t8oSeMsbPlkzkNc2V6IUzHaMtUxdBcdREAhb+7NA=="
|
||||||
|
},
|
||||||
|
"magic-string": {
|
||||||
|
"version": "0.30.7",
|
||||||
|
"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.7.tgz",
|
||||||
|
"integrity": "sha512-8vBuFF/I/+OSLRmdf2wwFCJCz+nSn0m6DPvGH1fS/KiQoSaR+sETbov0eIk9KhEKy8CYqIkIAnbohxT/4H0kuA==",
|
||||||
|
"requires": {
|
||||||
|
"@jridgewell/sourcemap-codec": "^1.4.15"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -7020,9 +7040,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"vue-demi": {
|
"vue-demi": {
|
||||||
"version": "0.14.6",
|
"version": "0.14.7",
|
||||||
"resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.6.tgz",
|
"resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.7.tgz",
|
||||||
"integrity": "sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w=="
|
"integrity": "sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA=="
|
||||||
},
|
},
|
||||||
"vue-eslint-parser": {
|
"vue-eslint-parser": {
|
||||||
"version": "9.4.1",
|
"version": "9.4.1",
|
||||||
|
@ -7040,12 +7060,12 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"vue-imask": {
|
"vue-imask": {
|
||||||
"version": "7.3.0",
|
"version": "7.4.0",
|
||||||
"resolved": "https://registry.npmjs.org/vue-imask/-/vue-imask-7.3.0.tgz",
|
"resolved": "https://registry.npmjs.org/vue-imask/-/vue-imask-7.4.0.tgz",
|
||||||
"integrity": "sha512-KufV7f9cX6hgiuRNeejVtz57xRBdRSoHy0wVxN9pQ80NLbMkTNRDFYVTcJxC1eUky2A2EkxSUBDAaSjD/c/Nbw==",
|
"integrity": "sha512-lvTKV0+0BvKXV+/4GoTqUGHZQFBFoNSC56jmvGB3C6SUQsytRKJb1AB/qjNBZFv9gYAWBk2Sx5QiMVf3tV9BXw==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"imask": "^7.3.0",
|
"imask": "^7.4.0",
|
||||||
"vue-demi": "^0.14.6"
|
"vue-demi": "^0.14.7"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"vue-loader": {
|
"vue-loader": {
|
||||||
|
|
10
package.json
10
package.json
|
@ -12,13 +12,13 @@
|
||||||
"@vue-leaflet/vue-leaflet": "^0.10.1",
|
"@vue-leaflet/vue-leaflet": "^0.10.1",
|
||||||
"another-vue3-blurhash": "^0.0.1",
|
"another-vue3-blurhash": "^0.0.1",
|
||||||
"apexcharts": "^3.45.2",
|
"apexcharts": "^3.45.2",
|
||||||
"axios": "^1.6.5",
|
"axios": "^1.6.7",
|
||||||
"blurhash": "^2.0.5",
|
"blurhash": "^2.0.5",
|
||||||
"bulma": "^0.9.4",
|
"bulma": "^0.9.4",
|
||||||
"conditioner-core": "^2.3.3",
|
"conditioner-core": "^2.3.3",
|
||||||
"countup.js": "^2.8.0",
|
"countup.js": "^2.8.0",
|
||||||
"css-vars-ponyfill": "^2.4.8",
|
"css-vars-ponyfill": "^2.4.8",
|
||||||
"floating-vue": "5.2.0",
|
"floating-vue": "5.2.2",
|
||||||
"leaflet": "^1.9.4",
|
"leaflet": "^1.9.4",
|
||||||
"leaflet-active-area": "^1.2.1",
|
"leaflet-active-area": "^1.2.1",
|
||||||
"masonry-layout": "^4.2.2",
|
"masonry-layout": "^4.2.2",
|
||||||
|
@ -31,10 +31,10 @@
|
||||||
"react-dom": "^18.2.0",
|
"react-dom": "^18.2.0",
|
||||||
"sortablejs": "^1.15.2",
|
"sortablejs": "^1.15.2",
|
||||||
"sortablejs-vue3": "^1.2.11",
|
"sortablejs-vue3": "^1.2.11",
|
||||||
"swiper": "^11.0.5",
|
"swiper": "^11.0.6",
|
||||||
"vue": "^3.4.15",
|
"vue": "^3.4.16",
|
||||||
"vue-countup-v3": "^1.4.1",
|
"vue-countup-v3": "^1.4.1",
|
||||||
"vue-imask": "^7.3.0",
|
"vue-imask": "^7.4.0",
|
||||||
"vue-router": "^4.2.5",
|
"vue-router": "^4.2.5",
|
||||||
"vue3-apexcharts": "^1.4.4",
|
"vue3-apexcharts": "^1.4.4",
|
||||||
"vuex": "^4.1.0"
|
"vuex": "^4.1.0"
|
||||||
|
|
|
@ -188,7 +188,6 @@ export default {
|
||||||
app.config.globalProperties.$store.dispatch('search/cleanSelectedItems');
|
app.config.globalProperties.$store.dispatch('search/cleanSelectedItems');
|
||||||
},
|
},
|
||||||
async filterBySelectedItems(selectedItems) {
|
async filterBySelectedItems(selectedItems) {
|
||||||
await app.config.globalProperties.$router.replace({ path: app.config.globalProperties.$route.path, query: {} });
|
|
||||||
await app.config.globalProperties.$router.replace({ path: app.config.globalProperties.$route.path, query: { postin: selectedItems } });
|
await app.config.globalProperties.$router.replace({ path: app.config.globalProperties.$route.path, query: { postin: selectedItems } });
|
||||||
},
|
},
|
||||||
highlightsItem(itemId) {
|
highlightsItem(itemId) {
|
||||||
|
@ -200,7 +199,6 @@ export default {
|
||||||
},
|
},
|
||||||
updateURLQueries() {
|
updateURLQueries() {
|
||||||
const newQueries = JSON.parse(JSON.stringify(app.config.globalProperties.$store.getters['search/getPostQuery']));
|
const newQueries = JSON.parse(JSON.stringify(app.config.globalProperties.$store.getters['search/getPostQuery']));
|
||||||
//app.config.globalProperties.$router.replace({ path: app.config.globalProperties.$route.path, query: {} });
|
|
||||||
app.config.globalProperties.$router.replace({ path: app.config.globalProperties.$route.path, query: newQueries });
|
app.config.globalProperties.$router.replace({ path: app.config.globalProperties.$route.path, query: newQueries });
|
||||||
},
|
},
|
||||||
updateStoreFromURL() {
|
updateStoreFromURL() {
|
||||||
|
|
|
@ -870,27 +870,6 @@
|
||||||
this.$route.query.orderby = 'date'
|
this.$route.query.orderby = 'date'
|
||||||
}
|
}
|
||||||
|
|
||||||
// Theme View Modes
|
|
||||||
if ((this.$route.name == null || this.$route.name == undefined ) &&
|
|
||||||
this.$route.name != 'CollectionItemsPage' && this.$route.name != 'ItemsPage' &&
|
|
||||||
(this.$route.query.view_mode == undefined || to.params.collectionId != from.params.collectionId)
|
|
||||||
) {
|
|
||||||
|
|
||||||
let viewModeKey = (this.collectionId != undefined ? 'view_mode_' + this.collectionId : 'view_mode');
|
|
||||||
let viewModeValue = this.$userPrefs.get(viewModeKey);
|
|
||||||
|
|
||||||
if (viewModeValue)
|
|
||||||
this.$route.query.view_mode = viewModeValue;
|
|
||||||
else {
|
|
||||||
this.$route.query.view_mode = 'table';
|
|
||||||
this.$userPrefs.set(viewModeKey, 'table');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Emit slideshow-from to start this view mode from index
|
|
||||||
if (this.$route.query.view_mode != 'slideshow' && this.$route.query['slideshow-from'] !== null && this.$route.query['slideshow-from'] !== undefined && this.$route.query['slideshow-from'] !== false)
|
|
||||||
this.$eventBusSearchEmitter.emit('startSlideshowFromItem', this.$route.query['slideshow-from']);
|
|
||||||
|
|
||||||
// Admin View Modes
|
// Admin View Modes
|
||||||
if (this.$route.name != null && this.$route.name != undefined &&
|
if (this.$route.name != null && this.$route.name != undefined &&
|
||||||
(this.$route.name == 'CollectionItemsPage' || this.$route.name == 'ItemsPage') &&
|
(this.$route.name == 'CollectionItemsPage' || this.$route.name == 'ItemsPage') &&
|
||||||
|
@ -982,6 +961,15 @@
|
||||||
this.$eventBusSearch.setCollectionId(this.collectionId);
|
this.$eventBusSearch.setCollectionId(this.collectionId);
|
||||||
this.$eventBusSearch.updateStoreFromURL();
|
this.$eventBusSearch.updateStoreFromURL();
|
||||||
|
|
||||||
|
let currentQuery = JSON.parse(JSON.stringify(this.$route.query));
|
||||||
|
|
||||||
|
if (currentQuery && currentQuery.advancedSearch)
|
||||||
|
this.openAdvancedSearch = !!currentQuery.advancedSearch;
|
||||||
|
|
||||||
|
this.$emitter.on('openAdvancedSearch', (openAdvancedSearch) => {
|
||||||
|
this.openAdvancedSearch = openAdvancedSearch;
|
||||||
|
});
|
||||||
|
|
||||||
this.$eventBusSearchEmitter.on('isLoadingItems', isLoadingItems => {
|
this.$eventBusSearchEmitter.on('isLoadingItems', isLoadingItems => {
|
||||||
|
|
||||||
if (isLoadingItems != this.isLoadingItems && this.$refs['items-page-container'] && this.$refs['search-control']) {
|
if (isLoadingItems != this.isLoadingItems && this.$refs['items-page-container'] && this.$refs['search-control']) {
|
||||||
|
@ -998,14 +986,6 @@
|
||||||
this.$eventBusSearchEmitter.on('hasFiltered', hasFiltered => {
|
this.$eventBusSearchEmitter.on('hasFiltered', hasFiltered => {
|
||||||
this.hasFiltered = hasFiltered;
|
this.hasFiltered = hasFiltered;
|
||||||
});
|
});
|
||||||
|
|
||||||
if (this.$route.query && this.$route.query.advancedSearch) {
|
|
||||||
this.openAdvancedSearch = this.$route.query.advancedSearch;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.$emitter.on('openAdvancedSearch', (openAdvancedSearch) => {
|
|
||||||
this.openAdvancedSearch = openAdvancedSearch;
|
|
||||||
});
|
|
||||||
|
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
|
|
|
@ -25,7 +25,6 @@ import {
|
||||||
} from '@ntohq/buefy-next';
|
} from '@ntohq/buefy-next';
|
||||||
import VTooltip from 'floating-vue';
|
import VTooltip from 'floating-vue';
|
||||||
import cssVars from 'css-vars-ponyfill';
|
import cssVars from 'css-vars-ponyfill';
|
||||||
import qs from 'qs';
|
|
||||||
import VueBlurHash from 'another-vue3-blurhash';
|
import VueBlurHash from 'another-vue3-blurhash';
|
||||||
|
|
||||||
import getDataAttribute from '../../js/compatibility/tainacan-blocks-compat-data-attributes.js';
|
import getDataAttribute from '../../js/compatibility/tainacan-blocks-compat-data-attributes.js';
|
||||||
|
@ -103,14 +102,6 @@ export default (element) => {
|
||||||
created() {
|
created() {
|
||||||
blockElement.setAttribute('aria-live', 'polite');
|
blockElement.setAttribute('aria-live', 'polite');
|
||||||
blockElement.classList.add('theme-items-list'); // This used to be on the component, but as Vue now do not renders the component inside a div...
|
blockElement.classList.add('theme-items-list'); // This used to be on the component, but as Vue now do not renders the component inside a div...
|
||||||
|
|
||||||
// Loads params if passed previously
|
|
||||||
const currentRouteQueries = qs.parse(location.search.split('?')[1]);
|
|
||||||
|
|
||||||
if ( currentRouteQueries.advancedSearch )
|
|
||||||
this.$store.dispatch('search/setAdvancedQuery', currentRouteQueries);
|
|
||||||
else
|
|
||||||
this.$store.dispatch('search/setPostQuery', currentRouteQueries )
|
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
blockElement.classList.add('has-mounted');
|
blockElement.classList.add('has-mounted');
|
||||||
|
|
|
@ -693,6 +693,7 @@
|
||||||
<script>
|
<script>
|
||||||
import { nextTick, defineAsyncComponent } from 'vue';
|
import { nextTick, defineAsyncComponent } from 'vue';
|
||||||
import { mapActions, mapGetters } from 'vuex';
|
import { mapActions, mapGetters } from 'vuex';
|
||||||
|
import qs from 'qs';
|
||||||
import ItemsPagination from '../../../admin/components/search/items-pagination.vue'
|
import ItemsPagination from '../../../admin/components/search/items-pagination.vue'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
|
@ -915,11 +916,10 @@
|
||||||
this.$eventBusSearchEmitter.emit('startSlideshowFromItem', this.$route.query['slideshow-from']);
|
this.$eventBusSearchEmitter.emit('startSlideshowFromItem', this.$route.query['slideshow-from']);
|
||||||
|
|
||||||
// Advanced Search
|
// Advanced Search
|
||||||
// if (this.$route.query && this.$route.query.advancedSearch){
|
if (this.$route.query && this.$route.query.advancedSearch)
|
||||||
// this.$store.dispatch('search/setAdvancedQuery', this.$route.query);
|
this.$store.dispatch('search/setAdvancedQuery', JSON.parse(JSON.stringify(this.$route.query)));
|
||||||
//} else {
|
else
|
||||||
// this.$store.dispatch('search/setPostQuery', this.$route.query);
|
this.$store.dispatch('search/setPostQuery', JSON.parse(JSON.stringify(this.$route.query)));
|
||||||
//}
|
|
||||||
|
|
||||||
// Finally, loads items even berfore facets so they won't stuck them
|
// Finally, loads items even berfore facets so they won't stuck them
|
||||||
if (to.fullPath != from.fullPath)
|
if (to.fullPath != from.fullPath)
|
||||||
|
@ -937,15 +937,12 @@
|
||||||
const newMetaQueryArray = newQueryArray.filter(queryItem => queryItem.startsWith('metaquery'));
|
const newMetaQueryArray = newQueryArray.filter(queryItem => queryItem.startsWith('metaquery'));
|
||||||
const oldTaxQueryArray = oldQueryArray.filter(queryItem => queryItem.startsWith('taxquery'));
|
const oldTaxQueryArray = oldQueryArray.filter(queryItem => queryItem.startsWith('taxquery'));
|
||||||
const newTaxQueryArray = newQueryArray.filter(queryItem => queryItem.startsWith('taxquery'));
|
const newTaxQueryArray = newQueryArray.filter(queryItem => queryItem.startsWith('taxquery'));
|
||||||
const oldStatusArray = oldQueryArray.filter(queryItem => queryItem.startsWith('status'));
|
|
||||||
const newStatusArray = newQueryArray.filter(queryItem => queryItem.startsWith('status'));
|
|
||||||
const oldSearchQuery = oldQueryArray.filter(queryItem => queryItem.startsWith('search'));
|
const oldSearchQuery = oldQueryArray.filter(queryItem => queryItem.startsWith('search'));
|
||||||
const newSearchQuery = newQueryArray.filter(queryItem => queryItem.startsWith('search'));
|
const newSearchQuery = newQueryArray.filter(queryItem => queryItem.startsWith('search'));
|
||||||
|
|
||||||
if (
|
if (
|
||||||
JSON.stringify(oldMetaQueryArray) != JSON.stringify(newMetaQueryArray) ||
|
JSON.stringify(oldMetaQueryArray) != JSON.stringify(newMetaQueryArray) ||
|
||||||
JSON.stringify(oldTaxQueryArray) != JSON.stringify(newTaxQueryArray) ||
|
JSON.stringify(oldTaxQueryArray) != JSON.stringify(newTaxQueryArray) ||
|
||||||
JSON.stringify(oldStatusArray) != JSON.stringify(newStatusArray) ||
|
|
||||||
JSON.stringify(oldSearchQuery) != JSON.stringify(newSearchQuery)
|
JSON.stringify(oldSearchQuery) != JSON.stringify(newSearchQuery)
|
||||||
) {
|
) {
|
||||||
this.$eventBusSearchEmitter.emit('hasToReloadFacets', true);
|
this.$eventBusSearchEmitter.emit('hasToReloadFacets', true);
|
||||||
|
@ -999,12 +996,12 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
|
|
||||||
this.$userPrefs.init();
|
this.$userPrefs.init();
|
||||||
|
|
||||||
this.isRepositoryLevel = (this.collectionId == undefined || this.collectionId == '' || this.collectionId == null);
|
this.isRepositoryLevel = (this.collectionId == undefined || this.collectionId == '' || this.collectionId == null);
|
||||||
|
|
||||||
this.$eventBusSearch.updateStoreFromURL();
|
// Loads params if passed previously
|
||||||
|
let currentQuery = qs.parse(location.search.split('?')[1]);
|
||||||
|
|
||||||
// Sets initial variables important to searchbus
|
// Sets initial variables important to searchbus
|
||||||
if (this.collectionId != undefined)
|
if (this.collectionId != undefined)
|
||||||
|
@ -1013,7 +1010,7 @@
|
||||||
this.$eventBusSearch.setTerm(this.termId, this.taxonomy);
|
this.$eventBusSearch.setTerm(this.termId, this.taxonomy);
|
||||||
if (this.defaultOrder != undefined) {
|
if (this.defaultOrder != undefined) {
|
||||||
this.$eventBusSearch.setDefaultOrder(this.defaultOrder);
|
this.$eventBusSearch.setDefaultOrder(this.defaultOrder);
|
||||||
if (!this.$route.query.order)
|
if (!currentQuery.order)
|
||||||
this.$eventBusSearch.setOrder(this.defaultOrder);
|
this.$eventBusSearch.setOrder(this.defaultOrder);
|
||||||
}
|
}
|
||||||
if (this.defaultOrderBy != undefined) {
|
if (this.defaultOrderBy != undefined) {
|
||||||
|
@ -1030,17 +1027,38 @@
|
||||||
|
|
||||||
this.$eventBusSearch.setDefaultOrderBy(orderByObject);
|
this.$eventBusSearch.setDefaultOrderBy(orderByObject);
|
||||||
|
|
||||||
if (!this.$route.query.orderby)
|
if (!currentQuery.orderby)
|
||||||
this.$eventBusSearch.setOrderBy(orderByObject);
|
this.$eventBusSearch.setOrderBy(orderByObject);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
this.$eventBusSearch.setDefaultOrderBy(this.defaultOrderBy);
|
this.$eventBusSearch.setDefaultOrderBy(this.defaultOrderBy);
|
||||||
|
|
||||||
if (!this.$route.query.orderby)
|
if (!currentQuery.orderby)
|
||||||
this.$eventBusSearch.setOrderBy(this.defaultOrderBy);
|
this.$eventBusSearch.setOrderBy(this.defaultOrderBy);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for (let key in currentQuery) {
|
||||||
|
if (currentQuery[key] == 'true')
|
||||||
|
currentQuery[key] = true;
|
||||||
|
if (currentQuery[key] == 'false')
|
||||||
|
currentQuery[key] = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ( currentQuery.advancedSearch )
|
||||||
|
this.$store.dispatch('search/setAdvancedQuery', currentQuery);
|
||||||
|
else
|
||||||
|
this.$store.dispatch('search/setPostQuery', currentQuery )
|
||||||
|
|
||||||
|
if (!this.hideAdvancedSearch) {
|
||||||
|
if (currentQuery && currentQuery.advancedSearch)
|
||||||
|
this.openAdvancedSearch = !!currentQuery.advancedSearch;
|
||||||
|
|
||||||
|
this.$emitter.on('openAdvancedSearch', (openAdvancedSearch) => {
|
||||||
|
this.openAdvancedSearch = openAdvancedSearch;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
this.$eventBusSearchEmitter.on('isLoadingItems', isLoadingItems => {
|
this.$eventBusSearchEmitter.on('isLoadingItems', isLoadingItems => {
|
||||||
|
|
||||||
this.isLoadingItems = isLoadingItems;
|
this.isLoadingItems = isLoadingItems;
|
||||||
|
@ -1060,7 +1078,7 @@
|
||||||
});
|
});
|
||||||
|
|
||||||
this.$eventBusSearchEmitter.on('exitViewModeWithoutPagination', () => {
|
this.$eventBusSearchEmitter.on('exitViewModeWithoutPagination', () => {
|
||||||
let currentQuery = this.$route.query;
|
let currentQuery = JSON.parse(JSON.stringify(this.$route.query));
|
||||||
delete currentQuery['slideshow-from'];
|
delete currentQuery['slideshow-from'];
|
||||||
this.$router.replace({ query: currentQuery });
|
this.$router.replace({ query: currentQuery });
|
||||||
|
|
||||||
|
@ -1069,20 +1087,9 @@
|
||||||
this.$eventBusSearch.setPage(this.latestPageAfterViewModeWithoutPagination);
|
this.$eventBusSearch.setPage(this.latestPageAfterViewModeWithoutPagination);
|
||||||
this.onChangeViewMode(this.latestNonFullscreenViewMode ? this.latestNonFullscreenViewMode : this.defaultViewMode);
|
this.onChangeViewMode(this.latestNonFullscreenViewMode ? this.latestNonFullscreenViewMode : this.defaultViewMode);
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!this.hideAdvancedSearch) {
|
|
||||||
|
|
||||||
if (this.$route.query && this.$route.query.advancedSearch) {
|
|
||||||
this.openAdvancedSearch = this.$route.query.advancedSearch;
|
|
||||||
}
|
|
||||||
|
|
||||||
this.$emitter.on('openAdvancedSearch', (openAdvancedSearch) => {
|
|
||||||
this.openAdvancedSearch = openAdvancedSearch;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
this.$eventBusSearchEmitter.on('startSlideshowFromItem', (index) => {
|
this.$eventBusSearchEmitter.on('startSlideshowFromItem', (index) => {
|
||||||
let currentQuery = this.$route.query;
|
let currentQuery = JSON.parse(JSON.stringify(this.$route.query));
|
||||||
delete currentQuery['slideshow-from'];
|
delete currentQuery['slideshow-from'];
|
||||||
this.$router.replace({ query: currentQuery }).catch((error) => this.$console.log(error));
|
this.$router.replace({ query: currentQuery }).catch((error) => this.$console.log(error));
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue