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

alexd-bes · 2024-07-31T21:15:37Z

Issue RN-1361: User type question

Changes:

Added user_account and user_entity_permission changes to meditrak_sync_queue
Added migrations to backfill data to sync queue
Added UserAccount and UserEntityPermission database types to meditrak-app
Added UserQuestion to meditrak-app
Updated the RealmExplorer menu to scroll so that as more db types get added they can be used

Screenshots:

alexd-bes · 2024-07-31T21:18:07Z

packages/central-server/src/apiV2/meditrakApp/getChanges.js

@@ -33,10 +32,11 @@ function getRecordForSync(models, record, recordType, appVersion) {
    }
  });

+  const model = models.getModelForDatabaseRecord(recordType);


This change is because we can get the correct model more accurately this way (e.g. for user_account database record type that i actually the User model)

Ah good change! Tho tbh it always bothers me when our model names don't match the underlying database tables, the worst one is Facility/clinic! Tho now that we mention it, I'm surprised that table was working here?

In this case, because in the meditrak sync queue I was calling these records user_account, what it was doing was looking for a model called UserAccount which doesn't exist

alexd-bes · 2024-07-31T21:23:28Z

packages/meditrak-app/app/database/types/PermissionGroup.jsx

-  const { parentId, ...restOfData } = data;
-  const permissionGroupObject = restOfData;
-  return database.update('PermissionGroup', permissionGroupObject);
+  return database.update('PermissionGroup', data);


Added parentId back here so I can get ancestors of permission groups for the user question

Ah if we're making this change, we might need to do a full resync of permission_groups?

rohan-bes

Great stuff @alexd-bes taking on this complex ticket. Kinda quite proud that it could be achieved in less than 500 lines of code 🥹

rohan-bes · 2024-08-01T23:03:20Z

packages/central-server/src/apiV2/meditrakApp/getChanges.js

@@ -33,10 +32,11 @@ function getRecordForSync(models, record, recordType, appVersion) {
    }
  });

+  const model = models.getModelForDatabaseRecord(recordType);


Ah good change! Tho tbh it always bothers me when our model names don't match the underlying database tables, the worst one is Facility/clinic! Tho now that we mention it, I'm surprised that table was working here?

rohan-bes · 2024-08-01T23:56:18Z

packages/meditrak-app/app/database/types/UserAccount.jsx

+  // skip internal users
+  if (internal) return null;


Thoughts on adding the users here and then later on filtering them out in the UserQuestion? I feel it would be a bit unexpected that we sync down internal users, but they don't get written to the client's database.

I also wonder if the rules around internal users might change? For instance it does seem like we might want to allow selecting a user with a bes.au email at some point. If we do want to allow that, then it'd be easier to just change the code and not need to worry about resyncing internal users.

Have we chatted with Georgia about the behaviour of internal users btw?

Sure, I can do that. Georgia asked for internal users to be excluded (and it does the same on Datatrak Web)

rohan-bes · 2024-08-02T00:23:17Z

packages/meditrak-app/app/database/types/UserEntityPermission.jsx

+  },
+};
+
+UserEntityPermission.requiredData = ['userId'];


Would entityId and permissionGroupId not also be required here?

rohan-bes · 2024-08-02T00:24:28Z

packages/meditrak-app/app/sync/syncMigrations.jsx

+  // Resync all users so that the new user entity permission structure comes through
+  10: async (synchroniser, setProgressMessage) => {
+    await resyncRecordTypes(synchroniser, setProgressMessage, ['user_account']);
+  },
+  11: async (synchroniser, setProgressMessage) => {
+    await resyncRecordTypes(synchroniser, setProgressMessage, ['user_entity_permission']);
+  },


Oooohhh I didn't know we could do this! This is awesome, it means we don't have to force users to do a full resync when we add those models, just syncing down the new data 😄 Great stuff!

rohan-bes · 2024-08-02T00:24:47Z

packages/meditrak-app/app/widgets/Autocomplete/Autocomplete.jsx

