Merge pull request #186 from EyeSeeTea/development

Release 0.4.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "d2-user-extended-app",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "DHIS2 Extended User app",
   "main": "src/index.html",
   "license": "GPL-3.0",
@@ -55,7 +55,6 @@
     "karma-coverage": "0.5.0",
     "karma-mocha": "0.2.0",
     "karma-mocha-reporter": "1.1.1",
-    "karma-phantomjs-launcher": "0.2.1",
     "karma-sinon": "1.0.4",
     "karma-sinon-chai": "1.0.0",
     "karma-sourcemap-loader": "0.3.5",
@@ -68,7 +67,6 @@
     "mocha": "2.2.5",
     "moment": "^2.19.1",
     "node-sass": "^3.7.0",
-    "phantomjs": "1.9.18",
     "phantomjs-polyfill": "0.0.1",
     "precommit-hook": "3.0.0",
     "prettier": "^1.18.2",

src/List/List.component.js

@@ -25,6 +25,7 @@ import replicateUserStore from "./replicateUser.store";
 import OrgUnitDialog from "./organisation-unit-dialog/OrgUnitDialog.component";
 import UserRolesDialog from "../components/UserRolesDialog.component";
 import UserGroupsDialog from "../components/UserGroupsDialog.component";
+import CopyInUserDialog from "../components/CopyInUserDialog.component";
 import ReplicateUserFromTemplate from "../components/ReplicateUserFromTemplate.component";
 import ReplicateUserFromTable from "../components/ReplicateUserFromTable.component";
 import snackActions from "../Snackbar/snack.actions";
@@ -43,6 +44,7 @@ import ModalLoadingMask from "../components/ModalLoadingMask.component";
 import SettingsDialog from "../components/SettingsDialog.component";
 import Filters from "./Filters.component";
 import DetailsBoxWithScroll from "./DetailsBoxWithScroll.component";
+import copyInUserStore from "./copyInUser.store";
 
 const pageSize = 50;
 
@@ -151,6 +153,9 @@ const List = React.createClass({
             importUsers: {
                 open: false,
             },
+            copyUsers: {
+                open: false,
+            },
         };
     },
 
