@abi-software/scaffoldvuer 1.5.1 → 1.6.0

package/src/scripts/Search.js

@@ -44,60 +44,47 @@ export class SearchIndex
         this._searchEngine =  new MiniSearch({
             fields: ['path', 'name'],
             storeFields: ['path'],
-            tokenize: (string, _fieldName) => string.split('"'), // indexing tokenizer
+            tokenize: (string, _fieldName) => string.split(/[\s/]+/), // indexing tokenizer
         });
-        this._featureIds = [];
-        this.zincObjects = [];
-        this.regions = [];
-    }
-
-    indexMetadata(featureId, metadata)
-    //================================
-    {
-        const textSeen = [];
-        for (const prop of indexedProperties) {
-            if (prop in metadata) {
-                const text = metadata[prop];
-                if (!textSeen.includes(text)) {
-                    this.addTerm_(featureId, text);
-                    textSeen.push(text);
-                }
-            }
-        }
+        this.idMaps = {};
     }
 
     addZincObject(zincObject, id)
     //=======================
     {
         const path = zincObject.getRegion().getFullPath();
-        const fullPath = path ? `${path}/${zincObject.groupName}` : zincObject.groupName;
-        const item = { path: fullPath, name: zincObject.groupName, id };
-        this._searchEngine.add(item, {fields: ['path', 'name']});
-        this.zincObjects.push(zincObject);
+        let groupName = zincObject.groupName;
+        let fullPath = path ? `${path}/${zincObject.groupName}` : zincObject.groupName;
+        groupName = groupName.replaceAll('"', '');
+        fullPath = fullPath.replaceAll('"', '');
+        const item = { path: fullPath, name: groupName, id };
+        this._searchEngine.add(item);
+        this.idMaps[id] = { path: fullPath, zincObject };
     }
 
     removeZincObject(zincObject, id)
     //=======================
     {
         const path = zincObject.getRegion().getFullPath();
-        const fullPath = path ? `${path}/${zincObject.groupName}` : zincObject.groupName;
-        const item = { path: fullPath, name: zincObject.groupName, id };
-        this._searchEngine.remove(item, {fields: ['path', 'name']});
-        for (let i = 0; i < this.zincObjects.length; i++) {
-          if (id === this.zincObjects[i].uuid) {
-            this.zincObjects.splice(i, 1);
-            return;
-          }
-        }
-        
+        let groupName = zincObject.groupName;
+        let fullPath = path ? `${path}/${zincObject.groupName}` : zincObject.groupName;
+        groupName = groupName.replaceAll('"', '');
+        fullPath = fullPath.replaceAll('"', '');
+        const item = { path: fullPath, name: groupName, id };
+        this._searchEngine.remove(item);
+        delete this.idMaps[id];
     }
 
     addRegion(region, id)
     //=======================
     {
-        const item = { path: region.getFullPath(), name: region.getName(), id };
-        this._searchEngine.add(item, {fields: ['path', 'name']});
-        this.regions.push(region);
+        let path = region.getFullPath();
+        let regionName = region.getName();
+        path = path.replaceAll('"', '');
+        regionName = regionName.replaceAll('"', '');
+        const item = { path, name: regionName, id };
+        this._searchEngine.add(item);
+        this.idMaps[id] = { path, zincObject: region };
     }
 
     clearResults()
@@ -110,17 +97,32 @@ export class SearchIndex
     //=======================
     {
         this._searchEngine.removeAll();
-        this.zincObjects.length = 0;
-        this.regions.length = 0;
+        //this.zincObjects.length = 0;
+        //this.regions.length = 0;
+        this.idMaps = {};
     }
 
