Fixes to avoid repeated API calls on startup

gramps-project · Sep 19, 2022 · 4d1d33b · 4d1d33b
1 parent 2efdcf6
commit 4d1d33b
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 13 deletions.
diff --git a/src/GrampsJs.js b/src/GrampsJs.js
@@ -1008,7 +1008,8 @@ export class GrampsJs extends LitElement {
 
  _loadStrings(strings, lang) {
  this._loadingStrings = true
- apiPost(`/api/translations/${lang}`, {strings}).then(data => {
+ apiPost(`/api/translations/${lang}`, {strings}, true, false).then(data => {
+ this._loadingStrings = false
  if ('data' in data) {
  this._strings = data.data.reduce(
  (obj, item) =>
@@ -1026,7 +1027,6 @@ export class GrampsJs extends LitElement {
  this._showError(data.error)
  }
  })
- this._loadingStrings = false
  }
 
  _showError(msg) {

diff --git a/src/api.js b/src/api.js
@@ -212,7 +212,13 @@ export async function apiGet(endpoint, isJson = true) {
  }
 }
 
-async function apiPutPost(method, endpoint, payload, isJson = true) {
+async function apiPutPost(
+ method,
+ endpoint,
+ payload,
+ isJson = true,
+ dbChanged = true
+) {
  const accessToken = localStorage.getItem('access_token')
  const headers = {Accept: 'application/json'}
  if (accessToken !== null) {
@@ -243,9 +249,11 @@ async function apiPutPost(method, endpoint, payload, isJson = true) {
  if (resp.status !== 201 && resp.status !== 200) {
  throw new Error(`Error ${resp.status}`)
  }
- window.dispatchEvent(
- new CustomEvent('db:changed', {bubbles: true, composed: true})
- )
+ if (dbChanged) {
+ window.dispatchEvent(
+ new CustomEvent('db:changed', {bubbles: true, composed: true})
+ )
+ }
  try {
  return {
  data: await resp.json(),
@@ -265,8 +273,13 @@ export async function apiPut(endpoint, payload) {
  return apiPutPost('PUT', endpoint, payload)
 }
 
-export async function apiPost(endpoint, payload, isJson = true) {
- return apiPutPost('POST', endpoint, payload, isJson)
+export async function apiPost(
+ endpoint,
+ payload,
+ isJson = true,
+ dbChanged = true
+) {
+ return apiPutPost('POST', endpoint, payload, isJson, dbChanged)
 }
 
 export function getExporterUrl(id, options) {

diff --git a/src/components/GrampsjsConnectedComponent.js b/src/components/GrampsjsConnectedComponent.js
@@ -61,7 +61,11 @@ export class GrampsjsConnectedComponent extends GrampsjsTranslateMixin(
 
  update(changed) {
  super.update(changed)
- if (changed.has('strings') && '__lang__' in this.strings) {
+ if (
+ changed.has('strings') &&
+ '__lang__' in this.strings &&
+ changed.get('strings')?.__lang__ !== this.strings?.__lang__
+ ) {
  this._updateData()
  }
  }

diff --git a/src/views/GrampsjsView.js b/src/views/GrampsjsView.js
@@ -36,6 +36,7 @@ export class GrampsjsView extends GrampsjsTranslateMixin(LitElement) {
  error: {type: Boolean},
  settings: {type: Object},
  _errorMessage: {type: String},
+ _hasFirstUpdated: {type: Boolean},
  }
  }
 
@@ -46,6 +47,7 @@ export class GrampsjsView extends GrampsjsTranslateMixin(LitElement) {
  this.error = false
  this.settings = {}
  this._errorMessage = ''
+ this._hasFirstUpdated = false
  }
 
  render() {
@@ -61,6 +63,10 @@ export class GrampsjsView extends GrampsjsTranslateMixin(LitElement) {
  return this.renderContent()
  }
 
+ firstUpdated() {
+ this._hasFirstUpdated = true
+ }
+
  update(changed) {
  super.update(changed)
  if (changed.has('loading')) {

diff --git a/src/views/GrampsjsViewExport.js b/src/views/GrampsjsViewExport.js
@@ -132,9 +132,15 @@ export class GrampsjsViewExport extends GrampsjsView {
  connectedCallback() {
  super.connectedCallback()
  window.addEventListener('language:changed', e =>
- this._fetchData(e.detail.lang)
+ this._handleLanguageChanged(e)
  )
  }
+
+ _handleLanguageChanged(e) {
+ if (this._hasFirstUpdated) {
+ this._fetchData(e.detail.lang)
+ }
+ }
 }
 
 window.customElements.define('grampsjs-view-export', GrampsjsViewExport)
diff --git a/src/views/GrampsjsViewRecent.js b/src/views/GrampsjsViewRecent.js
@@ -27,17 +27,25 @@ export class GrampsjsViewRecentObject extends GrampsjsView {
  window.addEventListener('storage', this._boundStorageHandler)
  this._handleStorage()
  window.addEventListener('language:changed', e =>
- this._fetchData(e.detail.lang)
+ this._handleLanguageChanged(e)
  )
  }
 
+ _handleLanguageChanged(e) {
+ if (this._hasFirstUpdated) {
+ this._fetchData(e.detail.lang)
+ }
+ }
+
  _handleStorage() {
  const recentObjects = JSON.parse(
  window.localStorage.getItem('recentObjects')
  )
  if (recentObjects !== undefined && recentObjects !== null) {
  this._data = recentObjects
- this._fetchData(this.strings.__lang__)
+ if (this._hasFirstUpdated) {
+ this._fetchData(this.strings.__lang__)
+ }
  }
  }
 

diff --git a/src/views/GrampsjsViewReports.js b/src/views/GrampsjsViewReports.js
@@ -90,9 +90,15 @@ export class GrampsjsViewReports extends GrampsjsView {
  connectedCallback() {
  super.connectedCallback()
  window.addEventListener('language:changed', e =>
- this._fetchData(e.detail.lang)
+ this._handleLanguageChanged(e)
  )
  }
+
+ _handleLanguageChanged(e) {
+ if (this._hasFirstUpdated) {
+ this._fetchData(e.detail.lang)
+ }
+ }
 }
 
 window.customElements.define('grampsjs-view-reports', GrampsjsViewReports)