Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix persist project tabs #1146

Open
wants to merge 151 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
151 commits
Select commit Hold shift + click to select a range
2cf82ab
disabled dellocate btn
sagarika-padmanaban Jun 4, 2024
7c15e11
disabled dellocate btn
sagarika-padmanaban Jun 4, 2024
c42d265
Merge pull request #1039 from AI4Bharat/deallocate
ishvindersethi22 Jun 4, 2024
89a116f
deallocation drop down
akshaya224 Jun 5, 2024
590880a
Merge pull request #1042 from AI4Bharat/deallocation
ishvindersethi22 Jun 5, 2024
09622ab
added new changes
sagarika-padmanaban Jun 21, 2024
8ff41c7
Merge pull request #1050 from AI4Bharat/ssi
ishvindersethi22 Jun 21, 2024
21e52c9
rsolved issues
sagarika-padmanaban Jun 21, 2024
861150c
merge
sagarika-padmanaban Jun 21, 2024
0113caf
Merge pull request #1051 from AI4Bharat/ssi
ishvindersethi22 Jun 21, 2024
562fd5a
rsolved issues
sagarika-padmanaban Jun 21, 2024
6289e08
merge
sagarika-padmanaban Jun 21, 2024
3289c7e
Merge pull request #1052 from AI4Bharat/ssi
ishvindersethi22 Jun 21, 2024
cec3620
change noise tag enclosing to <> and added validation for input text …
kartikvirendrar Jun 26, 2024
4d211f6
Merge pull request #1056 from AI4Bharat/noise-tags-master
ishvindersethi22 Jun 26, 2024
1363455
change noise tag enclosing to <> and added validation for input text …
kartikvirendrar Jun 26, 2024
9dbe009
Merge branch 'master' into noise-tags-master
kartikvirendrar Jun 26, 2024
4fb42e2
added validation for input text to not have any special chars
kartikvirendrar Jun 26, 2024
7f7db1f
added validation for input text to not have any special char
kartikvirendrar Jun 26, 2024
05e74a1
added validation for input text to not have any special char
kartikvirendrar Jun 26, 2024
88aedd5
added validation for input text to not have any special chars
kartikvirendrar Jun 26, 2024
13af40b
update regex condition
kartikvirendrar Jun 26, 2024
d90e7cc
update condition for text validation
kartikvirendrar Jun 27, 2024
8f44a01
update check for text validation
kartikvirendrar Jun 27, 2024
f04ff51
update condition for text validation
kartikvirendrar Jun 27, 2024
dc5cf01
update condition for text validation
kartikvirendrar Jun 27, 2024
bcbb1b9
update condition for text validation
kartikvirendrar Jun 27, 2024
fd304e1
Merge pull request #1057 from AI4Bharat/noise-tags-master
ishvindersethi22 Jun 27, 2024
246a9c5
update condition for text validation
kartikvirendrar Jun 27, 2024
4c79f33
Merge branch 'master' into noise-tags-master
ishvindersethi22 Jun 27, 2024
ac6edba
Merge pull request #1058 from AI4Bharat/noise-tags-master
ishvindersethi22 Jun 27, 2024
60f3ab7
use shoonya-backend for audio data
kartikvirendrar Jun 27, 2024
ec2c643
Merge branch 'master' into shoonya-backend-audio
kartikvirendrar Jun 27, 2024
cf5390d
Merge pull request #1059 from AI4Bharat/shoonya-backend-audio
ishvindersethi22 Jun 27, 2024
0d85737
add missing char for malyalam language
kartikvirendrar Jun 27, 2024
2e7d91c
Merge branch 'master' into text-validation-fix
kartikvirendrar Jun 27, 2024
dd57777
Merge pull request #1060 from AI4Bharat/text-validation-fix
ishvindersethi22 Jun 27, 2024
26f220f
show missing char words in error popup
kartikvirendrar Jun 28, 2024
ef1eba3
Merge branch 'master' into test-validation-1
kartikvirendrar Jun 28, 2024
16058fc
Merge pull request #1061 from AI4Bharat/test-validation-1
ishvindersethi22 Jun 28, 2024
d7beb25
add - to text validation noise tags
kartikvirendrar Jun 28, 2024
9baa3ef
Merge branch 'master' into test-validation-2
kartikvirendrar Jun 28, 2024
dfced6b
Merge pull request #1062 from AI4Bharat/test-validation-2
ishvindersethi22 Jun 28, 2024
96825db
update text validation condition
kartikvirendrar Jun 28, 2024
55ec08e
Merge branch 'master' into test-validation-2
ishvindersethi22 Jun 28, 2024
a34c750
Merge pull request #1063 from AI4Bharat/test-validation-2
ishvindersethi22 Jun 28, 2024
7fb50a9
Merge pull request #1064 from AI4Bharat/master
kartikvirendrar Jun 28, 2024
5c63ea7
added language code for konkani langauge
kartikvirendrar Jun 28, 2024
4eb5624
Merge pull request #1065 from AI4Bharat/test-validation-2
ishvindersethi22 Jun 28, 2024
dfdcf48
disable test validation error message temporarily
kartikvirendrar Jul 1, 2024
e85a702
Merge branch 'master' into test-validation-3
kartikvirendrar Jul 1, 2024
550a012
Merge pull request #1066 from AI4Bharat/test-validation-3
ishvindersethi22 Jul 1, 2024
78a6335
add loader until audio is loaded
kartikvirendrar Jul 2, 2024
6342c0c
Merge branch 'master' into test-validation-4
kartikvirendrar Jul 2, 2024
9de0050
Merge pull request #1067 from AI4Bharat/test-validation-4
ishvindersethi22 Jul 2, 2024
2e30d5d
Revert "add loader until audio is loaded"
ishvindersethi22 Jul 3, 2024
f680367
Merge pull request #1068 from AI4Bharat/revert-1067-test-validation-4
ishvindersethi22 Jul 3, 2024
55a29cb
Revert "use shoonya-backend for audio data"
ishvindersethi22 Jul 3, 2024
19d6701
Merge pull request #1069 from AI4Bharat/revert-1059-shoonya-backend-a…
ishvindersethi22 Jul 3, 2024
1a8fe28
use asr server instead of shoonya-backend for getting audio blob
kartikvirendrar Jul 4, 2024
8867e53
Revert "Revert "use shoonya-backend for audio data""
ishvindersethi22 Jul 4, 2024
61c1780
Merge pull request #1071 from AI4Bharat/revert-1069-revert-1059-shoon…
ishvindersethi22 Jul 4, 2024
f531be5
Revert "Revert "add loader until audio is loaded""
ishvindersethi22 Jul 4, 2024
bb6c72f
Merge pull request #1072 from AI4Bharat/revert-1068-revert-1067-test-…
ishvindersethi22 Jul 4, 2024
358aeee
Merge branch 'master' into asr-audio-bloburl
kartikvirendrar Jul 4, 2024
74af4d6
Merge pull request #1070 from AI4Bharat/asr-audio-bloburl
ishvindersethi22 Jul 4, 2024
71419f7
Update README.md
sagarika-padmanaban Jul 8, 2024
05a8081
changes for SU rejected tasks
kartikvirendrar Jul 8, 2024
40fef44
Clui changes for SU rejected task
kartikvirendrar Jul 8, 2024
5be72dc
Merge pull request #1078 from AI4Bharat/su_annotation_fix
aparna-aa Jul 8, 2024
6162b19
Merge pull request #1076 from AI4Bharat/sagarika-padmanaban-patch-1
aparna-aa Jul 9, 2024
3d0f7cc
added duration text
sagarika-padmanaban Jul 11, 2024
c4556fc
merge
sagarika-padmanaban Jul 11, 2024
d08bd5f
Merge pull request #1080 from AI4Bharat/sagarika-master
aparna-aa Jul 11, 2024
3018117
added download feature
sagarika-padmanaban Jul 22, 2024
7a84b67
fixex
sagarika-padmanaban Jul 22, 2024
83a120c
Merge pull request #1083 from AI4Bharat/sagarika-master
ishvindersethi22 Jul 23, 2024
342c9e3
upgrade transliteration module version to 1.3.5
kartikvirendrar Jul 23, 2024
23567f3
Merge pull request #1084 from AI4Bharat/indictrans1.3.5
ishvindersethi22 Jul 23, 2024
bcdd320
changes in payment reports
sagarika-padmanaban Jul 24, 2024
5ae890d
merge
sagarika-padmanaban Jul 24, 2024
c2eca4d
updated transliteration module to version 1.3.6
kartikvirendrar Jul 24, 2024
caa4e2c
Merge pull request #1086 from AI4Bharat/indictransv1.3.6
ishvindersethi22 Jul 24, 2024
61acbb4
removed coll pro btn
sagarika-padmanaban Jul 26, 2024
2985486
merge
sagarika-padmanaban Jul 26, 2024
a4cfca4
Merge pull request #1085 from AI4Bharat/sagarika-master
ishvindersethi22 Jul 26, 2024
f54024f
merge
sagarika-padmanaban Jul 26, 2024
39373bf
merge
sagarika-padmanaban Jul 26, 2024
f386e2c
tootltip
sagarika-padmanaban Jul 30, 2024
957b118
added projects
sagarika-padmanaban Aug 18, 2024
85b9553
added projects
sagarika-padmanaban Aug 18, 2024
99d4047
added projects
sagarika-padmanaban Aug 18, 2024
df7b04d
Merge pull request #1093 from AI4Bharat/project
ishvindersethi22 Aug 18, 2024
de49ef3
added ocr projecttype
sagarika-padmanaban Aug 28, 2024
04ef340
fix
sagarika-padmanaban Aug 28, 2024
7d6a269
Merge pull request #1094 from AI4Bharat/mas-ta2
ishvindersethi22 Aug 28, 2024
f6717b5
fixs
sagarika-padmanaban Aug 29, 2024
3314574
merge
sagarika-padmanaban Aug 29, 2024
900902f
Merge pull request #1096 from AI4Bharat/mas-ta2
ishvindersethi22 Aug 29, 2024
33430a8
issue in ta fixed
sagarika-padmanaban Sep 4, 2024
b33eb9d
Merge pull request #1097 from AI4Bharat/mas-ef
ishvindersethi22 Sep 11, 2024
6cce684
Revert "analytics api integration effciency and download button ui ch…
ishvindersethi22 Sep 11, 2024
8d901ec
Merge pull request #1100 from AI4Bharat/revert-1097-mas-ef
ishvindersethi22 Sep 11, 2024
9718e2e
fixex
sagarika-padmanaban Sep 12, 2024
5a75a15
Merge pull request #1102 from AI4Bharat/merging
ishvindersethi22 Sep 12, 2024
0cac0c2
Merge branch 'master' into sagarika-master
ishvindersethi22 Sep 20, 2024
a20440d
Merge pull request #1088 from AI4Bharat/sagarika-master
ishvindersethi22 Sep 20, 2024
7cee671
fixex
sagarika-padmanaban Oct 4, 2024
bc8361d
Update SentanceCountMetaAnalyticsChart.jsx
sagarika-padmanaban Oct 4, 2024
de9059f
Update WordCountMetaAnalyticsChart.jsx
sagarika-padmanaban Oct 4, 2024
57c0333
fixex
sagarika-padmanaban Oct 4, 2024
67afb18
Merge pull request #1110 from AI4Bharat/ana-mas
ishvindersethi22 Oct 4, 2024
1372458
Revert "task analytics for superchecker"
ishvindersethi22 Oct 4, 2024
aed965b
Merge pull request #1111 from AI4Bharat/revert-1110-ana-mas
ishvindersethi22 Oct 4, 2024
8aea647
Revert "Revert "task analytics for superchecker""
ishvindersethi22 Oct 4, 2024
66d4798
Merge pull request #1112 from AI4Bharat/revert-1111-revert-1110-ana-mas
ishvindersethi22 Oct 4, 2024
dc1646d
merge
sagarika-padmanaban Oct 5, 2024
f3a557d
Merge pull request #1113 from AI4Bharat/ana-mas
ishvindersethi22 Oct 5, 2024
b4084fb
use xlit api proxy through shoonya-backend
kartikvirendrar Oct 9, 2024
3f75e7f
Merge pull request #1116 from AI4Bharat/xlit-api-proxy
ishvindersethi22 Oct 10, 2024
fdd83e3
fix
sagarika-padmanaban Nov 7, 2024
3a137f7
Merge pull request #1118 from AI4Bharat/preview-mas
aparna-aa Nov 7, 2024
ec7f1c1
fix
sagarika-padmanaban Nov 24, 2024
18f978c
Merge pull request #1123 from AI4Bharat/master-pre
aparna-aa Nov 27, 2024
80fe5ed
fix minor bug in xlit transliteration
kartikvirendrar Nov 27, 2024
9a4c8c1
Merge pull request #1125 from AI4Bharat/xlit-api
ishvindersethi22 Nov 27, 2024
74e9ad6
fixs
sagarika-padmanaban Dec 10, 2024
784635f
fixes
sagarika-padmanaban Dec 14, 2024
06b5943
Merge pull request #1126 from AI4Bharat/analytic-org-ui
ishvindersethi22 Dec 15, 2024
b8b0420
fix
sagarika-padmanaban Dec 23, 2024
e48d9a9
merge
sagarika-padmanaban Dec 23, 2024
9ab8bfc
fix
sagarika-padmanaban Dec 23, 2024
97887a0
Merge pull request #1129 from AI4Bharat/analytic-org-ui
ishvindersethi22 Dec 23, 2024
a08d209
fix
sagarika-padmanaban Dec 23, 2024
ab43737
Merge branch 'master' into analytic-org-ui
ishvindersethi22 Dec 23, 2024
603275b
Merge pull request #1130 from AI4Bharat/analytic-org-ui
ishvindersethi22 Dec 23, 2024
9c01f06
fix
sagarika-padmanaban Dec 23, 2024
993a9d8
fix
sagarika-padmanaban Dec 23, 2024
39633e5
Merge pull request #1131 from AI4Bharat/analytic-org-ui
ishvindersethi22 Dec 23, 2024
3d5af0c
fixes
sagarika-padmanaban Dec 24, 2024
5c4a8eb
ui changes for OCR
kartikvirendrar Dec 30, 2024
3776b76
Merge pull request #1134 from AI4Bharat/analytic-org-ui
aparna-aa Dec 30, 2024
bf1e727
minor changes for OCR UI
kartikvirendrar Jan 2, 2025
0bc14d4
Merge branch 'master' into lsf-ui4
ishvindersethi22 Jan 7, 2025
bcc9972
Merge pull request #1140 from AI4Bharat/lsf-ui4
ishvindersethi22 Jan 7, 2025
0cd8f12
fix
sagarika-padmanaban Jan 17, 2025
8c764c0
merge
sagarika-padmanaban Jan 17, 2025
38dc506
Merge pull request #1141 from AI4Bharat/analytic-org-ui
aparna-aa Jan 17, 2025
11e5216
Revert "Analytic org UI"
aparna-aa Jan 17, 2025
436df26
Merge pull request #1142 from AI4Bharat/revert-1141-analytic-org-ui
aparna-aa Jan 17, 2025
4ddae3d
Persist project tabs state through Redux
humiiii Feb 1, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lsf-build/
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,6 @@ The project was created using [React 18.1.0](https://reactjs.org/docs/getting-st

#### For more information please check [Shoonya](https://github.com/AI4Bharat/Shoonya)

> Note: The page will reload when you make changes. You may also see any lint errors in the console.
> Note:-
> * The page will reload when you make changes. You may also see any lint errors in the console.
> * Languages List will be taken from LanguageCode.js
22 changes: 18 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@ai4bharat/indic-transliterate": "^1.3.2",
"@ai4bharat/indic-transliterate": "^1.3.8",
"@emotion/react": "^11.9.0",
"@emotion/styled": "^11.8.1",
"@heartexlabs/label-studio": "^1.4.0",
Expand All @@ -24,7 +24,9 @@
"date-fns": "^2.28.0",
"draft-js": "^0.11.7",
"duration-time-conversion": "^1.0.6",
"export-from-json": "^1.7.4",
"faker": "^5.5.3",
"file-saver": "^2.0.5",
"history": "^5.3.0",
"html2canvas": "^1.4.1",
"jspdf": "^2.5.1",
Expand Down Expand Up @@ -89,5 +91,8 @@
},
"devDependencies": {
"gh-pages": "^4.0.0"
},
"alias": {
"LabelStudio": false
}
}
2 changes: 1 addition & 1 deletion src/config/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const configs = {
BASE_URL: "https://backend.prod2.shoonya.ai4bharat.org",
BASE_URL_AUTO: process.env.REACT_APP_APIGW_BASE_URL
? process.env.REACT_APP_APIGW_BASE_URL
:"https://backend.dev.shoonya.ai4bharat.org"
:"https://backend.shoonya.ai4bharat.org"
};

