goblin-desktop 4.2.0 → 4.2.2

package/widgets/desktop-window/widget.js

@@ -1,70 +1,70 @@
-import React from 'react';
-import Widget from 'goblin-laboratory/widgets/widget';
-import importer from 'goblin_importer';
-import MouseTrap from 'mousetrap';
-import Container from 'goblin-gadgets/widgets/container/widget';
-const viewImporter = importer('view');
-
-class DesktopWindow extends Widget {
-  constructor() {
-    super(...arguments);
-  }
-  //#endregion
-
-  static get wiring() {
-    return {
-      id: 'id',
-      routesMap: 'routes',
-    };
-  }
-
-  render() {
-    const {id, routesMap} = this.props;
-
-    if (!id || !routesMap) {
-      return null;
-    }
-
-    const routes = {
-      '/hinter/': {},
-      '/task-bar/': {},
-      '/top-bar/': {},
-      '/before-content/': {},
-      '/content/': {},
-    };
-
-    Widget.shred(routesMap).select((k, v) => {
-      const ex = /^(\/.[:\-a-z]+\/).*/;
-      const res = ex.exec(v);
-      let mount = '/';
-      if (res) {
-        mount = res[1];
-      }
-      if (routes[mount]) {
-        routes[mount] = {path: v.replace(mount, '/'), component: k};
-      } else {
-        console.warn(`Invalid mount point ${mount} for ${k}`);
-      }
-    });
-
-    const contentView = viewImporter(routes['/content/'].component);
-    const Content = Widget.WithRoute(
-      contentView,
-      ['context', 'view'],
-      ['wid', 'did']
-    )(routes['/content/'].path);
-
-    const contentClass = this.styles.classNames.content;
-
-    return (
-      <Container kind="root">
-        <div className={contentClass}>
-          <Content desktopId={id} />
-        </div>
-      </Container>
-    );
-  }
-}
-
-/******************************************************************************/
-export default Widget.Wired(DesktopWindow);
+import React from 'react';
+import Widget from 'goblin-laboratory/widgets/widget';
+import importer from 'goblin_importer';
+import MouseTrap from 'mousetrap';
+import Container from 'goblin-gadgets/widgets/container/widget';
+const viewImporter = importer('view');
+
+class DesktopWindow extends Widget {
+  constructor() {
+    super(...arguments);
+  }
+  //#endregion
+
+  static get wiring() {
+    return {
+      id: 'id',
+      routesMap: 'routes',
+    };
+  }
+
+  render() {
+    const {id, routesMap} = this.props;
+
+    if (!id || !routesMap) {
+      return null;
+    }
+
+    const routes = {
+      '/hinter/': {},
+      '/task-bar/': {},
+      '/top-bar/': {},
+      '/before-content/': {},
+      '/content/': {},
+    };
+
+    Widget.shred(routesMap).select((k, v) => {
+      const ex = /^(\/.[:\-a-z]+\/).*/;
+      const res = ex.exec(v);
+      let mount = '/';
+      if (res) {
+        mount = res[1];
+      }
+      if (routes[mount]) {
+        routes[mount] = {path: v.replace(mount, '/'), component: k};
+      } else {
+        console.warn(`Invalid mount point ${mount} for ${k}`);
+      }
+    });
+
+    const contentView = viewImporter(routes['/content/'].component);
+    const Content = Widget.WithRoute(
+      contentView,
+      ['context', 'view'],
+      ['wid', 'did']
+    )(routes['/content/'].path);
+
+    const contentClass = this.styles.classNames.content;
+
+    return (
+      <Container kind="root">
+        <div className={contentClass}>
+          <Content desktopId={id} />
+        </div>
+      </Container>
+    );
+  }
+}
+
+/******************************************************************************/
+export default Widget.Wired(DesktopWindow);

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/detail/view.js

