goblin-desktop 2.0.0 → 2.0.2

package/widgets/taskbar/service.js

@@ -1,99 +1,99 @@
-'use strict';
-//T:2019-02-27
-
-const Goblin = require('xcraft-core-goblin');
-const goblinName = 'taskbar';
-const {v4: uuidV4} = require('uuid');
-const confConfig = require('xcraft-core-etc')().load('goblin-configurator');
-
-// Define initial logic values
-const logicState = {};
-// Define logic handlers according rc.json
-const logicHandlers = {
-  create: (state, action) => {
-    const id = action.get('id');
-    return state.set('', {
-      id: id,
-    });
-  },
-};
-
-// Register quest's according rc.json
-
-Goblin.registerQuest(goblinName, 'create', function (quest, desktopId) {
-  quest.goblin.setX('desktopId', desktopId);
-  quest.do();
-  return quest.goblin.id;
-});
-
-Goblin.registerQuest(goblinName, 'change-mandate', function (quest) {
-  quest.evt(`mandate.changed`);
-});
-
-Goblin.registerQuest(goblinName, 'delete', function (quest) {
-  quest.log.info('deleting tasks...');
-});
-
-Goblin.registerQuest(goblinName, 'run-app', function* (quest, app) {
-  if (!app.mainGoblin) {
-    throw new Error('missing mainGoblin in app definition');
-  }
-  if (!app.rootWidget) {
-    app.rootWidget = 'desktop';
-  }
-
-  const desktopId = quest.goblin.getX('desktopId');
-  const desk = quest.getAPI(desktopId);
-  const sameOriginConfig = yield desk.getConfiguration();
-  const labId = yield desk.getLabId();
-
-  if (app.mandate) {
-    //change mandate
-    //TODO: security -> use app whitelist
-    //it's possible to open an app to another mandate...
-    //not secure in multi-tenant configuration
-    sameOriginConfig.mandate = app.mandate;
-  }
-
-  const username = yield desk.getUserInfo();
-  const newDesktopSessionId = `desktop@${app.mandate}@${username}`;
-  quest.evt(`<${labId}>.open-session-requested`, {
-    desktopId: newDesktopSessionId,
-    session: newDesktopSessionId,
-    username: username,
-    rootWidget: app.rootWidget,
-    configuration: sameOriginConfig,
-    mainGoblin: app.mainGoblin,
-  });
-  return;
-});
-
-Goblin.registerQuest(goblinName, 'run-workitem', function* (
-  quest,
-  workitem,
-  contextId,
-  clientSessionId
-) {
-  const desk = quest.getAPI(quest.goblin.getX('desktopId'));
-
-  workitem.id = uuidV4();
-  workitem.isDone = false;
-  workitem.contextId = contextId;
-  return yield desk.addWorkitem({
-    workitem,
-    clientSessionId,
-    navigate: true,
-  });
-});
-
-Goblin.registerQuest(goblinName, 'run-client-quest', function* (
-  quest,
-  clientSessionId,
-  clientQuest
-) {
-  const deskAPI = quest.getAPI(quest.goblin.getX('desktopId'));
-  yield deskAPI.runClientQuest({clientSessionId, ...clientQuest});
-});
-
-// Create a Goblin with initial state and handlers
-module.exports = Goblin.configure(goblinName, logicState, logicHandlers);
+'use strict';
+//T:2019-02-27
+
+const Goblin = require('xcraft-core-goblin');
+const goblinName = 'taskbar';
+const {v4: uuidV4} = require('uuid');
+const confConfig = require('xcraft-core-etc')().load('goblin-configurator');
+
+// Define initial logic values
+const logicState = {};
+// Define logic handlers according rc.json
+const logicHandlers = {
+  create: (state, action) => {
+    const id = action.get('id');
+    return state.set('', {
+      id: id,
+    });
+  },
+};
+
+// Register quest's according rc.json
+
+Goblin.registerQuest(goblinName, 'create', function (quest, desktopId) {
+  quest.goblin.setX('desktopId', desktopId);
+  quest.do();
+  return quest.goblin.id;
+});
+
+Goblin.registerQuest(goblinName, 'change-mandate', function (quest) {
+  quest.evt(`mandate.changed`);
+});
+
+Goblin.registerQuest(goblinName, 'delete', function (quest) {
+  quest.log.info('deleting tasks...');
+});
+
+Goblin.registerQuest(goblinName, 'run-app', function* (quest, app) {
+  if (!app.mainGoblin) {
+    throw new Error('missing mainGoblin in app definition');
+  }
+  if (!app.rootWidget) {
+    app.rootWidget = 'desktop';
+  }
+
+  const desktopId = quest.goblin.getX('desktopId');
+  const desk = quest.getAPI(desktopId);
+  const sameOriginConfig = yield desk.getConfiguration();
+  const labId = yield desk.getLabId();
+
+  if (app.mandate) {
+    //change mandate
+    //TODO: security -> use app whitelist
+    //it's possible to open an app to another mandate...
+    //not secure in multi-tenant configuration
+    sameOriginConfig.mandate = app.mandate;
+  }
+
+  const username = yield desk.getUserInfo();
+  const newDesktopSessionId = `desktop@${app.mandate}@${username}`;
+  quest.evt(`<${labId}>.open-session-requested`, {
+    desktopId: newDesktopSessionId,
+    session: newDesktopSessionId,
+    username: username,
+    rootWidget: app.rootWidget,
+    configuration: sameOriginConfig,
+    mainGoblin: app.mainGoblin,
+  });
+  return;
+});
+
+Goblin.registerQuest(goblinName, 'run-workitem', function* (
+  quest,
+  workitem,
+  contextId,
+  clientSessionId
+) {
+  const desk = quest.getAPI(quest.goblin.getX('desktopId'));
+
+  workitem.id = uuidV4();
+  workitem.isDone = false;
+  workitem.contextId = contextId;
+  return yield desk.addWorkitem({
+    workitem,
+    clientSessionId,
+    navigate: true,
+  });
+});
+
+Goblin.registerQuest(goblinName, 'run-client-quest', function* (
+  quest,
+  clientSessionId,
+  clientQuest
+) {
+  const deskAPI = quest.getAPI(quest.goblin.getX('desktopId'));
+  yield deskAPI.runClientQuest({clientSessionId, ...clientQuest});
+});
+
+// Create a Goblin with initial state and handlers
+module.exports = Goblin.configure(goblinName, logicState, logicHandlers);

