Finish preparing for Web API v2.4

gramps-project · Jul 25, 2024 · 0d85be8 · 0d85be8
1 parent 9f46952
commit 0d85be8
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 13 deletions.
diff --git a/src/components/GrampsjsFormSelectObject.js b/src/components/GrampsjsFormSelectObject.js
@@ -162,17 +162,7 @@ class GrampsjsFormSelectObject extends GrampsjsTranslateMixin(LitElement) {
  indeterminate
  density="-3"
  ></mwc-circular-progress>`
- const url = textField.value
- ? `/api/search/?locale=${
- this.strings?.__lang__ || 'en'
- }&profile=all&query=${encodeURIComponent(
- `${textField.value}* AND type:${this.objectType || '*'}`
- )}&profile=all&page=1&pagesize=20`
- : `/api/search/?sort=-change&locale=${
- this.strings?.__lang__ || 'en'
- }&profile=all&query=${encodeURIComponent(
- `type:${this.objectType || '*'}`
- )}&profile=all&page=1&pagesize=20`
+ const url = this._getFetchUrl(textField.value)
  const data = await apiGet(url)
  if ('data' in data) {
  this.data = data.data.filter(
@@ -186,6 +176,34 @@ class GrampsjsFormSelectObject extends GrampsjsTranslateMixin(LitElement) {
  }
  }
 
+ _getFetchUrl(value) {
+ if (window._oldSearchBackend) {
+ return value
+ ? `/api/search/?locale=${
+ this.strings?.__lang__ || 'en'
+ }&profile=all&query=${encodeURIComponent(
+ `${value}* AND type:${this.objectType || '*'}`
+ )}&profile=all&page=1&pagesize=20`
+ : `/api/search/?sort=-change&locale=${
+ this.strings?.__lang__ || 'en'
+ }&profile=all&query=${encodeURIComponent(
+ `type:${this.objectType || '*'}`
+ )}&profile=all&page=1&pagesize=20`
+ }
+ let url = `/api/search/?locale=${
+ this.strings?.__lang__ || 'en'
+ }&profile=all&page=1&pagesize=20`
+ if (value) {
+ url = `${url}&query=${encodeURIComponent(`${value}*`)}`
+ } else {
+ url = `${url}&sort=-change&query=${encodeURIComponent('*')}`
+ }
+ if (this.objectType) {
+ url = `${url}&type=${this.objectType}`
+ }
+ return url
+ }
+
  firstUpdated() {
  const btn = this.shadowRoot.getElementById('button')
  const menu = this.shadowRoot.getElementById('menu-search-results')

diff --git a/src/views/GrampsjsViewRecentlyChanged.js b/src/views/GrampsjsViewRecentlyChanged.js
@@ -34,8 +34,16 @@ export class GrampsjsViewRecentlyChanged extends GrampsjsConnectedComponent {
  }
 
  getUrl() {
- const query = "change:'-1 year to tomorrow'"
- return `/api/search/?sort=-change&query=${query}&locale=${
+ if (window._oldSearchBackend) {
+ const query = "change:'-1 year to tomorrow'"
+ return `/api/search/?sort=-change&query=${query}&locale=${
+ this.strings.__lang__ || 'en'
+ }&profile=all&page=1&pagesize=8`
+ }
+ const ts = Math.floor(Date.now() / 1000) - 365 * 24 * 60 * 60 // ~1 year ago
+ return `/api/search/?sort=-change&query=${encodeURIComponent(
+ '*'
+ )}&change=${encodeURIComponent(`>${ts}`)}&locale=${
  this.strings.__lang__ || 'en'
  }&profile=all&page=1&pagesize=8`
  }