@@ -1,40 +1,40 @@
-//T:2019-02-27
-
-import React from 'react';
-import View from 'goblin-laboratory/widgets/view';
-import Detail from 'goblin-desktop/widgets/detail/widget';
-import WithRoute from 'goblin-laboratory/widgets/with-route/with-route.js';
-
-class DetailView extends View {
-  constructor() {
-    super(...arguments);
-  }
-
-  render() {
-    const {isDisplayed, hinter} = this.props;
-    if (!isDisplayed) {
-      return null;
-    }
-
-    let hinterName = hinter;
-    if (hinter.endsWith('-hidden')) {
-      hinterName = hinter.replace('-hidden', '');
-    }
-
-    const hash = this.getHash();
-    const workitemId = hash.split('.')[1];
-    return (
-      <Detail
-        id={`detail@${hinterName}@${workitemId}`}
-        leftPanelWorkitemId={this.props.leftPanelWorkitemId}
-      />
-    );
-  }
-}
-
-export default WithRoute(
-  DetailView,
-  ['context', 'hinter'],
-  null,
-  true
-)('/:context/:view/:hinter');
+//T:2019-02-27
+
+import React from 'react';
+import View from 'goblin-laboratory/widgets/view';
+import Detail from 'goblin-desktop/widgets/detail/widget';
+import WithRoute from 'goblin-laboratory/widgets/with-route/with-route.js';
+
+class DetailView extends View {
+  constructor() {
+    super(...arguments);
+  }
+
+  render() {
+    const {isDisplayed, hinter} = this.props;
+    if (!isDisplayed) {
+      return null;
+    }
+
+    let hinterName = hinter;
+    if (hinter.endsWith('-hidden')) {
+      hinterName = hinter.replace('-hidden', '');
+    }
+
+    const hash = this.getHash();
+    const workitemId = hash.split('.')[1];
+    return (
+      <Detail
+        id={`detail@${hinterName}@${workitemId}`}
+        leftPanelWorkitemId={this.props.leftPanelWorkitemId}
+      />
+    );
+  }
+}
+
+export default WithRoute(
+  DetailView,
+  ['context', 'hinter'],
+  null,
+  true
+)('/:context/:view/:hinter');

package/widgets/detail/widget.js