package/widgets/taskbar/view.js

@@ -1,24 +1,24 @@
-//T:2019-02-27
-import React from 'react';
-import Widget from 'goblin-laboratory/widgets/widget';
-import Taskbar from 'goblin-desktop/widgets/taskbar/widget';
-
-class TaskbarView extends Widget {
-  constructor() {
-    super(...arguments);
-  }
-
-  render() {
-    const {isDisplayed, context, desktopId} = this.props;
-
-    if (!isDisplayed) {
-      return null;
-    }
-    const WiredTaskbar = Widget.Wired(Taskbar)(
-      `${context}-taskbar@${desktopId}`
-    );
-    return <WiredTaskbar desktopId={desktopId} />;
-  }
-}
-
-export default TaskbarView;
+//T:2019-02-27
+import React from 'react';
+import Widget from 'goblin-laboratory/widgets/widget';
+import Taskbar from 'goblin-desktop/widgets/taskbar/widget';
+
+class TaskbarView extends Widget {
+  constructor() {
+    super(...arguments);
+  }
+
+  render() {
+    const {isDisplayed, context, desktopId} = this.props;
+
+    if (!isDisplayed) {
+      return null;
+    }
+    const WiredTaskbar = Widget.Wired(Taskbar)(
+      `${context}-taskbar@${desktopId}`
+    );
+    return <WiredTaskbar desktopId={desktopId} />;
+  }
+}
+
+export default TaskbarView;

package/widgets/taskbar/widget.js

