fix: quickfix for usetagsearch side effect (#589)

Author: JulienDroulez

src/components/admin/ClassificationAdmin.vue

@@ -118,6 +118,7 @@ import ConfirmModal from '@/components/base/modal/ConfirmModal.vue'
 import useOrganizationsStore from '@/stores/useOrganizations.ts'
 import useToasterStore from '@/stores/useToaster.ts'
 import ClassificationDescription from '@/components/admin/ClassificationDescription.vue'
+import { isCustomClassification } from '@/functs/ClassificationUtils.ts'
 export default {
     name: 'ClassificationAdmin',
 
@@ -147,7 +148,6 @@ export default {
             allOrgClassifications,
             isLoadingOrgClassifications,
             fetchAllClassifications,
-            isCustomClassification,
         } = useTagSearch({
             hideOrganizationTags: true,
         })
@@ -159,7 +159,6 @@ export default {
             allOrgClassifications,
             isLoadingOrgClassifications,
             fetchAllClassifications,
-            isCustomClassification,
         }
     },
 
@@ -174,6 +173,9 @@ export default {
     },
 
     methods: {
+        isCustomClassification(classification) {
+            return isCustomClassification(classification)
+        },
         async set_enabled_for_projects(classification, value) {
             try {
                 // set enabled for projects

src/components/admin/ClassificationDescription.vue

@@ -1,9 +1,7 @@
 <script setup>
 import { computed } from 'vue'
 import useLanguagesStore from '@/stores/useLanguages.ts'
-import useTagSearch from '@/composables/useTagSearch.js'
-
-const { isEscoClassification } = useTagSearch()
+import { isEscoClassification } from '@/functs/ClassificationUtils.ts'
 
 defineProps({
     classification: {

src/components/search/Filters/SkillsFilterEditor.vue

@@ -139,12 +139,7 @@ export default {
             return [...this.skills.map((s) => s.id), ...this.blockedSkills.map((s) => s.id)]
         },
         showPreSearchList() {
-            return (
-                !this.allSearchMode &&
-                this.selectedClassification &&
-                //this.isCustomClassification(this.selectedClassification) &&
-                !this.search
-            )
+            return !this.allSearchMode && this.selectedClassification && !this.search
         },
     },
 

src/components/search/Filters/TagsFilterEditor.vue

@@ -122,7 +122,6 @@ export default {
             orgClassificationOptions,
             showTagSearch,
             resetTagSearch,
-            isCustomClassification,
         } = useTagSearch({
             useProjects: true,
             hideOrganizationTags: props.hideOrganizationTags,
@@ -137,7 +136,6 @@ export default {
             orgClassificationOptions,
             showTagSearch,
             resetTagSearch,
-            isCustomClassification,
         }
     },
 
@@ -152,12 +150,7 @@ export default {
             return [...this.tags.map((t) => t.id), ...this.blockedTags.map((t) => t.id)]
         },
         showPreSearchList() {
-            return (
-                !this.allSearchMode &&
-                this.selectedClassification &&
-                //this.isCustomClassification(this.selectedClassification) &&
-                !this.search
-            )
+            return !this.allSearchMode && this.selectedClassification && !this.search
         },
     },
 

src/composables/useTagSearch.js

@@ -125,22 +125,6 @@ export default function useTagSearch({
         }
     }
 
-    function isClassificationOfType(classification, type) {
-        return classification.type === type
-    }
-
-    function isCustomClassification(classification) {
-        return isClassificationOfType(classification, 'Custom')
-    }
-
-    function isEscoClassification(classification) {
-        return isClassificationOfType(classification, 'ESCO')
-    }
-
-    function isWikipediaClassification(classification) {
-        return isClassificationOfType(classification, 'Wikipedia')
-    }
-
     // watch
 
     watch(selectedClassificationId, loadSelectedClassificationTags, { immediate: true })
@@ -166,9 +150,5 @@ export default function useTagSearch({
         allOrgClassifications,
         isLoadingOrgClassifications,
         fetchAllClassifications,
-        isClassificationOfType,
-        isCustomClassification,
-        isEscoClassification,
-        isWikipediaClassification,
     }
 }

src/functs/ClassificationUtils.ts

@@ -0,0 +1,22 @@
+export function isClassificationOfType(classification, type) {
+    return classification.type === type
+}
+
+export function isCustomClassification(classification) {
+    return isClassificationOfType(classification, 'Custom')
+}
+
+export function isEscoClassification(classification) {
+    return isClassificationOfType(classification, 'ESCO')
+}
+
+export function isWikipediaClassification(classification) {
+    return isClassificationOfType(classification, 'Wikipedia')
+}
+
+export default {
+    isClassificationOfType,
+    isCustomClassification,
+    isEscoClassification,
+    isWikipediaClassification,
+}