CM-138: User Groups Management implementation #1

olewandowski1 · 2023-06-23T14:49:43Z

Changes:

Added the 'Task Executioner Groups' route to the Administration.
Created a Task Group overview page.
Created a logic to create, edit and delete Task Groups.
Possibility to select users that will form a new group and to filter them.

NOTE: Some of implemented logic relates to the CM-139.

…ixes

dborowiecki

I left some comments. We need to move BenefitPlan logic to the proper module.

src/actions.js

dborowiecki · 2023-06-27T08:50:24Z

src/components/BenefitPlanTasksFilter.js

This should be added as a contribution from the benefit plan js to the TaskManagement view ContributionPoint. Same goes for BenefitPlanTaskSearcher.

Moving all benefit plan logic to the other modules will be handled in scope of the CM-139.

dborowiecki · 2023-06-27T08:56:02Z

src/components/TaskPreviewCell.js

Task Table, Preview Cells and Panels are quite tricky components as content as well as format will depend on the specific task type (or task group). In our case this view will be predetermined by the fact that we're working on tasks that are BenefitPlanTasks.
Let me know if we could refactor it and use ContributionPoint that would be extended by the BenefitPlanTask preview cell with conditional rendering (it would be renedered only when incoming task has benefit plan as a source, or meets other conditions that we can manage from the benefit plan module.

src/constants.js

src/pages/TaskTriageDetailsPage.js

src/pages/TasksManagementPage.js

src/pickers/TaskExecutorsPicker.js

dborowiecki · 2023-06-27T09:32:50Z

src/pickers/TaskExecutorsPicker.js

+  const filterOptions = (users, { inputValue }) => {
+    const filteredUsers = users?.filter((user) => {
+      const username = user.username.toLowerCase();
+      const lastName = user.lastName.toLowerCase();
+      const input = inputValue.toLowerCase();
+
+      return username.includes(input) || lastName.includes(input);
+    });
+    return filteredUsers.filter((user, i, arr) => arr.findIndex((u) => u.id === user.id) === i);
+  };


I think that this should be resolved on the graphql level. If logic is not compliant with the users query then we can create custom search query for task triage candidate purposes

As I mentioned before, I didn't want to solve this via graphql filters. Let me know if this approach is acceptable for you.

As long as we pull all entries in one query it's fine but I don't think that solution is sustainable in the long term. Please create ticket in the OP board to address dropdowns that pull everything.

olewandowski1 · 2023-06-27T12:03:24Z

@dborowiecki I've addressed your comments.

* CM-147: use fe-template * CM-147: workflows added, minor changes * CM-147: workflows update * CM-138: User Groups Management implementation (#1) * CM-139: base project configuration, eslint, main route * CM-139: basic structure of tasks view * CM-139: basic view of task traiage * CM-139: basic view of task triage * CM-139: task preview improvements * CM-139: import fix * CM-138: user groups management page and basic searcher * CM-138: reducer, actions, fetchTaskGroups, searcher * CM-138: taskExecutorsPicker, taskGroupPage, taskGroupHeadPanel * CM-138: fetch task group, clear on unmount * OTC-138: remove package-lock json * CM-138: implementation of create/update mutation, executors picker fix * CM-138: removal of console log * CM-138: filtering, sorting, searching improvements, executorsPicker fixes * CM-138: create PERFORM_MUTATION and adjust existing logic, constants fix * CM-138: name of function changed * CM-138: TaskExecutorsPicker fixes * CM-138: component name changed - TaskDetailsPage * CM-139: add core tasks fe (#2) * CM-139: add core tasks fe * CM-143: fix eslint * CM-139: add styles * CM-139: address PR comments * CM-139: remove intl * CM-144: add my tasks fe (#3) * CM-144: add my tasks fe * CM-144: remove unused variables * CM-139: fix issues from QA (#4) * CM-139: fix comparing edited and fetch object * CM-139: fix formatting of taskGroup * CM-231: Added Admin main menu contribution * CM-145: make initial policy empty (#7) * CM-145: make initial policy empty * CM-145: fix eslint * CM-138: fix mutation label and action type (#6) * add-server-deploy-workflow: add file (#9) * CM-139: change perms on frontend (#8) * CM-139: fix comparing edited and fetch object * CM-139: fix formatting of taskGroup * CM-139: change perms to search tasks * CM-232: use IDs in mutation label (#11) * CM-144: fix tasks (#10) * CM-144: add my tasks fe * CM-144: remove unused variables * CM-144: fix tasks * CM-144: fix eslint * Update README.md * CM-230: tasks refactor (#12) * CM-230: fix modularity of the module * CM-230: refactor code * CM-230: refactor code * CM-230: fix headers * CM-230: add beneficiary crud tasks * CM-230: eslint * CM-230: address pr review * CM-230: address pr review * CM-230: fix eslint * CM-299: show business status on searcher (#13) * CM-332: fetch tasks only for particular searcher (#14) * CM-332: fetch tasks only for particular searcher * CM-332: fix eslint --------- Co-authored-by: Jan <j.dolkowski@soldevelo.com> * CM-327: change the way how task updates are fetched (#15) Co-authored-by: Jan <j.dolkowski@soldevelo.com> * hotfix: fix parsing schema in task (#16) Co-authored-by: Jan <j.dolkowski@soldevelo.com> * CM-327: fetch task only after it is updated (#18) * CM-327: change the way how task updates are fetched * CM-327: make sure task is fetched after it is uploaded --------- Co-authored-by: Jan <j.dolkowski@soldevelo.com> * hotfix: fix displaying deleted groups (#17) Co-authored-by: Jan <j.dolkowski@soldevelo.com> * add-sonar-ci: add sonar files (#20) Co-authored-by: Jan <j.dolkowski@soldevelo.com> * MERGING RELEASE branches (#19) * CM-332: fetch tasks only for particular searcher (#14) * CM-332: fetch tasks only for particular searcher * CM-332: fix eslint --------- Co-authored-by: Jan <j.dolkowski@soldevelo.com> * CM-327: change the way how task updates are fetched (#15) Co-authored-by: Jan <j.dolkowski@soldevelo.com> * hotfix: fix parsing schema in task (#16) Co-authored-by: Jan <j.dolkowski@soldevelo.com> * CM-327: fetch task only after it is updated (#18) * CM-327: change the way how task updates are fetched * CM-327: make sure task is fetched after it is uploaded --------- Co-authored-by: Jan <j.dolkowski@soldevelo.com> * hotfix: fix displaying deleted groups (#17) Co-authored-by: Jan <j.dolkowski@soldevelo.com> * add-sonar-ci: add sonar files (#20) Co-authored-by: Jan <j.dolkowski@soldevelo.com> --------- Co-authored-by: Jan <jdolkowski@soldevelo.com> Co-authored-by: Jan <j.dolkowski@soldevelo.com> --------- Co-authored-by: olewandowski <olewandowski@soldevelo.com> Co-authored-by: olewandowski1 <109145288+olewandowski1@users.noreply.github.com> Co-authored-by: Jan <jdolkowski@soldevelo.com> Co-authored-by: Damian Borowiecki <dborowiecki@soldevelo.com> Co-authored-by: sniedzielski <52816247+sniedzielski@users.noreply.github.com> Co-authored-by: Jan <j.dolkowski@soldevelo.com> Co-authored-by: Dragos DOBRE <dragos.dobre@swisstph.ch> Co-authored-by: Hiren Soni <65155846+hirensoni913@users.noreply.github.com>

olewandowski1 added 11 commits June 21, 2023 16:32

CM-139: base project configuration, eslint, main route

8638651

CM-139: basic structure of tasks view

65bf88a

CM-139: basic view of task traiage

db4f908

CM-139: basic view of task triage

d0cd70b

CM-139: task preview improvements

24fb02c

CM-139: import fix

3577ad0

CM-138: user groups management page and basic searcher

63515dc

CM-138: reducer, actions, fetchTaskGroups, searcher

0403866

CM-138: taskExecutorsPicker, taskGroupPage, taskGroupHeadPanel

fc20da7

CM-138: fetch task group, clear on unmount

51c8a72

OTC-138: remove package-lock json

1806f27

olewandowski1 requested review from dborowiecki and sniedzielski June 23, 2023 14:49

olewandowski1 added 3 commits June 26, 2023 11:55

CM-138: implementation of create/update mutation, executors picker fix

0d7558c

CM-138: removal of console log

cd7d9c6

CM-138: filtering, sorting, searching improvements, executorsPicker f…

0c421ab

…ixes

olewandowski1 marked this pull request as ready for review June 27, 2023 08:17

dborowiecki requested changes Jun 27, 2023

View reviewed changes

olewandowski1 added 4 commits June 27, 2023 12:33

CM-138: create PERFORM_MUTATION and adjust existing logic, constants fix

26d8400

CM-138: name of function changed

1227e90

CM-138: TaskExecutorsPicker fixes

06a2dc0

CM-138: component name changed - TaskDetailsPage

18c0dda

olewandowski1 requested a review from dborowiecki June 27, 2023 12:03

dborowiecki approved these changes Jun 27, 2023

View reviewed changes

dborowiecki merged commit 71d904b into develop Jun 27, 2023
3 checks passed

dborowiecki deleted the feature/CM-138 branch June 27, 2023 14:33

This was referenced Jul 5, 2023

CM-139: add core tasks fe #2

Merged

CM-139: add core tasks fe openimis/openimis-fe-social_protection_js#33

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

CM-138: User Groups Management implementation #1

CM-138: User Groups Management implementation #1

olewandowski1 commented Jun 23, 2023 •

edited

Loading

dborowiecki left a comment

dborowiecki Jun 27, 2023

olewandowski1 Jun 27, 2023

dborowiecki Jun 27, 2023

dborowiecki Jun 27, 2023

olewandowski1 Jun 27, 2023

dborowiecki Jun 27, 2023

olewandowski1 commented Jun 27, 2023

CM-138: User Groups Management implementation #1

CM-138: User Groups Management implementation #1

Conversation

olewandowski1 commented Jun 23, 2023 • edited Loading

dborowiecki left a comment

Choose a reason for hiding this comment

dborowiecki Jun 27, 2023

Choose a reason for hiding this comment

olewandowski1 Jun 27, 2023

Choose a reason for hiding this comment

dborowiecki Jun 27, 2023

Choose a reason for hiding this comment

dborowiecki Jun 27, 2023

Choose a reason for hiding this comment

olewandowski1 Jun 27, 2023

Choose a reason for hiding this comment

dborowiecki Jun 27, 2023

Choose a reason for hiding this comment

olewandowski1 commented Jun 27, 2023

olewandowski1 commented Jun 23, 2023 •

edited

Loading