goblin-desktop 2.0.13 → 2.0.16

package/.editorconfig

@@ -1,9 +1,9 @@
-root = true
-
-[*.{js,jsx,json}]
-indent_style = space
-indent_size = 2
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-max_line_length = 80
+root = true
+
+[*.{js,jsx,json}]
+indent_style = space
+indent_size = 2
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+max_line_length = 80

package/.eslintrc.js

@@ -1,28 +1,28 @@
-'use strict';
-
-module.exports = {
-  root: true,
-  parserOptions: {
-    ecmaVersion: 7,
-    sourceType: 'module',
-    ecmaFeatures: {
-      jsx: true,
-    },
-  },
-  env: {
-    browser: true,
-    mocha: true,
-    node: true,
-    es6: true,
-  },
-  parser: 'babel-eslint',
-  plugins: ['react', 'babel'],
-  extends: ['prettier', 'eslint:recommended', 'plugin:react/recommended'],
-  rules: {
-    // Other rules
-    'no-console': 'off',
-    'valid-jsdoc': ['error', {requireReturn: false}],
-    'eqeqeq': 'error',
-    'react/display-name': 'off',
-  },
-};
+'use strict';
+
+module.exports = {
+  root: true,
+  parserOptions: {
+    ecmaVersion: 7,
+    sourceType: 'module',
+    ecmaFeatures: {
+      jsx: true,
+    },
+  },
+  env: {
+    browser: true,
+    mocha: true,
+    node: true,
+    es6: true,
+  },
+  parser: 'babel-eslint',
+  plugins: ['react', 'babel'],
+  extends: ['prettier', 'eslint:recommended', 'plugin:react/recommended'],
+  rules: {
+    // Other rules
+    'no-console': 'off',
+    'valid-jsdoc': ['error', {requireReturn: false}],
+    'eqeqeq': 'error',
+    'react/display-name': 'off',
+  },
+};

package/.zou-flow

@@ -0,0 +1,3 @@
+[update-version]
+	freezed = true
+	package-json = package.json

package/builders/builders.js

@@ -1,3 +1,3 @@
-module.exports = {
-  buildWizard: require('./wizard.js'),
-};
+module.exports = {
+  buildWizard: require('./wizard.js'),
+};

package/builders/wizard.js

