Merge pull request #127 from LuCEresearchlab/highlighting-fixes

Highlighting fixes

Author: malags

frontend/src/components/v2/tagger_component/ClusterView.tsx

@@ -120,9 +120,12 @@ function ClusterItem({answer, taggingClusterSession, dispatchTaggingClusterSessi
         const misconception = getCurrentMisconception(taggingClusterSession)
         if (misconception == null) return
 
+        const start: number = answer.data[e.start] == ' ' ? e.start + 1 : e.start
+        const end: number = answer.data[e.end] == ' ' ? e.end - 1 : e.end
+
         const newRange: HighlightRangeColor = {
-            start: e.start,
-            end: e.end,
+            start: start,
+            end: end,
             misconception: misconception,
             color: taggingClusterSession.currentColor
         }
@@ -200,18 +203,20 @@ function ClusterItem({answer, taggingClusterSession, dispatchTaggingClusterSessi
         // hack to support indexes for words
         if (command.startsWith('' + displayKey + 'h')) {
             let counter: number = 0
-            letters.forEach(letter => {
+            letters.forEach((letter: any) => {
                 const content = letter.textContent
                 if (content == ' ') {
                     counter++
                     letter.textContent = `[${counter}] `
+                    letter.style.color = HIGHLIGHT_COLOR_ELEMENT
                 }
             })
         } else {
-            letters.forEach(letter => {
+            letters.forEach((letter: any) => {
                 const content = letter.textContent
                 if (content?.indexOf(' ') != -1) {
                     letter.textContent = ' '
+                    letter.style.color = ""
                 }
             })
         }
@@ -229,7 +234,7 @@ function ClusterItem({answer, taggingClusterSession, dispatchTaggingClusterSessi
         }}>
             <KeyIndication
                 displayKey={"" + displayKey}
-                highlighted={stringEquals('' + displayKey + 'h', localCommand)}
+                highlighted={localCommand.startsWith('' + displayKey + 'h')}
             />
             <TruthCircle value={answer.picked}/>
             <div id={"Highlightable|" + displayKey} style={{padding: 'inherit'}}>

frontend/src/helpers/PostHelper.ts

@@ -8,15 +8,15 @@ const post_answer_url = TAGGING_SERVICE_URL + '/datasets/tagged-answer'
 
 
 function post(url: string, data: any) {
-    console.log('posting to ' + url)
-    console.log(data)
     fetch(url, {
         method: 'POST',
         headers: {
             'Content-Type': 'application/json;charset=utf-8'
         },
         body: JSON.stringify(data)
-    }).then((response: Response) => console.log(response.status));
+    }).then((response: Response) => {
+        if (response.status != 200) console.log(response.status)
+    });
 }
 
 export function postHelper(dataset_id: string,
@@ -45,9 +45,6 @@ export function postClusters(dataset_id: string,
                              question_id: string,
                              user_id: string,
                              clusters: Cluster[]) {
-    console.log(`posting to ${TAGGING_SERVICE_URL}/clusters/dataset/${dataset_id}/question/${question_id}/user/${
-        user_id}`)
-    console.log(clusters)
     post(`${TAGGING_SERVICE_URL}/clusters/dataset/${dataset_id}/question/${question_id}/user/${user_id}`,
         clusters)
 }

frontend/src/model/TaggingClusterSession.ts

@@ -106,7 +106,6 @@ function init(state: TaggingClusterSession,
                   currentColor: string,
                   history: string[]
               }) {
-    console.log("init")
     return {
         ...state,
         dataset_id: payload.dataset_id,
@@ -138,7 +137,6 @@ function setTags(state: TaggingClusterSession, tags: (string | null)[]): Tagging
     const new_tags = loadedTagsFormatAndSet(state, tags)
 
     if (arrayFilteredNotNullEquals(new_tags, state.tags)) return state // no change
-    console.log("setTags")
     return {
         ...state,
         tags: new_tags,
@@ -147,7 +145,6 @@ function setTags(state: TaggingClusterSession, tags: (string | null)[]): Tagging
 
 function setRangesList(state: TaggingClusterSession, rangesList: HighlightRange[][]): TaggingClusterSession {
     if (arrayFilteredNotNullEquals(rangesList, state.tags)) return state
-    console.log("setRangesList")
     return {
         ...state,
         rangesList
@@ -159,7 +156,6 @@ function setRanges(state: TaggingClusterSession, payload: { answer: Answer, rang
     const ranges: HighlightRange[] = payload.ranges
     const idx = getCurrentCluster(state).answers.findIndex(ans => stringEquals(ans.answer_id, answer.answer_id))
     if (idx === -1) return state
-    console.log("setRanges")
     const new_ranges = [...state.rangesList]
     new_ranges[idx] = ranges
     return {
@@ -176,7 +172,6 @@ function setTagsAndRanges(state: TaggingClusterSession,
                                   ranges: HighlightRange[]
                               }): TaggingClusterSession {
 
-    console.log("setTagsAndRanges")
 
     const answer: Answer = payload.answer
     const tags: (string | null)[] = payload.tags