Merge pull request #96 from LuCEresearchlab/tagging-cluster-data-rework

malags · web-flow · commit 99e5cbff1f81 · 2021-04-28T19:31:30.000Z
Fixed variable name in model for clarity
diff --git a/frontend/src/components/v2/cluster_handler_component/ClusterHandler.tsx b/frontend/src/components/v2/cluster_handler_component/ClusterHandler.tsx
@@ -66,7 +66,7 @@ function getSortedClusters(clusters: Cluster[], query: string): Result[] {
 
     const extended_clusters: ExtendedCluster[] = clusters
         .map((cluster: Cluster, cluster_idx: number) =>
-            cluster.cluster.map((answer: Answer, answer_idx: number) => {
+            cluster.answers.map((answer: Answer, answer_idx: number) => {
                 return {
                     cluster_idx,
                     answer_idx,
@@ -123,7 +123,7 @@ function getSortedClusters(clusters: Cluster[], query: string): Result[] {
 
 function getClusterFromExtended(extended_clusters: Result[], idx: number): Cluster {
     const r: Result = extended_clusters[extended_clusters.findIndex(v => v.cluster_idx == idx)]
-    return {name: r.name, cluster: r.clusters.map(resultCluster => resultCluster.item.answer)}
+    return {name: r.name, answers: r.clusters.map(resultCluster => resultCluster.item.answer)}
 }
 
 
@@ -148,16 +148,16 @@ function handleClusterChange(
     // reorder source cluster to match order in extended
     new_clusters[source_cluster] = getClusterFromExtended(extended_clusters, source_cluster)
 
-    const answer: Answer = new_clusters[source_cluster].cluster[source_index]
+    const answer: Answer = new_clusters[source_cluster].answers[source_index]
 
-    new_clusters[source_cluster].cluster = new_clusters[source_cluster].cluster.filter(elem =>
+    new_clusters[source_cluster].answers = new_clusters[source_cluster].answers.filter(elem =>
         !stringEquals(answer_id, elem.answer_id))
 
     // reorder target cluster to match order in extended
     new_clusters[target_cluster] = getClusterFromExtended(extended_clusters, target_cluster)
 
     // update tags of moved answer to target cluster ones
-    if (new_clusters[target_cluster].cluster.length > 0) {
+    if (new_clusters[target_cluster].answers.length > 0) {
 
         const get_url = (my_answer_id: string) => TAGGING_SERVICE_URL +
             '/datasets/tagged-answer/dataset/' + taggingClusterSession.dataset_id +
@@ -166,7 +166,7 @@ function handleClusterChange(
             '/user/' + taggingClusterSession.user_id
 
 
-        JSONLoader(get_url(new_clusters[target_cluster].cluster[0].answer_id), (tagged_answers: TaggedAnswer[]) => {
+        JSONLoader(get_url(new_clusters[target_cluster].answers[0].answer_id), (tagged_answers: TaggedAnswer[]) => {
             if (tagged_answers.length == 0) {
                 return;
             } else {
@@ -186,8 +186,8 @@ function handleClusterChange(
         })
     }
     // update target cluster
-    new_clusters[target_cluster].cluster.splice(target_idx, 0, answer)
-    const clean_new_clusters: Cluster[] = new_clusters.filter(cluster => cluster.cluster.length > 0)
+    new_clusters[target_cluster].answers.splice(target_idx, 0, answer)
+    const clean_new_clusters: Cluster[] = new_clusters.filter(cluster => cluster.answers.length > 0)
 
     dispatchTaggingClusterSession(
         setClusters(clean_new_clusters) // remove empty clusters
diff --git a/frontend/src/components/v2/cluster_handler_component/DraggableCluster.tsx b/frontend/src/components/v2/cluster_handler_component/DraggableCluster.tsx
@@ -54,17 +54,17 @@ function popAnswer(clusters: Cluster[], result: Result, resultCluster: ResultClu
                    taggingSession: TaggingSession,
                    dispatchTaggingClusterSession: React.Dispatch<TaggingClusterSessionDispatch>): Cluster[] {
     const cluster: Cluster = clusters[result.cluster_idx]
-    const answer_idx = cluster.cluster.findIndex(
+    const answer_idx = cluster.answers.findIndex(
         answer => stringEquals(answer.answer_id,
             resultCluster.item.answer.answer_id)
     )
-    const popped: Answer[] = cluster.cluster.slice(answer_idx, answer_idx + 1)
+    const popped: Answer[] = cluster.answers.slice(answer_idx, answer_idx + 1)
 
-    const reduced_cluster: Answer[] = cluster.cluster.slice(0, answer_idx).concat(cluster.cluster.slice(answer_idx + 1))
+    const reduced_cluster: Answer[] = cluster.answers.slice(0, answer_idx).concat(cluster.answers.slice(answer_idx + 1))
     let new_clusters = [...clusters]
-    new_clusters[result.cluster_idx] = {name: cluster.name, cluster: reduced_cluster}
-    new_clusters.push({name: 'Cluster ' + new_clusters.length, cluster: popped})
-    new_clusters = new_clusters.filter(cluster => cluster.cluster.length > 0) // remove empty clusters
+    new_clusters[result.cluster_idx] = {name: cluster.name, answers: reduced_cluster}
+    new_clusters.push({name: 'Cluster ' + new_clusters.length, answers: popped})
+    new_clusters = new_clusters.filter(cluster => cluster.answers.length > 0) // remove empty clusters
 
     dispatchTaggingClusterSession(setClusters(new_clusters))
     postClusters(
diff --git a/frontend/src/components/v2/cluster_handler_component/DroppableCluster.tsx b/frontend/src/components/v2/cluster_handler_component/DroppableCluster.tsx
@@ -32,8 +32,6 @@ interface Input {
 
 
 function shouldCollapse(query: string, result: Result): boolean {
-    console.log('shouldNotCollapse')
-    console.log(query, query.length == 0)
     for (let c of result.clusters) {
         if (c.matches.length != 0) return false
     }
diff --git a/frontend/src/components/v2/tagger_component/ClusterView.tsx b/frontend/src/components/v2/tagger_component/ClusterView.tsx
@@ -38,7 +38,7 @@ function ClusterView({taggingClusterSession, dispatchTaggingClusterSession}: Inp
         <div>
             {
                 currentCluster
-                    .cluster
+                    .answers
                     .map((answer: Answer, index: number) =>
                         <ClusterItem
                             key={"ClusterItem|Answer|" + answer.answer_id}
diff --git a/frontend/src/components/v2/tagger_component/MisconceptionView.tsx b/frontend/src/components/v2/tagger_component/MisconceptionView.tsx
@@ -80,7 +80,7 @@ function MisconceptionView(
 
     const getNewRangesList = (element: (string | null), index: number) => {
         if (taggingClusterSession.tags[0] != null)  // delete highlighting if selecting with NoMisconception
-            return [...Array(getCurrentCluster(taggingClusterSession).cluster.length)].map(() => [])
+            return [...Array(getCurrentCluster(taggingClusterSession).answers.length)].map(() => [])
         let new_ranges_list = []
         for (let ranges of taggingClusterSession.rangesList)
             new_ranges_list.push(highlightRangesColorUpdating(
diff --git a/frontend/src/components/v2/tagger_component/StaticSelectorView.tsx b/frontend/src/components/v2/tagger_component/StaticSelectorView.tsx
@@ -40,10 +40,10 @@ function StaticSelectorView({
     const getNewRangesList = (element: (string | null), index: number) => {
 
         if (isNoMisconception(element))
-            return [...Array(getCurrentCluster(taggingClusterSession).cluster.length)].map(() => [])
+            return [...Array(getCurrentCluster(taggingClusterSession).answers.length)].map(() => [])
 
         if (handledIndex != 0 && taggingClusterSession.tags[0] != null)
-            return [...Array(getCurrentCluster(taggingClusterSession).cluster.length)].map(() => [])
+            return [...Array(getCurrentCluster(taggingClusterSession).answers.length)].map(() => [])
 
         let new_ranges_list = []
         for (let ranges of taggingClusterSession.rangesList)
diff --git a/frontend/src/index.js b/frontend/src/index.js
@@ -1,6 +1,6 @@
 import React, {useState} from "react";
 import ReactDOM from "react-dom";
-import {BrowserRouter as Router, Switch, useHistory} from "react-router-dom"
+import {BrowserRouter as Router, Switch} from "react-router-dom"
 
 import NavBar from "./NavBar";
 import Uploader from "./pages/upload/FileUploader"
@@ -20,17 +20,13 @@ import LoginRoute from "./pages/auth/LoginRoute";
 
 function App() {
     const [session, setSession] = useState(getSessionCookie())
-    const router = useHistory()
-
-    console.log(router)
 
     const update_session = (data) => {
         setSession(data)
         setSessionCookie(data)
         console.log('save cookies')
     }
 
-    if (router !== undefined && (session.loggedIn === undefined || !session.loggedIn)) router.push('/login')
 
     return (
         <Router>
diff --git a/frontend/src/interfaces/Dataset.ts b/frontend/src/interfaces/Dataset.ts
@@ -28,5 +28,5 @@ export interface Answer {
 
 export interface Cluster {
     "name": string,
-    "cluster": Answer[]
+    "answers": Answer[]
 }
diff --git a/frontend/src/model/TaggingClusterSession.ts b/frontend/src/model/TaggingClusterSession.ts
@@ -157,7 +157,7 @@ function setRangesList(state: TaggingClusterSession, rangesList: HighlightRange[
 function setRanges(state: TaggingClusterSession, payload: { answer: Answer, ranges: HighlightRange[] }): TaggingClusterSession {
     const answer: Answer = payload.answer
     const ranges: HighlightRange[] = payload.ranges
-    const idx = getCurrentCluster(state).cluster.findIndex(ans => stringEquals(ans.answer_id, answer.answer_id))
+    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]
@@ -182,7 +182,7 @@ function setTagsAndRanges(state: TaggingClusterSession,
     const tags: (string | null)[] = payload.tags
     const ranges: HighlightRange[] = payload.ranges
 
-    const idx = getCurrentCluster(state).cluster.findIndex(ans => stringEquals(ans.answer_id, answer.answer_id))
+    const idx = getCurrentCluster(state).answers.findIndex(ans => stringEquals(ans.answer_id, answer.answer_id))
     if (idx === -1) return state
 
     _history_add_if_missing(state, tags)
@@ -206,7 +206,7 @@ function setClusters(state: TaggingClusterSession, new_clusters: Cluster[]): Tag
     return {
         ...state,
         clusters: new_clusters,
-        rangesList: [...Array(new_clusters[state.currentCluster].cluster.length)].map(() => []),
+        rangesList: [...Array(new_clusters[state.currentCluster].answers.length)].map(() => []),
         startTaggingTime: getMillis(),
     }
 }
@@ -219,7 +219,7 @@ function nextCluster(state: TaggingClusterSession) {
             currentCluster: next_cluster_idx,
             currentColor: NO_COLOR,
             tags: [...initEmptyTagsList(), null],
-            rangesList: [...Array(state.clusters[next_cluster_idx].cluster.length)].map(() => []),
+            rangesList: [...Array(state.clusters[next_cluster_idx].answers.length)].map(() => []),
             startTaggingTime: getMillis(),
         }
     } else return state
@@ -234,7 +234,7 @@ function setCurrentCluster(state: TaggingClusterSession, idx: number) {
             currentCluster: idx,
             currentColor: NO_COLOR,
             tags: [...initEmptyTagsList(), null],
-            rangesList: [...Array(state.clusters[idx].cluster.length)].map(() => []),
+            rangesList: [...Array(state.clusters[idx].answers.length)].map(() => []),
             startTaggingTime: getMillis(),
         }
     }
@@ -249,7 +249,7 @@ function setAvailableMisconceptions(state: TaggingClusterSession, misconceptions
 }
 
 function post(state: TaggingClusterSession): TaggingClusterSession {
-    getCurrentCluster(state).cluster.forEach((answer, index) => {
+    getCurrentCluster(state).answers.forEach((answer, index) => {
         postHelper(
             state.dataset_id,
             state.question_id,
@@ -275,11 +275,11 @@ function pop_answer(state: TaggingClusterSession, idx: number) {
         post(state)
 
         const cluster: Cluster = state.clusters[state.currentCluster]
-        const popped_answer: Answer[] = cluster.cluster.slice(idx, idx + 1)
-        const reduced_answers: Answer[] = cluster.cluster.slice(0, idx).concat(cluster.cluster.slice(idx + 1))
+        const popped_answer: Answer[] = cluster.answers.slice(idx, idx + 1)
+        const reduced_answers: Answer[] = cluster.answers.slice(0, idx).concat(cluster.answers.slice(idx + 1))
         const new_clusters = [...state.clusters]
-        new_clusters[state.currentCluster].cluster = [...reduced_answers]
-        new_clusters.push({name: 'Cluster ' + new_clusters.length, cluster: popped_answer})
+        new_clusters[state.currentCluster].answers = [...reduced_answers]
+        new_clusters.push({name: 'Cluster ' + new_clusters.length, answers: popped_answer})
 
         postClusters(state.dataset_id, state.question_id, state.user_id, new_clusters)
 
@@ -346,8 +346,8 @@ function useTaggingClusterSession(): [
 }
 
 export function getRanges(state: TaggingClusterSession, answer: Answer): HighlightRangeColor[] {
-    if (arrayEquals(getCurrentCluster(state).cluster, [])) return []
-    const idx = getCurrentCluster(state).cluster.findIndex(ans => stringEquals(ans.answer_id, answer.answer_id))
+    if (arrayEquals(getCurrentCluster(state).answers, [])) return []
+    const idx = getCurrentCluster(state).answers.findIndex(ans => stringEquals(ans.answer_id, answer.answer_id))
     if (state.rangesList.length === 0 || state.availableMisconceptions.length == 0) return []
     return state.rangesList[idx].map(elem => {
         return {
@@ -367,7 +367,7 @@ export function isUsingDefaultColor(state: TaggingClusterSession): boolean {
 }
 
 export function getCurrentCluster(state: TaggingClusterSession): Cluster {
-    if (state.clusters.length === 0) return {name: 'not initialized', cluster: []}
+    if (state.clusters.length === 0) return {name: 'not initialized', answers: []}
     return state.clusters[state.currentCluster]
 }
 
diff --git a/frontend/src/util/UserContext.ts b/frontend/src/util/UserContext.ts
@@ -17,6 +17,4 @@ if (initial_state == null) {
 
 const userContext = React.createContext<User>(initial_state);
 
-console.log('created new context', initial_state)
-
 export {userContext, initial_state};
diff --git a/tagging-service/flaskr/endpoints/cluster_api.py b/tagging-service/flaskr/endpoints/cluster_api.py
@@ -9,7 +9,7 @@
 CLUSTER = api.model('Cluster', {
     'name': fields.String(required=True, readonly=True, description='Name of the cluster',
                           example='Special Cluster'),
-    'cluster': fields.List(fields.Nested(ANSWER))
+    'answers': fields.List(fields.Nested(ANSWER))
 })
 
 CLUSTERED_ANSWERS = api.model('Clustered Answers', {
diff --git a/tagging-service/flaskr/handlers/dataset_handler.py b/tagging-service/flaskr/handlers/dataset_handler.py
@@ -48,7 +48,7 @@ def thread_func(_dataset_id, _question_id, _answers):
         save_cluster(dataset_id=_dataset_id,
                      question_id=_question_id,
                      user_id='',
-                     cluster=[{'cluster': c, 'name': f'Cluster {i}'} for i, c in enumerate(cls)])  # convert format
+                     cluster=[{'answers': c, 'name': f'Cluster {i}'} for i, c in enumerate(cls)])  # convert format
         logger.debug('done ' + _question_id)
 
     threads = []

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,6 @@ interface Input {`
`32`	`32`
`33`	`33`
`34`	`34`	`function shouldCollapse(query: string, result: Result): boolean {`
`35`		`- console.log('shouldNotCollapse')`
`36`		`- console.log(query, query.length == 0)`
`37`	`35`	`for (let c of result.clusters) {`
`38`	`36`	`if (c.matches.length != 0) return false`
`39`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ function ClusterView({taggingClusterSession, dispatchTaggingClusterSession}: Inp`
`38`	`38`	`<div>`
`39`	`39`	`{`
`40`	`40`	`currentCluster`
`41`		`- .cluster`
	`41`	`+ .answers`
`42`	`42`	`.map((answer: Answer, index: number) =>`
`43`	`43`	`<ClusterItem`
`44`	`44`	`key={"ClusterItem\|Answer\|" + answer.answer_id}`
Original file line number	Diff line number	Diff line change
`@@ -28,5 +28,5 @@ export interface Answer {`
`28`	`28`
`29`	`29`	`export interface Cluster {`
`30`	`30`	`"name": string,`
`31`		`- "cluster": Answer[]`
	`31`	`+ "answers": Answer[]`
`32`	`32`	`}`