@@ -42,6 +42,7 @@ module.exports = (config) => {
   const wizardSteps = Object.keys(steps);
   const wizardFlow = ['init'].concat(wizardSteps);
   const hinterIdsByName = {};
+  const hinterWidgetIdsByName = {};
   // Define logic handlers according rc.json
   const logicHandlers = {
     'create': (state, action) => {
@@ -177,7 +178,9 @@ module.exports = (config) => {
         }
         if (quest.hasAPI(`${hName}-hinter`)) {
           const id = `${hName}-hinter@${h}@${quest.goblin.id}`;
+          const widgetId = `hinter@${hName}@${quest.goblin.id}`;
           hinterIdsByName[h] = id;
+          hinterWidgetIdsByName[h] = widgetId;
           quest.create(
             `${hName}-hinter`,
             {
@@ -398,8 +401,8 @@ module.exports = (config) => {
     type,
     withDetail = true
   ) {
-    const hinterId = hinterIdsByName[type];
-    const hinterAPI = quest.getAPI(hinterId).noThrow();
+    const hinterWidgetId = hinterWidgetIdsByName[type];
+    const hinterAPI = quest.getAPI(hinterWidgetId).noThrow();
     yield hinterAPI.show();
     if (withDetail) {
       yield hinterAPI.showDetail();
@@ -418,12 +421,12 @@ module.exports = (config) => {
     type,
     entityId
   ) {
-    const hinterId = hinterIdsByName[type];
+    const hinterWidgetId = hinterWidgetIdsByName[type];
     const deskAPI = quest.getAPI(quest.getDesktop()).noThrow();
     yield deskAPI.setDetail({
-      hinterId,
+      hinterId: hinterWidgetId,
     });
-    const hinterAPI = quest.getAPI(hinterId).noThrow();
+    const hinterAPI = quest.getAPI(hinterWidgetId).noThrow();
     yield hinterAPI.setCurrentDetailEntity({entityId});
   });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "goblin-desktop",
-  "version": "2.0.13",
+  "version": "2.0.16",
   "description": "Goblin Desktop",
   "main": "./builders/builders.js",
   "scripts": {

package/widgets/desktop/reducer.js

@@ -1,35 +1,35 @@
-//T:2019-02-27
-import {fromJS} from 'immutable';
-
-const initialState = fromJS({
-  showPrompt: false,
-  widgetsCache: {},
-});
-
-const WIDGETS_CACHE_LIMIT = 128;
-
-export default (state = initialState, action = {}) => {
-  switch (action.type) {
-    case 'TOGGLEPROMPT': {
-      return state.set('showPrompt', !state.get('showPrompt'));
-    }
-
-    /* Limited cache in size to store values for some widgets like for example
-     * the ScrollableContainer. Because this cache is limited, it's possible
-     * to lose the data at any time.
-     */
-    case 'WIDGET_CACHE': {
-      const id = action.widgetId;
-      if (state.has(`widgetsCache.${id}`)) {
-        return state.set(`widgetsCache.${id}`, action.value);
-      }
-      let widgetsCache = state.get('widgetsCache');
-      if (widgetsCache.size >= WIDGETS_CACHE_LIMIT) {
-        const _id = widgetsCache.keySeq().first();
-        state = state.del(`widgetsCache.${_id}`);
-      }
-      return state.set(`widgetsCache.${id}`, action.value);
-    }
-  }
-  return state;
-};
+//T:2019-02-27
+import {fromJS} from 'immutable';
+
+const initialState = fromJS({
+  showPrompt: false,
+  widgetsCache: {},
+});
+
+const WIDGETS_CACHE_LIMIT = 128;
+
+export default (state = initialState, action = {}) => {
+  switch (action.type) {
+    case 'TOGGLEPROMPT': {
+      return state.set('showPrompt', !state.get('showPrompt'));
+    }
+
+    /* Limited cache in size to store values for some widgets like for example
+     * the ScrollableContainer. Because this cache is limited, it's possible
+     * to lose the data at any time.
+     */
+    case 'WIDGET_CACHE': {
+      const id = action.widgetId;
+      if (state.has(`widgetsCache.${id}`)) {
+        return state.set(`widgetsCache.${id}`, action.value);
+      }
+      let widgetsCache = state.get('widgetsCache');
+      if (widgetsCache.size >= WIDGETS_CACHE_LIMIT) {
+        const _id = widgetsCache.keySeq().first();
+        state = state.del(`widgetsCache.${_id}`);
+      }
+      return state.set(`widgetsCache.${id}`, action.value);
+    }
+  }
+  return state;
+};

package/widgets/desktop/service.js

@@ -2,7 +2,6 @@
 
 const path = require('path');
 const Goblin = require('xcraft-core-goblin');
-const {v4: uuidV4} = require('uuid');
 const watt = require('gigawatts');
 const goblinName = path.basename(module.parent.filename, '.js');
 const StringBuilder = require('goblin-nabu/lib/string-builder.js');
@@ -530,7 +529,7 @@ Goblin.registerQuest(goblinName, 'add-notification', function (
   broadcast
 ) {
   if (!notificationId) {
-    notificationId = uuidV4();
+    notificationId = quest.uuidV4();
   }
 
   message = StringBuilder.combine(message);

package/widgets/desktop-monitors/widget.js

@@ -217,11 +217,9 @@ class DesktopMonitors extends Widget {
         </RetroPanel>
       );
     } else {
-      let glyph = 'light/square';
-      let glyphColor = this.context.theme.palette.buttonDisableText;
+      let glyphColor = null; // default
       if (this.props.isActive) {
-        glyph = 'solid/square';
-        glyphColor = '#0f0';
+        glyphColor = '#0f0'; // green
       }
 
       return (
@@ -230,8 +228,9 @@ class DesktopMonitors extends Widget {
             kind="button-footer"
             width="140px"
             justify="start"
-            glyph={glyph}
+            glyph="light/monitor-heart-rate"
             glyphColor={glyphColor}
+            active={this.showMonitor}
             text={T('Activité')}
             onClick={this.onMonitor}
           />

package/widgets/desktop-notebook/widget.js

@@ -218,7 +218,6 @@ class DesktopNotebook extends Widget {
       );
     } else {
       let glyph = 'solid/pen';
-      let glyphColor = this.context.theme.palette.buttonDisableText;
 
       return (
         <>
@@ -227,8 +226,8 @@ class DesktopNotebook extends Widget {
             width="140px"
             justify="start"
             glyph={glyph}
-            glyphColor={glyphColor}
             text={T('Notes')}
+            active={this.showMonitor}
             onClick={this.onMonitor}
           />
         </>

package/widgets/desktop-state-monitor/widget.js

@@ -91,7 +91,7 @@ class DesktopStateMonitor extends Widget {
           kind="button-footer"
           width="120px"
           glyph="light/radar"
-          glyphColor={this.props.showed ? '#0f0' : null}
+          active={this.props.showed}
           text={T('State')}
           onClick={this.onToggleStateMonitor}
         />

package/widgets/detail/compensator.js

@@ -1,17 +1,17 @@
-//T:2019-02-27
-
-export default (state, action = {}) => {
-  //Pre compensate loading
-  if (action.type === 'set-loading') {
-    return state.set('loading', true);
-  }
-  //Pre compensate loading
-  if (action.type === 'set-entity') {
-    if (state.get('entityId') !== action.data.entityId) {
-      return state.set('loading', true);
-    } else {
-      return state.set('loading', false);
-    }
-  }
-  return state;
-};
+//T:2019-02-27
+
+export default (state, action = {}) => {
+  //Pre compensate loading
+  if (action.type === 'set-loading') {
+    return state.set('loading', true);
+  }
+  //Pre compensate loading
+  if (action.type === 'set-entity') {
+    if (state.get('entityId') !== action.data.entityId) {
+      return state.set('loading', true);
+    } else {
+      return state.set('loading', false);
+    }
+  }
+  return state;
+};

package/widgets/entity-list/styles.js

@@ -1,66 +1,66 @@
-/******************************************************************************/
-
-export default function styles() {
-  const full = {
-    margin: '0px',
-    padding: '0px',
-    overflowX: 'hidden',
-    overflowY: 'hidden',
-    flexGrow: '1',
-    display: 'flex',
-    flexDirection: 'column',
-    backgroundColor: 'white',
-  };
-
-  const toolbar = {
-    margin: '20px',
-  };
-
-  const list = {
-    width: '100%',
-    height: '100%',
-    overflowX: 'auto',
-    overflowY: 'hidden',
-    display: 'flex',
-    flexDirection: 'column',
-    flexGrow: '1',
-  };
-
-  const content = {
-    height: '100%',
-    overflowX: 'hidden',
-    overflowY: 'hidden',
-    display: 'flex',
-    flexDirection: 'column',
-    flexGrow: '1',
-  };
-
-  const header = {
-    minHeight: '24px',
-    padding: '0px 36px 0px 16px',
-    borderBottom: '1px solid #888',
-    display: 'flex',
-    flexDirection: 'row',
-    flexGrow: '1',
-  };
-
-  const rows = {
-    height: '100%',
-    overflowX: 'hidden',
-    overflowY: 'auto',
-    display: 'flex',
-    flexDirection: 'column',
-    flexGrow: '1',
-  };
-
-  return {
-    full,
-    toolbar,
-    list,
-    content,
-    header,
-    rows,
-  };
-}
-
-/******************************************************************************/
+/******************************************************************************/
+
+export default function styles() {
+  const full = {
+    margin: '0px',
+    padding: '0px',
+    overflowX: 'hidden',
+    overflowY: 'hidden',
+    flexGrow: '1',
+    display: 'flex',
+    flexDirection: 'column',
+    backgroundColor: 'white',
+  };
+
+  const toolbar = {
+    margin: '20px',
+  };
+
+  const list = {
+    width: '100%',
+    height: '100%',
+    overflowX: 'auto',
+    overflowY: 'hidden',
+    display: 'flex',
+    flexDirection: 'column',
+    flexGrow: '1',
+  };
+
+  const content = {
+    height: '100%',
+    overflowX: 'hidden',
+    overflowY: 'hidden',
+    display: 'flex',
+    flexDirection: 'column',
+    flexGrow: '1',
+  };
+
+  const header = {
+    minHeight: '24px',
+    padding: '0px 36px 0px 16px',
+    borderBottom: '1px solid #888',
+    display: 'flex',
+    flexDirection: 'row',
+    flexGrow: '1',
+  };
+
+  const rows = {
+    height: '100%',
+    overflowX: 'hidden',
+    overflowY: 'auto',
+    display: 'flex',
+    flexDirection: 'column',
+    flexGrow: '1',
+  };
+
+  return {
+    full,
+    toolbar,
+    list,
+    content,
+    header,
+    rows,
+  };
+}
+
+/******************************************************************************/

package/widgets/main-tab-menu/styles.js

@@ -1,17 +1,17 @@
-/******************************************************************************/
-
-export default function styles() {
-  const contentStyle = {
-    position: 'relative',
-    display: 'flex',
-    flexGrow: '1',
-    flexBasis: '0',
-    flexShrink: '1',
-  };
-
-  return {
-    content: contentStyle,
-  };
-}
-
-/******************************************************************************/
+/******************************************************************************/
+
+export default function styles() {
+  const contentStyle = {
+    position: 'relative',
+    display: 'flex',
+    flexGrow: '1',
+    flexBasis: '0',
+    flexShrink: '1',
+  };
+
+  return {
+    content: contentStyle,
+  };
+}
+
+/******************************************************************************/

package/widgets/monitor/reducer.js

@@ -1,15 +1,15 @@
-//T:2019-02-27
-
-import Shredder from 'xcraft-core-shredder';
-
-const initialState = new Shredder({
-  enabled: false,
-});
-
-export default (state = initialState, action) => {
-  switch (action.type) {
-    case 'TOGGLE': {
-      return state.set('enabled', !state.get('enabled'));
-    }
-  }
-};
+//T:2019-02-27
+
+import Shredder from 'xcraft-core-shredder';
+
+const initialState = new Shredder({
+  enabled: false,
+});
+
+export default (state = initialState, action) => {
+  switch (action.type) {
+    case 'TOGGLE': {
+      return state.set('enabled', !state.get('enabled'));
+    }
+  }
+};

package/widgets/plugin/reducer.js

@@ -1,19 +1,19 @@
-//T:2019-02-27
-
-import Shredder from 'xcraft-core-shredder';
-
-const initialState = new Shredder({
-  extendedId: null,
-});
-
-export default (state = initialState, action) => {
-  switch (action.type) {
-    case 'TOGGLE_EXTENDED': {
-      const current = state.get('extendedId');
-      if (current === action.entityId) {
-        return state.set('extendedId', null);
-      }
-      return state.set('extendedId', action.entityId);
-    }
-  }
-};
+//T:2019-02-27
+
+import Shredder from 'xcraft-core-shredder';
+
+const initialState = new Shredder({
+  extendedId: null,
+});
+
+export default (state = initialState, action) => {
+  switch (action.type) {
+    case 'TOGGLE_EXTENDED': {
+      const current = state.get('extendedId');
+      if (current === action.entityId) {
+        return state.set('extendedId', null);
+      }
+      return state.set('extendedId', action.entityId);
+    }
+  }
+};

package/widgets/widget-doc-caller/reducer.js

@@ -1,15 +1,15 @@
-//T:2019-02-27
-
-import Shredder from 'xcraft-core-shredder';
-
-const initialState = new Shredder({
-  enabled: false,
-});
-
-export default (state = initialState, action) => {
-  switch (action.type) {
-    case 'TOGGLE': {
-      return state.set('enabled', !state.get('enabled'));
-    }
-  }
-};
+//T:2019-02-27
+
+import Shredder from 'xcraft-core-shredder';
+
+const initialState = new Shredder({
+  enabled: false,
+});
+
+export default (state = initialState, action) => {
+  switch (action.type) {
+    case 'TOGGLE': {
+      return state.set('enabled', !state.get('enabled'));
+    }
+  }
+};

package/widgets/widget-doc-caller/styles.js

@@ -1,20 +1,20 @@
-/******************************************************************************/
-
-export default function styles(theme) {
-  const fullScreen = {
-    position: 'fixed',
-    left: 0,
-    right: 0,
-    bottom: 0,
-    top: 0,
-    zIndex: 10,
-    display: 'flex',
-    backgroundColor: theme.palette.rootBackground,
-  };
-
-  return {
-    fullScreen,
-  };
-}
-
-/******************************************************************************/
+/******************************************************************************/
+
+export default function styles(theme) {
+  const fullScreen = {
+    position: 'fixed',
+    left: 0,
+    right: 0,
+    bottom: 0,
+    top: 0,
+    zIndex: 10,
+    display: 'flex',
+    backgroundColor: theme.palette.rootBackground,
+  };
+
+  return {
+    fullScreen,
+  };
+}
+
+/******************************************************************************/