studiokit-scaffolding-js 4.3.20 → 4.4.0

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

@@ -2,8 +2,9 @@ import { Component } from 'react';
 import { RoleDescription } from '../../types';
 export interface UserRolesAddProps {
     id: string;
+    /** optional, if not targeting entityUserRoles */
     entityName?: string;
-    addUsersToRole: any;
+    addUsersToRole: (identifiers: string[], role: string) => void;
     shouldReset: boolean;
     isAddingUsersToRole: boolean;
     defaultRole: string;

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

@@ -1,12 +1,12 @@
 import React, { FunctionComponent } from 'react';
 import { BaseReduxState } from '../../types/BaseReduxState';
-import { UserWithRoles } from '../../types/UserRole';
+import { UserRole, UserWithRoles } from '../../types/UserRole';
 export interface RoleCellOwnProps {
     user: UserWithRoles;
     readOnly?: boolean;
     canModifySelf?: boolean;
     textForRole?: (role: string) => string;
-    removeUserFromRole?: (user: UserWithRoles, role: string) => void;
+    removeUserRole?: (user: UserRole) => void;
     roles: string[];
     entityOwnerRole: string;
 }
@@ -17,5 +17,5 @@ export interface RoleCellProps extends RoleCellOwnProps, RoleCellReduxProps {
 }
 export declare const RoleCell: FunctionComponent<RoleCellProps>;
 export declare const mapStateToProps: (state: BaseReduxState) => RoleCellReduxProps;
-declare const _default: import("react-redux").ConnectedComponent<React.FunctionComponent<RoleCellProps>, Pick<RoleCellProps, "user" | "readOnly" | "textForRole" | "canModifySelf" | "removeUserFromRole" | "roles" | "entityOwnerRole">>;
+declare const _default: import("react-redux").ConnectedComponent<React.FunctionComponent<RoleCellProps>, Pick<RoleCellProps, "user" | "readOnly" | "textForRole" | "canModifySelf" | "removeUserRole" | "roles" | "entityOwnerRole">>;
 export default _default;

package/lib/components/UserRoles/RoleCell.js

@@ -12,11 +12,12 @@ var react_redux_1 = require("react-redux");
 var userRole_1 = require("../../utils/userRole");
 var IconExternalUser_1 = require("../Icons/IconExternalUser");
 var RoleCell = function (_a) {
-    var user = _a.user, currentUserId = _a.currentUserId, readOnly = _a.readOnly, canModifySelf = _a.canModifySelf, textForRole = _a.textForRole, removeUserFromRole = _a.removeUserFromRole, roles = _a.roles, entityOwnerRole = _a.entityOwnerRole;
+    var user = _a.user, currentUserId = _a.currentUserId, readOnly = _a.readOnly, canModifySelf = _a.canModifySelf, textForRole = _a.textForRole, removeUserRole = _a.removeUserRole, roles = _a.roles, entityOwnerRole = _a.entityOwnerRole;
     return (react_1.default.createElement("ul", { className: "mb0 list pa0 tr" }, user.roles.sort(userRole_1.sortByRole(roles)).map(function (userRole) {
         var roleText = userRole_1.getRoleText(textForRole)(userRole);
         var isUserRoleExternal = userRole_1.isExternal(userRole);
-        var popover = (react_1.default.createElement(react_bootstrap_1.Popover, { id: "is-external-popover-" + userRole.userId + "-" + userRole.role },
+        var userId = userRole_1.getUserId(userRole);
+        var popover = (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" },
@@ -24,8 +25,8 @@ var RoleCell = function (_a) {
             !isUserRoleExternal &&
                 !readOnly &&
                 (user.id !== currentUserId || canModifySelf || userRole.role !== entityOwnerRole) ? (react_1.default.createElement(core_1.IconButton, { className: "remove-user-button", "aria-label": "Remove " + roleText, onClick: function () {
-                    if (removeUserFromRole) {
-                        removeUserFromRole(user, userRole.role);
+                    if (removeUserRole) {
+                        removeUserRole(userRole);
                     }
                 } },
                 react_1.default.createElement(Delete_1.default, { color: "error" }))) : isUserRoleExternal ? (react_1.default.createElement(react_bootstrap_1.OverlayTrigger, { placement: "auto", trigger: ['click', 'hover', 'focus'], overlay: popover },

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

@@ -1,11 +1,11 @@
 import React from 'react';
-import { UserWithRoles } from '../../types';
+import { UserRole, UserWithRoles } from '../../types';
 export interface UserRolesTableProps {
     id?: string;
     users: UserWithRoles[];
     readOnly?: boolean;
     canModifySelf?: boolean;
-    removeUserFromRole?: (user: UserWithRoles, role: string) => void;
+    removeUserRole?: (userRole: UserRole) => void;
     textForRole?: (role: string) => string;
     roles: string[];
     /** The role for the owner of the entity, i.e. GroupOwner, RubricOwner, ProblemOwner etc.

package/lib/components/UserRoles/Table.js

@@ -31,7 +31,7 @@ var RoleFilter_1 = require("../Tables/RoleFilter");
 var TextFilter_1 = require("../Tables/TextFilter");
 var RoleCell_1 = __importDefault(require("./RoleCell"));
 var UserRolesTableComponent = function (_a) {
-    var id = _a.id, users = _a.users, roles = _a.roles, readOnly = _a.readOnly, canModifySelf = _a.canModifySelf, textForRole = _a.textForRole, removeUserFromRole = _a.removeUserFromRole, entityOwnerRole = _a.entityOwnerRole;
+    var id = _a.id, users = _a.users, roles = _a.roles, readOnly = _a.readOnly, canModifySelf = _a.canModifySelf, textForRole = _a.textForRole, removeUserRole = _a.removeUserRole, entityOwnerRole = _a.entityOwnerRole;
     var hasExternal = users.some(function (r) { return r.roles.some(function (r) { return userRole_1.isExternal(r); }); });
     var columns = [
         {
@@ -60,7 +60,7 @@ var UserRolesTableComponent = function (_a) {
             accessor: function (u) { return u; },
             Cell: function (cell) {
                 var user = cell.value;
-                return (react_1.default.createElement(RoleCell_1.default, { user: user, readOnly: readOnly, canModifySelf: canModifySelf, textForRole: textForRole, removeUserFromRole: removeUserFromRole, roles: roles, entityOwnerRole: entityOwnerRole }));
+                return (react_1.default.createElement(RoleCell_1.default, { user: user, readOnly: readOnly, canModifySelf: canModifySelf, textForRole: textForRole, removeUserRole: removeUserRole, roles: roles, entityOwnerRole: entityOwnerRole }));
             },
             filterMethod: RoleFilter_1.roleFilterMethod,
             Filter: RoleFilter_1.RoleFilter(roles, textForRole, hasExternal),
@@ -69,20 +69,26 @@ var UserRolesTableComponent = function (_a) {
         });
     }
     var _b = react_1.useState(users), usersState = _b[0], setUsersState = _b[1];
+    var _c = react_1.useState(), roleFilter = _c[0], setRoleFilter = _c[1];
     var onFilteredChange = function (newFiltering, column, value) {
+        var newRoleFilter = newFiltering.find(function (f) { return f.id === 'role'; });
+        setRoleFilter(newRoleFilter);
+    };
+    // update `usersState` when `users` or `roleFilter` changes
+    react_1.useEffect(function () {
+        var usersToDisplay = users;
         // when the role filter is set, only show the matching userRoles in the table
-        var roleFilter = newFiltering.find(function (f) { return f.id === 'role'; });
         if (roleFilter) {
-            setUsersState(users.map(function (u) {
+            usersToDisplay = users.map(function (u) {
                 var newUser = lodash_1.merge({}, u);
                 newUser.roles = u.roles.filter(function (r) { return RoleFilter_1.roleUserRoleFilterMethod(roleFilter, r); });
                 return newUser;
-            }));
+            });
         }
-        else if (!lodash_1.isEqual(users, usersState)) {
-            setUsersState(users);
+        if (!lodash_1.isEqual(usersToDisplay, usersState)) {
+            setUsersState(usersToDisplay);
         }
-    };
+    }, [users, roleFilter, usersState]);
     return (react_1.default.createElement("div", { id: id, className: "table-container" },
         react_1.default.createElement(react_table_1.default, { className: "-striped", columns: columns, data: usersState, resizable: false, filterable: true, onFilteredChange: onFilteredChange, defaultSorted: [
                 {
@@ -93,7 +99,7 @@ var UserRolesTableComponent = function (_a) {
                     id: 'firstName',
                     desc: false
                 }
-            ], defaultPageSize: Object.keys(usersState).length, showPagination: false })));
+            ], pageSize: Object.keys(usersState).length, showPagination: false })));
 };
 // similar to "shouldComponentUpdate", prevent unnecessary renders
-exports.UserRolesTable = react_1.default.memo(UserRolesTableComponent, function (prevProps, nextProps) { return !lodash_1.isEqual(prevProps, nextProps); });
+exports.UserRolesTable = react_1.default.memo(UserRolesTableComponent, function (prevProps, nextProps) { return lodash_1.isEqual(prevProps, nextProps); });

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

@@ -1,15 +1,14 @@
 import React, { Component } from 'react';
 import { FetchError, Model, ModelCollection } from 'studiokit-net-js';
-import BASE_ROLE from '../../constants/baseRole';
-import { BaseReduxState, ExternalProvider, RoleDescription, User, UserWithRoles } from '../../types';
+import { BaseReduxState, ExternalProvider, RoleDescription, UserRole, UserWithRoles } from '../../types';
 import { CollectionComponentWrappedProps } from '../HOC/CollectionComponent';
 export interface UserRolesReduxProps {
     canModifySelf?: boolean;
     canModify?: boolean;
 }
-export interface UserRolesOwnProps extends CollectionComponentWrappedProps<UserWithRoles> {
+export interface UserRolesOwnProps extends CollectionComponentWrappedProps<UserRole> {
     modifyUserRoleActivityName: string;
-    filterUsers: (userRoles: UserWithRoles[]) => UserWithRoles[];
+    filterUsers: (users: UserWithRoles[]) => UserWithRoles[];
     /** The role that will be shown first in the list of available roles. Currently assumes that this is the entity owner role, groupOwner, assignmentOwner, rubricOwner, problemOwner etc. */
     defaultRole: string;
     /** A dictionary of all possible roles and their descriptions. */
@@ -28,6 +27,7 @@ export interface UserRolesOwnProps extends CollectionComponentWrappedProps<UserW
     isDeleteDisabled?: boolean;
     /** An optional parameter for `renderRemoveUserDescription` */
     externalProviders?: ModelCollection<ExternalProvider>;
+    allowMultipleRoles?: boolean;
 }
 export interface UserRolesProps extends UserRolesReduxProps, UserRolesOwnProps {
 }
@@ -38,16 +38,17 @@ interface UserRolesState {
     identifiersToAdd?: string[];
     roleForAdd?: string;
     shouldResetAddForm: boolean;
+    userRoleToUpdate: UserRole | undefined;
+    roleForUpdate?: string;
     shouldShowRemoveDialog: boolean;
-    userToRemove: UserWithRoles | undefined;
-    roleForRemove?: string;
+    userRoleToRemove: UserRole | undefined;
     successMessage?: string;
-    existingUsersMessage?: string;
+    existingMessage?: string;
     failMessage?: string;
 }
 export interface AddBusinessModel {
-    addedUsers: UserWithRoles[];
-    existingUsers: UserWithRoles[];
+    addedUserRoles: UserRole[];
+    existingUserRoles: UserRole[];
     invalidIdentifiers: string[];
     allowedDomains: string;
     invalidDomainIdentifiers: string[];
@@ -62,15 +63,17 @@ export declare class UserRoles extends Component<UserRolesProps, UserRolesState>
     setStateFromProps: (props: UserRolesProps) => void;
     textForRole: (role: string) => string;
     singularArticleForRole: (role: string) => string;
-    addUsers: (ids: string[], role: BASE_ROLE) => void;
+    addUserRoles: (ids: string[], role: string) => void;
     didAdd: (data?: FetchError | AddBusinessModel | undefined) => void;
-    alertRemoveUser: (userToRemove: UserWithRoles, roleForRemove: string) => void;
-    removeUserTitle: (roleForRemove: string) => string;
-    renderRemoveUserDescription: (userToRemove: User, role: string, warning?: JSX.Element | undefined) => JSX.Element;
-    removeUser: (shouldRemove: boolean) => void;
+    updateUserRole: (userToUpdate: UserRole, newRole: string) => void;
+    didUpdate: (isSuccess: boolean) => void;
+    alertRemoveUserRole: (userToRemove: UserRole) => void;
+    removeUserRoleTitle: (roleForRemove: string) => string;
+    renderRemoveUserRoleDescription: (userRoleToRemove: UserRole, warning?: JSX.Element | undefined) => JSX.Element;
+    removeUserRole: (shouldRemove: boolean) => void;
     didRemove: (isSuccess: boolean) => void;
     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" | "modifyUserRoleActivityName" | "filterUsers" | "addRoleBlacklist" | "renderTableDescription" | "entity" | "singularArticleForRole" | "isDeleteDisabled"> & UserRolesOwnProps>;
+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" | "modifyUserRoleActivityName" | "filterUsers" | "addRoleBlacklist" | "renderTableDescription" | "entity" | "singularArticleForRole" | "isDeleteDisabled" | "allowMultipleRoles"> & UserRolesOwnProps>;
 export default _default;

package/lib/components/UserRoles/index.js

@@ -41,6 +41,7 @@ var react_1 = __importStar(require("react"));
 var react_bootstrap_1 = require("react-bootstrap");
 var react_redux_1 = require("react-redux");
 var studiokit_net_js_1 = require("studiokit-net-js");
+var fetchSaga_1 = require("studiokit-net-js/lib/fetchSaga");
 var uuid_1 = require("uuid");
 var AlertDialog_1 = __importDefault(require("../../components/AlertDialog"));
 var Loading_1 = __importDefault(require("../../components/Loading"));
@@ -55,6 +56,7 @@ var domainIdentifier_1 = require("../../utils/domainIdentifier");
 var entityUserRole_1 = require("../../utils/entityUserRole");
 var sort_1 = require("../../utils/sort");
 var user_1 = require("../../utils/user");
+var userRole_1 = require("../../utils/userRole");
 var AlertWithIcon_1 = __importDefault(require("../AlertWithIcon"));
 /**
  * Component used to manage either UserRoles (global roles) or EntityUserRoles.
@@ -71,19 +73,33 @@ var UserRoles = /** @class */ (function (_super) {
             identifiersToAdd: undefined,
             roleForAdd: undefined,
             shouldResetAddForm: false,
+            // update
+            userRoleToUpdate: undefined,
             // remove
             shouldShowRemoveDialog: false,
-            userToRemove: undefined,
-            roleForRemove: undefined,
+            userRoleToRemove: undefined,
             // messages
             successMessage: undefined,
-            existingUsersMessage: undefined,
+            existingMessage: undefined,
             failMessage: undefined
         };
         _this.setStateFromProps = function (props) {
             var userRoles = props.modelArray, filterUsers = props.filterUsers;
+            var usersWithRoles = Object.values(userRoles.reduce(function (result, userRole) {
+                var userId = userRole_1.getUserId(userRole);
+                var userWithRoles = result[userId];
+                if (!userWithRoles) {
+                    userWithRoles = userRole_1.convertToUserWithRoles(userRole);
+                }
+                else {
+                    userWithRoles.roles.push(userRole);
+                }
+                result[userId] = userWithRoles;
+                return result;
+            }, {}));
+            var sortedUsers = filterUsers(usersWithRoles).sort(sort_1.sortByNames);
             _this.setState({
-                sortedUsers: filterUsers(userRoles).sort(sort_1.sortByNames)
+                sortedUsers: sortedUsers
             });
         };
         _this.textForRole = function (role) {
@@ -95,7 +111,7 @@ var UserRoles = /** @class */ (function (_super) {
                 : baseRole_2.singularArticleForBaseRole(role);
         };
         //#region Add Users
-        _this.addUsers = function (ids, role) {
+        _this.addUserRoles = function (ids, role) {
             var entity = _this.props.entity;
             _this.setState({
                 identifiersToAdd: ids,
@@ -124,7 +140,7 @@ var UserRoles = /** @class */ (function (_super) {
             });
         };
         _this.didAdd = function (data) {
-            var _a = _this.props, entityName = _a.entityName, load = _a.load, onChange = _a.onChange;
+            var _a = _this.props, entityName = _a.entityName, onChange = _a.onChange, model = _a.model, modelName = _a.modelName, pathParams = _a.pathParams;
             var _b = _this.state, roleForAdd = _b.roleForAdd, identifiersToAdd = _b.identifiersToAdd;
             if (!roleForAdd || !identifiersToAdd || identifiersToAdd.length === 0) {
                 throw new Error('didAdd was called in the incorrect state');
@@ -141,29 +157,29 @@ var UserRoles = /** @class */ (function (_super) {
                 });
                 return;
             }
-            var _c = data, addedUsers = _c.addedUsers, existingUsers = _c.existingUsers, invalidIdentifiers = _c.invalidIdentifiers, allowedDomains = _c.allowedDomains, invalidDomainIdentifiers = _c.invalidDomainIdentifiers;
+            var _c = data, addedUserRoles = _c.addedUserRoles, existingUserRoles = _c.existingUserRoles, invalidIdentifiers = _c.invalidIdentifiers, allowedDomains = _c.allowedDomains, invalidDomainIdentifiers = _c.invalidDomainIdentifiers;
             var roleString = _this.textForRole(roleForAdd).toLowerCase();
             var singularArticleString = _this.singularArticleForRole(roleForAdd);
-            var addedNames = !!addedUsers && addedUsers.length > 0
-                ? addedUsers
+            var addedNames = !!addedUserRoles && addedUserRoles.length > 0
+                ? addedUserRoles
                     .map(function (au) {
                     return "" + user_1.displayName(au) + (au.uid ? " (" + au.uid + ")" : '');
                 })
                     .join('\r\n')
                 : undefined;
             var successMessage = addedNames
-                ? "The following " + roleString + (addedUsers.length > 1 ? 's were' : ' was') + " successfully added" + (entityName ? " to your " + entityName : '') + ":\r\n" + addedNames
+                ? "The following " + roleString + (addedUserRoles.length > 1 ? 's were' : ' was') + " successfully added" + (entityName ? " to your " + entityName : '') + ":\r\n" + addedNames
                 : undefined;
-            var unchangedNames = !!existingUsers && existingUsers.length > 0
-                ? existingUsers.map(function (eu) { return "" + user_1.displayName(eu) + (eu.uid ? " (" + eu.uid + ")" : ''); }).join('\r\n')
+            var existingNames = !!existingUserRoles && existingUserRoles.length > 0
+                ? existingUserRoles.map(function (eu) { return "" + user_1.displayName(eu) + (eu.uid ? " (" + eu.uid + ")" : ''); }).join('\r\n')
                 : undefined;
-            var hasMultipleExistingUsers = existingUsers.length > 1;
-            var existingUsersMessage = unchangedNames
-                ? "The following " + (hasMultipleExistingUsers ? 'people were' : 'person was') + " already " + (entityName
-                    ? "in your " + entityName + " as " + (hasMultipleExistingUsers ? '' : singularArticleString + " ")
-                    : hasMultipleExistingUsers
+            var hasMultipleExisting = existingUserRoles.length > 1;
+            var existingMessage = existingNames
+                ? "The following " + (hasMultipleExisting ? 'people were' : 'person was') + " already " + (entityName
+                    ? "in your " + entityName + " as " + (hasMultipleExisting ? '' : singularArticleString + " ")
+                    : hasMultipleExisting
                         ? ''
-                        : singularArticleString + " ") + roleString + (hasMultipleExistingUsers ? 's' : '') + ":\r\n" + unchangedNames
+                        : singularArticleString + " ") + roleString + (hasMultipleExisting ? 's' : '') + ":\r\n" + existingNames
                 : undefined;
             var failMessage = !!invalidIdentifiers && invalidIdentifiers.length > 0
                 ? "The following " + domainIdentifier_1.getDomainIdentifierTypePluralString() + " are invalid:\r\n" + invalidIdentifiers.join('\r\n')
@@ -177,46 +193,103 @@ var UserRoles = /** @class */ (function (_super) {
                 identifiersToAdd: undefined,
                 roleForAdd: undefined,
                 successMessage: successMessage,
-                existingUsersMessage: existingUsersMessage,
+                existingMessage: existingMessage,
                 failMessage: failMessage
             });
             // only reload if we had some successful adds
             if (addedNames) {
-                load();
+                // update redux with added userRoles
+                var updatedModel_1 = lodash_1.cloneDeep(model);
+                addedUserRoles.forEach(function (userRole) { return (updatedModel_1[userRole.id] = lodash_1.cloneDeep(userRole)); });
+                var prepareFetchResult = fetchSaga_1.prepareFetch({ type: studiokit_net_js_1.NET_ACTION.DATA_REQUESTED, modelName: modelName, pathParams: pathParams });
+                actionCreator_1.dispatchAction(studiokit_net_js_1.NET_ACTION.FETCH_RESULT_RECEIVED, {
+                    modelName: prepareFetchResult.modelName,
+                    data: updatedModel_1
+                });
                 if (onChange) {
                     onChange();
                 }
             }
         };
         //#endregion Add Users
+        //#region Update
+        _this.updateUserRole = function (userToUpdate, newRole) {
+            _this.setState({
+                userRoleToUpdate: userToUpdate,
+                roleForUpdate: newRole,
+                successMessage: undefined,
+                failMessage: undefined
+            });
+            _this.props.update({
+                id: userToUpdate.id.toString(),
+                body: undefined,
+                queryParams: {
+                    roleName: newRole
+                }
+            });
+        };
+        _this.didUpdate = function (isSuccess) {
+            var _a = _this.props, entityName = _a.entityName, onChange = _a.onChange;
+            var _b = _this.state, userToUpdate = _b.userRoleToUpdate, roleForUpdate = _b.roleForUpdate;
+            if (userToUpdate === undefined) {
+                throw new Error('`didUpdate` was called without `userToUpdate` in state');
+            }
+            if (roleForUpdate === undefined) {
+                throw new Error('`didUpdate` was called without `roleForUpdate` in state');
+            }
+            var name = user_1.displayName(userToUpdate);
+            var roleString = _this.textForRole(roleForUpdate).toLowerCase();
+            var singularArticleString = _this.singularArticleForRole(roleForUpdate);
+            if (!isSuccess) {
+                var failMessage = "Oops! There was an error updating " + name + " to " + singularArticleString + " " + roleString + (entityName ? " in your " + entityName : '') + ". Please try again.";
+                _this.setState({
+                    userRoleToUpdate: undefined,
+                    roleForUpdate: undefined,
+                    failMessage: failMessage
+                });
+                return;
+            }
+            var successMessage = name + " was successfully updated to " + singularArticleString + " " + roleString + (entityName ? " in your " + entityName : '') + ".";
+            _this.setState({
+                userRoleToUpdate: undefined,
+                roleForUpdate: undefined,
+                successMessage: successMessage
+            });
+            if (onChange) {
+                onChange();
+            }
+        };
+        //#endregion Update
         //#region Remove User
-        _this.alertRemoveUser = function (userToRemove, roleForRemove) {
+        _this.alertRemoveUserRole = function (userToRemove) {
             _this.setState({
-                userToRemove: userToRemove,
-                shouldShowRemoveDialog: true,
-                roleForRemove: roleForRemove
+                userRoleToRemove: userToRemove,
+                shouldShowRemoveDialog: true
             });
         };
-        _this.removeUserTitle = function (roleForRemove) {
+        _this.removeUserRoleTitle = function (roleForRemove) {
             return "Remove " + _this.textForRole(roleForRemove);
         };
-        _this.renderRemoveUserDescription = function (userToRemove, role, warning) {
+        _this.renderRemoveUserRoleDescription = function (userRoleToRemove, warning) {
             var _a = _this.props, entity = _a.entity, externalProviders = _a.externalProviders;
             var group = entity && entity.externalGroups ? entity : undefined;
-            var roleString = _this.textForRole(role).toLowerCase();
-            var singularArticleString = _this.singularArticleForRole(role);
+            var roleString = _this.textForRole(userRoleToRemove.role).toLowerCase();
+            var singularArticleString = _this.singularArticleForRole(userRoleToRemove.role);
             var defaultWarning = warning !== null && warning !== void 0 ? warning : (react_1.default.createElement("p", { className: "ma0" },
                 "Are you sure you want to ",
                 react_1.default.createElement("strong", null,
                     "remove ",
-                    user_1.displayName(userToRemove)),
-                " as ",
-                singularArticleString,
+                    user_1.displayName(userRoleToRemove)),
+                " as",
                 ' ',
+                singularArticleString,
+                " ",
                 roleString,
                 "?"));
-            var externalGroupsToRemove = group === null || group === void 0 ? void 0 : group.externalGroups.filter(function (eg) { return eg.userId === userToRemove.id; });
-            if (!externalGroupsToRemove || externalGroupsToRemove.length === 0 || role !== baseRole_1.default.GROUP_OWNER) {
+            var externalGroupsToRemove = group === null || group === void 0 ? void 0 : group.externalGroups.filter(function (eg) { return eg.userId === userRoleToRemove.id; });
+            if (!externalGroupsToRemove ||
+                externalGroupsToRemove.length === 0 ||
+                userRoleToRemove.role !== baseRole_1.default.GROUP_OWNER) {
                 return defaultWarning;
             }
             var externalGroupsToRemoveWithRosterSync = externalGroupsToRemove.filter(function (eg) { var _a; return (_a = externalProviders === null || externalProviders === void 0 ? void 0 : externalProviders[eg.externalProviderId]) === null || _a === void 0 ? void 0 : _a.rosterSyncEnabled; });
@@ -233,51 +306,45 @@ var UserRoles = /** @class */ (function (_super) {
                 react_1.default.createElement("ul", null, externalGroupsToRemove.map(function (eg) { return (react_1.default.createElement("li", { key: eg.id }, eg.description)); })),
                 defaultWarning));
         };
-        _this.removeUser = function (shouldRemove) {
-            var entity = _this.props.entity;
-            var _a = _this.state, userToRemove = _a.userToRemove, roleForRemove = _a.roleForRemove;
-            if (userToRemove === undefined) {
-                throw new Error('removeUser was called without setting userToRemove in state');
-            }
-            if (roleForRemove === undefined) {
-                throw new Error('removeUser was called without setting rollForRemove in state');
+        _this.removeUserRole = function (shouldRemove) {
+            var userRoleToRemove = _this.state.userRoleToRemove;
+            if (userRoleToRemove === undefined) {
+                throw new Error('`removeUser` was called without setting `userRoleToRemove` in state');
             }
             _this.setState({
                 shouldShowRemoveDialog: false,
                 successMessage: undefined,
                 failMessage: undefined,
                 // clear if cancelled
-                userToRemove: shouldRemove ? userToRemove : undefined
+                userRoleToRemove: shouldRemove ? userRoleToRemove : undefined
             });
             if (!shouldRemove) {
                 return;
             }
             _this.props.delete({
-                id: userToRemove.id,
-                body: entity ? { roleName: roleForRemove, entityId: entity.id } : undefined
+                id: userRoleToRemove.id
             });
         };
         _this.didRemove = function (isSuccess) {
-            var _a = _this.props, entityName = _a.entityName, load = _a.load, onChange = _a.onChange;
-            var userToRemove = _this.state.userToRemove;
-            if (userToRemove === undefined) {
-                throw new Error('didRemove was called without setting state correctly');
+            var _a = _this.props, entityName = _a.entityName, onChange = _a.onChange;
+            var userRoleToRemove = _this.state.userRoleToRemove;
+            if (userRoleToRemove === undefined) {
+                throw new Error('`didRemove` was called without setting `userRoleToRemove` in state');
             }
-            var name = user_1.displayName(userToRemove);
+            var name = user_1.displayName(userRoleToRemove);
             if (!isSuccess) {
                 var failMessage = "Oops! There was an error removing " + name + (entityName ? " from your " + entityName : '') + ". Please try again.";
                 _this.setState({
-                    userToRemove: undefined,
+                    userRoleToRemove: undefined,
                     failMessage: failMessage
                 });
                 return;
             }
             var successMessage = name + " was successfully removed" + (entityName ? " from your " + entityName : '') + ".";
             _this.setState({
-                userToRemove: undefined,
+                userRoleToRemove: undefined,
                 successMessage: successMessage
             });
-            load();
             if (onChange) {
                 onChange();
             }
@@ -302,6 +369,10 @@ var UserRoles = /** @class */ (function (_super) {
                 failMessage: "Oops! There was an error loading" + (entityName ? " the people for your " + entityName : '') + ".\r\nPlease try again."
             });
         }
+        // updating
+        if (prevModelStatus === modelStatus_1.default.UPDATING && modelStatus !== modelStatus_1.default.UPDATING) {
+            this.didUpdate(modelStatus === modelStatus_1.default.READY);
+        }
         // removing
         if (prevModelStatus === modelStatus_1.default.DELETING && modelStatus !== modelStatus_1.default.DELETING) {
             this.didRemove(modelStatus === modelStatus_1.default.READY);
@@ -311,7 +382,7 @@ var UserRoles = /** @class */ (function (_super) {
     UserRoles.prototype.render = function () {
         var _this = this;
         var _a = this.props, modelStatus = _a.modelStatus, canModify = _a.canModify, canModifySelf = _a.canModifySelf, entityName = _a.entityName, renderTableDescription = _a.renderTableDescription, defaultRole = _a.defaultRole, roleDescriptions = _a.roleDescriptions, renderAddDescription = _a.renderAddDescription, disabled = _a.disabled, isDeleteDisabled = _a.isDeleteDisabled, addRoleBlacklist = _a.addRoleBlacklist;
-        var _b = this.state, isAddingUsers = _b.isAddingUsers, sortedUsers = _b.sortedUsers, shouldResetAddForm = _b.shouldResetAddForm, shouldShowRemoveDialog = _b.shouldShowRemoveDialog, userToRemove = _b.userToRemove, roleForRemove = _b.roleForRemove, successMessage = _b.successMessage, existingUsersMessage = _b.existingUsersMessage, failMessage = _b.failMessage;
+        var _b = this.state, isAddingUsers = _b.isAddingUsers, sortedUsers = _b.sortedUsers, shouldResetAddForm = _b.shouldResetAddForm, shouldShowRemoveDialog = _b.shouldShowRemoveDialog, userRoleToRemove = _b.userRoleToRemove, successMessage = _b.successMessage, existingMessage = _b.existingMessage, failMessage = _b.failMessage;
         var addableRoleDescriptions = addRoleBlacklist
             ? lodash_1.pickBy(roleDescriptions, function (_, key) { return !addRoleBlacklist.includes(key); })
             : roleDescriptions;
@@ -323,25 +394,25 @@ var UserRoles = /** @class */ (function (_super) {
                     });
                 } },
                 react_1.default.createElement("p", { className: "pre-wrap" }, successMessage))),
-            !!existingUsersMessage && (react_1.default.createElement(AlertWithIcon_1.default, { id: "existingUsersMessageAlert", variant: "info", dismissible: true, onClose: function () {
+            !!existingMessage && (react_1.default.createElement(AlertWithIcon_1.default, { id: "existingMessageAlert", variant: "info", dismissible: true, onClose: function () {
                     return _this.setState({
-                        existingUsersMessage: undefined
+                        existingMessage: undefined
                     });
                 } },
-                react_1.default.createElement("p", { className: "pre-wrap" }, existingUsersMessage))),
+                react_1.default.createElement("p", { className: "pre-wrap" }, existingMessage))),
             !!failMessage && (react_1.default.createElement(AlertWithIcon_1.default, { id: "failMessageAlert", variant: "warning", dismissible: true, onClose: function () {
                     return _this.setState({
                         failMessage: undefined
                     });
                 } },
                 react_1.default.createElement("p", { className: "pre-wrap" }, failMessage))),
-            canModify && (react_1.default.createElement(Add_1.default, { id: "entityUserRolesAdd", entityName: entityName, addUsersToRole: this.addUsers, shouldReset: shouldResetAddForm, isAddingUsersToRole: isAddingUsers, defaultRole: defaultRole, roleDescriptions: addableRoleDescriptions, renderAddDescription: renderAddDescription, disabled: disabled, textForRole: this.textForRole })),
+            canModify && (react_1.default.createElement(Add_1.default, { id: "entityUserRolesAdd", entityName: entityName, addUsersToRole: this.addUserRoles, shouldReset: shouldResetAddForm, isAddingUsersToRole: isAddingUsers, defaultRole: defaultRole, roleDescriptions: addableRoleDescriptions, renderAddDescription: renderAddDescription, disabled: disabled, textForRole: this.textForRole })),
             !!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(Table_1.UserRolesTable, { id: "entityUserRolesTable", users: sortedUsers, readOnly: !canModify || isDeleteDisabled, roles: roles, 
                     // Assumes the default is the groupOwner, assignment/assessmentOwner, rubricOwner, problemOwner etc.
-                    entityOwnerRole: defaultRole, canModifySelf: canModifySelf, removeUserFromRole: this.alertRemoveUser, textForRole: this.textForRole })) : null)),
-            !!userToRemove && !!roleForRemove && (react_1.default.createElement(AlertDialog_1.default, { id: "removeUserAlert", isOpen: shouldShowRemoveDialog, title: this.removeUserTitle(roleForRemove), description: this.renderRemoveUserDescription(userToRemove, roleForRemove), onDestroy: function () { return _this.removeUser(true); }, destroyText: "Yes, remove the user", onCancel: function () { return _this.removeUser(false); }, cancelText: "No, I changed my mind" }))));
+                    entityOwnerRole: defaultRole, canModifySelf: canModifySelf, removeUserRole: this.alertRemoveUserRole, textForRole: this.textForRole })) : null)),
+            !!userRoleToRemove && (react_1.default.createElement(AlertDialog_1.default, { id: "removeUserAlert", isOpen: shouldShowRemoveDialog, title: this.removeUserRoleTitle(userRoleToRemove.role), description: this.renderRemoveUserRoleDescription(userRoleToRemove), onDestroy: function () { return _this.removeUserRole(true); }, destroyText: "Yes, remove the user", onCancel: function () { return _this.removeUserRole(false); }, cancelText: "No, I changed my mind" }))));
     };
     return UserRoles;
 }(react_1.Component));

package/lib/constants/mockData.d.ts

@@ -1,5 +1,5 @@
 import { ModelCollection } from 'studiokit-net-js';
-import { AppConfiguration, ExternalProvider, ExternalTerm, Group, GroupUserWithRoles, SimpleLocation, UserInfo, UserWithRoles } from '../types';
+import { AppConfiguration, ExternalProvider, ExternalTerm, Group, GroupUserRole, SimpleLocation, UserInfo, UserRole } from '../types';
 export declare const defaultAppConfiguration: AppConfiguration;
 export declare const defaultLocation: SimpleLocation;
 export declare function mockHistory(): History;
@@ -31,7 +31,6 @@ export declare const defaultNamelessUserInfo: {
     activities: string[];
     dateDemoGenerationSucceeded: string | null;
     dateStored: string;
-    /** 5/15/18 - 8/14/18 */
     dateLastUpdated: string;
     isImpersonated: boolean;
     id: string;
@@ -52,7 +51,6 @@ export declare const defaultNamedUserInfo: {
     activities: string[];
     dateDemoGenerationSucceeded: string | null;
     dateStored: string;
-    /** 5/15/18 - 8/14/18 */
     dateLastUpdated: string;
     isImpersonated: boolean;
     id: string;
@@ -64,14 +62,14 @@ export declare function mockUser(activities?: string[]): {
     userInfo: UserInfo;
 };
 export declare const defaultGroupOwnerUserInfo: UserInfo;
-export declare const defaultGroupOwner: GroupUserWithRoles;
-export declare const defaultNamelessGroupLearner: GroupUserWithRoles;
-export declare const defaultNamedGroupLearner: GroupUserWithRoles;
-export declare const defaultGroupLearner: GroupUserWithRoles;
-export declare const defaultExternalGroupLearner: GroupUserWithRoles;
-export declare const defaultGroupGrader: GroupUserWithRoles;
-export declare const defaultGroupUsers: GroupUserWithRoles[];
-export declare const defaultAdmins: UserWithRoles[];
+export declare const defaultGroupOwner: GroupUserRole;
+export declare const defaultNamelessGroupLearner: GroupUserRole;
+export declare const defaultNamedGroupLearner: GroupUserRole;
+export declare const defaultGroupLearner: GroupUserRole;
+export declare const defaultExternalGroupLearner: GroupUserRole;
+export declare const defaultGroupGrader: GroupUserRole;
+export declare const defaultGroupUserRoles: GroupUserRole[];
+export declare const defaultAdminUserRoles: UserRole[];
 export declare const defaultGroup: Group;
 export declare function mockGroups(activities?: string[], roles?: string[]): ModelCollection<Group>;
 export declare function mockSyncedGroups(activities?: string[], roles?: string[]): ModelCollection<Group>;

package/lib/constants/mockData.js

@@ -14,8 +14,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defaultExternalTerms = exports.defaultExternalProviders = exports.mockPastAndCurrentGroups = exports.mockPastGroups = exports.mockTermAndUniTimeGroups = exports.mockTermGroups = exports.mockLtiGroups = exports.mockSyncedGroups = exports.mockGroups = exports.defaultGroup = exports.defaultAdmins = exports.defaultGroupUsers = exports.defaultGroupGrader = exports.defaultExternalGroupLearner = exports.defaultGroupLearner = exports.defaultNamedGroupLearner = exports.defaultNamelessGroupLearner = exports.defaultGroupOwner = exports.defaultGroupOwnerUserInfo = exports.mockUser = exports.defaultNamedUserInfo = exports.defaultNamelessUserInfo = exports.defaultUser = exports.defaultDate = exports.currentDates = exports.pastDates = exports.mockHistory = exports.defaultLocation = exports.defaultAppConfiguration = void 0;
-var lodash_1 = __importDefault(require("lodash"));
+exports.defaultExternalTerms = exports.defaultExternalProviders = exports.mockPastAndCurrentGroups = exports.mockPastGroups = exports.mockTermAndUniTimeGroups = exports.mockTermGroups = exports.mockLtiGroups = exports.mockSyncedGroups = exports.mockGroups = exports.defaultGroup = exports.defaultAdminUserRoles = exports.defaultGroupUserRoles = exports.defaultGroupGrader = exports.defaultExternalGroupLearner = exports.defaultGroupLearner = exports.defaultNamedGroupLearner = exports.defaultNamelessGroupLearner = exports.defaultGroupOwner = exports.defaultGroupOwnerUserInfo = exports.mockUser = exports.defaultNamedUserInfo = exports.defaultNamelessUserInfo = exports.defaultUser = exports.defaultDate = exports.currentDates = exports.pastDates = exports.mockHistory = exports.defaultLocation = exports.defaultAppConfiguration = void 0;
+var lodash_1 = require("lodash");
 var externalProviderType_1 = __importDefault(require("../constants/externalProviderType"));
 var baseRole_1 = __importDefault(require("./baseRole"));
 var tier_1 = __importDefault(require("./tier"));
@@ -103,120 +103,85 @@ exports.defaultNamedUserInfo = __assign(__assign({}, exports.defaultUser.userInf
 });
 function mockUser(activities) {
     if (activities === void 0) { activities = []; }
-    return lodash_1.default.merge({ userInfo: { activities: activities } }, exports.defaultUser);
+    return lodash_1.merge({ userInfo: { activities: activities } }, exports.defaultUser);
 }
 exports.mockUser = mockUser;
 exports.defaultGroupOwnerUserInfo = __assign(__assign({}, exports.defaultUser.userInfo), { id: '2', firstName: 'Jane', lastName: 'Doe', email: 'jane@gmail.com' });
 exports.defaultGroupOwner = {
-    id: '2',
+    id: '1',
+    userId: '2',
     firstName: 'Jane',
     lastName: 'Doe',
     email: 'jane@gmail.com',
     uid: 'jane',
     entityId: 1,
-    roles: [
-        {
-            userId: '2',
-            entityId: 1,
-            role: baseRole_1.default.GROUP_OWNER,
-            isExternal: false
-        }
-    ]
+    role: baseRole_1.default.GROUP_OWNER,
+    isExternal: false
 };
 exports.defaultNamelessGroupLearner = {
-    id: '3',
+    id: '2',
+    userId: '3',
     firstName: null,
     lastName: null,
     email: 'nicki@minaj.superbass',
     uid: 'nm-nameless',
     entityId: 1,
-    roles: [
-        {
-            userId: '3',
-            entityId: 1,
-            role: baseRole_1.default.GROUP_LEARNER,
-            isExternal: false
-        }
-    ]
+    role: baseRole_1.default.GROUP_LEARNER,
+    isExternal: false
 };
 exports.defaultNamedGroupLearner = {
-    id: '4',
+    id: '3',
+    userId: '4',
     firstName: 'Nicki',
     lastName: 'Minaj',
     email: null,
     uid: 'nm-named',
     entityId: 1,
-    roles: [
-        {
-            userId: '4',
-            entityId: 1,
-            role: baseRole_1.default.GROUP_LEARNER,
-            isExternal: false
-        }
-    ]
+    role: baseRole_1.default.GROUP_LEARNER,
+    isExternal: false
 };
 exports.defaultGroupLearner = {
-    id: '3',
+    id: '4',
+    userId: '5',
     firstName: 'Joe',
     lastName: 'Schmoe',
     email: 'nope@gmail.com',
     uid: 'nope',
     entityId: 1,
-    roles: [
-        {
-            userId: '3',
-            entityId: 1,
-            role: baseRole_1.default.GROUP_LEARNER,
-            isExternal: false
-        }
-    ]
+    role: baseRole_1.default.GROUP_LEARNER,
+    isExternal: false
 };
 exports.defaultExternalGroupLearner = {
-    id: '4',
+    id: '5',
+    userId: '6',
     firstName: 'Bob',
     lastName: 'Loblaw',
     email: 'bobloblaw@lawblog.com',
     uid: 'bobloblaw',
     entityId: 1,
-    roles: [
-        {
-            userId: '4',
-            entityId: 1,
-            role: baseRole_1.default.GROUP_LEARNER,
-            isExternal: true
-        }
-    ]
+    role: baseRole_1.default.GROUP_LEARNER,
+    isExternal: true
 };
 exports.defaultGroupGrader = {
-    id: '5',
+    id: '6',
+    userId: '7',
     firstName: 'Grader',
     lastName: 'McGradeface',
     email: 'grader@gmail.com',
     uid: 'grader',
     entityId: 1,
-    roles: [
-        {
-            userId: '35',
-            entityId: 1,
-            role: baseRole_1.default.GROUP_GRADER,
-            isExternal: false
-        }
-    ]
+    role: baseRole_1.default.GROUP_GRADER,
+    isExternal: false
 };
-exports.defaultGroupUsers = [exports.defaultGroupOwner, exports.defaultGroupLearner, exports.defaultExternalGroupLearner];
-exports.defaultAdmins = [
+exports.defaultGroupUserRoles = [exports.defaultGroupOwner, exports.defaultGroupLearner, exports.defaultExternalGroupLearner];
+exports.defaultAdminUserRoles = [
     {
         id: '1',
         firstName: 'Joe',
         lastName: 'Schmo',
         email: null,
         uid: null,
-        roles: [
-            {
-                userId: '1',
-                role: baseRole_1.default.ADMIN
-            }
-        ]
+        role: baseRole_1.default.ADMIN
     },
     {
         id: '2',
@@ -224,12 +189,7 @@ exports.defaultAdmins = [
         lastName: null,
         email: 'carlysimon@clouds.in.coffee',
         uid: 'carlysimon',
-        roles: [
-            {
-                userId: '2',
-                role: baseRole_1.default.ADMIN
-            }
-        ]
+        role: baseRole_1.default.ADMIN
     }
 ];
 //#endregion Users
@@ -260,13 +220,13 @@ exports.defaultGroup = {
 function mockGroups(activities, roles) {
     if (activities === void 0) { activities = []; }
     if (roles === void 0) { roles = []; }
-    return { '1': lodash_1.default.merge({ activities: activities, roles: roles }, exports.defaultGroup) };
+    return { '1': lodash_1.merge({ activities: activities, roles: roles }, exports.defaultGroup) };
 }
 exports.mockGroups = mockGroups;
 function mockSyncedGroups(activities, roles) {
     if (activities === void 0) { activities = []; }
     if (roles === void 0) { roles = []; }
-    var rosterSyncEnabledGroup = lodash_1.default.merge({ activities: activities, roles: roles }, exports.defaultGroup);
+    var rosterSyncEnabledGroup = lodash_1.merge({ activities: activities, roles: roles }, exports.defaultGroup);
     rosterSyncEnabledGroup.isRosterSyncEnabled = true;
     return { '1': rosterSyncEnabledGroup };
 }
@@ -274,7 +234,7 @@ exports.mockSyncedGroups = mockSyncedGroups;
 function mockLtiGroups(activities, roles) {
     if (activities === void 0) { activities = []; }
     if (roles === void 0) { roles = []; }
-    var ltiGroup = lodash_1.default.merge({ activities: activities, roles: roles }, exports.defaultGroup);
+    var ltiGroup = lodash_1.merge({ activities: activities, roles: roles }, exports.defaultGroup);
     ltiGroup.isRosterSyncEnabled = true;
     ltiGroup.externalGroups = [
         {
@@ -297,7 +257,7 @@ exports.mockLtiGroups = mockLtiGroups;
 function mockTermGroups(activities, roles) {
     if (activities === void 0) { activities = []; }
     if (roles === void 0) { roles = []; }
-    var group = lodash_1.default.merge({ activities: activities, roles: roles }, exports.defaultGroup);
+    var group = lodash_1.merge({ activities: activities, roles: roles }, exports.defaultGroup);
     group.startDate = null;
     group.endDate = null;
     group.externalTermId = 1;
@@ -307,7 +267,7 @@ exports.mockTermGroups = mockTermGroups;
 function mockTermAndUniTimeGroups(activities, roles) {
     if (activities === void 0) { activities = []; }
     if (roles === void 0) { roles = []; }
-    var group = lodash_1.default.merge({ activities: activities, roles: roles }, exports.defaultGroup);
+    var group = lodash_1.merge({ activities: activities, roles: roles }, exports.defaultGroup);
     group.startDate = null;
     group.endDate = null;
     group.externalTermId = 1;
@@ -332,15 +292,15 @@ exports.mockTermAndUniTimeGroups = mockTermAndUniTimeGroups;
 function mockPastGroups(activities, roles) {
     if (activities === void 0) { activities = []; }
     if (roles === void 0) { roles = []; }
-    var pastGroup = lodash_1.default.merge({ activities: activities, roles: roles }, exports.defaultGroup, exports.pastDates);
+    var pastGroup = lodash_1.merge({ activities: activities, roles: roles }, exports.defaultGroup, exports.pastDates);
     return { '1': pastGroup };
 }
 exports.mockPastGroups = mockPastGroups;
 function mockPastAndCurrentGroups(activities, roles) {
     if (activities === void 0) { activities = []; }
     if (roles === void 0) { roles = []; }
-    var pastGroup = lodash_1.default.merge({ activities: activities, roles: roles }, exports.defaultGroup, exports.pastDates);
-    var currentGroup = lodash_1.default.merge({ activities: activities, roles: roles }, exports.defaultGroup, {
+    var pastGroup = lodash_1.merge({ activities: activities, roles: roles }, exports.defaultGroup, exports.pastDates);
+    var currentGroup = lodash_1.merge({ activities: activities, roles: roles }, exports.defaultGroup, {
         id: '2'
     }, exports.currentDates);
     return { '1': pastGroup, '2': currentGroup };

package/lib/endpointMappings.d.ts

@@ -1,4 +1,4 @@
 import { EndpointMapping, EndpointMappings } from 'studiokit-net-js';
-export declare const entityUserRoleEndpointMappings: (typename: string) => EndpointMappings;
+export declare const entityUserRoleEndpointMappings: (endpointName: string) => EndpointMappings;
 export declare const groupEndpointMapping: EndpointMapping;
 export declare const endpointMappings: EndpointMappings;

package/lib/endpointMappings.js

@@ -12,37 +12,27 @@ var __assign = (this && this.__assign) || function () {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.endpointMappings = exports.groupEndpointMapping = exports.entityUserRoleEndpointMappings = void 0;
-var entityUserRoleEndpointMappings = function (typename) {
-    return {
-        entityUserRoles: {
+var entityUserRoleEndpointMappings = function (endpointName) {
+    var _a;
+    return _a = {},
+        _a[endpointName] = {
             _config: {
                 isCollection: true,
                 fetch: {
-                    path: '/api/entityUserRoles',
-                    // for GET
-                    queryParams: {
-                        typename: typename
-                    },
-                    // for DELETE
-                    body: {
-                        typename: typename
-                    }
+                    path: "/api/" + endpointName
                 }
             }
         },
         // use separate model for transient POSTs
-        addUserRoles: {
+        _a.addUserRoles = {
             _config: {
                 fetch: {
-                    path: '/api/entityUserRoles',
-                    method: 'POST',
-                    body: {
-                        typename: typename
-                    }
+                    path: "/api/" + endpointName,
+                    method: 'POST'
                 }
             }
-        }
-    };
+        },
+        _a;
 };
 exports.entityUserRoleEndpointMappings = entityUserRoleEndpointMappings;
 exports.groupEndpointMapping = __assign({ _config: {
@@ -56,7 +46,7 @@ exports.groupEndpointMapping = __assign({ _config: {
                 method: 'POST'
             }
         }
-    } }, exports.entityUserRoleEndpointMappings('Group'));
+    } }, exports.entityUserRoleEndpointMappings('groupUserRoles'));
 exports.endpointMappings = {
     urlChecker: {
         _config: {

package/lib/types/Group.d.ts

@@ -1,7 +1,7 @@
 import { Model, ModelCollection } from 'studiokit-net-js';
 import { ExternalGroup } from './External';
 import { EntityUser } from './User';
-import { GroupUserWithRoles } from './UserRole';
+import { GroupUserRole } from './UserRole';
 export interface Group extends Model {
     id: number;
     name: string;
@@ -15,5 +15,5 @@ export interface Group extends Model {
     owners: EntityUser[];
     graders: EntityUser[];
     externalGroups: ExternalGroup[];
-    entityUserRoles?: ModelCollection<GroupUserWithRoles>;
+    groupUserRoles?: ModelCollection<GroupUserRole>;
 }

package/lib/types/UserRole.d.ts

@@ -1,9 +1,9 @@
 import { User } from './User';
-export interface UserRole {
-    userId: string;
+export interface UserRole extends User {
     role: string;
 }
 export interface EntityUserRole extends UserRole {
+    userId: string;
     entityId: number;
 }
 export interface GroupUserRole extends EntityUserRole {
@@ -12,8 +12,3 @@ export interface GroupUserRole extends EntityUserRole {
 export interface UserWithRoles<TUserRole extends UserRole = UserRole> extends User {
     roles: TUserRole[];
 }
-export interface EntityUserWithRoles<TUserRole extends EntityUserRole = EntityUserRole> extends UserWithRoles<TUserRole> {
-    entityId: number;
-}
-export interface GroupUserWithRoles extends EntityUserWithRoles<GroupUserRole> {
-}

package/lib/utils/entityUserRole.js

@@ -1,7 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRootModelName = void 0;
-var getRootModelName = function (props) {
-    return props.modelName.replace('.entityUserRoles', '').replace('userRoles', '');
-};
+var getRootModelName = function (props) { return props.modelName.split('.').slice(0, -1).join('.'); };
 exports.getRootModelName = getRootModelName;

package/lib/utils/groupRoles.d.ts

@@ -1,8 +1,8 @@
 import { ModelCollection } from 'studiokit-net-js';
-import { Group, GroupUserWithRoles } from '../types';
+import { Group, UserWithRoles } from '../types';
 export declare const groupsAsLearner: (groups: ModelCollection<Group>) => Group[];
 export declare const groupsAsOwner: (groups: ModelCollection<Group>) => Group[];
 export declare const groupsAsGrader: (groups: ModelCollection<Group>) => Group[];
 export declare const groupsAsAnythingButLearner: (groups: ModelCollection<Group>) => Group[];
-export declare const filterManualGroupUsers: (groupUsers: GroupUserWithRoles[]) => GroupUserWithRoles[];
-export declare const filterSyncedGroupUsers: (groupUsers: GroupUserWithRoles[]) => GroupUserWithRoles[];
+export declare const filterManualGroupUsers: (groupUsers: UserWithRoles[]) => UserWithRoles<import("../types").UserRole>[];
+export declare const filterSyncedGroupUsers: (groupUsers: UserWithRoles[]) => UserWithRoles<import("../types").UserRole>[];

package/lib/utils/groupRoles.js

@@ -7,6 +7,7 @@ exports.filterSyncedGroupUsers = exports.filterManualGroupUsers = exports.groups
 var lodash_1 = __importDefault(require("lodash"));
 var baseRole_1 = __importDefault(require("../constants/baseRole"));
 var model_1 = require("./model");
+var userRole_1 = require("./userRole");
 var groupsAsLearner = function (groups) {
     return filterGroupsByRole(groups, baseRole_1.default.GROUP_LEARNER);
 };
@@ -33,10 +34,10 @@ var filterGroupsByRoleOtherThanRole = function (groups, role) {
     return lodash_1.default.values(lodash_1.default.omitBy(model_1.getModelArray(groups), function (value, key) { return !groupHasRole(value, key) || lodash_1.default.every(value.roles, function (r) { return r === role; }); }));
 };
 var filterManualGroupUsers = function (groupUsers) {
-    return groupUsers.filter(function (groupUser) { return !groupUser.roles.some(function (r) { return r.isExternal; }); });
+    return groupUsers.filter(function (groupUser) { return !groupUser.roles.some(function (r) { return userRole_1.isExternal(r); }); });
 };
 exports.filterManualGroupUsers = filterManualGroupUsers;
 var filterSyncedGroupUsers = function (groupUsers) {
-    return groupUsers.filter(function (groupUser) { return groupUser.roles.some(function (r) { return r.isExternal; }); });
+    return groupUsers.filter(function (groupUser) { return groupUser.roles.some(function (r) { return userRole_1.isExternal(r); }); });
 };
 exports.filterSyncedGroupUsers = filterSyncedGroupUsers;

package/lib/utils/userRole.d.ts

@@ -1,4 +1,9 @@
 import { UserRole, UserWithRoles } from '../types/UserRole';
+/**
+ * Get the user id for a `userRole`, either a `UserRole` or `EntityUserRole`.
+ * @param userRole The user role
+ */
+export declare const getUserId: (userRole: UserRole) => string;
 /**
  * Get whether or not the `userRole` has a prop `isExternal` and it is `true`.
  * @param userRole The user role
@@ -19,3 +24,4 @@ export declare const sortByRole: (roles: string[]) => (a: UserRole, b: UserRole)
  * @param roles Roles ordered in descing access level
  */
 export declare const sortByHighestAccessRole: (roles: string[]) => (a: UserWithRoles, b: UserWithRoles) => 0 | 1 | -1;
+export declare const convertToUserWithRoles: <TUserRole extends UserRole = UserRole>(userRole: TUserRole) => UserWithRoles<TUserRole>;

package/lib/utils/userRole.js

@@ -1,7 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sortByHighestAccessRole = exports.sortByRole = exports.getRoleText = exports.isExternal = void 0;
+exports.convertToUserWithRoles = exports.sortByHighestAccessRole = exports.sortByRole = exports.getRoleText = exports.isExternal = exports.getUserId = void 0;
 var baseRole_1 = require("./baseRole");
+/**
+ * Get the user id for a `userRole`, either a `UserRole` or `EntityUserRole`.
+ * @param userRole The user role
+ */
+var getUserId = function (userRole) {
+    return Object.prototype.hasOwnProperty.call(userRole, 'userId') ? userRole.userId : userRole.id;
+};
+exports.getUserId = getUserId;
 /**
  * Get whether or not the `userRole` has a prop `isExternal` and it is `true`.
  * @param userRole The user role
@@ -46,3 +54,15 @@ var sortByHighestAccessRole = function (roles) { return function (a, b) {
     return 0;
 }; };
 exports.sortByHighestAccessRole = sortByHighestAccessRole;
+var convertToUserWithRoles = function (userRole) {
+    var userId = exports.getUserId(userRole);
+    return {
+        id: userId,
+        firstName: userRole.firstName,
+        lastName: userRole.lastName,
+        email: userRole.email,
+        uid: userRole.uid,
+        roles: [userRole]
+    };
+};
+exports.convertToUserWithRoles = convertToUserWithRoles;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "studiokit-scaffolding-js",
-	"version": "4.3.20",
+	"version": "4.4.0",
 	"description": "Common scaffolding for Studio apps at Purdue",
 	"repository": "https://gitlab.com/purdue-informatics/studiokit/studiokit-scaffolding-js",
 	"license": "MIT",
@@ -92,7 +92,7 @@
 		"lodash": "^4.17.20",
 		"mixin-deep": "^1.3.2",
 		"set-value": "^2.0.1",
-		"studiokit-net-js": "^4.0.2"
+		"studiokit-net-js": "^4.1.2"
 	},
 	"dependencies": {
 		"@material-ui/core": "^4.11.3",
@@ -145,7 +145,7 @@
 		"redux-saga": "^1.1.3",
 		"studiokit-auth-js": "^3.0.2",
 		"studiokit-caliper-js": "^1.0.23",
-		"studiokit-net-js": "^4.0.2",
+		"studiokit-net-js": "^4.1.2",
 		"tachyons": "^4.12.0",
 		"tslib": "^2.1.0",
 		"uuid": "^8.3.2"