@@ -1,169 +1,169 @@
-//T:2019-02-27
-import React from 'react';
-import importer from 'goblin_importer';
-import Widget from 'goblin-laboratory/widgets/widget';
-
-import Container from 'goblin-gadgets/widgets/container/widget';
-import Button from 'goblin-gadgets/widgets/button/widget';
-import Separator from 'goblin-gadgets/widgets/separator/widget';
-import SFX from '../audio/sfx.js';
-
-const tasksImporter = importer('tasks');
-class Taskbar extends Widget {
-  constructor() {
-    super(...arguments);
-    this.runApp = this.runApp.bind(this);
-    this.runWorkitem = this.runWorkitem.bind(this);
-  }
-
-  static get wiring() {
-    return {
-      id: 'id',
-    };
-  }
-
-  runApp(app) {
-    this.do('run-app', {
-      app,
-    });
-  }
-
-  runClientQuest(clientQuest) {
-    this.do('run-client-quest', {
-      clientQuest,
-    });
-  }
-
-  runWorkitem(workitem, context) {
-    this.do('run-workitem', {
-      workitem,
-      context,
-    });
-    if (workitem.kind === 'tab') {
-      SFX.tuludu.play();
-    }
-    if (workitem.kind === 'dialog') {
-      SFX.zim.play();
-    }
-  }
-
-  renderButton(context, task, index) {
-    if (task.workitem) {
-      const runWorkitem = () => this.runWorkitem(task.workitem, task.context);
-      return (
-        <Button
-          key={index}
-          kind="task-bar"
-          text={task.text}
-          glyph={task.glyph}
-          tooltip={task.workitem.description}
-          onClick={runWorkitem}
-        />
-      );
-    }
-    if (task.app) {
-      const runApp = () => this.runApp(task.app);
-      return (
-        <Button
-          key={index}
-          kind="task-bar"
-          text={task.text}
-          glyph={task.glyph}
-          tooltip={task.app.description}
-          onClick={runApp}
-        />
-      );
-    }
-    if (task.clientQuest) {
-      const runClientQuest = () =>
-        this.runClientQuest({labId: window.labId, ...task.clientQuest});
-      return (
-        <Button
-          key={index}
-          kind="task-bar"
-          text={task.text}
-          glyph={task.glyph}
-          tooltip={task.clientQuest.description}
-          onClick={runClientQuest}
-        />
-      );
-    }
-  }
-
-  renderSeparator(index) {
-    return <Separator key={index} kind="task" />;
-  }
-
-  render() {
-    const {id, context} = this.props;
-    if (!id) {
-      return null;
-    }
-    const contextTasks = tasksImporter(context);
-    if (!contextTasks) {
-      return null;
-    }
-
-    const navigatingStyle = {
-      height: '100%',
-      display: 'flex',
-      flexDirection: 'column',
-    };
-    if (this.props.working) {
-      navigatingStyle.pointerEvents = 'none';
-    }
-
-    return (
-      <div style={navigatingStyle}>
-        <Container kind="task-bar">
-          {contextTasks.map((task, i) => {
-            let isValidScope = true;
-            if (task.scope) {
-              switch (task.scope) {
-                case 'prototype':
-                  if (!this.props.prototypeMode) {
-                    isValidScope = false;
-                  }
-                  break;
-                case 'dev':
-                  isValidScope = false;
-                  if (
-                    this.props.prototypeMode &&
-                    process &&
-                    process.env &&
-                    process.env.NODE_ENV === 'development'
-                  ) {
-                    isValidScope = true;
-                  }
-                  break;
-                default:
-                  break;
-              }
-            }
-
-            let canDo = true;
-            if (task.workitem) {
-              canDo = this.canDo(`${task.workitem.name}.create`);
-            }
-
-            if (isValidScope && canDo) {
-              if (task.separator) {
-                return this.renderSeparator(i);
-              } else {
-                return this.renderButton(context, task, i);
-              }
-            }
-          })}
-        </Container>
-      </div>
-    );
-  }
-}
-
-export default Widget.connect((state, props) => {
-  const userSession = Widget.getUserSession(state);
-  const prototypeMode = userSession.get('prototypeMode');
-  const working = state.get(`backend.${props.desktopId}.working`);
-  const context = state.get(`backend.${props.desktopId}.current.workcontext`);
-  return {prototypeMode, working, context};
-})(Taskbar);
+//T:2019-02-27
+import React from 'react';
+import importer from 'goblin_importer';
+import Widget from 'goblin-laboratory/widgets/widget';
+
+import Container from 'goblin-gadgets/widgets/container/widget';
+import Button from 'goblin-gadgets/widgets/button/widget';
+import Separator from 'goblin-gadgets/widgets/separator/widget';
+import SFX from '../audio/sfx.js';
+
+const tasksImporter = importer('tasks');
+class Taskbar extends Widget {
+  constructor() {
+    super(...arguments);
+    this.runApp = this.runApp.bind(this);
+    this.runWorkitem = this.runWorkitem.bind(this);
+  }
+
+  static get wiring() {
+    return {
+      id: 'id',
+    };
+  }
+
+  runApp(app) {
+    this.do('run-app', {
+      app,
+    });
+  }
+
+  runClientQuest(clientQuest) {
+    this.do('run-client-quest', {
+      clientQuest,
+    });
+  }
+
+  runWorkitem(workitem, context) {
+    this.do('run-workitem', {
+      workitem,
+      context,
+    });
+    if (workitem.kind === 'tab') {
+      SFX.tuludu.play();
+    }
+    if (workitem.kind === 'dialog') {
+      SFX.zim.play();
+    }
+  }
+
+  renderButton(context, task, index) {
+    if (task.workitem) {
+      const runWorkitem = () => this.runWorkitem(task.workitem, task.context);
+      return (
+        <Button
+          key={index}
+          kind="task-bar"
+          text={task.text}
+          glyph={task.glyph}
+          tooltip={task.workitem.description}
+          onClick={runWorkitem}
+        />
+      );
+    }
+    if (task.app) {
+      const runApp = () => this.runApp(task.app);
+      return (
+        <Button
+          key={index}
+          kind="task-bar"
+          text={task.text}
+          glyph={task.glyph}
+          tooltip={task.app.description}
+          onClick={runApp}
+        />
+      );
+    }
+    if (task.clientQuest) {
+      const runClientQuest = () =>
+        this.runClientQuest({labId: window.labId, ...task.clientQuest});
+      return (
+        <Button
+          key={index}
+          kind="task-bar"
+          text={task.text}
+          glyph={task.glyph}
+          tooltip={task.clientQuest.description}
+          onClick={runClientQuest}
+        />
+      );
+    }
+  }
+
+  renderSeparator(index) {
+    return <Separator key={index} kind="task" />;
+  }
+
+  render() {
+    const {id, context} = this.props;
+    if (!id) {
+      return null;
+    }
+    const contextTasks = tasksImporter(context);
+    if (!contextTasks) {
+      return null;
+    }
+
+    const navigatingStyle = {
+      height: '100%',
+      display: 'flex',
+      flexDirection: 'column',
+    };
+    if (this.props.working) {
+      navigatingStyle.pointerEvents = 'none';
+    }
+
+    return (
+      <div style={navigatingStyle}>
+        <Container kind="task-bar">
+          {contextTasks.map((task, i) => {
+            let isValidScope = true;
+            if (task.scope) {
+              switch (task.scope) {
+                case 'prototype':
+                  if (!this.props.prototypeMode) {
+                    isValidScope = false;
+                  }
+                  break;
+                case 'dev':
+                  isValidScope = false;
+                  if (
+                    this.props.prototypeMode &&
+                    process &&
+                    process.env &&
+                    process.env.NODE_ENV === 'development'
+                  ) {
+                    isValidScope = true;
+                  }
+                  break;
+                default:
+                  break;
+              }
+            }
+
+            let canDo = true;
+            if (task.workitem) {
+              canDo = this.canDo(`${task.workitem.name}.create`);
+            }
+
+            if (isValidScope && canDo) {
+              if (task.separator) {
+                return this.renderSeparator(i);
+              } else {
+                return this.renderButton(context, task, i);
+              }
+            }
+          })}
+        </Container>
+      </div>
+    );
+  }
+}
+
+export default Widget.connect((state, props) => {
+  const userSession = Widget.getUserSession(state);
+  const prototypeMode = userSession.get('prototypeMode');
+  const working = state.get(`backend.${props.desktopId}.working`);
+  const context = state.get(`backend.${props.desktopId}.current.workcontext`);
+  return {prototypeMode, working, context};
+})(Taskbar);