Merge pull request #19 from Ithanil/add_skip_picked_users

feat: add new checkbox to choose if already picked users should be skipped
bigbluebutton · Nov 7, 2024 · 51d722c · 51d722c
2 parents 4ccddb0 + b198a66
commit 51d722c
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 1 deletion.
diff --git a/src/components/modal/component.tsx b/src/components/modal/component.tsx
@@ -18,6 +18,8 @@ export function PickUserModal(props: PickUserModalProps) {
     setFilterOutPresenter,
     userFilterViewer,
     setUserFilterViewer,
+    filterOutPickedUsers,
+    setFilterOutPickedUsers,
     dataChannelPickedUsers,
     deletionFunction,
     dispatcherPickedUser,
@@ -72,6 +74,8 @@ export function PickUserModal(props: PickUserModalProps) {
                 setFilterOutPresenter,
                 userFilterViewer,
                 setUserFilterViewer,
+                filterOutPickedUsers,
+                setFilterOutPickedUsers,
                 deletionFunction,
                 handlePickRandomUser,
                 dataChannelPickedUsers,

diff --git a/src/components/modal/presenter-view/component.tsx b/src/components/modal/presenter-view/component.tsx
@@ -40,6 +40,8 @@ export function PresenterViewComponent(props: PresenterViewComponentProps) {
     setFilterOutPresenter,
     userFilterViewer,
     setUserFilterViewer,
+    filterOutPickedUsers,
+    setFilterOutPickedUsers,
     deletionFunction,
     handlePickRandomUser,
     dataChannelPickedUsers,
@@ -83,6 +85,19 @@ export function PresenterViewComponent(props: PresenterViewComponentProps) {
             />
             <span className="check-box-label">Skip Presenter</span>
           </label>
+          <label className="check-box-label-container" htmlFor="includePickedUsers">
+            <input
+              type="checkbox"
+              id="includePickedUsers"
+              checked={!filterOutPickedUsers}
+              onChange={() => {
+                setFilterOutPickedUsers(!filterOutPickedUsers);
+              }}
+              name="options"
+              value="includePickedUsers"
+            />
+            <span className="check-box-label">Include already picked users</span>
+          </label>
         </p>
       </div>
       <div className="moderator-view-wrapper">

diff --git a/src/components/modal/presenter-view/types.ts b/src/components/modal/presenter-view/types.ts
@@ -7,6 +7,8 @@ export interface PresenterViewComponentProps {
     setFilterOutPresenter: (filter: boolean) => void;
     userFilterViewer: boolean;
     setUserFilterViewer: (filter: boolean) => void;
+    filterOutPickedUsers: boolean;
+    setFilterOutPickedUsers: (filter: boolean) => void;
     deletionFunction: DeleteEntryFunction;
     handlePickRandomUser: () => void;
     dataChannelPickedUsers?: DataChannelEntryResponseType<PickedUser>[];

diff --git a/src/components/modal/types.ts b/src/components/modal/types.ts
@@ -13,6 +13,8 @@ export interface PickUserModalProps {
   setFilterOutPresenter: (filter: boolean) => void,
   userFilterViewer: boolean;
   setUserFilterViewer: (filter: boolean) => void;
+  filterOutPickedUsers: boolean,
+  setFilterOutPickedUsers: (filter: boolean) => void,
   dataChannelPickedUsers?: DataChannelEntryResponseType<PickedUser>[];
   deletionFunction: DeleteEntryFunction;
   dispatcherPickedUser: PushEntryFunction;

diff --git a/src/components/pick-random-user/component.tsx b/src/components/pick-random-user/component.tsx
@@ -19,6 +19,7 @@ function PickRandomUserPlugin({ pluginUuid: uuid }: PickRandomUserPluginProps) {
   const [pickedUser, setPickedUser] = useState<PickedUser | undefined>();
   const [userFilterViewer, setUserFilterViewer] = useState<boolean>(true);
   const [filterOutPresenter, setFilterOutPresenter] = useState<boolean>(true);
+  const [filterOutPickedUsers, setFilterOutPickedUsers] = useState<boolean>(true);
   const pluginApi: PluginApi = BbbPluginSdk.getPluginApi(uuid);
   const currentUserInfo = pluginApi.useCurrentUser();
   const { data: currentUser } = currentUserInfo;
@@ -49,14 +50,15 @@ function PickRandomUserPlugin({ pluginUuid: uuid }: PickRandomUserPluginProps) {
     if (modalInformation) {
       setFilterOutPresenter(modalInformation.skipPresenter);
       setUserFilterViewer(modalInformation.skipModerators);
+      setFilterOutPickedUsers(!modalInformation.includePickedUsers);
     }
   }, [modalInformationFromPresenter]);
 
   const usersToBePicked: UsersMoreInformationGraphqlResponse = {
     user: allUsers?.user.filter((user) => {
       let roleFilter = true;
       if (userFilterViewer) roleFilter = user.role === Role.VIEWER;
-      if (pickedUserFromDataChannel.data) {
+      if (filterOutPickedUsers && pickedUserFromDataChannel.data) {
         return roleFilter && pickedUserFromDataChannel
           .data.findIndex(
             (u) => u?.payloadJson?.userId === user?.userId,
@@ -83,6 +85,7 @@ function PickRandomUserPlugin({ pluginUuid: uuid }: PickRandomUserPluginProps) {
       dispatchModalInformationFromPresenter({
         skipModerators: userFilterViewer,
         skipPresenter: filterOutPresenter,
+        includePickedUsers: !filterOutPickedUsers,
       });
       pushPickedUser(null);
     }
@@ -124,6 +127,8 @@ function PickRandomUserPlugin({ pluginUuid: uuid }: PickRandomUserPluginProps) {
           setFilterOutPresenter,
           userFilterViewer,
           setUserFilterViewer,
+          filterOutPickedUsers,
+          setFilterOutPickedUsers,
           dataChannelPickedUsers: pickedUserFromDataChannel.data,
           dispatcherPickedUser: pushPickedUser,
           deletionFunction: deletePickedUser,

diff --git a/src/components/pick-random-user/types.ts b/src/components/pick-random-user/types.ts
@@ -18,6 +18,7 @@ export interface UsersMoreInformationGraphqlResponse {
 export interface ModalInformationFromPresenter {
     skipModerators: boolean;
     skipPresenter: boolean;
+    includePickedUsers: boolean;
 }
 
 export interface DataChannelArrayMessages <T> {