Made UnityGroup class more generic #98

sheldor1510 · 2023-08-03T01:01:10Z

Update the UnityGroup class to be more generic #97

hakasapl · 2023-08-04T14:19:46Z

This is a good start. Now that you have renamed the pi_groups to unity_groups/unitygroups, you'll now need to build the logic around the UnityGroup class. We had discussed that it would be good to include the frontend and the backend in the same PR so it's easier to test together.

…er code for new system

hakasapl · 2023-12-28T01:05:03Z

@sheldor1510 this PR looks good. I think I had previously said I would add LDAP attributes for groupType, startTime, and endTime. I've thought about it a bit and I think it would be better to store these things in MySQL and use LDAP only for the objects. That being said, could you add to this PR a groupAttributes table in MySQL that has the columns groupID, startTime, endTime, and groupType? We can add any future attributes as columns to this table. In addition, could you also write the relevant methods for setting/modifying these values and add them to the UnityGroup class and wherever they need to be called?

hakasapl

I ran into some issues that I left comments on. Unfortunately I can't continue testing because the comment I mentioned with the fatal error prevents me from continuing testing. Once that is resolved I will continue.

In addition, it would be great if you could comment all of the new methods/code that you added. For methods, use phpdoc syntax, which you can find examples in other parts of this code base. Comments will help me track your code a bit better.

Thank you for your work!

webroot/panel/new_group.php

tools/docker-dev/sql/bootstrap.sql

webroot/admin/group-mgmt.php

hakasapl · 2024-01-05T19:55:03Z

resources/lib/UnitySQL.php

+        return $users;
+    }
+
+    public function assignRole($role, $uid, $gid)


Getting a fatal error when trying to approve a group request for a class/center using the user [email protected]. I tried approving the class group using the same user and got this:

Notice: Trying to access array offset on value of type bool in /var/www/unity-web-portal/resources/lib/UnitySQL.php on line 646 Fatal error: Uncaught PDOException: SQLSTATE[23000]: Integrity constraint violation: 1048 Column 'user' cannot be null in /var/www/unity-web-portal/resources/lib/UnitySQL.php:524 Stack trace: #0 /var/www/unity-web-portal/resources/lib/UnitySQL.php(524): PDOStatement->execute() #1 /var/www/unity-web-portal/resources/lib/UnitySQL.php(751): UnityWebPortal\lib\UnitySQL->assignRole() #2 /var/www/unity-web-portal/resources/lib/UnityGroup.php(538): UnityWebPortal\lib\UnitySQL->assignSuperRole() #3 /var/www/unity-web-portal/resources/lib/UnityGroup.php(172): UnityWebPortal\lib\UnityGroup->init() #4 /var/www/unity-web-portal/webroot/admin/group-mgmt.php(25): UnityWebPortal\lib\UnityGroup->approveGroup() #5 {main} thrown in /var/www/unity-web-portal/resources/lib/UnitySQL.php on line 524

I haven't tracked down the origin of this

webroot/panel/groups.php

hakasapl

Nice work on this. Keep in mind that I am reproducing the notes in this review in Firefox, but that shouldn't cause an issue as most of this is server-side code.

A few other more generic things:

The user management page takes a very long time to load, can you reproduce that?

For the next iteration, let's test the following cases:

A non-admin user requesting to join a non-admin group
- Test approve/deny from the account that owns the group
A non-admin user requesting any of the 3 example group types
An admin approving or denying all of the 3 example group types

hakasapl · 2024-05-29T19:19:47Z

webroot/panel/groups.php

-    <input type='hidden' name='pi' value='" . $group->getPIUID() . "'>
-    <input type='submit' value='Leave Group'>
+    <input type='hidden' name='pi' value='" . $group->getGroupUID() . "'>
+    <input type='submit' value='Leave Group' style='margin-top: 0px'>


Pressing on the Leave Group button on the groups page initially shows a dialog but then immediately redirects to the group details page.

hakasapl · 2024-05-29T19:22:24Z

webroot/panel/new_group.php

+<form id="newGroupForm" action="" method="POST">
+    <p>Fill in the following information to request a new group</p>
+    <div>
+        <strong>Type of Group</strong><br>


For specifically the PI group type, I am unable to request a new group. The page refreshes but nothing happens. The other 2 types work fine.

hakasapl · 2024-05-29T19:23:43Z

webroot/admin/group-mgmt.php

+                $group_type = $_POST["group_type"];
+                $group_name = $_POST["group_name"];
+                $group_uid = $group_type . "_" . $group_name;
+                $group = new UnityGroup($group_uid, $LDAP, $SQL, $MAILER, $REDIS, $WEBHOOK);
+                $group->approveGroup($_POST["uid"], $OPERATOR);


When trying to approve any group, I get this php error. In my case the requestor of the group is [email protected] and the approver is also [email protected].

