Merge pull request #34 from PanSpagetka/tagging-changes

Tagging changes

src/tagging/components/tag.jsx

@@ -1,7 +1,6 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { Label } from 'patternfly-react';
-import styles from './tag.scss';
 
 
 const Tag = ({
@@ -12,7 +11,7 @@ const Tag = ({
       key={tagValue.id}
       bsStyle="primary"
       onRemoveClick={() => onTagDeleteClick(tagCategory, tagValue)}
-      style={{ color: styles.defaultColor }}
+      className="tagColor"
     >
       {tagValue.description}
     </Label>

src/tagging/components/tagCategory.jsx

@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import Tag from './tag';
-import './tagCategory.scss';
 
 class TagCategory extends React.Component {
   generateTag = tagValue =>

src/tagging/components/tagSelector.jsx

@@ -1,7 +1,6 @@
 import React from 'react';
 import Select from 'react-select';
 import PropTypes from 'prop-types';
-import './tagSelector.scss';
 
 class TagSelector extends React.Component {
   handleChange = (selectedOption) => {

src/tagging/components/taggingWithButtons.jsx

@@ -26,7 +26,7 @@ class TaggingWithButtons extends React.Component {
           <ButtonToolbar>
             <ButtonGroup>
               <Button
-                onClick={this.props.saveButton.onClick}
+                onClick={() => this.props.saveButton.onClick(this.props.assignedTags)}
                 href={this.props.saveButton.href}
                 disabled={this.props.saveButton.disabled}
                 type={this.props.saveButton.type}

src/tagging/containers/tagging.js

@@ -4,11 +4,11 @@ import Tagging from '../components/tagging';
 import TaggingWithButtons from '../components/taggingWithButtons';
 
 // container compo
-const mapStateToProps = state => ({
-  tags: state.tagging.appState.tags,
-  selectedTagCategory: state.tagging.appState.selected.tagCategory,
-  selectedTagValue: state.tagging.appState.selected.tagValue,
-  assignedTags: state.tagging.appState.assignedTags,
+const mapStateToProps = ({ tagging }) => ({
+  tags: tagging.appState.tags,
+  selectedTagCategory: tagging.appState.selected.tagCategory,
+  selectedTagValue: tagging.appState.selected.tagValue,
+  assignedTags: tagging.appState.assignedTags,
 });
 
 

src/tagging/reducers/index.js

@@ -1,10 +1,11 @@
 import { combineReducers } from 'redux';
-import { modifyassignedTags as assignedTags, toggle as selected, tags, initialize } from './reducers';
+import { modifyassignedTags as assignedTags, toggle as selected, tags, initialize, affectedItems } from './reducers';
 
 const combinedReducers = combineReducers({
   tags,
   assignedTags,
   selected,
+  affectedItems,
 });
 
 

src/tagging/reducers/reducers.js

@@ -61,16 +61,22 @@ export const toggle = (state = { tagCategory: {}, tagValue: {} }, action) => {
 };
 
 export const tags = (state = []) => state;
+export const affectedItems = (state = []) => state;
 
 export const initialize = (state = {}, action) => {
   switch (action.type) {
     case actionsConstants.LOAD_STATE:
-      return Object.assign(
-        { initialState: action.initialState },
-        { appState: { tags: action.initialState.tags, assignedTags: action.initialState.assignedTags } },
-      );
+      return {
+        ...state,
+        initialState: action.initialState,
+        appState: {
+          tags: action.initialState.tags,
+          assignedTags: action.initialState.assignedTags,
+          affectedItems: action.initialState.affectedItems,
+        },
+      };
     case actionsConstants.RESET_STATE:
-      return { ...state, appState: state.initialState };
+      return { ...state, appState: { ...state.initialState } };
     default:
       return { ...state };
   }

src/tagging/stories/tagging.stories.js

@@ -34,8 +34,8 @@ const singleTags = [
   },
 ];
 const assignedTags = [{ tagCategory: { description: 'Name', id: 1 }, tagValues: [{ description: 'Pepa', id: 11 }] }];
-const selectedTagCategory = 'animal';
-const selectedTagValue = 'pig';
+const selectedTagCategory = {};
+const selectedTagValue = {};
 const defaultState = { tags, assignedTags };
 const defaultStateSingle = { singleTags, assignedTags };
 const store = createStore(taggingApp);
@@ -53,6 +53,8 @@ storiesOf('Tagging', module)
     selectedTagCategory={selectedTagCategory}
     selectedTagValue={selectedTagValue}
   />));
+
+
 storiesOf('Tagging', module)
   .add('Simple Tagging', () => <Provider store={store}><TaggingConnected /></Provider>);
 storiesOf('Tagging', module)

src/tagging/tests/__snapshots__/tag.category.test.js.snap

@@ -13,12 +13,7 @@ exports[`TagCategory Component match snapshot 1`] = `
     className="tag"
   >
     <span
-      className="label label-primary"
-      style={
-        Object {
-          "color": "defaultColor",
-        }
-      }
+      className="tagColor label label-primary"
     >
       duck
       <a
@@ -42,12 +37,7 @@ exports[`TagCategory Component match snapshot 1`] = `
     className="tag"
   >
     <span
-      className="label label-primary"
-      style={
-        Object {
-          "color": "defaultColor",
-        }
-      }
+      className="tagColor label label-primary"
     >
       lion
       <a