Upgrade `explorer-schema` to Octane (#202)

* Upgrade `explorer-schema` to Octane

assets/javascripts/discourse/components/explorer-schema.hbs

@@ -0,0 +1,34 @@
+{{#if this.hideSchema}}
+  <DButton
+    @action={{this.expandSchema}}
+    @icon="chevron-left"
+    @class="no-text unhide"
+  />
+{{/if}}
+
+<div class="schema">
+  <div class={{if this.hideSchema "hidden"}}>
+    <div class="schema-search inline-form full-width">
+      <TextField
+        @value={{this.filter}}
+        @onChange={{this.filterChanged}}
+        @placeholderKey="explorer.schema.filter"
+      />
+      <DButton
+        @action={{this.collapseSchema}}
+        @icon="chevron-right"
+        @class="no-text"
+      />
+    </div>
+
+    <ConditionalLoadingSpinner @condition={{this.loading}}>
+      <div class="schema-container">
+        <ul>
+          {{#each this.filteredTables as |table|}}
+            {{explorer-schema-onetable table=table}}
+          {{/each}}
+        </ul>
+      </div>
+    </ConditionalLoadingSpinner>
+  </div>
+</div>

assets/javascripts/discourse/components/explorer-schema.js

@@ -1,18 +1,17 @@
-import Component from "@ember/component";
+import Component from "@glimmer/component";
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
+import { debounce } from "discourse-common/utils/decorators";
-import discourseDebounce from "discourse-common/lib/debounce";
 import { isBlank, isEmpty } from "@ember/utils";
+import { action } from "@ember/object";
+import { tracked } from "@glimmer/tracking";
 
-export default Component.extend({
+export default class ExplorerSchema extends Component {
-  actions: {
+  @tracked filter;
-    collapseSchema() {
+  @tracked loading;
-      this.set("hideSchema", true);
+  @tracked hideSchema = this.args.hideSchema;
-    },
-  },
 
-  @discourseComputed("schema")
+  get transformedSchema() {
-  transformedSchema(schema) {
+    const schema = this.args.schema;
-    for (let key in schema) {
+    for (const key in schema) {
       if (!schema.hasOwnProperty(key)) {
         continue;
       }
@@ -48,28 +47,30 @@ export default Component.extend({
       });
     }
     return schema;
-  },
-
-  @discourseComputed("filter")
-  rfilter(filter) {
-    if (!isBlank(filter)) {
-      return new RegExp(filter);
   }
-  },
 
-  filterTables(schema) {
+  get filteredTables() {
     let tables = [];
-    const filter = this.rfilter,
+    let filter = this.filter;
-      haveFilter = !!filter;
 
-    for (let key in schema) {
+    try {
-      if (!schema.hasOwnProperty(key)) {
+      if (!isBlank(this.filter)) {
+        filter = new RegExp(this.filter);
+      }
+    } catch {
+      filter = null;
+    }
+
+    const haveFilter = !!filter;
+
+    for (const key in this.transformedSchema) {
+      if (!this.transformedSchema.hasOwnProperty(key)) {
         continue;
       }
       if (!haveFilter) {
         tables.push({
           name: key,
-          columns: schema[key],
+          columns: this.transformedSchema[key],
           open: false,
         });
         continue;
@@ -79,20 +80,20 @@ export default Component.extend({
       if (filter.source === key || filter.source + "s" === key) {
         tables.unshift({
           name: key,
-          columns: schema[key],
+          columns: this.transformedSchema[key],
           open: haveFilter,
         });
       } else if (filter.test(key)) {
         // whole table matches
         tables.push({
           name: key,
-          columns: schema[key],
+          columns: this.transformedSchema[key],
           open: haveFilter,
         });
       } else {
         // filter the columns
         let filterCols = [];
-        schema[key].forEach((col) => {
+        this.transformedSchema[key].forEach((col) => {
           if (filter.source === col.column_name) {
             filterCols.unshift(col);
           } else if (filter.test(col.column_name)) {
@@ -109,29 +110,29 @@ export default Component.extend({
       }
     }
     return tables;
-  },
+  }
 
-  @observes("filter")
+  @debounce(500)
-  triggerFilter() {
+  updateFilter(value) {
-    discourseDebounce(
+    this.filter = value;
-      this,
+    this.loading = false;
-      function () {
+  }
-        this.set("filteredTables", this.filterTables(this.transformedSchema));
-        this.set("loading", false);
-      },
-      500
-    );
-  },
 
-  @observes("filter")
+  @action
-  setLoading() {
+  filterChanged(value) {
-    this.set("loading", true);
+    this.loading = true;
-  },
+    this.updateFilter(value);
+  }
 
-  init() {
+  @action
-    this._super(...arguments);
+  collapseSchema() {
+    this.hideSchema = true;
+    this.args.updateHideSchema(true);
+  }
 
-    this.set("loading", true);
+  @action
-    this.triggerFilter();
+  expandSchema() {
-  },
+    this.hideSchema = false;
-});
+    this.args.updateHideSchema(false);
+  }
+}

assets/javascripts/discourse/controllers/admin-plugins-explorer.js

@@ -175,10 +175,8 @@ export default Controller.extend({
   },
 
   actions: {
-    dummy() {},
+    updateHideSchema(value) {
-
+      this.set("hideSchema", value);
-    expandSchema() {
-      this.set("hideSchema", false);
     },
 
     import(files) {

assets/javascripts/discourse/templates/admin/plugins-explorer.hbs

@@ -119,17 +119,11 @@
                   </div>
 
                   <div class="right-panel">
-                    {{#if hideSchema}}
+                    <ExplorerSchema
-                      {{d-button
+                      @schema={{schema}}
-                        action=(action "expandSchema")
+                      @hideSchema={{hideSchema}}
-                        icon="chevron-left"
+                      @updateHideSchema={{action "updateHideSchema"}}
-                        class="no-text unhide"
+                    />
-                      }}
-                    {{/if}}
-
-                    <div class="schema">
-                      {{explorer-schema schema=schema hideSchema=hideSchema}}
-                    </div>
                   </div>
                 </div>
 

assets/javascripts/discourse/templates/components/explorer-schema.hbs

@@ -1,20 +0,0 @@
-<div class={{if hideSchema "hidden"}}>
-  <div class="schema-search inline-form full-width">
-    {{text-field value=filter placeholderKey="explorer.schema.filter"}}
-    {{d-button
-      action=(action "collapseSchema")
-      icon="chevron-right"
-      class="no-text"
-    }}
-  </div>
-
-  {{conditional-loading-spinner condition=loading}}
-
-  <div class="schema-container">
-    <ul>
-      {{#each filteredTables as |table|}}
-        {{explorer-schema-onetable table=table}}
-      {{/each}}
-    </ul>
-  </div>
-</div>