Merge pull request #4 from eapearson/master

simplify react state generators

README.md

@@ -6,17 +6,17 @@ This library is a collection of classes, functions, types, and react components
 
 Includes:
 
--   communication libraries for kbase services and dynamic services
--   types for common kbase data objects and apis
--   components and other support files required for plugin integration
+- communication libraries for kbase services and dynamic services
+- types for common kbase data objects and apis
+- components and other support files required for plugin integration
 
 ## Usage
 
 There are many usage scenarios ...
 
--   comm libraries
--   types
--   plugin integration
+- comm libraries
+- types
+- plugin integration
 
 ## Install
 

docs/_config.yml

@@ -0,0 +1,12 @@
+title: KBase UI Lib
+remote_theme: kbaseIncubator/kbase-github-pages-theme
+search_enabled: false
+aux_links: 
+    "KBase UI Lib on Github":
+        - "//github.com/kbaseIncubator/kbase-github-pages-theme"
+    "About KBase":
+        - "//kbase.us/about"
+navigation:
+    menu:
+        - label: Testing
+        - label: Updating npm package

docs/updating-npm-package.md

@@ -0,0 +1,23 @@
+# Updating npm package
+
+## How it WILL work
+
+1. increment the version in package.json
+
+2. push up change to fork
+
+3. issue PR
+
+4. Accept and merge PR
+
+5. The package is published via travis
+
+## How it DOES work
+
+1. increment the version in package.json
+
+2. publish the package:
+
+    ```bash
+    npm publish
+    ```

package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kbase/ui-lib",
-    "version": "0.1.0-alpha.3",
+    "version": "0.1.0-alpha.5",
     "description": "A typescript library to support kbase-ui and plugins",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -62,5 +62,8 @@
         "ts-jest": "24.0.2",
         "jest-transform-css": "2.0.0",
         "typedoc": "0.14.2"
+    },
+    "publishConfig": {
+        "access": "public"
     }
 }

src/index.ts

@@ -8,8 +8,6 @@ export { default as NarrativeJobServiceClient } from './lib/coreServices/Narrati
 export { default as CatalogClient } from './lib/coreServices/Catalog';
 export { AppError } from './redux/store';
 export { default as baseReducer } from './redux/reducers';
-export { BaseStoreState } from './redux/store';
-export { makeAuthStoreInitialState } from './redux/auth/store';
-export { makeIntegrationStoreInitialState } from './redux/integration/store';
+export { BaseStoreState, makeBaseStoreState } from './redux/store';
 export { default as NiceTimeDuration } from './components/NiceTimeDuration';
 export { default as NiceRelativeTime } from './components/NiceRelativeTime';

src/redux/store.ts

@@ -1,8 +1,17 @@
-import { AppStoreState } from './integration/store';
-import { AuthStoreState } from './auth/store';
+import { AppStoreState, makeIntegrationStoreInitialState } from './integration/store';
+import { AuthStoreState, makeAuthStoreInitialState } from './auth/store';
 
 export interface BaseStoreState extends AppStoreState, AuthStoreState {}
 
+export function makeBaseStoreState(): BaseStoreState {
+    const appStore = makeIntegrationStoreInitialState();
+    const authStore = makeAuthStoreInitialState();
+    return {
+        ...appStore,
+        ...authStore
+    };
+}
+
 export interface AppError {
     code: string;
     message: string;