Notice: Trying to access array offset on value of type bool in /var/www/unity-web-portal/resources/lib/UnitySQL.php on line 649 Fatal error: Uncaught PDOException: SQLSTATE[23000]: Integrity constraint violation: 1048 Column 'user' cannot be null in /var/www/unity-web-portal/resources/lib/UnitySQL.php:524 Stack trace: #0 /var/www/unity-web-portal/resources/lib/UnitySQL.php(524): PDOStatement->execute() #1 /var/www/unity-web-portal/resources/lib/UnitySQL.php(766): UnityWebPortal\lib\UnitySQL->assignRole() #2 /var/www/unity-web-portal/resources/lib/UnityGroup.php(538): UnityWebPortal\lib\UnitySQL->assignSuperRole() #3 /var/www/unity-web-portal/resources/lib/UnityGroup.php(172): UnityWebPortal\lib\UnityGroup->init() #4 /var/www/unity-web-portal/webroot/admin/group-mgmt.php(25): UnityWebPortal\lib\UnityGroup->approveGroup() #5 {main} thrown in /var/www/unity-web-portal/resources/lib/UnitySQL.php on line 524

hakasapl · 2024-08-15T12:09:56Z

This PR covers the issue described here.

In its current state it should be feature complete. The remaining things to touch on are:

Bug fixes (there are probably a good amount of both server-side, and client-side issues at the moment)
Frontend touch-ups - there seems to be some inconsistent frontend changes that might need to be touched a bit to get looking completely right.
Merge conflicts - this PR has been open a while so there are some things to fix with the new main branch

The entire goal of this PR is making groups on the web portal generic. This means that people deploying the web portal define the group types and requirements, and users can select these. Before this PR, UnityGroup class in this code base was meant to be a PI group and nothing else. In this PR's bootstrap.sql there are example group types for PI, Class, and Center, which is what was originally requested by the Unity cluster, but it's designed in a way that types are arbitrary and can be extended to whatever the deployment needs. For example, you can make the Class group require a timeframe when requesting a group.

The issue linked about goes into all of this in more detail, so this is just an overview.

made unitygroup more generic

baebd86

sheldor1510 requested a review from hakasapl August 3, 2023 01:01

sheldor1510 added 7 commits August 9, 2023 00:12

made things more generic, added view_group.php [in progress]

ca0e3c8

admin check

9f685d7

completed view_group.php with UI and functionality

a0271bf

fixed up some perms issues

f353765

created request new group page, modified admin panel and a lot of oth…

dec215b

…er code for new system

made getgrouptype() generic

95edeb3

removed remove role + ranked roles per priority + implemented isNameable

623d648

hakasapl marked this pull request as ready for review August 30, 2023 21:04

sheldor1510 added 11 commits August 30, 2023 20:43

cs error fixes

88f7eb7

cs error fixes (2)

0e513f6

cs error fixes (3)

e15f240

cs warning fix (1)

a686b6f

cs warning fix (2)

9f5ecd7

cs warning fix (3)

bf4caca

cs warning fix (4)

01e75d6

cs warning fix (5)

d6a671d

cs warning fix (6)

0479333

cs warning fix (7)

40074c2

cs warning fix (8)

0ecd1f6

sheldor1510 added 2 commits January 3, 2024 20:38

added groupAttributes table

22a8b72

cs fix

0928514

hakasapl requested changes Jan 5, 2024

View reviewed changes

sheldor1510 added 4 commits March 7, 2024 22:29

some comments resolved

cdb636b

cancel request + exclusive owner property

74f7d41

cs fix

f981b59

cs fix (1)

0b49232

sheldor1510 requested a review from Shaswat975 May 24, 2024 15:35

hakasapl requested changes May 29, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Made UnityGroup class more generic #98

Made UnityGroup class more generic #98

sheldor1510 commented Aug 3, 2023

hakasapl commented Aug 4, 2023

hakasapl commented Dec 28, 2023

hakasapl left a comment

hakasapl Jan 5, 2024

hakasapl left a comment

hakasapl May 29, 2024

hakasapl May 29, 2024

hakasapl May 29, 2024

hakasapl commented Aug 15, 2024

Made UnityGroup class more generic #98

Are you sure you want to change the base?

Made UnityGroup class more generic #98

Conversation

sheldor1510 commented Aug 3, 2023

hakasapl commented Aug 4, 2023

hakasapl commented Dec 28, 2023

hakasapl left a comment

Choose a reason for hiding this comment

hakasapl Jan 5, 2024

Choose a reason for hiding this comment

hakasapl left a comment

Choose a reason for hiding this comment

hakasapl May 29, 2024

Choose a reason for hiding this comment

hakasapl May 29, 2024

Choose a reason for hiding this comment

hakasapl May 29, 2024

Choose a reason for hiding this comment

hakasapl commented Aug 15, 2024