@@ -1,119 +1,119 @@
-//T:2019-02-27
-
-import React from 'react';
-import Widget from 'goblin-laboratory/widgets/widget';
-import StateLoader from 'goblin-laboratory/widgets/state-loader/widget.js';
-import stateMapperToProps from 'goblin-laboratory/widgets/state-mapper-to-props/widget.js';
-import importer from 'goblin_importer';
-
-import Container from 'goblin-gadgets/widgets/container/widget';
-import Workitem from 'goblin-desktop/widgets/workitem/widget';
-
-const Spinner = () => {
-  return <Container width={'100%'} height={'100%'} busy={true} />;
-};
-const uiImporter = importer('ui');
-
-const WorkitemConnected = Widget.connectBackend((state, props) => {
-  return {buttons: state.get('buttons')};
-})(Workitem);
-
-class Detail extends Widget {
-  constructor() {
-    super(...arguments);
-    this.doProxy = this.doProxy.bind(this);
-  }
-
-  static get wiring() {
-    return {
-      id: 'id',
-      type: 'type',
-      title: 'title',
-      kind: 'kind',
-      width: 'width',
-      detailWidget: 'detailWidget',
-      detailWidgetId: 'detailWidgetId',
-      entityId: 'entityId',
-      loading: 'loading',
-    };
-  }
-
-  doProxy(action, args) {
-    const workitem = this.props.detailWidgetId;
-    this.doFor(workitem, action, args);
-  }
-
-  render() {
-    const {
-      id,
-      kind,
-      customWidth,
-      entityId,
-      detailWidget,
-      detailWidgetId,
-    } = this.props;
-    let {width} = this.props;
-
-    if (!id) {
-      return null;
-    }
-    if (!detailWidget) {
-      return null;
-    }
-    if (!detailWidgetId) {
-      return null;
-    }
-
-    if (!entityId) {
-      return null;
-    }
-
-    const workitemUI = uiImporter(detailWidget);
-
-    const workitemId = detailWidgetId;
-    const mapper =
-      workitemUI.mappers &&
-      workitemUI.mappers.panel &&
-      workitemUI.mappers.panel.readonly;
-    const DetailUI = stateMapperToProps(
-      workitemUI.panel.readonly,
-      mapper,
-      `backend.${entityId}`
-    );
-
-    if (customWidth) {
-      width = customWidth;
-    }
-
-    return (
-      <Container
-        kind="view-right"
-        grow="1"
-        width={width ? width : '800px'}
-        busy={this.props.loading}
-      >
-        <WorkitemConnected
-          kind={kind ? kind : 'detail'}
-          id={workitemId}
-          entityId={entityId}
-          readonly={true}
-          dragServiceId={this.props.dragServiceId}
-          leftPanelWorkitemId={this.props.leftPanelWorkitemId}
-        >
-          <StateLoader path={entityId} FallbackComponent={Spinner}>
-            <DetailUI
-              id={workitemId}
-              theme={this.context.theme}
-              do={this.doProxy}
-              entityId={entityId}
-              entitySchema={this.getSchema(this.props.type)}
-              contextId={this.context.contextId}
-            />
-          </StateLoader>
-        </WorkitemConnected>
-      </Container>
-    );
-  }
-}
-
-export default Widget.Wired(Detail);
+//T:2019-02-27
+
+import React from 'react';
+import Widget from 'goblin-laboratory/widgets/widget';
+import StateLoader from 'goblin-laboratory/widgets/state-loader/widget.js';
+import stateMapperToProps from 'goblin-laboratory/widgets/state-mapper-to-props/widget.js';
+import importer from 'goblin_importer';
+
+import Container from 'goblin-gadgets/widgets/container/widget';
+import Workitem from 'goblin-desktop/widgets/workitem/widget';
+
+const Spinner = () => {
+  return <Container width={'100%'} height={'100%'} busy={true} />;
+};
+const uiImporter = importer('ui');
+
+const WorkitemConnected = Widget.connectBackend((state, props) => {
+  return {buttons: state.get('buttons')};
+})(Workitem);
+
+class Detail extends Widget {
+  constructor() {
+    super(...arguments);
+    this.doProxy = this.doProxy.bind(this);
+  }
+
+  static get wiring() {
+    return {
+      id: 'id',
+      type: 'type',
+      title: 'title',
+      kind: 'kind',
+      width: 'width',
+      detailWidget: 'detailWidget',
+      detailWidgetId: 'detailWidgetId',
+      entityId: 'entityId',
+      loading: 'loading',
+    };
+  }
+
+  doProxy(action, args) {
+    const workitem = this.props.detailWidgetId;
+    this.doFor(workitem, action, args);
+  }
+
+  render() {
+    const {
+      id,
+      kind,
+      customWidth,
+      entityId,
+      detailWidget,
+      detailWidgetId,
+    } = this.props;
+    let {width} = this.props;
+
+    if (!id) {
+      return null;
+    }
+    if (!detailWidget) {
+      return null;
+    }
+    if (!detailWidgetId) {
+      return null;
+    }
+
+    if (!entityId) {
+      return null;
+    }
+
+    const workitemUI = uiImporter(detailWidget);
+
+    const workitemId = detailWidgetId;
+    const mapper =
+      workitemUI.mappers &&
+      workitemUI.mappers.panel &&
+      workitemUI.mappers.panel.readonly;
+    const DetailUI = stateMapperToProps(
+      workitemUI.panel.readonly,
+      mapper,
+      `backend.${entityId}`
+    );
+
+    if (customWidth) {
+      width = customWidth;
+    }
+
+    return (
+      <Container
+        kind="view-right"
+        grow="1"
+        width={width ? width : '800px'}
+        busy={this.props.loading}
+      >
+        <WorkitemConnected
+          kind={kind ? kind : 'detail'}
+          id={workitemId}
+          entityId={entityId}
+          readonly={true}
+          dragServiceId={this.props.dragServiceId}
+          leftPanelWorkitemId={this.props.leftPanelWorkitemId}
+        >
+          <StateLoader path={entityId} FallbackComponent={Spinner}>
+            <DetailUI
+              id={workitemId}
+              theme={this.context.theme}
+              do={this.doProxy}
+              entityId={entityId}
+              entitySchema={this.getSchema(this.props.type)}
+              contextId={this.context.contextId}
+            />
+          </StateLoader>
+        </WorkitemConnected>
+      </Container>
+    );
+  }
+}
+
+export default Widget.Wired(Detail);

package/widgets/editor/widget.js

