Skip to content

Commit

Permalink
feat(datatrakWeb): RN-1335: Tasks Epic (#5863)
Browse files Browse the repository at this point in the history
* No data display

* Fix tests

* Reorganise files

* tweaks

* Add loading state

* Exclude tasks from ios

* tweaks

* Types fix

* Make due date nullable

* Rename repeat_schedule field

* Tweaks

* Fix tests

* Revert "Fix tests"

This reverts commit 0e566d3.

* Fix tests

* Fix validation rules

* Link status and assignee name to records at the model level

* Generate types

* Fix types and apply new field names

* Get tasks filters working

* Fix pagination

* Fix build

* refactor(adminPanel): RN-1336: Move modal into ui-components (#5765)

* Move modal to ui-components

* Fix build

* Reorder import

* Enable popover portal

* feat(datatrakWeb): RN-1336: Create a task workflow (#5763)

* Create button

* Move modal to ui-components

* Move country selector to features folder

* Update country selector exports/imports

* Update tupaia-pin.svg

* Country selector on modal

* Move survey selector to features

* Move types

* Update survey list component to take care of fetching

* Survey selector

* Move entity selector to features

* Fix types

* Entity selector

* Styling entity selector

* Due date

* WIP

* WIP

* assignee input

* Add loading state and save user id

* Styling repeat scheduler

* Comments placholder

* Styling

* WIP

* Create task route

* Create task workflow

* Clear form when modal is reopened

* Update schemas.ts

* remove unused import

* Handle reset

* Fix datatrak tests

* Fix central server tests

* Move modal to ui-components

* Remove unused import

* Remove duplicate file

* Fix build

* Fix tests

* Update packages/central-server/src/apiV2/utilities/constructNewRecordValidationRules.js

Co-authored-by: Tom Caiger <caigertom@gmail.com>

* Fix error messages

* Handle search term in the BE

* Fix timezone issue

* Fix date formatting of filter

* remove unused variable

* Fix casing

* Default to showing countries if no primary entity question

* Update AssigneeInput.tsx

* Show loader when loading project and countries

* Fix copy

* Exclude internal users

* Fix types

* Change colour of icon in entity list

---------

Co-authored-by: Tom Caiger <caigertom@gmail.com>

* feat(datatrakWeb): RN-1338: Mark tasks as completed when survey responses are submitted (#5766)

* Create migration for created_at column

* Create change handler

* fix(types):Update schemas.ts

* feat(datatrakWeb): RN-1358: Assign tasks from dashboard (#5770)

* Create button

* Move modal to ui-components

* Move country selector to features folder

* Update country selector exports/imports

* Update tupaia-pin.svg

* Country selector on modal

* Move survey selector to features

* Move types

* Update survey list component to take care of fetching

* Survey selector

* Move entity selector to features

* Fix types

* Entity selector

* Styling entity selector

* Due date

* WIP

* WIP

* assignee input

* Add loading state and save user id

* Styling repeat scheduler

* Comments placholder

* Styling

* WIP

* Create task route

* Create task workflow

* Clear form when modal is reopened

* Update schemas.ts

* remove unused import

* Handle reset

* Fix datatrak tests

* Fix central server tests

* Move modal to ui-components

* Remove unused import

* Remove duplicate file

* Fix build

* Fix tests

* Update packages/central-server/src/apiV2/utilities/constructNewRecordValidationRules.js

Co-authored-by: Tom Caiger <caigertom@gmail.com>

* Fix error messages

* Handle search term in the BE

* WIP

* WIP

* Assignee Id modal

* Working assignee

* remove unused property

* Fix timezone issue

* Fix date formatting of filter

* remove unused variable

* Remove unused variable

* Fix casing

* Default to showing countries if no primary entity question

* Update AssigneeInput.tsx

* Show loader when loading project and countries

* Fix copy

* Exclude internal users

* Fix types

* Change colour of icon in entity list

* Fix modal button types

* Fix types

---------

Co-authored-by: Tom Caiger <caigertom@gmail.com>

* feat(datatrakWeb): RN-1314: add return to tasks button on success screen (#5747)

* add back to tasks button

* use useFromLocation

* update types

* Update SurveySuccessScreen.tsx

* save task endpoint

* save task mutation

* task cancel modal

* update types

* pass from location into useSubmitSurveyResponse

* remove SaveTaskRequest

* Update TasksTable.tsx

* refactor action button

* fix(datatrakWeb): Fix table height

* tweak(datatrakWeb): Use full month name in repeat schedule options

* fix(datatrakWeb): Handle errors when loading creating task modal

* fix(datatrakWeb): Hide actions on completed and cancelled tasks

* tweak(datatrakWeb): Update repeating schedule input to be matching autocomplete

* fix(datatrakWeb): Change select list focus styling slightly

* fix(datatrakWeb): Fix UTC date issue

* fix(datatrakWeb): fix focus styles on select filter

* fix(datatrakWeb): Fix type error

* tweak(datatrakWeb): Change text on complete task button

* fix(datatrakWeb): remove redundant file

* fix(datatrakWeb): Fix assignee autocomplete

* tweak(datatrakWeb): Navigate user to project select screen on 403 entities error

* feat(datatrak): RN-1343: Task dashboard filter settings (#5757)

* add back to tasks button

* use useFromLocation

* update types

* Update SurveySuccessScreen.tsx

* save task endpoint

* save task mutation

* task cancel modal

* update types

* pass from location into useSubmitSurveyResponse

* build ui

* set up filtering

* testing filters

* Update useTasks.ts

* fix front end

* filtering with cookies

* update cookie handling

* clean up types

* refactor tasks route

* handle invalidFilterValues

* Create TaskRoute.test.ts

* sort by status

* clear cookies on logout

* Delete SaveTaskRoute.ts

* renaming

* tweak(datatrakWeb): Make search fuzzy always

* tweak(datatrakWeb): RN-1358: Assign task modal changes (#5784)

* Update design for assign modal

* Update schemas.ts

* PR fixes

* Update taskFilterSettings.ts

* Update ActionButton.tsx

* feat(datatrakWeb): RN-1329: Task details view (#5783)

* Create button

* Move modal to ui-components

* Move country selector to features folder

* Update country selector exports/imports

* Update tupaia-pin.svg

* Country selector on modal

* Move survey selector to features

* Move types

* Update survey list component to take care of fetching

* Survey selector

* Move entity selector to features

* Fix types

* Entity selector

* Styling entity selector

* Due date

* WIP

* WIP

* assignee input

* Add loading state and save user id

* Styling repeat scheduler

* Comments placholder

* Styling

* WIP

* Create task route

* Create task workflow

* Clear form when modal is reopened

* Update schemas.ts

* remove unused import

* Handle reset

* Fix datatrak tests

* Fix central server tests

* Move modal to ui-components

* Remove unused import

* Remove duplicate file

* Fix build

* Fix tests

* Update packages/central-server/src/apiV2/utilities/constructNewRecordValidationRules.js

Co-authored-by: Tom Caiger <caigertom@gmail.com>

* Fix error messages

* Handle search term in the BE

* WIP

* WIP

* Assignee Id modal

* Working assignee

* remove unused property

* Fix timezone issue

* Fix date formatting of filter

* remove unused variable

* Remove unused variable

* Fix casing

* Default to showing countries if no primary entity question

* Update AssigneeInput.tsx

* Show loader when loading project and countries

* Fix copy

* Exclude internal users

* Fix types

* Change colour of icon in entity list

* Link to details page

* Fix modal button types

* Fix types

* Update handling of columns

* get task route

* WIP

* Link to survey for incomplete tasks

* Handle unloaded task

* Task metadata section

* Fix merge issue

* WIP

* Update schemas.ts

* feat(datatrakWeb): RN-1358: Assign tasks from dashboard (#5770)

* Create button

* Move modal to ui-components

* Move country selector to features folder

* Update country selector exports/imports

* Update tupaia-pin.svg

* Country selector on modal

* Move survey selector to features

* Move types

* Update survey list component to take care of fetching

* Survey selector

* Move entity selector to features

* Fix types

* Entity selector

* Styling entity selector

* Due date

* WIP

* WIP

* assignee input

* Add loading state and save user id

* Styling repeat scheduler

* Comments placholder

* Styling

* WIP

* Create task route

* Create task workflow

* Clear form when modal is reopened

* Update schemas.ts

* remove unused import

* Handle reset

* Fix datatrak tests

* Fix central server tests

* Move modal to ui-components

* Remove unused import

* Remove duplicate file

* Fix build

* Fix tests

* Update packages/central-server/src/apiV2/utilities/constructNewRecordValidationRules.js

Co-authored-by: Tom Caiger <caigertom@gmail.com>

* Fix error messages

* Handle search term in the BE

* WIP

* WIP

* Assignee Id modal

* Working assignee

* remove unused property

* Fix timezone issue

* Fix date formatting of filter

* remove unused variable

* Remove unused variable

* Fix casing

* Default to showing countries if no primary entity question

* Update AssigneeInput.tsx

* Show loader when loading project and countries

* Fix copy

* Exclude internal users

* Fix types

* Change colour of icon in entity list

* Fix modal button types

* Fix types

---------

Co-authored-by: Tom Caiger <caigertom@gmail.com>

* Fix merge error

* Fix styles and types

* Styling

* Fix multi re-render

* Comments placeholder

* Add buttons

* Submit changes

* Clear changes

* Fix merge issues

* Disable inputs when task is completed or cancelled

* responsive styling

* Add cancel menu

* Generate types

* Fix loading styling

* Remove unused var

* Handle onSuccess of edit task

* PR fixes

* PR fixes

* Remove form provider

---------

Co-authored-by: Tom Caiger <caigertom@gmail.com>

* fix tasks button

* removeTaskFilterSetting on logout

* fix(datatrakWeb): Make 'unassigned' searchable

* fix(datatrakWeb): Fix task row links

* fix(datatrakWeb): Fix task styling

* tweak(datatrakWeb): Tweak styling of task details view

* fix(adminPanel): Fix merge

* Fix build

* feat(datatrak): RN-1314: Auto populate entity question (#5793)

* set primary entity

* survey response

* Update SurveyResponsePage.tsx

* feat(datatrak): RN-1313: My tasks section (#5776)

* add tasks section

* create task tile

* NoTasksSection

* styling

* styling landing page

* styling

* Update TaskTile.tsx

* pr changes

* styling

* responsive styles

* Update useTasks.ts

* fix use tasks

* Update TasksRoute.ts

* Update TaskTile.tsx

* Update SurveyScreen.tsx

* Fix build

* tweak(datatrakWeb): RN-1339: Move survey response page into modal (#5786)

* Create button

* Move modal to ui-components

* Move country selector to features folder

* Update country selector exports/imports

* Update tupaia-pin.svg

* Country selector on modal

* Move survey selector to features

* Move types

* Update survey list component to take care of fetching

* Survey selector

* Move entity selector to features

* Fix types

* Entity selector

* Styling entity selector

* Due date

* WIP

* WIP

* assignee input

* Add loading state and save user id

* Styling repeat scheduler

* Comments placholder

* Styling

* WIP

* Create task route

* Create task workflow

* Clear form when modal is reopened

* Update schemas.ts

* remove unused import

* Handle reset

* Fix datatrak tests

* Fix central server tests

* Move modal to ui-components

* Remove unused import

* Remove duplicate file

* Fix build

* Fix tests

* Update packages/central-server/src/apiV2/utilities/constructNewRecordValidationRules.js

Co-authored-by: Tom Caiger <caigertom@gmail.com>

* Fix error messages

* Handle search term in the BE

* WIP

* WIP

* Assignee Id modal

* Working assignee

* remove unused property

* Fix timezone issue

* Fix date formatting of filter

* remove unused variable

* Remove unused variable

* Fix casing

* Default to showing countries if no primary entity question

* Update AssigneeInput.tsx

* Show loader when loading project and countries

* Fix copy

* Exclude internal users

* Fix types

* Change colour of icon in entity list

* Link to details page

* Fix modal button types

* Fix types

* Update handling of columns

* get task route

* WIP

* Link to survey for incomplete tasks

* Handle unloaded task

* Task metadata section

* Fix merge issue

* WIP

* Update schemas.ts

* feat(datatrakWeb): RN-1358: Assign tasks from dashboard (#5770)

* Create button

* Move modal to ui-components

* Move country selector to features folder

* Update country selector exports/imports

* Update tupaia-pin.svg

* Country selector on modal

* Move survey selector to features

* Move types

* Update survey list component to take care of fetching

* Survey selector

* Move entity selector to features

* Fix types

* Entity selector

* Styling entity selector

* Due date

* WIP

* WIP

* assignee input

* Add loading state and save user id

* Styling repeat scheduler

* Comments placholder

* Styling

* WIP

* Create task route

* Create task workflow

* Clear form when modal is reopened

* Update schemas.ts

* remove unused import

* Handle reset

* Fix datatrak tests

* Fix central server tests

* Move modal to ui-components

* Remove unused import

* Remove duplicate file

* Fix build

* Fix tests

* Update packages/central-server/src/apiV2/utilities/constructNewRecordValidationRules.js

Co-authored-by: Tom Caiger <caigertom@gmail.com>

* Fix error messages

* Handle search term in the BE

* WIP

* WIP

* Assignee Id modal

* Working assignee

* remove unused property

* Fix timezone issue

* Fix date formatting of filter

* remove unused variable

* Remove unused variable

* Fix casing

* Default to showing countries if no primary entity question

* Update AssigneeInput.tsx

* Show loader when loading project and countries

* Fix copy

* Exclude internal users

* Fix types

* Change colour of icon in entity list

* Fix modal button types

* Fix types

---------

Co-authored-by: Tom Caiger <caigertom@gmail.com>

* Fix merge error

* Fix styles and types

* Styling

* Fix multi re-render

* Comments placeholder

* Add buttons

* Submit changes

* Clear changes

* Fix merge issues

* Disable inputs when task is completed or cancelled

* responsive styling

* Add cancel menu

* Generate types

* Fix loading styling

* Remove unused var

* Handle onSuccess of edit task

* Display modal

* Survey response modal

* Handle isResponseScreen flag

* Error handling

* Error handling

* Fix tests

* Remove country and survey code from url

* Fix imports

* feat(datatrakWeb): RN-1339: Link survey responses to tasks (#5788)

* Create survey_response_id column

* Update change handler

* Update TaskCompletionHandler.js

* Fix type

* feat(datatrakWeb): RN-1339: View completed survey response from task (#5789)

* Create survey_response_id column

* Update change handler

* View completed survey

* Error handling

* Fix comment

* fix tasks button

* removeTaskFilterSetting on logout

* PR fixes

---------

Co-authored-by: Tom Caiger <caigertom@gmail.com>

* Fix build

---------

Co-authored-by: Tom Caiger <caigertom@gmail.com>

* feat(datatrak): RN-1357: Task created toast message (#5798)

Update useCreateTask.ts

Co-authored-by: alexd-bes <129009580+alexd-bes@users.noreply.github.com>

* feat(datatrakWeb): RN-1381: Add new question types (#5807)

* Add User and Task question types

* Add question config types

* Update types

* Update types

* Fix surveyCode type

* feat(datatrak): RN-1364: Completing of repeat tasks (#5802)

* Create button

* Move modal to ui-components

* Move country selector to features folder

* Update country selector exports/imports

* Update tupaia-pin.svg

* Country selector on modal

* Move survey selector to features

* Move types

* Update survey list component to take care of fetching

* Survey selector

* Move entity selector to features

* Fix types

* Entity selector

* Styling entity selector

* Due date

* WIP

* WIP

* assignee input

* Add loading state and save user id

* Styling repeat scheduler

* Comments placholder

* Styling

* WIP

* Create task route

* Create task workflow

* Clear form when modal is reopened

* Update schemas.ts

* remove unused import

* Handle reset

* Fix datatrak tests

* Fix central server tests

* Move modal to ui-components

* Remove unused import

* Remove duplicate file

* Fix build

* Fix tests

* Update packages/central-server/src/apiV2/utilities/constructNewRecordValidationRules.js

Co-authored-by: Tom Caiger <caigertom@gmail.com>

* Fix error messages

* Handle search term in the BE

* WIP

* WIP

* Assignee Id modal

* Working assignee

* remove unused property

* Fix timezone issue

* Fix date formatting of filter

* remove unused variable

* Remove unused variable

* Fix casing

* Default to showing countries if no primary entity question

* Update AssigneeInput.tsx

* Show loader when loading project and countries

* Fix copy

* Exclude internal users

* Fix types

* Change colour of icon in entity list

* Link to details page

* Fix modal button types

* Fix types

* Update handling of columns

* get task route

* WIP

* Link to survey for incomplete tasks

* Handle unloaded task

* Task metadata section

* Fix merge issue

* WIP

* Update schemas.ts

* feat(datatrakWeb): RN-1358: Assign tasks from dashboard (#5770)

* Create button

* Move modal to ui-components

* Move country selector to features folder

* Update country selector exports/imports

* Update tupaia-pin.svg

* Country selector on modal

* Move survey selector to features

* Move types

* Update survey list component to take care of fetching

* Survey selector

* Move entity selector to features

* Fix types

* Entity selector

* Styling entity selector

* Due date

* WIP

* WIP

* assignee input

* Add loading state and save user id

* Styling repeat scheduler

* Comments placholder

* Styling

* WIP

* Create task route

* Create task workflow

* Clear form when modal is reopened

* Update schemas.ts

* remove unused import

* Handle reset

* Fix datatrak tests

* Fix central server tests

* Move modal to ui-components

* Remove unused import

* Remove duplicate file

* Fix build

* Fix tests

* Update packages/central-server/src/apiV2/utilities/constructNewRecordValidationRules.js

Co-authored-by: Tom Caiger <caigertom@gmail.com>

* Fix error messages

* Handle search term in the BE

* WIP

* WIP

* Assignee Id modal

* Working assignee

* remove unused property

* Fix timezone issue

* Fix date formatting of filter

* remove unused variable

* Remove unused variable

* Fix casing

* Default to showing countries if no primary entity question

* Update AssigneeInput.tsx

* Show loader when loading project and countries

* Fix copy

* Exclude internal users

* Fix types

* Change colour of icon in entity list

* Fix modal button types

* Fix types

---------

Co-authored-by: Tom Caiger <caigertom@gmail.com>

* Fix merge error

* Fix styles and types

* Styling

* Fix multi re-render

* Comments placeholder

* Add buttons

* Submit changes

* Clear changes

* Fix merge issues

* Disable inputs when task is completed or cancelled

* responsive styling

* Add cancel menu

* Generate types

* Fix loading styling

* Remove unused var

* Handle onSuccess of edit task

* Display modal

* Survey response modal

* Handle isResponseScreen flag

* Error handling

* Error handling

* Fix tests

* Remove country and survey code from url

* Fix imports

* feat(datatrakWeb): RN-1339: Link survey responses to tasks (#5788)

* Create survey_response_id column

* Update change handler

* Update TaskCompletionHandler.js

* Fix type

* feat(datatrakWeb): RN-1339: View completed survey response from task (#5789)

* Create survey_response_id column

* Update change handler

* View completed survey

* Error handling

* Fix comment

* fix tasks button

* removeTaskFilterSetting on logout

* PR fixes

---------

Co-authored-by: Tom Caiger <caigertom@gmail.com>

* Update TaskCompletionHandler.test.js

* handle repeatSchedule tasks

* set up duplicate test

* clean up PR

* allow null repeating tasks

---------

Co-authored-by: alexd-bes <129009580+alexd-bes@users.noreply.github.com>

* feat(datatrakWeb): RN-1331: Task comments setup (#5800)

* Create task comment table and generate types

* Create Model

* WIP

* WIP

* Working endpoints

* Generate types

* Fix test

* Update 20240719015050-AddTaskCommentsTable-modifies-schema.js

* Remove task comments endpoints

* Revert "Remove task comments endpoints"

This reverts commit 498b1be.

* Fix revert

* feat(datatrakWeb): RN-1331: Task comments UI (#5801)

* Create task with comments

* View comments on task details

* Allow create comment on edit task

* Display comments count on table

* Show comment count on tasks tile on landing page

* Fix up types

* Order comments descending

* Update schemas.ts

* Move comment adding to central server

* Update schemas.ts

* Fix types

* build fixes

* Revert "Remove task comments endpoints"

This reverts commit 498b1be.

* Remove task comment create endpoint as no longer needed

* Fix merge errors

* Fix build

* feat(datatrakWeb): RN-1391: Generate system comments for tasks (#5806)

* Create task comment table and generate types

* Create Model

* WIP

* WIP

* Working endpoints

* Generate types

* Fix test

* Create task with comments

* Update 20240719015050-AddTaskCommentsTable-modifies-schema.js

* View comments on task details

* Allow create comment on edit task

* Display comments count on table

* Show comment count on tasks tile on landing page

* Fix up types

* Order comments descending

* Update schemas.ts

* addTaskComment on model

* Generate comment on edit task

* Generate comments on create of task

* Generate system message on task completion

* Syetm task styling

* Handle editing a task with just a comment

* Move comment handling to central server

* Move comment adding to central server

* Update schemas.ts

* Fix types

* Remove task comments endpoints

* build fixes

* Add comments

* Revert "Remove task comments endpoints"

This reverts commit 498b1be.

* Remove task comment create endpoint as no longer needed

* Revert "Remove task comments endpoints"

This reverts commit 498b1be.

* Fix revert

* Handle recurring task comments

* feat(datatrakWeb): RN-1331: Task comments UI (#5801)

* Create task with comments

* View comments on task details

* Allow create comment on edit task

* Display comments count on table

* Show comment count on tasks tile on landing page

* Fix up types

* Order comments descending

* Update schemas.ts

* Move comment adding to central server

* Update schemas.ts

* Fix types

* build fixes

* Revert "Remove task comments endpoints"

This reverts commit 498b1be.

* Remove task comment create endpoint as no longer needed

* Fix import order

* PR changes

* Fix change handler tests

* Update TasksRoute.ts

* Update taskFilterSettings.ts

* feat(adminPanel): RN-1381: Ability to import task and user questions in surveys (#5813)

* Add User and Task question types

* Add question config types

* Update types

* Update types

* Fix surveyCode type

* WIP

* Ability to import config

* WIP

* User permission group validation

* Add comment

* Handle exporting of questions

* Hide the task question always

* Handle BES admin users

* Handle multiple task questions

* rename entityCode to entityId

* Generate types

* Update SurveyContext.tsx

* Update TaskCompletionHandler.js

* feat(datatrakWeb): RN-1362: Datatrak Web User question type (#5815)

* New endpoint

* Question

* Add tests

* Generate types

* PR fixes

* feat(datatrak) RN-1340: Cancel task modal design update (#5819)

update modal design

* fix merge conflicts

* tweak(datatrakWeb): Update tooltip on tasks dashboard

* feat(datatrak): RN-1373: Task question (#5809)

* task creation handler

* get answers for task questions

* handle saving string values

* Update TaskCreationHandler.test.js

* Update surveyScreenComponent.ts

* move change handler to central server

* move helpers to central server

* handle primary entity question

* generate types

* clean up

* Update TaskCreationHandler.js

* move back to database

* fix fe tests

* handle success message

* handle should_create_task

* fix tests

* fix tests

* remove test code

* update types

* refactor

* Update getTaskQuestionField.ts

* remove toast message

* hide task questions on the server side

* Update SurveyRoute.ts

* remove survey_response_id

* fix tests

* update types

* test multiple task questions

* update types

* Update schemas.ts

* tweak(datatrakWeb): RN-1331: Update to task details/comments (#5823)

* WIP

* UI comments

* Remove comment handling on edit task

* Create task comment endpoint

* Link to task from landing page, and back button

* CHange back icon

* Update tests

* Don't navigate back on successful task save

* Remove double default values

* feat(datatrak): RN-1314: Handle task completion when submitting a survey (#5826)

* handle task completion inline

* update task completion handling

* Clean up

* Update index.js

* update comments

* pr review tweaks

* fix handle completion

* Update TaskDetailsPage.tsx

* feat(meditrakApp): RN-1361: User type question (#5820)

* Add User and Task question types

* Add question config types

* Update types

* Update types

* Fix surveyCode type

* WIP

* Ability to import config

* WIP

* User permission group validation

* Add comment

* Handle exporting of questions

* Hide the task question always

* Handle BES admin users

* Handle multiple task questions

* rename entityCode to entityId

* Generate types

* Add sync configs

* Update permissions based sync queue for user entity permissions

* Add user entity permissions to sync queue

* Sync user accounts

* User account syncing

* Make realm explorer scroll

* Fix permissions based sync queue for user entity permissions

* Add database type for user entity permission

* Make separate user account model

* Working question

* Fix user model usage

* Working question with permission groups

* Update schema.jsx

* add comments

* Handle filtering and pagination

* Use permission group id instead of name

* Update filtering

* PR fixes

* Add internal field to users

* fix shouldCreateTask

* Update TaskCreationHandler.js

* Display parent entity name next to entity name

* Update task details buttons

* Generate types

* Reset pagination on filter change

* fix(datatrakWeb): Fix permissions on tasks

* feat(tasks): RN-1372: Email templating (#5830)

* Working template setup

* v1

* Generic template working

* Request country access

* Delete account request

* Rename templates

* Password reset template

* Verify email

* Permission granted email

* email after timeout

* dashboard subscription emails

* Handle no template name

* Make subfolder for content

* Update pagination no records text

* Fix tests

* feat(datatrak): RN-1330: View initial request for a task (#5832)

* add initial_request_id and modal

* remove unused useSurveyResponseWithForm

* Update useSurveyResponseWithForm.ts

* Update TaskDetails.tsx

* update types

* Update TaskDetails.tsx

* fix tests

* feat(datatrakWeb): RN-1337: Send emails to assignee of tasks (#5834)

* Working template setup

* v1

* Generic template working

* Request country access

* Delete account request

* Rename templates

* Password reset template

* Verify email

* Permission granted email

* email after timeout

* dashboard subscription emails

* Handle no template name

* Make subfolder for content

* Add email template

* WIP

* Add env

* Update configureEnv.js

* Working email handler

* Tests

* Remove log

* Remove duplicate model

* Add trigger creation in runPostMigration

* Allow assignee question to be empty or non-mandatory

* Fix tests

* Revert to starts with search

* Fix tests

* Fix comment details colour

* Don't email assignees when completed repeating tasks are created

* Fix tests

* Update LandingPage.tsx

* tweak(datatrakWeb): RN-1417: save parent task to completed repeating tasks (#5840)

* Ad column to tasks table

* Handle completion of repeating tasks

* feat(datatrak): RN-1398: Setup task scheduler (#5841)

* setup scheduled task

* set up email template

* update script

* clean up

* PR suggestions

* Update ScheduledTask.js

* Basic responsive styling

* Task header back button

* Layout tidy ups

* Remove warning log

* Scroll tidying

* Generate types

* Merge fixes

* Fix build

* tweak emails

* tweak(datatrakWeb): RN-1400: save task due date in unix time (#5838)

* Change due date to be number

* Working time zone saving

* Save dates

* Working filters

* Fix tests

* Task creation handler tests

* database tests

* Central server tests

* Fix merge conflict error

* handle timezones

* Fix tests

* Handle creating tasks in timezone

* Set ms to be 0

* Fix tests

* Add task route test

* Update packages/datatrak-web-server/src/routes/TasksRoute.ts

Co-authored-by: Tom Caiger <caigertom@gmail.com>

* Make custom column selector for due dates

* Update due date field

* build fixes

* Build fixes

---------

Co-authored-by: Tom Caiger <caigertom@gmail.com>

* Make survey success direct to tasks where applicable

* add a default sort

* Fix user question

* Filter surveys by permission group and country

* Handle when no permissions for country

* fix(datatrakWeb): Limit entity results to 100 (#5847)

Fix(datatrakWeb): Limit entity results to 100

* Update SurveyContext.tsx

* Show all users for public surveys

* Fix font weights

* Convert permission groupI ID to name when exporting survey

* Handle assignee lists and search

* Generate types

* feat(datatrakWeb): RN-1341: Repeating tasks (#5844)

* WIP rrule

* Working rrule utils

* Add generic rrule handler

* frequency enum

* types

* handle repeat schedule in task changes

* Create and edit repeating tasks

* Handle system comments

* Creating and editing with comments

* WIP

* Update filtering

* disable sort by repeat frequency

* Add next occurrence handler

* Apply due date to completed tasks

* Handle bugs

* Update tests

* Update yarn.lock

* Mark due date of tasks

* Comments and tidy ups

* Use timestamp for due date

* Fix tests

* add comments

* Move getRepeatScheduleOptions

* Remove duplicate identifier

* Allow removing of repeat schedule

* feat(datatrak): RN-1314: Auto fill primary entity questions for a survey (#5853)

* useEntityAncestors

* entityAncestors

* clean up

* refactoring

* refactor getEntityQuestionAncestorAnswers

* refactor usePrimaryEntityLocation

* autofill in survey context

* add test

* Update usePrimaryEntityQuestionAutoFill.ts

* Update schemas.ts

* fix test

* Repeating task fixes

* Reset tasks pagination to 0 when filter checkbox value changes

* Handle overdue tasks with no assignee

* styling tidy ups

* Handle multiline task comments

* Add entity name to modals

* Fix user question re-renders

* Update task entities on survey response edit

* tweak(datatrakWeb): RN-1391: Update system comments handling (#5859)

* Task comment changes

* Tidy ups

* Update Task.js

* interceptor for creating tasks

* Editing tidyups

* central server tests

* Task tests

* Merge fixes

* Comment fix

* build fixes

* Fix type error

* Display entity parent name on survey response modals

* Fix user question values disappearing

* Fix user not showing in survey response

* Display 'user deleted' message for deleted message

* Remove review section headings

* Generate types

* Update SurveyReviewSection.tsx

* Amend db migration for meditrak sync queue

* Tidy up migration

* Handle exporting of answers for user questions

* Admin panel user question fixes

* Check for user config being allowed access to the survey

* Should validate that surveyCode is set

* Add validation for task config question types and multi field validation errors

* Update TaskConfigValidator.js

* Update task assignee question validation

* Don't remove instruction questions on survey review screens

* Undo change with multiple config being validated at once

* Update importSurveyQuestions.js

* Remove unused import

* Handle user question names with special characters

* Use locale for datepicker

* feat(datatrakWeb): RN-1374: Task Metrics (#5860)

* task metrics

* types update

* Update useCreateTask.ts

* review changes

* review updates

* update to MUI breakpoints

* Review updates

* Update TaskCompletionHandler.js

* tasks section responsive styles

* Update SurveyContext.tsx

* Complete tasks based on survey response end time

* Create permissions based sync queue on first startup

* Handle survey responses with no parent name

* Make use of util for survey review screen

* tweak(datatrakWeb): RN-1374: Dashboard Metrics Updates (#5864)

* task metrics

* types update

* Update useCreateTask.ts

* review changes

* review updates

* update to MUI breakpoints

* Review updates

* Update TaskCompletionHandler.js

* updates

* Update permissions based sync handler on startup

* Allow removal of repeat schedule

* Handle db migrations error

* Fix types

* Remove unused var

* Test

* Update index.js

* fix(datatrak): RN-1330: Fix logout request cache clearing (#5865)

* Update Tile.tsx

* wip

* cleanup

* Update TaskTile.tsx

* tweak(datatrakWeb): RN-1374: Dashboard Metrics Updates (#5866)

* task metrics

* types update

* Update useCreateTask.ts

* review changes

* review updates

* update to MUI breakpoints

* Review updates

* Update TaskCompletionHandler.js

* updates

* Rounding up completion rate

* Update SingleSurveyResponseRoute.ts

* Update getDbMigrator.js

* Fix error on due date updater

* Fix broken deployment

* Wrap sync queue handler in feature flag checker

* Update scheduledTask.js

* Allow past due dates in some cases

* Fix env vars

* fix task link

* Update usePrimaryEntityQuestionAutoFill.ts

* Update TaskTile.tsx

* Handle user changes

* Update TaskOverdueChecker.js

* remove due date from overdue email

* Remove due date from assignee emails

* fix(datatrak): Fix survey autofill loading (#5883)

* add loading

* Update TaskOverdueChecker.js

* overdue email comment

* Update schemas.ts

* Update yarn.lock

* Regenerate types

* Fix build

* Fix apostrophe and single quote search

* Fix build

* Fix random 0

* Sort filtered users

* Sync all user entity permissions by country, instead of by country and permission group

* Update TaskComment.js

* Force a full resync on update to version 26

* TEST

* Update version

* fix(datatrak): RN-1314: Update autofilling entity when completing a task (#5893)

move primary entity code to url params

* TEST

* Fix react-query updates

* Fix ordering of keys

* Update migration

* Keep survey search on page change

* handle loading state

* Use isSuccess instead of loading state for use effect

* Fix loading race conditions

* Disable backdating of tasks

---------

Co-authored-by: Tom Caiger <caigertom@gmail.com>
Co-authored-by: Salman <114740396+hrazasalman@users.noreply.github.com>
  • Loading branch information
3 people authored Sep 16, 2024
1 parent b7939ac commit 147dbe8
Show file tree
Hide file tree
Showing 391 changed files with 13,712 additions and 1,714 deletions.
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
9 changes: 8 additions & 1 deletion packages/admin-panel/src/routes/surveys/surveyResponses.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -150,14 +150,21 @@ export const ANSWER_COLUMNS = [
source: 'text',
type: 'tooltip',
accessor: row => {
return row['entity.code'] || row.text;
if (row['entity.code']) return row['entity.code'];
if (row['user.full_name']) return `${row['user.full_name']} (${row.text})`;
return row.text;
},
},
{
Header: 'EntityName',
show: false,
source: 'entity.code',
},
{
Header: 'UserName',
show: false,
source: 'user.full_name',
},
];

const IMPORT_CONFIG = {
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 ID',
fieldName: 'entityId',
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 @@ -221,7 +221,6 @@ const DataFetchingTableComponent = memo(
<FilterableTable
columns={formattedColumns}
data={data}
isLoading={isChangingDataOnServer}
pageIndex={pageIndex}
pageSize={pageSize}
sorting={sortingToUse}
Expand All @@ -234,8 +233,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.

Loading

0 comments on commit 147dbe8

Please sign in to comment.