Merge pull request #84 in CCKEY/frontend from feature/CCKEY-204-tag-administration-ui to master

* commit 'd0d4161e883d9be8b235aa47eeb96221e7fad24c': CCKEY-204 Fixed comments CCKEY-204 Updated package lock, fixed tests CCKEY-204 Added tests for new modal, admin menu CCKEY-204 Added colorpicker to tag modal CCKEY-204 Added tags

Author: fermentfan

package-lock.json

@@ -42,6 +42,7 @@
  "prop-type": "latest",
  "rc-queue-anim": "1.0.4",
  "react": "15.4.2",
+ "react-color": "2.13.8",
  "react-copy-to-clipboard": "5.0.0",
  "react-dom": "15.4.2",
  "react-file-download": "0.3.4",

package.json

@@ -14,15 +14,18 @@ import {
  KEY_STORE,
  USER_STORE,
  USER_GROUP_STORE,
- ENCRYPTION_JOB_STORE, INVOCATION_HELPER
+ ENCRYPTION_JOB_STORE,
+ INVOCATION_HELPER,
+ TAG_STORE
 } from "./stores/storeConstants";
 import {ADMINISTRATION, ROOT} from "./routes/routeConstants";
 import {
  ROUTE_SIGNOUT,
  ROUTE_DASHBOARD,
  ROUTE_ADMINISTRATION_USER_GROUPS,
  ROUTE_ADMINISTRATION_USERS,
- ROUTE_KEYS
+ ROUTE_KEYS,
+ ROUTE_ADMINISTRATION_TAGS
 } from "./routes/routeMappings";
 import {
  VERSION,
@@ -42,7 +45,7 @@ import "antd/lib/icon/style/css";
 import "antd/lib/row/style/css";
 import "./BaseLayout.less";
 
-@inject(AUTHORITY_STORE, AUTH_STORE, CATEGORY_STORE, KEY_STORE, USER_STORE, USER_GROUP_STORE, ENCRYPTION_JOB_STORE, INVOCATION_HELPER) @observer
+@inject(AUTHORITY_STORE, AUTH_STORE, CATEGORY_STORE, KEY_STORE, USER_STORE, USER_GROUP_STORE, ENCRYPTION_JOB_STORE, INVOCATION_HELPER, TAG_STORE) @observer
 class BaseLayout extends React.Component {
  constructor(props) {
  super(props);
@@ -105,14 +108,16 @@ class BaseLayout extends React.Component {
  this.props.categoryStore.fetchAll(),
  this.props.keyStore.fetchAll(),
  this.props.userStore.fetchAll(),
- this.props.userGroupStore.fetchAll()
+ this.props.userGroupStore.fetchAll(),
+ this.props.tagStore.fetchAll()
  ]);
  };
 
  initializeUserStores = () => {
  return apiService.all([
  this.props.categoryStore.fetchAll(),
- this.props.keyStore.fetchAll()
+ this.props.keyStore.fetchAll(),
+ this.props.tagStore.fetchAll()
  ]);
  };
 
@@ -250,6 +255,12 @@ class BaseLayout extends React.Component {
  isActive={() => this.isActiveSidebarNavLink(ROUTE_ADMINISTRATION_USER_GROUPS)}>User Groups
  </NavLink>
  </Menu.Item>
+ <Menu.Item key={ROUTE_ADMINISTRATION_TAGS}>
+ <NavLink
+ to={ROUTE_ADMINISTRATION_TAGS}
+ isActive={() => this.isActiveSidebarNavLink(ROUTE_ADMINISTRATION_TAGS)}>Tags
+ </NavLink>
+ </Menu.Item>
  </Menu.SubMenu>
  }
  </Menu>
@@ -427,6 +438,11 @@ BaseLayout.propTypes = {
  */
  encryptionJobStore: MobXPropTypes.objectOrObservableObject,
 
+ /**
+ * @type {ObservableArray} tagStore - The injected tag store
+ */
+ tagStore: MobXPropTypes.observableArray,
+
  /**
  * @type {object} passphraseNeeded - The state object that invokes a passphrase modal
  */

src/BaseLayout.js

@@ -21,6 +21,7 @@ import SignIn from "./routes/SignIn";
 import SignOut from "./routes/SignOut";
 import UserAdministration from "./routes/administration/UserAdministration";
 import UserGroupAdministration from "./routes/administration/UserGroupAdministration";
+import TagAdministration from "./routes/administration/TagAdministration";
 import Dashboard from "./routes/Dashboard";
 import Keys from "./routes/Keys";
 import AuthorityStore from "./stores/AuthorityStore";
@@ -29,6 +30,7 @@ import CategoryStore from "./stores/CategoryStore";
 import KeyStore from "./stores/KeyStore";
 import UserGroupStore from "./stores/UserGroupStore";
 import UserStore from "./stores/UserStore";
+import TagStore from "./stores/TagStore";
 import EncryptionJobStore from "./stores/EncryptionJobStore";
 import EventStore from "./stores/EventStore";
 import InvocationHelper from "./stores/InvocationHelper";
@@ -37,6 +39,7 @@ import motionConfig from "./config/motion";
 import {
  ROUTE_ADMINISTRATION_USERS,
  ROUTE_ADMINISTRATION_USER_GROUPS,
+ ROUTE_ADMINISTRATION_TAGS,
  ROUTE_DASHBOARD,
  ROUTE_KEYS,
  ROUTE_LINKED_KEY,
@@ -124,14 +127,21 @@ export const eventStore = new EventStore();
  */
 export const invocationHelper = new InvocationHelper();
 
+/**
+ * The tag store instance.
+ *
+ * @type {TagStore}
+ * @since 0.18.0
+ */
+export const tagStore = new TagStore();
 
 /**
  * The wrapper for all store instances to be injected via a MobX {@linkplain Provider} components.
  *
  * @type {Object.<{AuthorityStore}, {AuthStore}, {CategoryStore}, {KeyStore},
  * {UserGroupStore}, {UserStore}, {EncryptionJobStore}, {EventStore}, {InvocationHelper}>}
  */
-const stores = {authorityStore, authStore, categoryStore, keyStore, userGroupStore, userStore, encryptionJobStore, eventStore, invocationHelper};
+const stores = {authorityStore, authStore, categoryStore, keyStore, userGroupStore, userStore, encryptionJobStore, eventStore, invocationHelper, tagStore};
 
 /**
  * The notification service instance.
@@ -273,6 +283,12 @@ class Communikey extends React.Component {
  authorized={stores.authStore.isAuthorized}
  privileged={stores.authStore.privileged}
  />
+ <AuthenticatedPrivilegedRoute
+ path={ROUTE_ADMINISTRATION_TAGS}
+ component={TagAdministration}
+ authorized={stores.authStore.isAuthorized}
+ privileged={stores.authStore.privileged}
+ />
  <KeyDeepLinkAuthenticatedRoute path={ROUTE_LINKED_KEY} component={Keys} authorized={stores.authStore.isAuthorized}/>
  <CategoryDeepLinkAuthenticatedRoute path={ROUTE_LINKED_CATEGORY} component={Keys} authorized={stores.authStore.isAuthorized}/>
  <AuthenticatedRoute path={ROUTE_KEYS} component={Keys} authorized={stores.authStore.isAuthorized}/>