Add search by old names & old names section

* Add search by old names & old names section * fix package json Co-authored-by: Blue <[email protected]>
altmp · Nov 28, 2022 · e591a77 · e591a77
1 parent a3014b0
commit e591a77
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 8 deletions.
diff --git a/src/components/Content.vue b/src/components/Content.vue
@@ -71,6 +71,12 @@
             <pre v-if="native.comment !== undefined && native.comment.trim().length > 0">{{ native.comment }}</pre>
             <span v-else class="no-description">No description</span>
           </div>
+          <div class="description-section">
+            <div class="section-header">Old names</div>
+
+            <pre v-if="nativeOldNames.length">{{ nativeOldNames }}</pre>
+            <span v-else class="no-description">No old names</span>
+          </div>
         </div>
         <div class="content-hash-history">
           <div class="content-placeholder"></div>
@@ -102,7 +108,7 @@ import { NativeAlt } from '@/models/Native';
 export default class Content extends Vue {
   @Prop() private hash!: string;
 
-  private get native() {
+  private get native(): NativeAlt {
     return this.$store.state.nativesByHash[this.hash];
   }
 
@@ -125,6 +131,17 @@ export default class Content extends Vue {
     return history;
   }
 
+  private get nativeOldNames() {
+    const { oldNames = [], old_names = [] } = this.native;
+    if (!(oldNames.length || old_names.length)) return [];
+
+    return [
+      ...oldNames, // altv names 
+      ...(oldNames.length ? " " : []), 
+      ...old_names // GTA_NAMES
+    ].join("\n");
+  }
+
   @Watch('native', { immediate: false, deep: true })
   private onNativeChange(to: NativeAlt, from: NativeAlt) {
     if (to && to.altName) {

diff --git a/src/models/Native.ts b/src/models/Native.ts
@@ -8,6 +8,7 @@ export interface Native {
   hashes: NativeHash;
   altName: string;
   oldNames: string[];
+  old_names?: string[];
 }
 
 export interface NativeParam {

diff --git a/src/store.ts b/src/store.ts
@@ -66,8 +66,8 @@ export default new Vuex.Store({
 
       ctx.commit('init', { nativesByCat, nativesByHash, nativesCount, nativesNamed, nativesOrigNamed });
     },
-    search(ctx, str) {
-      const result: any[] = [];
+    search(ctx, str: string) {
+      const result: NativeAlt[] = [];
       const strs = str.split(' ')
         .flatMap((s: string) => s.split('_'))
         .filter((s: string) => s.length > 0)
@@ -83,16 +83,27 @@ export default new Vuex.Store({
             ++found;
           } else if (n.jhash!.toLowerCase() === s) {
             ++found;
-          } else if (n.hashes) {
-            for (const hash of Object.values(n.hashes)) {
-              if (hash.toLowerCase() === s) {
+          } else if (n.hashes || n.oldNames || n.old_names) {
+            let hashFound = false;
+            if (n.hashes) {
+              for (const hash of Object.values(n.hashes)) {
+                if (hash.toLowerCase() === s) {
+                  ++found;
+                  hashFound = true;
+                  break;
+                }
+              }
+            }
+
+            if (!hashFound) {
+              if (n.oldNames?.find(name => name.toLowerCase().includes(s))) {
+                ++found;
+              } else if (n.old_names?.find(name => name.toLowerCase().replace(/_/gm, '').includes(s))) {
                 ++found;
-                break;
               }
             }
           }
         }
-
         if (found === strs.length) {
           ++count;
           result.push(n);
@@ -105,6 +116,7 @@ export default new Vuex.Store({
           }
         }
 
+
         if (count >= 200) {
           break;
         }