@@ -248,13 +253,18 @@ const List = React.createClass({
 
         const deleteUserStoreDisposable = deleteUserStore.subscribe(users => this.filterList());
 
+        const userCopyUserDialogStoreDisposable = copyInUserStore.subscribe(copyUsers => {
+            this.setAssignState("copyUsers", copyUsers);
+        });
+
         this.registerDisposable(detailsStoreDisposable);
         this.registerDisposable(orgUnitAssignmentStoreDisposable);
         this.registerDisposable(userRolesAssignmentDialogStoreDisposable);
         this.registerDisposable(userGroupsAssignmentDialogStoreDisposable);
         this.registerDisposable(replicateUserDialogStoreDisposable);
         this.registerDisposable(deleteUserStoreDisposable);
         this.registerDisposable(enableStoreDisposable);
+        this.registerDisposable(userCopyUserDialogStoreDisposable);
 
         this.filterList();
     },
@@ -456,7 +466,13 @@ const List = React.createClass({
         };
 
         const rows = this.getDataTableRows(this.state.dataRows);
-        const { assignUserRoles, assignUserGroups, replicateUser, listFilterOptions } = this.state;
+        const {
+            assignUserRoles,
+            assignUserGroups,
+            replicateUser,
+            listFilterOptions,
+            copyUsers,
+        } = this.state;
         const {
             showAllUsers,
             filterByGroups,
@@ -555,6 +571,13 @@ const List = React.createClass({
                     />
                 ) : null}
 
+                {copyUsers.open ? (
+                    <CopyInUserDialog
+                        user={copyUsers.user}
+                        onRequestClose={() => copyInUserStore.setState({ open: false })}
+                    />
+                ) : null}
+
                 {assignUserGroups.open ? (
                     <UserGroupsDialog
                         users={assignUserGroups.users}

src/List/context.actions.js

@@ -1,3 +1,4 @@
+import _ from "lodash";
 import detailsStore from "./details.store";
 import { config, getInstance as getD2 } from "d2/lib/d2";
 import orgUnitAssignmentDialogStore from "./organisation-unit-dialog/organisationUnitDialogStore";
@@ -6,6 +7,7 @@ import userRolesAssignmentDialogStore from "./userRoles.store";
 import userGroupsAssignmentDialogStore from "./userGroups.store";
 import replicateUserStore from "./replicateUser.store";
 import deleteUserStore from "./deleteUser.store";
+import copyInUserStore from "./copyInUser.store";
 import _m from "../utils/lodash-mixins";
 import { getOrgUnitsRoots } from "../utils/dhis2Helpers";
 
@@ -95,6 +97,13 @@ const contextActions = [
         onClick: user => detailsStore.setState(user),
         primary: true,
     },
+    {
+        name: "copyInUser",
+        multiple: false,
+        icon: "content_copy",
+        onClick: user => copyInUserStore.setState({ user, open: true }),
+        allowed: checkAccess(["update"]),
+    },
     {
         name: "assignToOrgUnits",
         multiple: true,

src/List/copyInUser.store.js

@@ -0,0 +1,3 @@
+import Store from "d2-ui/lib/store/Store";
+
+export default Store.create();

src/components/CopyInUserDialog.component.js

@@ -0,0 +1,46 @@
+import React from "react";
+import PropTypes from "prop-types";
+import CopyInUserBatchModelsMultiSelectComponent from "./batch-models-multi-select/CopyInUserBatchModelsMultiSelect.component";
+import CopyInUserBatchModelsMultiSelectModel from "./batch-models-multi-select/CopyInUserBatchModelsMultiSelect.model";
+import _m from "../utils/lodash-mixins";
+import { getPayload } from "../models/userHelpers";
+
+function getTitle(getTranslation, users) {
+    const usernames = users && users.map(user => user.userCredentials.username);
+    const info = usernames ? _m.joinString(getTranslation, usernames, 3, ", ") : "...";
+    return getTranslation("copyInUser") + ": " + info;
+}
+
+function CopyInUserDialog(props, context) {
+    const { d2 } = context;
+    const getTranslation = context.d2.i18n.getTranslation.bind(context.d2.i18n);
+    const modelOptions = {
+        parentModel: d2.models.users,
+        parentFields: ":owner,userCredentials[id,username,userRoles[id,name],lastLogin]",
+        childrenModel: d2.models.users,
+        getChildren: user => user.userCredentials.userRoles,
+        getPayload: getPayload,
+    };
+
+    return (
+        <CopyInUserBatchModelsMultiSelectComponent
+            model={new CopyInUserBatchModelsMultiSelectModel(context.d2, modelOptions)}
+            parents={[{ ...props.user }]}
+            onRequestClose={props.onRequestClose}
+            getTitle={users => getTitle(getTranslation, users)}
+            onSuccess={getTranslation("user_configuration_copied")}
+            onError={getTranslation("user_configuration_copied_error")}
+        />
+    );
+}
+
+CopyInUserDialog.contextTypes = {
+    d2: PropTypes.object.isRequired,
+};
+
+CopyInUserDialog.propTypes = {
+    user: PropTypes.object.isRequired,
+    onRequestClose: PropTypes.func.isRequired,
+};
+
+export default CopyInUserDialog;

src/components/batch-models-multi-select/BatchModelsMultiSelect.component.js

@@ -60,7 +60,6 @@ export default class BatchModelsMultiSelectComponent extends React.Component {
 
     componentDidMount() {
         const { parents, model } = this.props;
-
         return Promise.all([model.getAllChildren(), model.getParents(parents)])
             .then(([allChildren, parentsLoaded]) =>
                 this.setState({
@@ -111,7 +110,6 @@ export default class BatchModelsMultiSelectComponent extends React.Component {
             .then(() => this.close(this.props.onSuccess))
             .catch(err => this.close(this.props.onError));
     }
-
     onChange(selectedIds) {
         this.setState({ selectedIds });
     }

src/components/batch-models-multi-select/BatchModelsMultiSelect.model.js

@@ -1,5 +1,4 @@
 import _ from "lodash";
-
 const toArray = obj => (obj.toArray ? obj.toArray() : obj || []);
 
 export default class BatchModelsMultiSelectModel {