studiokit-scaffolding-js 4.3.20-next.2.2 → 4.3.20-next.2.3

package/lib/components/UserRoles/Context.d.ts

@@ -1,6 +1,8 @@
 import React from 'react';
 import { UserRole } from '../../types';
 export interface UserRolesContextType {
+    /** disable all user role select dropdowns, if any */
+    isUpdateDisabled?: boolean;
     /** disable all user role delete buttons */
     isDeleteDisabled?: boolean;
     /** Is the current user allowed to add, update, and delete user roles? */

package/lib/components/UserRoles/RoleCell.js

@@ -34,7 +34,7 @@ var Context_1 = require("./Context");
 var Select_1 = require("./Select");
 var RoleCell = function (_a) {
     var user = _a.user, requiredRoleCount = _a.requiredRoleCount;
-    var _b = react_1.useContext(Context_1.UserRolesContext), isDeleteDisabled = _b.isDeleteDisabled, canModify = _b.canModify, canDeleteSelf = _b.canDeleteSelf, allowMultipleRoles = _b.allowMultipleRoles, roles = _b.roles, requiredRole = _b.requiredRole, textForRole = _b.textForRole, updateUserRole = _b.updateUserRole, removeUserRole = _b.removeUserRole;
+    var _b = react_1.useContext(Context_1.UserRolesContext), isUpdateDisabled = _b.isUpdateDisabled, isDeleteDisabled = _b.isDeleteDisabled, canModify = _b.canModify, canDeleteSelf = _b.canDeleteSelf, allowMultipleRoles = _b.allowMultipleRoles, roles = _b.roles, requiredRole = _b.requiredRole, textForRole = _b.textForRole, updateUserRole = _b.updateUserRole, removeUserRole = _b.removeUserRole;
     var currentUserId = react_redux_1.useSelector(function (state) {
         if (!state.models.user || !state.models.user.userInfo) {
             throw new Error('Current user id is not stored in redux');
@@ -45,6 +45,19 @@ var RoleCell = function (_a) {
         var roleText = userRole_1.getRoleText(textForRole)(userRole);
         var isUserRoleExternal = userRole_1.isExternal(userRole);
         var userId = userRole_1.getUserId(userRole);
+        /**
+         * allow update if
+         * * multiple roles are not allowed (single role mode)
+         * * the userRole is not external (roster synced)
+         * * update is not disabled
+         * * there is more than one possible role
+         * * the user role is not the last remaining required role user
+         */
+        var canUpdate = !allowMultipleRoles &&
+            !isUserRoleExternal &&
+            !isUpdateDisabled &&
+            roles.length > 1 &&
+            (!requiredRole || userRole.role !== requiredRole || !requiredRoleCount || requiredRoleCount > 1);
         /**
          * allow removal if
          * * the userRole is not external (roster synced)
@@ -59,10 +72,10 @@ var RoleCell = function (_a) {
         var isExternalPopover = (react_1.default.createElement(react_bootstrap_1.Popover, { id: "is-external-popover-" + userId + "-" + userRole.role },
             react_1.default.createElement("h3", null, "Added via Roster Sync"),
             react_1.default.createElement("p", { className: "mb2" }, "This person was added automatically via roster sync and cannot be manually removed.")));
-        return (react_1.default.createElement("li", { key: user.id + "-" + roleText, className: "nowrap flex items-center justify-end" },
-            allowMultipleRoles || isUserRoleExternal || roles.length === 1 ? (react_1.default.createElement("span", null, roleText)) : (react_1.default.createElement(Select_1.RoleSelectControl, { options: roles, value: userRole.role, onChange: function (role) {
+        return (react_1.default.createElement("li", { key: user.id + "-" + roleText, className: "nowrap flex items-center" + (allowMultipleRoles ? ' justify-end' : '') },
+            canUpdate ? (react_1.default.createElement(Select_1.RoleSelectControl, { options: roles, value: userRole.role, onChange: function (role) {
                     updateUserRole(userRole, role);
-                }, textForRole: textForRole })),
+                }, textForRole: textForRole })) : (react_1.default.createElement("span", { className: allowMultipleRoles ? '' : 'pl3' }, roleText)),
             canDelete ? (react_1.default.createElement(core_1.IconButton, { className: "remove-user-button", "aria-label": "Remove " + roleText, onClick: function () {
                     removeUserRole(userRole);
                 } },

package/lib/components/UserRoles/index.d.ts

@@ -14,7 +14,9 @@ export interface UserRolesOwnProps extends CollectionComponentWrappedProps<UserR
     /** If multiple roles allowed, each role is displayed per user, otherwise a select dropdown is displayed. */
     allowMultipleRoles?: boolean;
     /** disable adding new user roles */
-    disabled?: boolean;
+    isAddDisabled?: boolean;
+    /** disable all user role select dropdowns, if any */
+    isUpdateDisabled?: boolean;
     /** disable all user role delete buttons */
     isDeleteDisabled?: boolean;
     /** The activity the current user must have in order to add, update, or delete user roles. */
@@ -96,5 +98,5 @@ export declare class UserRoles extends Component<UserRolesProps, UserRolesState>
     render(): JSX.Element;
 }
 export declare const mapStateToProps: (state: BaseReduxState, ownProps: UserRolesOwnProps) => UserRolesReduxProps;
-declare const _default: import("react-redux").ConnectedComponent<typeof UserRoles, Pick<React.ClassAttributes<UserRoles> & UserRolesProps, "externalProviders" | "model" | "ref" | "onChange" | "key" | "disabled" | "guid" | "load" | "modelName" | "pathParams" | "modelStatus" | "queryParams" | "disableAutoLoad" | "modelArray" | "stopPeriodicLoad" | "create" | "update" | "delete" | "previousModelStatus" | "fetchingId" | "textForRole" | "entityName" | "defaultRole" | "roleDescriptions" | "renderAddDescription" | "isDeleteDisabled" | "allowMultipleRoles" | "requiredRole" | "modifyUserRoleActivityName" | "deleteOwnUserRoleActivityName" | "addRoleExcludeList" | "entity" | "filterUsers" | "renderTableDescription" | "singularArticleForRole"> & UserRolesOwnProps>;
+declare const _default: import("react-redux").ConnectedComponent<typeof UserRoles, Pick<React.ClassAttributes<UserRoles> & UserRolesProps, "externalProviders" | "model" | "ref" | "onChange" | "key" | "guid" | "load" | "modelName" | "pathParams" | "modelStatus" | "queryParams" | "disableAutoLoad" | "modelArray" | "stopPeriodicLoad" | "create" | "update" | "delete" | "previousModelStatus" | "fetchingId" | "textForRole" | "entityName" | "defaultRole" | "roleDescriptions" | "renderAddDescription" | "isUpdateDisabled" | "isDeleteDisabled" | "allowMultipleRoles" | "requiredRole" | "isAddDisabled" | "modifyUserRoleActivityName" | "deleteOwnUserRoleActivityName" | "addRoleExcludeList" | "entity" | "filterUsers" | "renderTableDescription" | "singularArticleForRole"> & UserRolesOwnProps>;
 export default _default;

package/lib/components/UserRoles/index.js

@@ -382,7 +382,7 @@ var UserRoles = /** @class */ (function (_super) {
     //#endregion Remove User
     UserRoles.prototype.render = function () {
         var _this = this;
-        var _a = this.props, modelStatus = _a.modelStatus, canModify = _a.canModify, canDeleteSelf = _a.canDeleteSelf, allowMultipleRoles = _a.allowMultipleRoles, disabled = _a.disabled, isDeleteDisabled = _a.isDeleteDisabled, defaultRole = _a.defaultRole, requiredRole = _a.requiredRole, roleDescriptions = _a.roleDescriptions, addRoleExcludeList = _a.addRoleExcludeList, entityName = _a.entityName, renderTableDescription = _a.renderTableDescription, renderAddDescription = _a.renderAddDescription;
+        var _a = this.props, modelStatus = _a.modelStatus, canModify = _a.canModify, canDeleteSelf = _a.canDeleteSelf, allowMultipleRoles = _a.allowMultipleRoles, isAddDisabled = _a.isAddDisabled, isUpdateDisabled = _a.isUpdateDisabled, isDeleteDisabled = _a.isDeleteDisabled, defaultRole = _a.defaultRole, requiredRole = _a.requiredRole, roleDescriptions = _a.roleDescriptions, addRoleExcludeList = _a.addRoleExcludeList, entityName = _a.entityName, renderTableDescription = _a.renderTableDescription, renderAddDescription = _a.renderAddDescription;
         var _b = this.state, sortedUsers = _b.sortedUsers, isAddingUsers = _b.isAddingUsers, shouldResetAddForm = _b.shouldResetAddForm, shouldShowRemoveDialog = _b.shouldShowRemoveDialog, userRoleToRemove = _b.userRoleToRemove, successMessage = _b.successMessage, existingMessage = _b.existingMessage, blockedMessage = _b.blockedMessage, failMessage = _b.failMessage;
         var addableRoleDescriptions = addRoleExcludeList
             ? lodash_1.pickBy(roleDescriptions, function (_, key) { return !addRoleExcludeList.includes(key); })
@@ -413,10 +413,11 @@ var UserRoles = /** @class */ (function (_super) {
                     });
                 } },
                 react_1.default.createElement("p", { className: "pre-wrap" }, failMessage))),
-            canModify && (react_1.default.createElement(Add_1.default, { id: "entityUserRolesAdd", disabled: disabled, entityName: entityName, defaultRole: defaultRole, roleDescriptions: addableRoleDescriptions, renderAddDescription: renderAddDescription, textForRole: this.textForRole, isAddingUsersToRole: isAddingUsers, shouldReset: shouldResetAddForm, addUserRoles: this.addUserRoles })),
+            canModify && (react_1.default.createElement(Add_1.default, { id: "entityUserRolesAdd", disabled: isAddDisabled, entityName: entityName, defaultRole: defaultRole, roleDescriptions: addableRoleDescriptions, renderAddDescription: renderAddDescription, textForRole: this.textForRole, isAddingUsersToRole: isAddingUsers, shouldReset: shouldResetAddForm, addUserRoles: this.addUserRoles })),
             !!renderTableDescription && renderTableDescription(canModify),
             react_1.default.createElement(react_bootstrap_1.Row, { className: "mt3" },
                 react_1.default.createElement(react_bootstrap_1.Col, { xs: 12 }, modelStatus === modelStatus_1.default.LOADING ? (react_1.default.createElement(Loading_1.default, null)) : sortedUsers.length > 0 ? (react_1.default.createElement(Context_1.UserRolesContext.Provider, { value: {
+                        isUpdateDisabled: isUpdateDisabled,
                         isDeleteDisabled: isDeleteDisabled,
                         canModify: canModify,
                         canDeleteSelf: canDeleteSelf,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "studiokit-scaffolding-js",
-	"version": "4.3.20-next.2.2",
+	"version": "4.3.20-next.2.3",
 	"description": "Common scaffolding for Studio apps at Purdue",
 	"repository": "https://gitlab.com/purdue-informatics/studiokit/studiokit-scaffolding-js",
 	"license": "MIT",