Merge branch 'main' into enh-822

neurobagel · Dec 13, 2024 · ace2fa1 · ace2fa1
2 parents c2347f9 + 37f6c89
commit ace2fa1
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 19 deletions.
diff --git a/components/annot-categorical.vue b/components/annot-categorical.vue
@@ -152,24 +152,25 @@
                 "updateAnnotationCount"
             ]),
             filterOptions(option, label, search) {
+                // Match the first character of the label with the first character of the search string
                 if (!label || search[0].toLowerCase() !== label[0].toLowerCase()) {
                     return false;
                 }
 
-                let labelIndex = 1;
+                let labelIndex = 0;
                 for (let searchIndex = 1; searchIndex < search.length; searchIndex++) {
                     const searchChar = search[searchIndex].toLowerCase();
                     let matchFound = false;
 
-                    while (labelIndex < label.length) {
+                    while (labelIndex < label.length-1) {
+                        labelIndex++;
                         if (label[labelIndex].toLowerCase() === searchChar) {
                             matchFound = true;
-                            labelIndex++;
                             break;
                         }
-                        labelIndex++;
                     }
 
+
                     if (!matchFound) {
                         return false;
                     }

diff --git a/components/category-toolgroup.vue b/components/category-toolgroup.vue
@@ -101,27 +101,25 @@
             ...mapMutations([
 
                 "createAssessmentTool",
-                "alterColumnToToolMapping",
-                "alterColumnCategoryMapping",
-                "deselectTool"
+                "alterColumnToToolMapping"
             ]),
             filterOptions(option, label, search) {
+                // Match the first character of the label with the first character of the search string
                 if (!label || search[0].toLowerCase() !== label[0].toLowerCase()) {
                     return false;
                 }
 
-                let labelIndex = 1;
+                let labelIndex = 0;
                 for (let searchIndex = 1; searchIndex < search.length; searchIndex++) {
                     const searchChar = search[searchIndex].toLowerCase();
                     let matchFound = false;
 
-                    while (labelIndex < label.length) {
+                    while (labelIndex < label.length-1) {
+                        labelIndex++;
                         if (label[labelIndex].toLowerCase() === searchChar) {
                             matchFound = true;
-                            labelIndex++;
                             break;
                         }
-                        labelIndex++;
                     }
 
                     if (!matchFound) {

diff --git a/cypress.config.js b/cypress.config.js
@@ -33,6 +33,8 @@ module.exports = defineConfig({
     },
 
     component: {
+        viewportHeight: 1080,
+        viewportWidth: 1920,
 
         devServer: {
 

diff --git a/cypress/fixtures/examples/good/ds003653_participant_annotated_1698934398962.json b/cypress/fixtures/examples/good/ds003653_participant_annotated_1698934398962.json
@@ -16,7 +16,7 @@
                 "TermURL": "nb:Age"
             },
             "Transformation": {
-                "Label": "integer value",
+                "Label": "float value",
                 "TermURL": "nb:FromFloat"
             },
             "MissingValues": []

diff --git a/store/index.js b/store/index.js
@@ -944,16 +944,11 @@ export const mutations = {
     },
 
     resetState(p_state) {
+        const initialState = getDefaultState();
         Object.keys(p_state).forEach((key) => {
-          const initialState = getDefaultState();
           if (Object.prototype.hasOwnProperty.call(initialState, key)) {
             Vue.set(p_state, key, initialState[key]);
           }
         });
-      },
-
-    deselectTool(p_state, toolIdentifier) {
-        const toolIndex = p_state.toolTerms.findIndex(tool => tool.identifier === toolIdentifier);
-        p_state.toolTerms[toolIndex].selected = false;
-    }
+      }
 };