@@ -1,82 +1,82 @@
-//T:2019-02-27
-import React from 'react';
-import Widget from 'goblin-laboratory/widgets/widget';
-import StateLoader from 'goblin-laboratory/widgets/state-loader/widget';
-import stateMapperToProps from 'goblin-laboratory/widgets/state-mapper-to-props/widget.js';
-import importer from 'goblin_importer';
-import Workitem from 'goblin-desktop/widgets/workitem/widget';
-
-const uiImporter = importer('ui');
-
-const WorkitemConnected = Widget.connectBackend((state, props) => {
-  return {buttons: state.get('buttons')};
-})(Workitem);
-
-class Editor extends Widget {
-  constructor() {
-    super(...arguments);
-    this.doProxy = this.doProxy.bind(this);
-  }
-
-  static get wiring() {
-    return {
-      id: 'id',
-      entityId: 'entityId',
-      firstFieldToFocus: 'firstFieldToFocus',
-      width: 'width',
-    };
-  }
-
-  doProxy(action, args) {
-    const workitem = this.props.id.split('@')[0];
-    this.doAs(workitem, action, args);
-  }
-
-  render() {
-    const {id, entityId, readonly, dragServiceId} = this.props;
-    if (!id) {
-      return null;
-    }
-    if (!entityId) {
-      return null;
-    }
-    const type = entityId.split('@', 1)[0];
-    let defaultPanel = 'edit';
-    if (readonly) {
-      defaultPanel = 'readonly';
-    }
-    const workitem = id.split('@')[0];
-    const workitemUI = uiImporter(workitem);
-    const mapper =
-      workitemUI.mappers &&
-      workitemUI.mappers.panel &&
-      workitemUI.mappers.panel[defaultPanel];
-    const EditorUI = stateMapperToProps(
-      workitemUI.panel[defaultPanel],
-      mapper,
-      `backend.${entityId}`
-    );
-
-    return (
-      <StateLoader path={entityId}>
-        <WorkitemConnected
-          kind="editor"
-          id={id}
-          readonly={readonly || false}
-          entityId={entityId}
-          dragServiceId={dragServiceId}
-        >
-          <EditorUI
-            {...this.props}
-            theme={this.context.theme}
-            do={this.doProxy}
-            entitySchema={this.getSchema(type)}
-            contextId={this.context.contextId}
-          />
-        </WorkitemConnected>
-      </StateLoader>
-    );
-  }
-}
-
-export default Widget.Wired(Editor);
+//T:2019-02-27
+import React from 'react';
+import Widget from 'goblin-laboratory/widgets/widget';
+import StateLoader from 'goblin-laboratory/widgets/state-loader/widget';
+import stateMapperToProps from 'goblin-laboratory/widgets/state-mapper-to-props/widget.js';
+import importer from 'goblin_importer';
+import Workitem from 'goblin-desktop/widgets/workitem/widget';
+
+const uiImporter = importer('ui');
+
+const WorkitemConnected = Widget.connectBackend((state, props) => {
+  return {buttons: state.get('buttons')};
+})(Workitem);
+
+class Editor extends Widget {
+  constructor() {
+    super(...arguments);
+    this.doProxy = this.doProxy.bind(this);
+  }
+
+  static get wiring() {
+    return {
+      id: 'id',
+      entityId: 'entityId',
+      firstFieldToFocus: 'firstFieldToFocus',
+      width: 'width',
+    };
+  }
+
+  doProxy(action, args) {
+    const workitem = this.props.id.split('@')[0];
+    this.doAs(workitem, action, args);
+  }
+
+  render() {
+    const {id, entityId, readonly, dragServiceId} = this.props;
+    if (!id) {
+      return null;
+    }
+    if (!entityId) {
+      return null;
+    }
+    const type = entityId.split('@', 1)[0];
+    let defaultPanel = 'edit';
+    if (readonly) {
+      defaultPanel = 'readonly';
+    }
+    const workitem = id.split('@')[0];
+    const workitemUI = uiImporter(workitem);
+    const mapper =
+      workitemUI.mappers &&
+      workitemUI.mappers.panel &&
+      workitemUI.mappers.panel[defaultPanel];
+    const EditorUI = stateMapperToProps(
+      workitemUI.panel[defaultPanel],
+      mapper,
+      `backend.${entityId}`
+    );
+
+    return (
+      <StateLoader path={entityId}>
+        <WorkitemConnected
+          kind="editor"
+          id={id}
+          readonly={readonly || false}
+          entityId={entityId}
+          dragServiceId={dragServiceId}
+        >
+          <EditorUI
+            {...this.props}
+            theme={this.context.theme}
+            do={this.doProxy}
+            entitySchema={this.getSchema(type)}
+            contextId={this.context.contextId}
+          />
+        </WorkitemConnected>
+      </StateLoader>
+    );
+  }
+}
+
+export default Widget.Wired(Editor);