@@ -139,7 +139,8 @@ class AutocompleteComponent extends PureComponent {
              data={options}
              onEndReached={this.onEndReached}
              onEndReachedThreshold={endReachedOffset}
-              keyExtractor={item => item}
+              // add an index here to make sure all options are unique
+              keyExtractor={(item, i) => `${item}-${i}`}


rohan-bes · 2024-08-02T00:26:26Z

packages/meditrak-app/app/database/types/PermissionGroup.jsx

-  const { parentId, ...restOfData } = data;
-  const permissionGroupObject = restOfData;
-  return database.update('PermissionGroup', permissionGroupObject);
+  return database.update('PermissionGroup', data);


Ah if we're making this change, we might need to do a full resync of permission_groups?

rohan-bes · 2024-08-02T00:29:04Z

packages/meditrak-app/app/database/DatabaseAccess.jsx

+
+    const userIds = userEntityPermissionEntries.map(entry => entry.userId);
+
+    if (!userIds.length) {


Suggested change

if (!userIds.length) {

if (userIds.length === 0) {

Extremely nitpicky and kinda personal, but js falsy behaviour has been bothering me a little lately so I've been leaning towards this. Totally optional

rohan-bes · 2024-08-02T00:34:33Z

packages/meditrak-app/app/assessment/specificQuestions/UserQuestion.jsx

+
+  const handleSelectOption = option => {
+    const newSelectedUser = users.find(user => user.name === option);
+    onSelectUser(newSelectedUser?.id ?? null);


Suggested change

onSelectUser(newSelectedUser?.id ?? null);

if (!newSelectedUser) {

throw new Error(`Cannot find user in database: ${option}`);

}

onSelectUser(newSelectedUser.id);

This feels like it would never fail, but on the chance it does it feels like it'd be better to fail explicitly than silently 👍

Btw I guess we just don't handle multiple users with the same name huh? Guess that's fine but might be worth mentioning to Georgia

Looking in the database, it does seem like we have quite a number of duplicate names:

select first_name || ' ' || last_name, count(*) from user_account ua group by first_name || ' ' || last_name order by count desc

I'm fairly certain almost all of these would be the same person just with multiple emails. However, I worry that things might not work for those users as there might be multiple entries in the dropdown for them and they'd only be able to select one...

Maybe lets chat with Georgia and workout if this is a data cleanup job? But we might also need to sync down emails and show them if the user has multiple accounts?

Oh yeah, good point. I think there is a task with the Maui team at the moment to cleanup test users in the db

I think this probably will still work - it will save the userId but this is just checking for the value to display as 'selected', but won't actually impact the saved value. Duplicate names is always going to be an issue, unfortunately, since there could be multiple 'John Smiths', but unless we show the email address, I'm not sure what we can do to fix that

rohan-bes · 2024-08-02T00:47:09Z

packages/database/src/migrations/20240730033844-AddUsersToSyncQueue-modifies-data.js

+      .map(
+        (id, i) =>
+          // the timestamp is incremented by i to ensure that each record has a unique timestamp
+          `('${generateId()}', 'update', 'user_account', '${id}', ${timestamp + i})`,


Suggested change

`('${generateId()}', 'update', 'user_account', '${id}', ${timestamp + i})`,

`('${generateId()}', 'update', 'user_account', '${id}', ${getSyncQueueChangeTime(i)})`,

We have this getSyncQueueChangeTime function in the tsutils package that we use when inserting records into the meditrak_sync_queue which we should probably use here. Tbh it doesn't differ much from what you're doing just that it divides the index by 1000 so that it's a decimal

rohan-bes · 2024-08-02T00:48:22Z

packages/central-server/src/database/models/User.js

+      }
+      return restOfRecord;
+    },
+    minAppVersion: '1.14.142',


Suggested change

minAppVersion: '1.14.142',

minAppVersion: '1.14.143',

Might be worth bumping the version as part of this ticket too. If we did accidentally release this without a version bump it would create a few problemos 😅

rohan-bes

Thanks for the change 🙏 Looks good!

* 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>

alexd-bes added 30 commits July 24, 2024 12:13

Add User and Task question types

6c5a826

Add question config types

961d633

Update types

59c4333

Update types

a44321b

Fix surveyCode type

5a7e102

WIP

4d407da

Merge branch 'epic-tasks' into rn-1381-import-task-user-question-configs

6d3bcab

Ability to import config

34eabb4

WIP

f2740e4

User permission group validation

07c8dce

Add comment

3c4bbcf

Handle exporting of questions

195660d

Hide the task question always

9fae75d

Handle BES admin users

a56b506

Handle multiple task questions

ee81c44

rename entityCode to entityId

b4a1a86

Generate types

9d6c786

Add sync configs

729f770

Update permissions based sync queue for user entity permissions

d9062b8

Merge branch 'epic-tasks' into rn-1361-user-app-question

07777ab

Add user entity permissions to sync queue

f21f031

Sync user accounts

ba8c85a

User account syncing

88bfc26

Make realm explorer scroll

ef1cd42

Fix permissions based sync queue for user entity permissions

f16abed

Add database type for user entity permission

0cadc24

Make separate user account model

f2f3965

Working question

84e5347

Fix user model usage

ee19e7d

Working question with permission groups

6ffed1b

Update schema.jsx

e507024

alexd-bes commented Jul 31, 2024

View reviewed changes

add comments

93b1ea5

alexd-bes commented Jul 31, 2024

View reviewed changes

alexd-bes added 4 commits August 1, 2024 09:41

Handle filtering and pagination

f03c8cd

Merge branch 'epic-tasks' into rn-1361-user-app-question

434d655

Use permission group id instead of name

b826125

Update filtering

02e867b

rohan-bes requested changes Aug 2, 2024

View reviewed changes

alexd-bes added 2 commits August 6, 2024 10:45

PR fixes

c5febd8

Add internal field to users

7643ecb

alexd-bes requested a review from rohan-bes August 5, 2024 23:15

rohan-bes approved these changes Aug 8, 2024

View reviewed changes

alexd-bes merged commit a739614 into epic-tasks Aug 8, 2024
44 checks passed

alexd-bes deleted the rn-1361-user-app-question branch August 8, 2024 02:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

alexd-bes commented Jul 31, 2024 •

edited

Loading

alexd-bes Jul 31, 2024

rohan-bes Aug 1, 2024

alexd-bes Aug 2, 2024

alexd-bes Jul 31, 2024

rohan-bes Aug 2, 2024

rohan-bes left a comment

rohan-bes Aug 1, 2024

rohan-bes Aug 1, 2024

alexd-bes Aug 2, 2024

rohan-bes Aug 2, 2024

rohan-bes Aug 2, 2024

rohan-bes Aug 2, 2024

rohan-bes Aug 2, 2024

rohan-bes Aug 2, 2024

rohan-bes Aug 2, 2024

rohan-bes Aug 2, 2024

alexd-bes Aug 2, 2024

alexd-bes Aug 2, 2024

rohan-bes Aug 2, 2024

rohan-bes Aug 2, 2024

rohan-bes left a comment


		const userIds = userEntityPermissionEntries.map(entry => entry.userId);

		if (!userIds.length) {

-    onSelectUser(newSelectedUser?.id ?? null);
+    if (!newSelectedUser) {
+      throw new Error(`Cannot find user in database: ${option}`);
+    }
+    onSelectUser(newSelectedUser.id);

	`('${generateId()}', 'update', 'user_account', '${id}', ${timestamp + i})`,
	`('${generateId()}', 'update', 'user_account', '${id}', ${getSyncQueueChangeTime(i)})`,

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

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

Conversation

alexd-bes commented Jul 31, 2024 • edited Loading

Issue RN-1361: User type question

Changes:

Screenshots:

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rohan-bes left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rohan-bes left a comment

Choose a reason for hiding this comment

alexd-bes commented Jul 31, 2024 •

edited

Loading