UI: Fix new bugs from disable/enable feature #537

daniel-arnauer · 2020-08-13T13:33:00Z

It is not possible to add the permissions global.enableUser and global.disableUser in UI
Closed resources must be ignored when checking assignments (API level bug)
After canceling the window to add global permissions, the userlist re-fetches, this is not necessary
The CSS Layout in "Add User" window is broken
The user permissions of disabled user should be possible to edit
When disabling/enabling an user, a confirmation dialog should appear
Instead of showing the assignments in the snack bar, the assignment should be listed within the confirmation container

Closes #536

openkfwCI · 2020-08-13T13:40:02Z

	Notes	Time
✅	Note for Reviewer: E2E tests on remote server succeeded	Wed, 16 Sep 2020 10:01:30 +0000

Generated by E2E-Test

daniel-arnauer · 2020-08-21T13:15:27Z

Remaining:

Api unit test
Translations
Rebase

daniel-arnauer · 2020-08-31T14:22:31Z

api/src/user_permissions_list.ts

@@ -86,7 +86,7 @@ export function addHttpHandler(server: FastifyInstance, urlPrefix: string, servi
        const userPermissionsResult = await service.getUserPermissions(ctx, user, userId);

        if (Result.isErr(userPermissionsResult)) {
-          throw new VError(userPermissionsResult, "user.intent.revokePermission failed");
+          throw new VError(userPermissionsResult, "user.intent.listPermission failed");


Correction of previous refactor PR

Stezido

Is an own endpoint for listAssigments needed?
Suggestion: Open up the confirmation dialog when the disableUser saga is called. After confirmation the frontend tries to disable the user, but get an error which leads to a filled assignments table in the confirmation dialog.
When the new endpoint should be kept the permission for the intent listAssignments should be the intent global.listAssignments not global.disableUser. If the issuer has the global.listAssignments permission but cannot view the projects, subproject or workflowitem the api cannot give information about where the user is assigned to.
Use the existing ConfirmationDialog.

Stezido · 2020-09-02T07:37:01Z

api/src/service/user_assignments_get.ts

-  userId: UserDisable.RequestData,
+  issuer: ServiceUser,
+  issuerOrganization: string,
+  user: UserAssignmentsGet.RequestData,


Suggested change

user: UserAssignmentsGet.RequestData,

requestData: UserAssignmentsGet.RequestData,

Stezido · 2020-09-02T08:05:37Z

frontend/src/pages/Common/CreationDialog.js

@@ -13,7 +13,11 @@ const styles = {
  paperRoot: {
    width: "100%",
    overflow: "scrollable"
-  }
+  },
+  container: {},


remove empty styles

Stezido · 2020-09-02T08:11:08Z

frontend/src/pages/Users/DisableUserDialog.js

@@ -0,0 +1,241 @@
+import { Typography } from "@material-ui/core";


Please use the ConfirmationDialog component

Stezido · 2020-09-02T08:11:21Z

frontend/src/pages/Users/EnableUserDialog.js

@@ -0,0 +1,79 @@
+import { Typography } from "@material-ui/core";


Please use the ConfirmationDialog component

Stezido · 2020-09-02T08:14:05Z

frontend/src/pages/Users/PasswordDialog.js

@@ -18,7 +18,11 @@ const styles = {
  paperRoot: {
    width: "100%",
    overflow: "scrollable"
-  }
+  },
+  container: {},


remove empty styles

Stezido · 2020-09-02T08:14:37Z

frontend/src/pages/Users/UserDialogContent.js

  infoIcon: {
    fontSize: 20,
    marginRight: "10px"
  },
  info: {
    display: "flex",
    paddingRight: 20
-  }
+  },
+  customWidth: {},


remove empty styles

Stezido · 2020-09-02T08:16:32Z

frontend/src/pages/Users/actions.js

@@ -70,6 +70,15 @@ export const ENABLE_USER_SUCCESS = "ENABLE_USER_SUCCESS";
 export const DISABLE_USER = " DISABLE_USER";
 export const DISABLE_USER_SUCCESS = " DISABLE_USER_SUCCESS";

+export const SHOW_ENABLE_DIALOG = "SHOW_ENABLE_DIALOG";


not needed if using the existing confirmation dialog

Stezido

There is a console warning in frontend when creating a new group.
when canceling the createUser/createGroup dialog listpermissions are fetched and the site is rerendered. If the dialog is canceled nothing should be fetched

Stezido · 2020-09-15T07:25:18Z

api/src/service/domain/workflow/user_assignment_get.spec.ts

+    );
+  });
+
+  it("A user can view user assignments of worklfowitems with view permissions", async () => {


workflowitems

Stezido · 2020-09-15T07:34:48Z

api/src/service/domain/workflow/user_assignments_get.ts

    for await (const subproject of subprojects) {
      if (subproject.status === "closed") continue;
      if (subproject.assignee === userId) {
-        assignedSubprojects.push(subproject);
+        if (!isRoot && !Subproject.permits(subproject, issuer, subprojectIntents)) {


cannot be root because a root user cannot be assigned to a subproject

Here, this checks if the issuer is the root-user

Stezido · 2020-09-15T07:35:18Z

api/src/service/domain/workflow/user_assignments_get.ts

      for await (const workflowitem of workflowitems) {
        if (workflowitem.status === "closed") continue;
        if (workflowitem.assignee === userId) {
-          assignedWorkflowitems.push(workflowitem);
+          if (!isRoot && !Workflowitem.permits(workflowitem, issuer, workflowitemIntents)) {


cannot be root because a root user cannot be assigned to a workflowitem

Stezido · 2020-09-15T07:35:26Z

api/src/service/domain/workflow/user_assignments_get.ts

  for await (const project of projects) {
    if (project.status === "closed") continue;
    if (project.assignee === userId) {
-      assignedProjects.push(project);
+      if (!isRoot && !Project.permits(project, issuer, projectIntents)) {


cannot be root because a root user cannot be assigned to a project

Stezido · 2020-09-15T07:40:07Z

e2e-test/cypress/integration/disable_enable_user_spec.js

-        expect(xhr.response.body.error.code).to.eql(412);
-      });
+      cy.get(`[data-test=confirmation-dialog-confirm]`).should("be.disabled");
+      cy.wait("@fetchAssignments");


why wait for that call? It's the end of the test

I change the position

Stezido · 2020-09-15T07:40:17Z

e2e-test/cypress/integration/disable_enable_user_spec.js

-          expect(xhr.response.body.error.code).to.eql(412);
-        });
+        cy.get(`[data-test=confirmation-dialog-confirm]`).should("be.disabled");
+        cy.wait("@fetchAssignments");


why wait for that call? It's the end of the test

I change the position

Stezido · 2020-09-15T08:04:29Z

frontend/src/pages/Confirmation/ConfirmationContainer.js

@@ -34,6 +34,9 @@ import { applyOriginalActions, createAdditionalActions } from "./createAdditiona
 import { executeOriginalActions } from "./executeOriginalActions";

 class ConfirmationContainer extends React.Component {
+  componentDidMount() {
+    this.props.cancelConfirmation(undefined);


Why this is needed?

This is needed to reset the redux state of Confirmation Dialog component. Bugs occurred after pressing the submit button and the API rejects the request - in this case, the submit-state remains true in redux store, hence the dialog is not showing up anymore (and the request are send immediately - without confirmation)

Solution: cancelConfirmation() only sets defaultState. For better readability, I should create another function called resetConfirmation() that also set the redux state to defaultState.
Another solution: Add action CONFIRMATION_UNSUCESSFULL and yield it on every API error related to confirmation dialog. This action resets redux state of confirmation dialog like this state.set("confirmed", defaultState.get("confirmed"));

Stezido · 2020-09-15T08:07:52Z

frontend/src/pages/Users/DisableUserDialogContent.js

+        <a href={url} target="_blank" rel="noopener noreferrer">
+          {assignment.displayName}
+        </a>
+        <br />


use css styles instead of br tags

When a user is fetching assignments, he only gets data from projects, subprojects and workflowitems when he has view permissions, respectively.

Refactored the Dialogs for enabling/disabling users.

daniel-arnauer self-assigned this Aug 14, 2020

daniel-arnauer force-pushed the global_perm_fix branch from 19ff5d0 to a4bc67f Compare August 21, 2020 10:34

daniel-arnauer force-pushed the global_perm_fix branch 2 times, most recently from 9db3e7d to 6b8fd60 Compare August 31, 2020 14:08

daniel-arnauer commented Aug 31, 2020

View reviewed changes

daniel-arnauer requested a review from Stezido August 31, 2020 15:22

daniel-arnauer assigned Stezido and unassigned daniel-arnauer Aug 31, 2020

Stezido suggested changes Sep 2, 2020

View reviewed changes

daniel-arnauer unassigned Stezido Sep 2, 2020

daniel-arnauer force-pushed the global_perm_fix branch 6 times, most recently from d3b7798 to 9b26018 Compare September 14, 2020 11:33

daniel-arnauer assigned Stezido Sep 14, 2020

Stezido suggested changes Sep 15, 2020

View reviewed changes

Stezido assigned daniel-arnauer and unassigned Stezido Sep 15, 2020

daniel-arnauer assigned Stezido and unassigned daniel-arnauer Sep 15, 2020

Stezido assigned daniel-arnauer and unassigned Stezido Sep 15, 2020

daniel-arnauer added 4 commits September 16, 2020 11:25

API: Add permission check to global.listAssignments

8ab3f77

When a user is fetching assignments, he only gets data from projects, subprojects and workflowitems when he has view permissions, respectively.

UI: Add confirmation dialog for enabling/disabling users

9b172ce

Refactored the Dialogs for enabling/disabling users.

Add e2e-tests

fa42436

Add CHANGELOG.md

7e2e902

daniel-arnauer force-pushed the global_perm_fix branch from e4cc957 to 7e2e902 Compare September 16, 2020 09:28

daniel-arnauer requested a review from Stezido September 16, 2020 10:04

Stezido approved these changes Sep 16, 2020

View reviewed changes

daniel-arnauer merged commit 9b87d28 into master Sep 16, 2020

Stezido deleted the global_perm_fix branch October 7, 2020 09:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

UI: Fix new bugs from disable/enable feature #537

UI: Fix new bugs from disable/enable feature #537

daniel-arnauer commented Aug 13, 2020 •

edited

Loading

openkfwCI commented Aug 13, 2020 •

edited

Loading

daniel-arnauer commented Aug 21, 2020 •

edited

Loading

daniel-arnauer Aug 31, 2020

Stezido left a comment

Stezido Sep 2, 2020

daniel-arnauer Sep 9, 2020

Stezido Sep 2, 2020

Stezido Sep 2, 2020

Stezido Sep 2, 2020

Stezido Sep 2, 2020

Stezido Sep 2, 2020

Stezido Sep 2, 2020

Stezido left a comment

Stezido Sep 15, 2020

Stezido Sep 15, 2020

daniel-arnauer Sep 15, 2020

Stezido Sep 15, 2020

Stezido Sep 15, 2020

Stezido Sep 15, 2020

daniel-arnauer Sep 15, 2020

Stezido Sep 15, 2020

daniel-arnauer Sep 15, 2020

Stezido Sep 15, 2020

daniel-arnauer Sep 15, 2020

Stezido Sep 15, 2020

daniel-arnauer Sep 15, 2020

	user: UserAssignmentsGet.RequestData,
	requestData: UserAssignmentsGet.RequestData,

		@@ -0,0 +1,241 @@
		import { Typography } from "@material-ui/core";

		@@ -0,0 +1,79 @@
		import { Typography } from "@material-ui/core";

UI: Fix new bugs from disable/enable feature #537

UI: Fix new bugs from disable/enable feature #537

Conversation

daniel-arnauer commented Aug 13, 2020 • edited Loading

openkfwCI commented Aug 13, 2020 • edited Loading

daniel-arnauer commented Aug 21, 2020 • edited Loading

Choose a reason for hiding this comment

Stezido 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

Stezido 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

daniel-arnauer commented Aug 13, 2020 •

edited

Loading

openkfwCI commented Aug 13, 2020 •

edited

Loading

daniel-arnauer commented Aug 21, 2020 •

edited

Loading