export default configs;
Expand Down
6 changes: 6 additions & 0 deletions src/redux/actions/Tasks/projectTabActions.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export const SET_TAB_VALUE = "SET_TAB_VALUE";

export const setValue = (value) => ({
type: SET_TAB_VALUE,
payload: value,
});
4 changes: 3 additions & 1 deletion src/redux/reducers/Progress/MetaAnalytics.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import C from "../../constants";

let initialState = {
data: [],
originalData: [],

};


Expand Down Expand Up @@ -58,7 +60,7 @@ const reducer = (state = initialState, action) => {
switch (action.type) {
case C.FETCH_META_ANALYTICS_DATA:
const data = diffAnnotationReview(action.payload);
return { ...state, data };
return { ...state, originalData: action.payload, data };

default:
return {
Expand Down
10 changes: 8 additions & 2 deletions src/redux/reducers/Progress/TaskAnalytics.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import C from "../../constants";

let initialState = {
data: [],
originalData: [],

};

const diffAnnotationReview = (payload) => {
Expand All @@ -13,7 +15,11 @@ const diffAnnotationReview = (payload) => {
languages: (value?.language),
annotation_cumulative_tasks_count: (value?.ann_cumulative_tasks_count),
review_cumulative_tasks_count: (value?.rew_cumulative_tasks_count),
diff_annotation_review: (value?.ann_cumulative_tasks_count - value?.rew_cumulative_tasks_count)
sup_cumulative_tasks_count : (value?.sup_cumulative_tasks_count),
diff_annotation_rev_sup: (value?.ann_cumulative_tasks_count - value?.rew_cumulative_tasks_count-value?.sup_cumulative_tasks_count),
diff_annotation_rev: (value?.ann_cumulative_tasks_count - value?.rew_cumulative_tasks_count),
diff_annotation_sup: (value?.ann_cumulative_tasks_count - value?.sup_cumulative_tasks_count),
diff_rev:(value?.rew_cumulative_tasks_count-value?.sup_cumulative_tasks_count),
};
})
})
Expand All @@ -28,7 +34,7 @@ const reducer = (state = initialState, action) => {
switch (action.type) {
case C.FETCH_TASK_ANALYTICS_DATA:
const data = diffAnnotationReview(action.payload);
return { ...state, data };
return { ...state, originalData: action.payload, data };

default:
return {
Expand Down
19 changes: 19 additions & 0 deletions src/redux/reducers/ProjectDetails/projectTabReducer.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
import { SET_TAB_VALUE } from "../../actions/Tasks/projectTabActions";

const initialState = {
value: 0,
};

const projectReducer = (state = initialState, action) => {
switch (action.type) {
case SET_TAB_VALUE:
return {
...state,
value: action.payload,
};
default:
return state;
}
};

export default projectReducer;
3 changes: 2 additions & 1 deletion src/redux/reducers/WorkspaceDetails/GetMetaAnalytics.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import constants from "../../constants";

let initialState = {
data: [],
originalData: []
};

const diffAnnotationReview = (payload) => {
Expand Down Expand Up @@ -49,7 +50,7 @@ const reducer = (state = initialState, action) => {
switch (action.type) {
case constants.WS_META_ANALYTICS:
const data = diffAnnotationReview(action.payload);
return { ...state, data };
return { ...state, originalData: action.payload, data };

default:
return {
Expand Down
10 changes: 8 additions & 2 deletions src/redux/reducers/WorkspaceDetails/GetTaskAnalytics.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ import constants from "../../constants";

let initialState = {
data: [],
originalData: [],

};

const diffAnnotationReview = (payload) => {
Expand All @@ -13,7 +15,11 @@ const diffAnnotationReview = (payload) => {
languages: (value?.language),
annotation_cumulative_tasks_count: (value?.ann_cumulative_tasks_count),
review_cumulative_tasks_count: (value?.rew_cumulative_tasks_count),
diff_annotation_review: (value?.ann_cumulative_tasks_count - value?.rew_cumulative_tasks_count)
sup_cumulative_tasks_count : (value?.sup_cumulative_tasks_count),
diff_annotation_rev_sup: (value?.ann_cumulative_tasks_count - value?.rew_cumulative_tasks_count-value?.sup_cumulative_tasks_count),
diff_annotation_rev: (value?.ann_cumulative_tasks_count - value?.rew_cumulative_tasks_count),
diff_annotation_sup: (value?.ann_cumulative_tasks_count - value?.sup_cumulative_tasks_count),
diff_rev:(value?.rew_cumulative_tasks_count-value?.sup_cumulative_tasks_count),
};
})
})
Expand All @@ -24,7 +30,7 @@ const reducer = (state = initialState, action) => {
switch (action.type) {
case constants.WS_TASK_ANALYTICS:
const data = diffAnnotationReview(action.payload);
return { ...state, data };
return { ...state, originalData: action.payload, data };

default:
return {
Expand Down
3 changes: 2 additions & 1 deletion src/redux/reducers/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ import commonReducer from "./CL-Transcription/Common";
import getAnnotationsTask from "./CL-Transcription/GetAnnotationsTask";
import patchAnnotation from "./CL-Transcription/PatchAnnotation"
import updateUIPrefs from "./UserManagement/UpdateUIPrefs";

import projectTabReducer from "./ProjectDetails/projectTabReducer";

const index = {
apiStatus,
Expand Down Expand Up @@ -204,6 +204,7 @@ const index = {
patchAnnotation,
updateUIPrefs,
getManagerSuggestions,
projectTab:projectTabReducer
};

export default index;
Loading