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

feat(datatrakWeb): RN-1335: Tasks Epic OLD ONE #5778

Closed
wants to merge 235 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
235 commits
Select commit Hold shift + click to select a range
34a474c
Add migration for table
alexd-bes Jun 17, 2024
ee94a56
Remove status type if exists
alexd-bes Jun 17, 2024
520e818
Create task db model
alexd-bes Jun 17, 2024
1df39f1
Add to db exports
alexd-bes Jun 17, 2024
f605b56
Generate types
alexd-bes Jun 17, 2024
50341bf
Fix migrate-down
alexd-bes Jun 17, 2024
8549411
Get tasks endpoint
alexd-bes Jun 17, 2024
366aa54
Create task endpoint
alexd-bes Jun 17, 2024
6780eef
WIP edit tasks
alexd-bes Jun 17, 2024
9438b4e
Edit task endpoint
alexd-bes Jun 17, 2024
bbbc6ae
Heading and route
alexd-bes Jun 17, 2024
ff86345
Add alignment for children
alexd-bes Jun 17, 2024
bbdb075
Allow assignee to be empty
alexd-bes Jun 17, 2024
3a0aa4e
Don't cascade user accounts
alexd-bes Jun 17, 2024
45c99b4
Merge branch 'rn-1335-setup-tasking' into rn-1335-tasks-dashboard
alexd-bes Jun 17, 2024
50a9a8b
Generate types
alexd-bes Jun 17, 2024
fa4c47d
Merge branch 'rn-1335-setup-tasking' into rn-1335-tasks-dashboard
alexd-bes Jun 17, 2024
1511c37
Tasks route
alexd-bes Jun 17, 2024
f7372eb
Request tasks
alexd-bes Jun 17, 2024
0805929
WIP table
alexd-bes Jun 18, 2024
d6ea45f
Working table
alexd-bes Jun 18, 2024
3c55ae2
Working table
alexd-bes Jun 18, 2024
00c1317
Merge branch 'rn-1335-tasks-dashboard' into rn-1335-refactor-table-co…
alexd-bes Jun 18, 2024
923875c
Fix error type
alexd-bes Jun 18, 2024
4f8f81b
Remove unused actions
alexd-bes Jun 18, 2024
74304e8
Fix sorting
alexd-bes Jun 18, 2024
ca718f2
Undo unneeded changes
alexd-bes Jun 18, 2024
7d3d83c
revert
alexd-bes Jun 18, 2024
1bbc3e5
Revert "Tasks route"
alexd-bes Jun 18, 2024
f7ff11c
Revert "Add alignment for children"
alexd-bes Jun 18, 2024
cd68dcf
Revert "Heading and route"
alexd-bes Jun 18, 2024
ddea8df
Remove extra file
alexd-bes Jun 18, 2024
136fb64
Reapply "Heading and route"
alexd-bes Jun 18, 2024
ebed637
Reapply "Add alignment for children"
alexd-bes Jun 18, 2024
a805681
Reapply "Tasks route"
alexd-bes Jun 18, 2024
ba74799
Revert "revert"
alexd-bes Jun 18, 2024
201d16d
Revert "Undo unneeded changes"
alexd-bes Jun 18, 2024
b9318ba
Return count and number of pages with data
alexd-bes Jun 18, 2024
aaed1dc
WIP tasks view
alexd-bes Jun 18, 2024
b21d01f
Only show filter row when applicable
alexd-bes Jun 18, 2024
6bb73a5
Fix type
alexd-bes Jun 18, 2024
6dea702
WIP
alexd-bes Jun 18, 2024
53a7992
Add assignee name field for easy filtering and indexes
alexd-bes Jun 18, 2024
809608f
Generate types
alexd-bes Jun 18, 2024
4931fde
Merge branch 'rn-1335-setup-tasking' into rn-1335-refactor-table-comp…
alexd-bes Jun 18, 2024
0544173
Merge branch 'rn-1335-refactor-table-component' into rn-1335-tasks-da…
alexd-bes Jun 18, 2024
a8ab3dc
Working filters
alexd-bes Jun 18, 2024
a7a7a8e
Status filters
alexd-bes Jun 19, 2024
7ab3dfa
Full width buttons
alexd-bes Jun 19, 2024
94c14c4
Date filters
alexd-bes Jun 20, 2024
d1382b2
Styling
alexd-bes Jun 20, 2024
7557de7
Debounced cell input
alexd-bes Jun 20, 2024
4da8223
Move useDebounce to ui-components for reuse
alexd-bes Jun 20, 2024
643cc7c
Sorting WIP
alexd-bes Jun 20, 2024
a0080d1
Change schema for repeating
alexd-bes Jun 20, 2024
60ec9f2
Merge branch 'rn-1335-setup-tasking' into rn-1335-refactor-table-comp…
alexd-bes Jun 20, 2024
ef6d4b7
Merge branch 'rn-1335-refactor-table-component' into rn-1335-tasks-da…
alexd-bes Jun 20, 2024
fbf6651
Styling
alexd-bes Jun 20, 2024
4ac0e33
Fix tests
alexd-bes Jun 20, 2024
9285ca1
Merge branch 'rn-1335-setup-tasking' into rn-1335-refactor-table-comp…
alexd-bes Jun 20, 2024
9501a03
Merge branch 'rn-1335-refactor-table-component' into rn-1335-tasks-da…
alexd-bes Jun 20, 2024
33cc484
No data display
alexd-bes Jun 20, 2024
2cf3cb4
Fix tests
alexd-bes Jun 20, 2024
de8a8f6
Merge branch 'rn-1335-setup-tasking' into rn-1335-refactor-table-comp…
alexd-bes Jun 20, 2024
f6c1cac
Merge branch 'rn-1335-refactor-table-component' into rn-1335-tasks-da…
alexd-bes Jun 20, 2024
76ef995
Reorganise files
alexd-bes Jun 20, 2024
56b851b
tweaks
alexd-bes Jun 20, 2024
4091210
Add loading state
alexd-bes Jun 20, 2024
a0bfeae
Exclude tasks from ios
alexd-bes Jun 20, 2024
0c1bd8d
tweaks
alexd-bes Jun 20, 2024
77693fa
Types fix
alexd-bes Jun 20, 2024
5e59d02
Make due date nullable
alexd-bes Jun 21, 2024
653ba77
Rename repeat_schedule field
alexd-bes Jun 21, 2024
41ea8ec
Merge branch 'rn-1335-setup-tasking' into rn-1335-refactor-table-comp…
alexd-bes Jun 21, 2024
75179ae
Merge branch 'rn-1335-refactor-table-component' into rn-1335-tasks-da…
alexd-bes Jun 21, 2024
fa82eb7
Tweaks
alexd-bes Jun 21, 2024
0e566d3
Fix tests
alexd-bes Jun 21, 2024
179426a
Revert "Fix tests"
alexd-bes Jun 21, 2024
77b30d3
Fix tests
alexd-bes Jun 21, 2024
116a710
Merge branch 'rn-1335-setup-tasking' into rn-1335-refactor-table-comp…
alexd-bes Jun 21, 2024
34d49b9
Merge branch 'rn-1335-refactor-table-component' into rn-1335-tasks-da…
alexd-bes Jun 21, 2024
eda54e3
Fix validation rules
alexd-bes Jun 21, 2024
f7aaeeb
Merge branch 'rn-1335-setup-tasking' into rn-1335-refactor-table-comp…
alexd-bes Jun 21, 2024
c34f6e3
Merge branch 'rn-1335-refactor-table-component' into rn-1335-tasks-da…
alexd-bes Jun 21, 2024
3dcad4b
Merge branch 'dev' into rn-1335-setup-tasking
alexd-bes Jun 21, 2024
d33844c
Link status and assignee name to records at the model level
alexd-bes Jun 23, 2024
16c7b6c
Merge branch 'dev' into rn-1335-setup-tasking
alexd-bes Jun 23, 2024
29155b2
Merge branch 'rn-1335-setup-tasking' into rn-1335-refactor-table-comp…
alexd-bes Jun 23, 2024
f2d09fe
Merge branch 'rn-1335-refactor-table-component' into rn-1335-tasks-da…
alexd-bes Jun 23, 2024
602a161
Generate types
alexd-bes Jun 23, 2024
48e46e2
Merge branch 'rn-1335-setup-tasking' into rn-1335-refactor-table-comp…
alexd-bes Jun 23, 2024
aec463f
Merge branch 'rn-1335-refactor-table-component' into rn-1335-tasks-da…
alexd-bes Jun 23, 2024
aab020e
Fix types and apply new field names
alexd-bes Jun 23, 2024
248a260
Get tasks filters working
alexd-bes Jun 24, 2024
15cabfe
Merge branch 'dev' into rn-1335-tasks-dashboard
alexd-bes Jun 24, 2024
32846a7
Fix pagination
alexd-bes Jul 5, 2024
346e923
Merge branch 'dev' into rn-1335-tasks-dashboard
alexd-bes Jul 7, 2024
cf927e8
Fix build
alexd-bes Jul 7, 2024
114e5d7
refactor(adminPanel): RN-1336: Move modal into ui-components (#5765)
alexd-bes Jul 8, 2024
f09ca29
Merge branch 'dev' into rn-1335-tasks-dashboard
alexd-bes Jul 9, 2024
fe4d518
Reorder import
alexd-bes Jul 10, 2024
a7ebad7
Enable popover portal
alexd-bes Jul 10, 2024
d6cb33a
Merge branch 'dev' into rn-1335-tasks-dashboard
alexd-bes Jul 11, 2024
1e184b2
feat(datatrakWeb): RN-1336: Create a task workflow (#5763)
alexd-bes Jul 11, 2024
df28a89
feat(datatrakWeb): RN-1338: Mark tasks as completed when survey respo…
alexd-bes Jul 11, 2024
696d191
fix(types):Update schemas.ts
alexd-bes Jul 11, 2024
ffa557a
feat(datatrakWeb): RN-1358: Assign tasks from dashboard (#5770)
alexd-bes Jul 11, 2024
184a0ac
feat(datatrakWeb): RN-1314: add return to tasks button on success scr…
tcaiger Jul 11, 2024
4991915
fix(datatrakWeb): Fix table height
alexd-bes Jul 12, 2024
c43b411
tweak(datatrakWeb): Use full month name in repeat schedule options
alexd-bes Jul 12, 2024
33e66d6
fix(datatrakWeb): Handle errors when loading creating task modal
alexd-bes Jul 12, 2024
c8c3d0a
fix(datatrakWeb): Hide actions on completed and cancelled tasks
alexd-bes Jul 12, 2024
3a98293
tweak(datatrakWeb): Update repeating schedule input to be matching au…
alexd-bes Jul 12, 2024
099a83c
fix(datatrakWeb): Change select list focus styling slightly
alexd-bes Jul 12, 2024
2e26e3f
fix(datatrakWeb): Fix UTC date issue
alexd-bes Jul 14, 2024
53ae054
fix(datatrakWeb): fix focus styles on select filter
alexd-bes Jul 14, 2024
612af24
fix(datatrakWeb): Fix type error
alexd-bes Jul 14, 2024
c16e4c0
tweak(datatrakWeb): Change text on complete task button
alexd-bes Jul 14, 2024
b22f67b
Merge branch 'dev' into epic-tasks
alexd-bes Jul 14, 2024
6351dc2
fix(datatrakWeb): remove redundant file
alexd-bes Jul 14, 2024
1647145
fix(datatrakWeb): Fix assignee autocomplete
alexd-bes Jul 15, 2024
5716e8d
tweak(datatrakWeb): Navigate user to project select screen on 403 ent…
alexd-bes Jul 15, 2024
3a2493c
feat(datatrak): RN-1343: Task dashboard filter settings (#5757)
tcaiger Jul 15, 2024
28df6fc
tweak(datatrakWeb): Make search fuzzy always
alexd-bes Jul 15, 2024
25009ec
tweak(datatrakWeb): RN-1358: Assign task modal changes (#5784)
alexd-bes Jul 16, 2024
84bb52f
Update taskFilterSettings.ts
tcaiger Jul 16, 2024
5a8793f
Update ActionButton.tsx
tcaiger Jul 16, 2024
d708a95
feat(datatrakWeb): RN-1329: Task details view (#5783)
alexd-bes Jul 16, 2024
9648668
fix tasks button
tcaiger Jul 17, 2024
fe4a457
removeTaskFilterSetting on logout
tcaiger Jul 17, 2024
70b06e6
fix(datatrakWeb): Make 'unassigned' searchable
alexd-bes Jul 18, 2024
1136c10
fix(datatrakWeb): Fix task row links
alexd-bes Jul 18, 2024
6b31938
fix(datatrakWeb): Fix task styling
alexd-bes Jul 18, 2024
7fc3061
tweak(datatrakWeb): Tweak styling of task details view
alexd-bes Jul 18, 2024
a702347
Merge branch 'dev' into epic-tasks
alexd-bes Jul 18, 2024
72be8cc
fix(adminPanel): Fix merge
alexd-bes Jul 18, 2024
f0eb8bf
Fix build
alexd-bes Jul 18, 2024
5ffb3e2
feat(datatrak): RN-1314: Auto populate entity question (#5793)
tcaiger Jul 18, 2024
e0fd7a5
feat(datatrak): RN-1313: My tasks section (#5776)
tcaiger Jul 18, 2024
da3bfd0
Update TaskTile.tsx
tcaiger Jul 19, 2024
ceae068
Update SurveyScreen.tsx
tcaiger Jul 19, 2024
4ddce28
Merge branch 'dev' into epic-tasks
alexd-bes Jul 21, 2024
458d5e8
Fix build
alexd-bes Jul 21, 2024
df93bd0
tweak(datatrakWeb): RN-1339: Move survey response page into modal (#5…
alexd-bes Jul 21, 2024
f52a43f
feat(datatrak): RN-1357: Task created toast message (#5798)
tcaiger Jul 22, 2024
e2c256c
feat(datatrakWeb): RN-1381: Add new question types (#5807)
alexd-bes Jul 24, 2024
298627f
feat(datatrak): RN-1364: Completing of repeat tasks (#5802)
tcaiger Jul 24, 2024
8f4b56b
feat(datatrakWeb): RN-1331: Task comments setup (#5800)
alexd-bes Jul 25, 2024
a9f37d1
Merge branch 'dev' into epic-tasks
alexd-bes Jul 25, 2024
e1600ed
Fix merge errors
alexd-bes Jul 25, 2024
a7abd03
Fix build
alexd-bes Jul 25, 2024
0f812a8
feat(datatrakWeb): RN-1391: Generate system comments for tasks (#5806)
alexd-bes Jul 26, 2024
5c2d643
Update TasksRoute.ts
tcaiger Jul 30, 2024
95ed5ee
Update taskFilterSettings.ts
tcaiger Jul 30, 2024
c205b4c
feat(adminPanel): RN-1381: Ability to import task and user questions …
alexd-bes Jul 30, 2024
38e666c
Update SurveyContext.tsx
tcaiger Jul 30, 2024
f14b61d
Update TaskCompletionHandler.js
tcaiger Jul 30, 2024
a2b2853
feat(datatrakWeb): RN-1362: Datatrak Web User question type (#5815)
alexd-bes Jul 31, 2024
c0e0b6d
feat(datatrak) RN-1340: Cancel task modal design update (#5819)
tcaiger Jul 31, 2024
dcb3287
fix merge conflicts
tcaiger Aug 1, 2024
703f7ce
tweak(datatrakWeb): Update tooltip on tasks dashboard
alexd-bes Aug 1, 2024
e877115
feat(datatrak): RN-1373: Task question (#5809)
tcaiger Aug 2, 2024
bfc62f2
tweak(datatrakWeb): RN-1331: Update to task details/comments (#5823)
alexd-bes Aug 5, 2024
ae60900
feat(datatrak): RN-1314: Handle task completion when submitting a sur…
tcaiger Aug 6, 2024
7118cc4
fix handle completion
tcaiger Aug 8, 2024
c019b25
Update TaskDetailsPage.tsx
tcaiger Aug 8, 2024
a739614
feat(meditrakApp): RN-1361: User type question (#5820)
alexd-bes Aug 8, 2024
f5e21ed
fix shouldCreateTask
tcaiger Aug 8, 2024
774d4a6
Merge branch 'epic-tasks' of github.com:beyondessential/tupaia into e…
tcaiger Aug 8, 2024
73c07f9
Update TaskCreationHandler.js
tcaiger Aug 8, 2024
dcad7f1
Display parent entity name next to entity name
alexd-bes Aug 8, 2024
fdb3eaa
Update task details buttons
alexd-bes Aug 8, 2024
eff872a
Generate types
alexd-bes Aug 8, 2024
4dc5d05
Reset pagination on filter change
alexd-bes Aug 8, 2024
afda72a
fix(datatrakWeb): Fix permissions on tasks
alexd-bes Aug 8, 2024
4ecbadb
feat(tasks): RN-1372: Email templating (#5830)
alexd-bes Aug 8, 2024
ab6d781
Update pagination no records text
alexd-bes Aug 8, 2024
8c70215
Fix tests
alexd-bes Aug 8, 2024
e3332a2
feat(datatrak): RN-1330: View initial request for a task (#5832)
tcaiger Aug 8, 2024
9d2d148
fix tests
tcaiger Aug 8, 2024
fbe4fe3
Merge branch 'epic-tasks' of github.com:beyondessential/tupaia into e…
tcaiger Aug 8, 2024
f302b4d
feat(datatrakWeb): RN-1337: Send emails to assignee of tasks (#5834)
alexd-bes Aug 11, 2024
784005a
Allow assignee question to be empty or non-mandatory
alexd-bes Aug 11, 2024
59bbd1c
Fix tests
alexd-bes Aug 11, 2024
86ea92f
Revert to starts with search
alexd-bes Aug 12, 2024
32b4b43
Fix tests
alexd-bes Aug 13, 2024
5a5ff7e
Fix comment details colour
alexd-bes Aug 13, 2024
0494a1b
Don't email assignees when completed repeating tasks are created
alexd-bes Aug 13, 2024
ed3d1f7
Fix tests
alexd-bes Aug 13, 2024
0695bad
Update LandingPage.tsx
tcaiger Aug 14, 2024
711e66b
tweak(datatrakWeb): RN-1417: save parent task to completed repeating …
alexd-bes Aug 15, 2024
79551a2
feat(datatrak): RN-1398: Setup task scheduler (#5841)
tcaiger Aug 15, 2024
8dfaa7d
Basic responsive styling
alexd-bes Aug 15, 2024
cbff16e
Task header back button
alexd-bes Aug 15, 2024
bc11fb1
Layout tidy ups
alexd-bes Aug 15, 2024
7159533
Remove warning log
alexd-bes Aug 15, 2024
90359bc
Scroll tidying
alexd-bes Aug 15, 2024
c971aa0
Generate types
alexd-bes Aug 15, 2024
98a334d
Merge branch 'dev' into epic-tasks
alexd-bes Aug 15, 2024
5654728
Merge fixes
alexd-bes Aug 15, 2024
f2b265f
Fix build
alexd-bes Aug 15, 2024
cadf238
tweak emails
tcaiger Aug 15, 2024
b5c9dac
tweak(datatrakWeb): RN-1400: save task due date in unix time (#5838)
alexd-bes Aug 16, 2024
62d29ba
Make survey success direct to tasks where applicable
alexd-bes Aug 18, 2024
9bb4d63
Merge branch 'dev' into epic-tasks
tcaiger Aug 18, 2024
4641dc2
add a default sort
tcaiger Aug 19, 2024
83f64ca
Fix user question
alexd-bes Aug 19, 2024
00e2252
Filter surveys by permission group and country
alexd-bes Aug 19, 2024
d5293cd
Handle when no permissions for country
alexd-bes Aug 19, 2024
b567b12
fix(datatrakWeb): Limit entity results to 100 (#5847)
alexd-bes Aug 19, 2024
c796fe1
Update SurveyContext.tsx
tcaiger Aug 19, 2024
03fd086
Show all users for public surveys
alexd-bes Aug 20, 2024
872de1d
Fix font weights
alexd-bes Aug 20, 2024
40db327
Convert permission groupI ID to name when exporting survey
alexd-bes Aug 21, 2024
ba5cf0e
Handle assignee lists and search
alexd-bes Aug 21, 2024
3038c12
Generate types
alexd-bes Aug 21, 2024
d770981
feat(datatrakWeb): RN-1341: Repeating tasks (#5844)
alexd-bes Aug 22, 2024
7f660c9
feat(datatrak): RN-1314: Auto fill primary entity questions for a sur…
tcaiger Aug 22, 2024
7de581f
Repeating task fixes
alexd-bes Aug 22, 2024
d8c820b
Reset tasks pagination to 0 when filter checkbox value changes
alexd-bes Aug 23, 2024
33448df
Handle overdue tasks with no assignee
alexd-bes Aug 23, 2024
746f2e9
styling tidy ups
alexd-bes Aug 23, 2024
f4215fd
Handle multiline task comments
alexd-bes Aug 26, 2024
33ce91c
Add entity name to modals
alexd-bes Aug 26, 2024
6efce15
Fix user question re-renders
alexd-bes Aug 26, 2024
7c7da0a
Update task entities on survey response edit
alexd-bes Aug 26, 2024
89aad5e
tweak(datatrakWeb): RN-1391: Update system comments handling (#5859)
alexd-bes Aug 27, 2024
8270b74
Display entity parent name on survey response modals
alexd-bes Aug 27, 2024
6a89229
Fix user question values disappearing
alexd-bes Aug 27, 2024
602b250
Fix user not showing in survey response
alexd-bes Aug 27, 2024
948ff0d
Display 'user deleted' message for deleted message
alexd-bes Aug 27, 2024
0f391e4
Remove review section headings
alexd-bes Aug 27, 2024
4defd54
Generate types
alexd-bes Aug 27, 2024
6d74306
Update SurveyReviewSection.tsx
tcaiger Aug 27, 2024
6a8ca02
Amend db migration for meditrak sync queue
alexd-bes Aug 27, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 4 additions & 0 deletions env/platform.env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
TUPAIA_FRONT_END_URL=
DATATRAK_FRONT_END_URL=
LESMIS_FRONT_END_URL=
ADMIN_PANEL_FRONT_END_URL=
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@
import React, { useState } from 'react';
import PropTypes from 'prop-types';
import { useForm, Controller } from 'react-hook-form';
import { Autocomplete, TextField } from '@tupaia/ui-components';
import { Autocomplete, TextField, useDebounce } from '@tupaia/ui-components';
import { useSearchPermissionGroups } from '../../api/queries';
import { useVizConfigContext } from '../../context';
import { useDebounce } from '../../../utilities';
import { DASHBOARD_ITEM_VIZ_TYPES } from '../../constants';
import { REQUIRED_FIELD_ERROR } from '../../../editor/validation';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import { Dialog } from '@material-ui/core';
import styled from 'styled-components';
import { ModalHeader } from '../../../../widgets';
import { ModalHeader } from '@tupaia/ui-components';

const Wrapper = styled.div`
height: 80vh;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@
import React, { useState } from 'react';
import PropTypes from 'prop-types';
import { useForm, Controller } from 'react-hook-form';
import { Autocomplete, TextField } from '@tupaia/ui-components';
import { Autocomplete, TextField, useDebounce } from '@tupaia/ui-components';
import Chip from '@material-ui/core/Chip';
import { useCountries, useProjects, useSearchPermissionGroups } from '../../api/queries';
import { useVizConfigContext } from '../../context';
import { useDebounce } from '../../../utilities';
import { MAP_OVERLAY_VIZ_TYPES } from '../../constants';
import { REQUIRED_FIELD_ERROR } from '../../../editor';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,16 @@
*/
import React, { useState } from 'react';
import { useParams } from 'react-router-dom';
import { Button, Dialog } from '@tupaia/ui-components';
import {
Button,
Dialog,
ModalContentProvider,
ModalFooter,
ModalHeader,
} from '@tupaia/ui-components';
import { DashboardItemMetadataForm } from '../DashboardItem';
import { MapOverlayMetadataForm } from '../MapOverlay';
import { DASHBOARD_ITEM_OR_MAP_OVERLAY_PARAM } from '../../constants';
import { ModalContentProvider, ModalFooter, ModalHeader } from '../../../widgets';

export const EditModal = () => {
const { dashboardItemOrMapOverlay } = useParams();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import PropTypes from 'prop-types';
import styled from 'styled-components';
import { Link as RouterLink, useParams } from 'react-router-dom';
import Typography from '@material-ui/core/Typography';
import { Modal, ModalCenteredContent } from '@tupaia/ui-components';
import { DASHBOARD_ITEM_OR_MAP_OVERLAY_PARAM, MODAL_STATUS } from '../../constants';
import { useVisualisationContext, useVizConfigContext } from '../../context';
import { useSaveDashboardVisualisation, useSaveMapOverlayVisualisation } from '../../api';
import { useVizBuilderBasePath } from '../../utils';
import { Modal, ModalCenteredContent } from '../../../widgets';

const Heading = styled(Typography).attrs({
variant: 'h3',
Expand Down Expand Up @@ -95,7 +95,7 @@ export const SaveVisualisationModal = ({ isOpen, onClose }) => {
isOpen={isOpen}
title="Save visualisation"
isLoading={status === MODAL_STATUS.LOADING}
errorMessage={error?.message}
error={error}
buttons={[
{
text: 'Cancel',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@ import React, { useState } from 'react';
import PropTypes from 'prop-types';
import styled from 'styled-components';
import InsertDriveFileIcon from '@material-ui/icons/InsertDriveFile';
import { FlexEnd, FlexSpaceBetween, FlexStart, ImportModal } from '@tupaia/ui-components';
import { FlexEnd, FlexSpaceBetween, FlexStart } from '@tupaia/ui-components';
import { usePreviewDataContext, useVizConfigContext } from '../../context';
import { LinkButton } from '../LinkButton';
import { useUploadTestData } from '../../api';
import { ProjectField } from './ProjectField';
import { LocationField } from './LocationField';
import { DateRangeField } from './DateRangeField';
import { ImportModal } from '../../../importExport';

const Container = styled(FlexSpaceBetween)`
padding: 24px 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,11 @@
*/

import React, { useState } from 'react';

import PropTypes from 'prop-types';

import { useDebounce } from '@tupaia/ui-components';
import { ParameterType } from '../../editing';
import { useEntities } from '../../../../VizBuilderApp/api';
import { Autocomplete } from '../../../../autocomplete';
import { useDebounce } from '../../../../utilities';
import { getArrayFieldValue } from './utils';

export const OrganisationUnitCodesField = ({ name, onChange }) => {
Expand Down
2 changes: 1 addition & 1 deletion packages/admin-panel/src/editor/EditModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
import React from 'react';
import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import { Modal } from '@tupaia/ui-components';
import { dismissEditor } from './actions';
import { UsedBy } from '../usedBy/UsedBy';
import { Modal } from '../widgets';
import { useEditFiles } from './useEditFiles';
import { FieldsEditor } from './FieldsEditor';
import { withConnectedEditor } from './withConnectedEditor';
Expand Down
2 changes: 1 addition & 1 deletion packages/admin-panel/src/importExport/ExportModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import React, { useState } from 'react';
import PropTypes from 'prop-types';
import { Modal } from '../widgets';
import { Modal } from '@tupaia/ui-components';
import { useApiContext } from '../utilities/ApiProvider';
import { ActionButton } from '../editor';
import { ExportIcon } from '../icons';
Expand Down
5 changes: 2 additions & 3 deletions packages/admin-panel/src/importExport/ImportModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@
import React, { useState } from 'react';
import { connect } from 'react-redux';
import PropTypes from 'prop-types';
import { FileUploadField } from '@tupaia/ui-components';
import { Modal } from '../widgets';
import { FileUploadField, Modal } from '@tupaia/ui-components';
import { InputField } from '../widgets';
import { useApiContext } from '../utilities/ApiProvider';
import { DATA_CHANGE_ERROR, DATA_CHANGE_REQUEST, DATA_CHANGE_SUCCESS } from '../table/constants';
import { checkVisibilityCriteriaAreMet, labelToId } from '../utilities';
import { ActionButton } from '../editor';
import { InputField } from '../widgets/InputField/InputField';
import { ImportIcon } from '../icons';

const STATUS = {
Expand Down
9 changes: 1 addition & 8 deletions packages/admin-panel/src/library.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,7 @@ export { PrivateRoute } from './authentication';
export { getHasBESAdminAccess } from './utilities/getHasBESAdminAccess';
export * from './pages/resources';
export { ReduxAutocomplete } from './autocomplete';
export {
IconButton,
ModalContentProvider,
Modal,
ModalFooter,
ModalHeader,
ModalCenteredContent,
} from './widgets';
export { IconButton } from './widgets';
export { AdminPanelDataProviders } from './utilities/AdminPanelProviders';
export { useApiContext } from './utilities/ApiProvider';
export { DataChangeAction, ActionButton } from './editor';
Expand Down
2 changes: 1 addition & 1 deletion packages/admin-panel/src/logsTable/LogsModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import React from 'react';
import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import { Modal } from '@tupaia/ui-components';
import { changeLogsTablePage, closeLogsModal } from './actions';
import { Modal } from '../widgets';
import { LogsTable } from './LogsTable';

export const LogsModalComponent = ({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,14 @@ import keyBy from 'lodash.keyby';
import { connect } from 'react-redux';
import { useNavigate, useParams } from 'react-router';
import styled from 'styled-components';
import { Button, SpinningLoader } from '@tupaia/ui-components';
import { Button, SpinningLoader, Modal } from '@tupaia/ui-components';
import { Breadcrumbs } from '../../../layout';
import { useItemDetails } from '../../../api/queries/useResourceDetails';
import { useValidationScroll, withConnectedEditor } from '../../../editor';
import { useEditFiles } from '../../../editor/useEditFiles';
import { FileUploadField } from '../../../widgets/InputField/FileUploadField';
import { FieldsEditor } from '../../../editor/FieldsEditor';
import { dismissEditor, loadEditor, resetEdits } from '../../../editor/actions';
import { Modal } from '../../../widgets';
import { useLinkToPreviousSearchState } from '../../../utilities';

const Wrapper = styled.div`
Expand Down
2 changes: 1 addition & 1 deletion packages/admin-panel/src/qrCode/QrCodeModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
import React from 'react';
import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import { Modal } from '@tupaia/ui-components';
import { QrCodeContainer } from './QrCodeContainer';
import { closeQrCodeModal } from './actions';
import { Modal } from '../widgets';

export const QrCodeModalComponent = ({ isOpen, onDismiss, qrCodeContents, humanReadableId }) => {
return (
Expand Down
56 changes: 56 additions & 0 deletions packages/admin-panel/src/routes/surveys/surveys.js
Original file line number Diff line number Diff line change
Expand Up @@ -490,6 +490,62 @@ const QUESTION_COLUMNS = [
},
],
},
{
label: 'Task',
fieldName: 'task',
type: 'json',
getJsonFieldSchema: () => [
{
label: 'Should create task',
fieldName: 'shouldCreateTask',
type: 'json',
getJsonFieldSchema: () => [{ label: 'Question Id', fieldName: 'questionId' }],
},
{
label: 'Entity code',
fieldName: 'entityCode',
type: 'json',
getJsonFieldSchema: () => [{ label: 'Question Id', fieldName: 'questionId' }],
},

{
label: 'Survey code',
fieldName: 'surveyCode',
optionsEndpoint: 'surveys',
optionLabelKey: 'name',
optionValueKey: 'code',
labelTooltip: 'Select the survey this task should be assigned for',
},
{
label: 'Due date',
fieldName: 'dueDate',
type: 'json',
getJsonFieldSchema: () => [{ label: 'Question Id', fieldName: 'questionId' }],
},

{
label: 'Assignee',
fieldName: 'assignee',
type: 'json',
getJsonFieldSchema: () => [{ label: 'Question Id', fieldName: 'questionId' }],
},
],
},
{
label: 'User',
fieldName: 'user',
type: 'json',
getJsonFieldSchema: () => [
{
label: 'Permission group name',
fieldName: 'permissionGroup',
optionsEndpoint: 'permissionGroups',
optionLabelKey: 'name',
optionValueKey: 'id',
labelTooltip: 'Select the permission group the user list should be filtered by',
},
],
},
],
},
},
Expand Down
4 changes: 2 additions & 2 deletions packages/admin-panel/src/surveyResponse/FileQuestionField.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ import React, { useState } from 'react';
import PropTypes from 'prop-types';
import styled from 'styled-components';
import generateId from 'uuid/v1';
import { TextField } from '@tupaia/ui-components';
import { TextField, Modal } from '@tupaia/ui-components';
import { getUniqueFileNameParts } from '@tupaia/utils';
import EditIcon from '@material-ui/icons/Edit';
import DeleteIcon from '@material-ui/icons/Delete';
import ExportIcon from '@material-ui/icons/GetApp';
import { FileUploadField } from '../widgets/InputField/FileUploadField';
import { IconButton, Modal } from '../widgets';
import { IconButton } from '../widgets';
import { useApiContext } from '../utilities/ApiProvider';

const Container = styled.div`
Expand Down
3 changes: 1 addition & 2 deletions packages/admin-panel/src/surveyResponse/Form.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@
import React, { useState, useCallback, useEffect } from 'react';
import PropTypes from 'prop-types';
import styled from 'styled-components';
import { Button } from '@tupaia/ui-components';
import { Button, ModalContentProvider, ModalFooter } from '@tupaia/ui-components';
import { useGetExistingData } from './useGetExistingData';
import { ModalContentProvider, ModalFooter } from '../widgets';
import { useEditSurveyResponse } from '../api/mutations/useEditSurveyResponse';
import { ResponseFields } from './ResponseFields';

Expand Down
3 changes: 1 addition & 2 deletions packages/admin-panel/src/surveyResponse/ResponseFields.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@ import React, { useState } from 'react';
import styled from 'styled-components';
import PropTypes from 'prop-types';
import { Typography } from '@material-ui/core';
import { Select, DateTimePicker } from '@tupaia/ui-components';
import { Select, DateTimePicker, useDebounce } from '@tupaia/ui-components';
import { ApprovalStatus } from '@tupaia/types';
import { format } from 'date-fns';
import { Autocomplete } from '../autocomplete';
import { useDebounce } from '../utilities';
import { useEntities } from '../VizBuilderApp/api';
import { EntityOptionLabel } from '../widgets';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@
import React from 'react';
import PropTypes from 'prop-types';
import { connect } from 'react-redux';
import { Dialog } from '@tupaia/ui-components';
import { Dialog, ModalHeader } from '@tupaia/ui-components';
import { closeResubmitSurveyModal, onAfterMutate as onAfterMutateAction } from './actions';
import { Form } from './Form';
import { ModalHeader } from '../widgets';

export const ResubmitSurveyResponseModalComponent = ({
isOpen,
Expand Down
2 changes: 1 addition & 1 deletion packages/admin-panel/src/surveys/useEditSurveyField.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

import { useEffect, useState } from 'react';
import { useDebounce } from '../utilities';
import { useDebounce } from '@tupaia/ui-components';
import { useApiContext } from '../utilities/ApiProvider';
import { useSuggestSurveyCode } from './useSuggestSurveyCode';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,6 @@ const DataFetchingTableComponent = memo(
<FilterableTable
columns={formattedColumns}
data={data}
isLoading={isChangingDataOnServer}
pageIndex={pageIndex}
pageSize={pageSize}
sorting={sortingToUse}
Expand All @@ -230,8 +229,6 @@ const DataFetchingTableComponent = memo(
onChangePage={onPageChange}
onChangePageSize={onPageSizeChange}
onChangeSorting={onSortedChange}
refreshData={onRefreshData}
errorMessage={errorMessage}
totalRecords={totalRecords}
/>

Expand Down
1 change: 0 additions & 1 deletion packages/admin-panel/src/utilities/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ export { convertSearchTermToFilter } from './convertSearchTermToFilter';
export { makeSubstitutionsInString } from './makeSubstitutionsInString';
export { usePortalWithCallback } from './usePortalWithCallback';
export * from './pretty';
export * from './useDebounce';
export { checkVisibilityCriteriaAreMet } from './visibilityCriteria';
export { labelToId } from './labelToId';
export { getColumns, getRows } from './getRowsAndColumns';
Expand Down
22 changes: 0 additions & 22 deletions packages/admin-panel/src/utilities/useDebounce.js

This file was deleted.

2 changes: 1 addition & 1 deletion packages/admin-panel/src/widgets/ConfirmDeleteModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import Typography from '@material-ui/core/Typography';
import styled from 'styled-components';
import { Modal, ModalCenteredContent } from './Modal';
import { Modal, ModalCenteredContent } from '@tupaia/ui-components';

const Heading = styled(Typography).attrs({
variant: 'h3',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ import {
Typography,
} from '@material-ui/core';
import { Search } from '@material-ui/icons';
import { InputLabel } from '@tupaia/ui-components';
import { InputLabel, useDebounce } from '@tupaia/ui-components';
import { get } from '../../VizBuilderApp/api/api';
import { Checkbox } from '../Checkbox';
import { convertSearchTermToFilter, useDebounce } from '../../utilities';
import { convertSearchTermToFilter } from '../../utilities';

const useOptions = (
endpoint,
Expand Down
Loading