NOTICKET: Merging OSM/master to OSM/projects

[osm/UI.git] / skyquake / plugins / composer / src / src / components / CatalogPanel.js

diff --git a/skyquake/plugins/composer/src/src/components/CatalogPanel.js b/skyquake/plugins/composer/src/src/components/CatalogPanel.js
index d7ebf0f..6d58c8a 100644 (file)
--- a/skyquake/plugins/composer/src/src/components/CatalogPanel.js
+++ b/skyquake/plugins/composer/src/src/components/CatalogPanel.js
@@ -18,7 +18,7 @@
  */
 'use strict';
 
-import _ from 'lodash'
+import _includes from 'lodash/includes'
 import React from 'react'
 import ReactDOM from 'react-dom'
 import messages from './messages'
@@ -117,7 +117,7 @@ const CatalogPanel = React.createClass({
                const isLoading = this.props.isLoading;
                return (
                        <div className={className} data-resizable="right" data-resizable-handle-offset="0 6" style={{width: this.props.layout.left}}>
-                               <CatalogPanelToolbar />
+                               <CatalogPanelToolbar rbacDisabled={this.props.rbacDisabled} />
                                <div className="CatalogPanelBody">
                                        {(() => {
                                                if (isLoading) {
@@ -167,7 +167,7 @@ const CatalogPanel = React.createClass({
                        uiTransientState.isDrop = false;
                        uiTransientState.isDragging = true;
                        uiTransientState.wasTrayOpen = this.state.isTrayOpen;
-                       uiTransientState.isDraggingFiles = _.includes(e.dataTransfer.types, 'Files');
+                       uiTransientState.isDraggingFiles = _includes(e.dataTransfer.types, 'Files');
                        const dragState = ComposerAppStore.getState().drag || {};
                        if (uiTransientState.isDraggingFiles || (dragState.type === 'catalog-item')) {
                                CatalogPanelTrayActions.open();