From 969c67f767357074d80808e78dbf2671971e67a0 Mon Sep 17 00:00:00 2001
From: Mel O'Hagan <mel@budibase.com>
Date: Wed, 5 Oct 2022 15:53:06 +0100
Subject: [PATCH] Use OG class properties for iOS13 support

---
 .../app/charts/ApexOptionsBuilder.js          | 58 ++++++-------
 packages/frontend-core/src/fetch/DataFetch.js | 82 +++++++++----------
 2 files changed, 71 insertions(+), 69 deletions(-)

diff --git a/packages/client/src/components/app/charts/ApexOptionsBuilder.js b/packages/client/src/components/app/charts/ApexOptionsBuilder.js
index 31c5a820f7..6b3e3a4440 100644
--- a/packages/client/src/components/app/charts/ApexOptionsBuilder.js
+++ b/packages/client/src/components/app/charts/ApexOptionsBuilder.js
@@ -1,37 +1,39 @@
 export class ApexOptionsBuilder {
-  formatters = {
-    ["Default"]: val => (isNaN(val) ? val : Math.round(val * 100) / 100),
-    ["Thousands"]: val => `${Math.round(val / 1000)}K`,
-    ["Millions"]: val => `${Math.round(val / 1000000)}M`,
-  }
-  options = {
-    series: [],
-    legend: {
-      show: false,
-      position: "top",
-      horizontalAlign: "right",
-      showForSingleSeries: true,
-      showForNullSeries: true,
-      showForZeroSeries: true,
-    },
-    chart: {
-      toolbar: {
+  constructor() {
+    this.formatters = {
+      ["Default"]: val => (isNaN(val) ? val : Math.round(val * 100) / 100),
+      ["Thousands"]: val => `${Math.round(val / 1000)}K`,
+      ["Millions"]: val => `${Math.round(val / 1000000)}M`,
+    }
+    this.options = {
+      series: [],
+      legend: {
         show: false,
+        position: "top",
+        horizontalAlign: "right",
+        showForSingleSeries: true,
+        showForNullSeries: true,
+        showForZeroSeries: true,
       },
-      zoom: {
-        enabled: false,
+      chart: {
+        toolbar: {
+          show: false,
+        },
+        zoom: {
+          enabled: false,
+        },
       },
-    },
-    xaxis: {
-      labels: {
-        formatter: this.formatters.Default,
+      xaxis: {
+        labels: {
+          formatter: this.formatters.Default,
+        },
       },
-    },
-    yaxis: {
-      labels: {
-        formatter: this.formatters.Default,
+      yaxis: {
+        labels: {
+          formatter: this.formatters.Default,
+        },
       },
-    },
+    }
   }
 
   setOption(path, value) {
diff --git a/packages/frontend-core/src/fetch/DataFetch.js b/packages/frontend-core/src/fetch/DataFetch.js
index a3cc1c231c..31007121f1 100644
--- a/packages/frontend-core/src/fetch/DataFetch.js
+++ b/packages/frontend-core/src/fetch/DataFetch.js
@@ -14,52 +14,52 @@ import { convertJSONSchemaToTableSchema } from "../utils/json"
  * For other types of datasource, this class is overridden and extended.
  */
 export default class DataFetch {
-  // API client
-  API = null
-
-  // Feature flags
-  featureStore = writable({
-    supportsSearch: false,
-    supportsSort: false,
-    supportsPagination: false,
-  })
-
-  // Config
-  options = {
-    datasource: null,
-    limit: 10,
-
-    // Search config
-    filter: null,
-    query: null,
-
-    // Sorting config
-    sortColumn: null,
-    sortOrder: "ascending",
-    sortType: null,
-
-    // Pagination config
-    paginate: true,
-  }
-
-  // State of the fetch
-  store = writable({
-    rows: [],
-    info: null,
-    schema: null,
-    loading: false,
-    loaded: false,
-    query: null,
-    pageNumber: 0,
-    cursor: null,
-    cursors: [],
-  })
-
   /**
    * Constructs a new DataFetch instance.
    * @param opts the fetch options
    */
   constructor(opts) {
+    // API client
+    this.API = null
+
+    // Feature flags
+    this.featureStore = writable({
+      supportsSearch: false,
+      supportsSort: false,
+      supportsPagination: false,
+    })
+
+    // Config
+    this.options = {
+      datasource: null,
+      limit: 10,
+
+      // Search config
+      filter: null,
+      query: null,
+
+      // Sorting config
+      sortColumn: null,
+      sortOrder: "ascending",
+      sortType: null,
+
+      // Pagination config
+      paginate: true,
+    }
+
+    // State of the fetch
+    this.store = writable({
+      rows: [],
+      info: null,
+      schema: null,
+      loading: false,
+      loaded: false,
+      query: null,
+      pageNumber: 0,
+      cursor: null,
+      cursors: [],
+    })
+
     // Merge options with their default values
     this.API = opts?.API
     this.options = {