-    auto_suggest(text)
-    //================
-    {
-        const results = this._searchEngine.autoSuggest(text, {prefix: true});
-        return results;
+    auto_suggest(text) {
+      let results = [];
+      if (text.length > 2 && ["'", '"'].includes(text.slice(0, 1))) {
+        text = text.replaceAll(text.slice(0, 1), '')
+        results = this._searchEngine.search(text, {prefix: true, combineWith: 'AND'})
+      } else if (text.length > 1) {
+          results = this._searchEngine.search(text, {prefix: true})
+      }
+      const items = [];
+      results.forEach(r => {
+        if (r.id in this.idMaps) {
+          items.push(this.idMaps[r.id].path);
+        }
+      });
+      const unique = [...new Set(items)];
+      const returned = [];
+      unique.forEach(u => returned.push({suggestion: '"' + u + '"'}));
+      return returned;
     }
 
+
     processResults(zincObjects, searchText) {
       const result = {
         regionPath: undefined,
@@ -145,11 +147,21 @@ export class SearchIndex
     }
 
     search(text) {
-        const results = this._searchEngine.search(text, {prefix: true});
-        const zincResults = this.zincObjects.filter(zincObject => results.map(r => r.id).includes(zincObject.uuid));
-        const regionResults = this.regions.filter(region => results.map(r => r.id).includes(region.uuid));
-        zincResults.push(...regionResults);
-        return zincResults;
+      let results = undefined;
+      if (text.length > 2 && ["'", '"'].includes(text.slice(0, 1))) {
+          text = text.replaceAll(text.slice(0, 1), '')
+          console.log(text)
+          results = this._searchEngine.search(text, {prefix: true, combineWith: 'AND'})
+      } else if (text.length > 1) {
+          results = this._searchEngine.search(text, {prefix: true})
+      }
+      const zincResults = [];
+      results.forEach(r => {
+        if (r.id in this.idMaps) {
+          zincResults.push(this.idMaps[r.id].zincObject);
+        }
+      });
+      return zincResults;
     }
 
     searchTerms(terms) {
@@ -174,25 +186,3 @@ export class SearchIndex
 
 }
 
-//==============================================================================
-
-class SearchResults
-{
-    constructor(results)
-    {
-        this.__results = results.sort((a, b) => (b.score - a.score));
-        this.__featureIds = results.map(r => r.featureId);
-    }
-
-    get featureIds()
-    {
-        return this.__featureIds;
-    }
-
-    get results()
-    {
-        return this.__results;
-    }
-}
-
-//==============================================================================

package/src/components/CreateTooltipContent.vue

@@ -1,201 +0,0 @@
-<template>
-  <el-container class="create-container">
-    <el-header height="30px" class="header">
-      <div>Create {{ createData.shape }}</div>
-    </el-header>
-    <el-main class="slides-block">
-      <span class="create-text">
-        Primitives will be created in the
-        <br>
-        __annotation region
-      </span>
-      <el-row class="row" v-show="showPoint">
-        <el-col :offset="0" :span="8">
-          Position:
-        </el-col>
-        <el-col :offset="0" :span="16">
-          <el-row v-for="{ value, i } in createData.points" :key="i" class="value">
-            {{ i }}
-          </el-row>
-        </el-col>
-      </el-row>
-      <el-row class="row">
-        <el-col :offset="0" :span="8">
-          Region:
-        </el-col>
-        <el-col :offset="0" :span="16">
-          <el-input
-            v-model="region"
-            placeholder="__annotation"
-            size="small"
-          />
-        </el-col>
-      </el-row>
-      <el-row class="row">
-        <el-col :offset="0" :span="8">
-          Group:
-        </el-col>
-        <el-col :offset="0" :span="16">
-          <el-input
-            v-model="group"
-            :placeholder="createData.shape"
-            size="small"
-          />
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :offset="0" :span="12">
-          <el-button
-            type="primary"
-            plain
-            @click="confirm"
-          >
-            {{ confirmText }}
-          </el-button>
-        </el-col>
-        <el-col :offset="0" :span="12">
-          <el-button
-            type="primary"
-            plain
-            @click="cancel"
-          >
-            Cancel
-          </el-button>
-        </el-col>
-      </el-row>
-    </el-main>
-  </el-container>
-</template>
-
-<script>
-/* eslint-disable no-alert, no-console */
-
-import {
-  ElButton as Button,
-  ElCol as Col,
-  ElContainer as Container,
-  ElHeader as Header,
-  ElInput as Input,
-  ElMain as Main,
-
-} from "element-plus";
-
-/**
- * A component to control the opacity of the target object.
- */
-export default {
-  name: "CreateTooltipContent",
-  components: {
-    Button,
-    Col,
-    Container,
-    Header,
-    Input,
-    Main,
-  },
-  props: {
-    createData: {
-      type: Object,
-    },
-  },
-  watch: {
-    "createData.shape": {
-      handler: function (value) {
-        this.group = value;
-        this.$emit("cancel-create");
-      },
-      immediate: true,
-    },
-  },
-  computed: {
-    confirmText: function () {
-      if (this.createData.editingIndex > -1) {
-        return "Edit";
-      }
-      return "Confirm";
-    },
-  },
-  data: function () {
-    return {
-      group: "default",
-      region: "",
-      showPoint: false,
-    }
-  },
-  methods: {
-    confirm: function () {
-      this.$emit(
-        "confirm-create", 
-        { 
-          region: "__annotation/" + this.region, 
-          group: this.group,
-          shape: this.createData.shape,
-          editingIndex: this.createData.editingIndex,
-        }
-      );
-      this.group = this.createData.shape;
-    },
-    cancel: function () {
-      this.$emit("cancel-create");
-    },
-  },
-};
-</script>
-
-<!-- Add "scoped" attribute to limit CSS to this component only -->
-<style scoped lang="scss">
-.header {
-  color: #606266;
-  line-height: 1;
-  padding: 8px 17px 1px 15px;
-  border-bottom: 1px solid #ebeef5;
-  font-size: 14px;
-}
-
-.row {
-  margin: 4px;
-  text-align: left;
-}
-
-:deep(.create-text) {
-  max-width: 220px;
-  height:35px;
-  font-size: 12px;
-}
-
-
-.create-container {
-  width: 250px;
-  height: auto;
-  border-radius: 4px;
-  border: solid 1px #d8dce6;
-  background-color: #fff;
-  overflow-y: none;
-  user-select: auto;
-  pointer-events: auto;
-}
-
-.value {
-  font-size: 12px;
-}
-
-.input-box {
-  width: 42px;
-  border-radius: 4px;
-  border: 1px solid rgb(144, 147, 153);
-  background-color: var(--white);
-  font-weight: 500;
-  color: rgb(48, 49, 51);
-  margin-left: 8px;
-  height: 24px;
-
-  &.number-input {
-    width: 42px;
-    :deep(.el-input__wrapper) {
-      padding-left: 0px;
-      padding-right: 0px;
-    }
-  }
-}
-
-</style>