Chore/kill yalc with fire (#629)

* init * more shifting * Move @babel dependencies up to workspace root * Begin updating dependent libraries to use sync'd webpack builds w/ watches * Commit changes before a long weekend * Split packages into platform and extensions * Consolidate how/where we specify file/module type entrypoints * Make it possible to pass in extensions as App props * Resolve viewer's modules * Target for UMD bundle * Add Webpack Stylus loader * Provide WebPack build options for microscopy, vtk, and ui * Better entrypoint for extensions * Push changes up to switch PCs * Fix ESM symlink build for Viewers * Shift docs to root * Specify additional lerna config props * Begin providing basic readme info * Rename example extension folder * Shift links to bottom of doc * First attempt at a netlify deploy preview * Attempt to fix deploy preview build * push workspace enabled to initial command; remove second yarn install; use npx to call gitbook cli commands * Try to use global gitbook-cli * Export node_modules path * More agressive with modifying PATH * Follow deploy log output advice * try again to set bin path * Try swapping bash with a new shell * Try bash -l instead of exec bash * Annd let's try again * and again * We may have figured it out johnny, boy * We need to pull cornerstone-wado-image-loader files from hoisted node_modules * Attempt to fix ticks/escapes * Change copy syntax; try running tests on viewers from root for circleci * Lower version to match circleci image * Try alternative jest-canvas-mock location and version file syntax * Run version command instead of calling node directly * Try alternative jest transform * Set path and enable workspaces * Add codecov flags * Use cpx so our copying finishes? * Get all platform unit tests to run * Run and report individually and in parallel * Try once relying on codecov yaml to split w/ flags * Add projects to split by flags * Generate separate reports * Trigger codecov after everything has finished running; these may not support flags * Use recommended flags from issue comments for codecov * Fix typo * Remove clear flag * Shift back to calling codecov from root * Generate example for codecov issue * Try fixing paths * Simplify * Try using codecov orb * Bump circleci version * Upload core and viewer * Use full string paths * Remove individual codecov calls * Fix dir * Combine files before upload * Escape anchors * tryfix syntax * Escape string literal * Combine lines to reduce path * long paths * Use home alias * Fix filename * Try to see the contents of our cat'd file * Also upload `core` * Try running with aliased folder * Fix path; split PR and Merge unit tests into separate jobs * Set default threshold * Fix typo * Changing to scoped package names * Adding note * Catch more updates * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.0 - @ohif/extension-dicom-html@0.0.4-alpha.0 - @ohif/extension-dicom-microscopy@0.0.9-alpha.0 - @ohif/extension-dicom-pdf@0.0.8-alpha.0 - @ohif/extension-vtk@0.1.4-alpha.0 - @ohif/core@0.11.1-alpha.0 - @ohif/i18n@0.2.3-alpha.0 - @ohif/ui@0.2.18-alpha.0 - @ohif/viewer@0.0.22-alpha.0 * Clean up primary readme * Support for dev and dev:* commands * Shift build command; satisfy default PWA build * Remove old scripts * Clean up UI to set webpack scripts * Tidy up project links * Clean duplicate code in UI project * Update UI project's docs * Clean up ui and i18n config * Reduce duplicate code in `@ohif/core` * Fix @ohif/ui versions * bump @ohif/core versions * Redux testkit dep * Remove unused/duplicate config files for projects/packages * ohif-core --> @ohif/core * Safer publish command * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.1 - @ohif/extension-dicom-html@0.0.4-alpha.1 - @ohif/extension-dicom-microscopy@0.0.9-alpha.1 - @ohif/extension-dicom-pdf@0.0.8-alpha.1 - @ohif/extension-vtk@0.1.4-alpha.1 - @ohif/core@0.11.1-alpha.1 - @ohif/i18n@0.2.3-alpha.1 - @ohif/ui@0.2.18-alpha.1 - @ohif/viewer@0.0.22-alpha.1 * test version bump * Add global prettier config * chore(release): publish %s [skip ci] - @ohif/viewer@0.0.22-alpha.2 * test lerna publish * Update package.jsons * Fix build scripts * catch changes * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.2 - @ohif/extension-dicom-html@0.0.4-alpha.2 - @ohif/extension-dicom-microscopy@0.0.9-alpha.2 - @ohif/extension-dicom-pdf@0.0.8-alpha.2 - @ohif/extension-vtk@0.1.4-alpha.2 - @ohif/core@0.11.1-alpha.2 - @ohif/i18n@0.2.3-alpha.2 - @ohif/ui@0.2.18-alpha.2 - @ohif/viewer@0.0.22-alpha.3 * fix eslint issues caused by eslint 6 and our react-app config * Publish with canary tag * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.3 - @ohif/extension-dicom-html@0.0.4-alpha.3 - @ohif/extension-dicom-microscopy@0.0.9-alpha.3 - @ohif/extension-dicom-pdf@0.0.8-alpha.3 - @ohif/extension-vtk@0.1.4-alpha.3 - @ohif/core@0.11.1-alpha.3 - @ohif/i18n@0.2.3-alpha.3 - @ohif/ui@0.2.18-alpha.3 - @ohif/viewer@0.0.22-alpha.4 * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.4 - @ohif/extension-dicom-html@0.0.4-alpha.4 - @ohif/extension-dicom-microscopy@0.0.9-alpha.4 - @ohif/extension-dicom-pdf@0.0.8-alpha.4 - @ohif/extension-vtk@0.1.4-alpha.4 - @ohif/core@0.11.1-alpha.4 - @ohif/i18n@0.2.3-alpha.4 - @ohif/ui@0.2.18-alpha.4 - @ohif/viewer@0.0.22-alpha.5 * Simplify build * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.5 - @ohif/extension-dicom-html@0.0.4-alpha.5 - @ohif/extension-dicom-microscopy@0.0.9-alpha.5 - @ohif/extension-dicom-pdf@0.0.8-alpha.5 - @ohif/extension-vtk@0.1.4-alpha.5 - @ohif/core@0.11.1-alpha.5 - @ohif/i18n@0.2.3-alpha.5 - @ohif/ui@0.2.18-alpha.5 - @ohif/viewer@0.0.22-alpha.6 * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.6 - @ohif/extension-dicom-html@0.0.4-alpha.6 - @ohif/extension-dicom-microscopy@0.0.9-alpha.6 - @ohif/extension-dicom-pdf@0.0.8-alpha.6 - @ohif/extension-vtk@0.1.4-alpha.6 - @ohif/core@0.11.1-alpha.6 - @ohif/i18n@0.2.3-alpha.6 - @ohif/ui@0.2.18-alpha.6 - @ohif/viewer@0.0.22-alpha.7 * Split version and publish * chore(release): publish %s [skip ci] - @ohif/extension-cornerstone@0.0.39-alpha.7 - @ohif/extension-dicom-html@0.0.4-alpha.7 - @ohif/extension-dicom-microscopy@0.0.9-alpha.7 - @ohif/extension-dicom-pdf@0.0.8-alpha.7 - @ohif/extension-vtk@0.1.4-alpha.7 - @ohif/core@0.11.1-alpha.7 - @ohif/i18n@0.2.3-alpha.7 - @ohif/ui@0.2.18-alpha.7 - @ohif/viewer@0.0.22-alpha.8 * Try simplify netlify build * react-viewerbase --> @ohif/ui * add test for stylus loader * Try new way to specify publish path * Use an output folder that won't be ignored * Try move command * fiddle with paths * Dig for some information * Make sure we're in root for our commands * Remove discovery * Setup script-tag example * Fix typo * Move config folder * Update cornerstone extension to use shared/root webpack configs * capture changes * Update extension webpack configs * Don't check in docz output * Fix babel runtime resolution issue * Simplify ui build steps * Push in progress * Shift directories * Get viewer dev path to work * Fix viewer commonjs build * Fix build pwa config for viewers * Make sure our package specific command can be called from root * Update notes * Fix imports and misc. merge notes * Bump wado-image-loader version * Switch up commands to remove webworkers copy * Fix CI config * Fix more broken package references * Add react-dropzone * Persist so e2e test can use * Fix lockfile * Use cypress orb to simplify CI * Fix config * Try again * Install yarn latest for orb * Install yarn a different way * Wait on correct port * Run tests in viewer project * Fix cypress config * Make Cypress happier - use default location * Simplify e2e testing * Capture UI changes since fork * Catch core up * Grab latest deps after merge * Fix broken import * Make sure cornerstone-wado-image-loader resolves to 3+ * Note regarding orbs * Fix refresh on 404 routes * Fix odd error for cornerstone-wado-image-loader * Different target for UMD * Simplify dev script * Try to get fancy with netlify output * Let's do it again * Try to fix measurementTools issue * See if we can get our lerna magic to work on merge to monorepo branch
2019-08-13 15:36:46 -04:00
1 parent cac911f08e
commit 08ff214ea6
@@ -0,0 +1,250 @@
+import './ToolbarRow.css';
+
+import React, { Component } from 'react';
+import {
+  ExpandableToolMenu,
+  RoundedButtonGroup,
+  ToolbarButton,
+} from '@ohif/ui';
+import { commandsManager, extensionManager } from './../App.js';
+
+import ConnectedCineDialog from './ConnectedCineDialog';
+import ConnectedLayoutButton from './ConnectedLayoutButton';
+import ConnectedPluginSwitch from './ConnectedPluginSwitch.js';
+import { MODULE_TYPES } from '@ohif/core';
+import PropTypes from 'prop-types';
+import { withTranslation } from 'react-i18next';
+
+class ToolbarRow extends Component {
+  // TODO: Simplify these? isOpen can be computed if we say "any" value for selected,
+  // closed if selected is null/undefined
+  static propTypes = {
+    isLeftSidePanelOpen: PropTypes.bool.isRequired,
+    isRightSidePanelOpen: PropTypes.bool.isRequired,
+    selectedLeftSidePanel: PropTypes.string.isRequired,
+    selectedRightSidePanel: PropTypes.string.isRequired,
+    handleSidePanelChange: PropTypes.func,
+    activeContexts: PropTypes.arrayOf(PropTypes.string).isRequired,
+  };
+
+  constructor(props) {
+    super(props);
+
+    const toolbarButtonDefinitions = _getVisibleToolbarButtons.call(this);
+    // TODO:
+    // If it's a tool that can be active... Mark it as active?
+    // - Tools that are on/off?
+    // - Tools that can be bound to multiple buttons?
+
+    // Normal ToolbarButtons...
+    // Just how high do we need to hoist this state?
+    // Why ToolbarRow instead of just Toolbar? Do we have any others?
+    this.state = {
+      toolbarButtons: toolbarButtonDefinitions,
+      activeButtons: [],
+      isCineDialogOpen: false,
+    };
+
+    this._handleBuiltIn = _handleBuiltIn.bind(this);
+
+    const panelModules = extensionManager.modules[MODULE_TYPES.PANEL];
+    this.buttonGroups = {
+      left: [
+        // TODO: This should come from extensions, instead of being baked in
+        {
+          value: 'studies',
+          icon: 'th-large',
+          bottomLabel: this.props.t('Series'),
+        },
+      ],
+      right: [],
+    };
+
+    panelModules.forEach(panelExtension => {
+      const panelModule = panelExtension.module;
+      const defaultContexts = Array.from(panelModule.defaultContext);
+
+      // MENU OPTIONS
+      panelModule.menuOptions.forEach(menuOption => {
+        const contexts = Array.from(menuOption.context || defaultContexts);
+
+        const activeContextIncludesAnyPanelContexts = this.props.activeContexts.some(
+          actx => contexts.includes(actx)
+        );
+        if (activeContextIncludesAnyPanelContexts) {
+          const menuOptionEntry = {
+            value: menuOption.target,
+            icon: menuOption.icon,
+            bottomLabel: menuOption.label,
+          };
+          const from = menuOption.from || 'right';
+
+          this.buttonGroups[from].push(menuOptionEntry);
+        }
+      });
+    });
+  }
+
+  componentDidUpdate(prevProps) {
+    const activeContextsChanged =
+      prevProps.activeContexts !== this.props.activeContexts;
+
+    if (activeContextsChanged) {
+      this.setState({
+        toolbarButtons: _getVisibleToolbarButtons.call(this),
+      });
+    }
+  }
+
+  render() {
+    const buttonComponents = _getButtonComponents.call(
+      this,
+      this.state.toolbarButtons,
+      this.state.activeButtons
+    );
+
+    const cineDialogContainerStyle = {
+      display: this.state.isCineDialogOpen ? 'block' : 'none',
+      position: 'absolute',
+      top: '82px',
+      zIndex: 999,
+    };
+
+    const onPress = (side, value) => {
+      this.props.handleSidePanelChange(side, value);
+    };
+    const onPressLeft = onPress.bind(this, 'left');
+    const onPressRight = onPress.bind(this, 'right');
+
+    return (
+      <>
+        <div className="ToolbarRow">
+          <div className="pull-left m-t-1 p-y-1" style={{ padding: '10px' }}>
+            <RoundedButtonGroup
+              options={this.buttonGroups.left}
+              value={this.props.selectedLeftSidePanel || ''}
+              onValueChanged={onPressLeft}
+            />
+          </div>
+          {buttonComponents}
+          <ConnectedLayoutButton />
+          <ConnectedPluginSwitch />
+          <div
+            className="pull-right m-t-1 rm-x-1"
+            style={{ marginLeft: 'auto' }}
+          >
+            {this.buttonGroups.right.length && (
+              <RoundedButtonGroup
+                options={this.buttonGroups.right}
+                value={this.props.selectedRightSidePanel || ''}
+                onValueChanged={onPressRight}
+              />
+            )}
+          </div>
+        </div>
+        <div className="CineDialogContainer" style={cineDialogContainerStyle}>
+          <ConnectedCineDialog />
+        </div>
+      </>
+    );
+  }
+}
+
+/**
+ * Determine which extension buttons should be showing, if they're
+ * active, and what their onClick behavior should be.
+ */
+function _getButtonComponents(toolbarButtons, activeButtons) {
+  return toolbarButtons.map((button, index) => {
+    let activeCommand = undefined;
+
+    if (button.buttons && button.buttons.length) {
+      // Iterate over button definitions and update `onClick` behavior
+      const childButtons = button.buttons.map(childButton => {
+        childButton.onClick = _handleToolbarButtonClick.bind(this, childButton);
+
+        if (activeButtons.indexOf(childButton.id) > -1) {
+          activeCommand = childButton.id;
+        }
+
+        return childButton;
+      });
+
+      return (
+        <ExpandableToolMenu
+          key={button.id}
+          text={button.label}
+          icon={button.icon}
+          buttons={childButtons}
+          activeCommand={activeCommand}
+        />
+      );
+    }
+    return (
+      <ToolbarButton
+        key={button.id}
+        label={button.label}
+        icon={button.icon}
+        onClick={_handleToolbarButtonClick.bind(this, button)}
+        isActive={activeButtons.includes(button.id)}
+      />
+    );
+  });
+}
+
+/**
+ * A handy way for us to handle different button types. IE. firing commands for
+ * buttons, or initiation built in behavior.
+ *
+ * @param {*} button
+ * @param {*} evt
+ * @param {*} props
+ */
+function _handleToolbarButtonClick(button, evt, props) {
+  if (button.commandName) {
+    const options = Object.assign({ evt }, button.commandOptions);
+    commandsManager.runCommand(button.commandName, options);
+  }
+
+  // TODO: Use Types ENUM
+  // TODO: We can update this to be a `getter` on the extension to query
+  //       For the active tools after we apply our updates?
+  if (button.type === 'setToolActive') {
+    this.setState({
+      activeButtons: [button.id],
+    });
+  } else if (button.type === 'builtIn') {
+    this._handleBuiltIn(button.options);
+  }
+}
+
+/**
+ *
+ */
+function _getVisibleToolbarButtons() {
+  const toolbarModules = extensionManager.modules[MODULE_TYPES.TOOLBAR];
+  const toolbarButtonDefinitions = [];
+
+  toolbarModules.forEach(extension => {
+    const { definitions, defaultContext } = extension.module;
+    definitions.forEach(definition => {
+      const context = definition.context || defaultContext;
+
+      if (this.props.activeContexts.includes(context)) {
+        toolbarButtonDefinitions.push(definition);
+      }
+    });
+  });
+
+  return toolbarButtonDefinitions;
+}
+
+function _handleBuiltIn({ behavior } = {}) {
+  if (behavior === 'CINE') {
+    this.setState({
+      isCineDialogOpen: !this.state.isCineDialogOpen,
+    });
+  }
+}
+
+export default withTranslation('Common')(ToolbarRow);