Skip to content

Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.

[Enhancement] order layers by dataset (#1675)

Nikola Karaklic1e8b3c1ae727
diff --git a/src/actions/ui-state-actions.d.ts b/src/actions/ui-state-actions.d.ts
index 4530d15d4..a01c67458 100644
--- a/src/actions/ui-state-actions.d.ts
+++ b/src/actions/ui-state-actions.d.ts
@@ -198,3 +198,11 @@ export type SetLocaleUpdaterAction = {
export function setLocale(
locale: string
): Merge<SetLocaleUpdaterAction, {type: ActionTypes.SET_LOCALE}>;
+
+/** TOGGLE_LAYER_PANEL_LIST_VIEW */
+export type ToggleLayerPanelListViewAction = {
+ payload: string;
+}
+export function toggleLayerPanelListView(
+ listView: string
+): Merge<ToggleLayerPanelListViewAction, {type: ActionTypes.TOGGLE_LAYER_PANEL_LIST_VIEW}>;
diff --git a/src/actions/ui-state-actions.js b/src/actions/ui-state-actions.js
index 3dedab30e..ab200cf99 100644
--- a/src/actions/ui-state-actions.js
+++ b/src/actions/ui-state-actions.js
@@ -270,3 +270,15 @@ export const setLocale = createAction(ActionTypes.SET_LOCALE, locale => ({
// @ts-ignore
const uiStateActions = null;
/* eslint-enable no-unused-vars */
+
+/**
+ * Toggle layer panel list view
+ * @memberof uiStateActions
+ * @param listView layer panel listView value. Can be 'list' or 'sortByDataset'
+ * @type {typeof import('./ui-state-actions').toggleLayerPanelListView}
+ * @public
+ */
+export const toggleLayerPanelListView = createAction(
+ ActionTypes.TOGGLE_LAYER_PANEL_LIST_VIEW,
+ listView => listView
+);
diff --git a/src/actions/vis-state-actions.d.ts b/src/actions/vis-state-actions.d.ts
index ea33b8e07..8b2e3cac0 100644
--- a/src/actions/vis-state-actions.d.ts
+++ b/src/actions/vis-state-actions.d.ts
@@ -157,9 +157,11 @@ export function addFilter(
export type AddLayerUpdaterAction = {
config: object;
+ datasetId?: string;
};
export function addLayer(
- config: object
+ config: object,
+ datasetId?: string,
): Merge<AddLayerUpdaterAction, {type: ActionTypes.ADD_LAYER}>;
export type ReorderLayerUpdaterAction = {
diff --git a/src/actions/vis-state-actions.js b/src/actions/vis-state-actions.js
index 656e9154e..4e11e5aee 100644
--- a/src/actions/vis-state-actions.js
+++ b/src/actions/vis-state-actions.js
@@ -232,14 +232,16 @@ export function addFilter(dataId) {
* Add a new layer
* @memberof visStateActions
* @param config - new layer config
+ * @param datasetId - dataset id used for creating an empty layer
* @returns action
* @type {typeof import('./vis-state-actions').addLayer}
* @public
*/
-export function addLayer(config) {
+export function addLayer(config, datasetId) {
return {
type: ActionTypes.ADD_LAYER,
- config
+ config,
+ datasetId
};
}
diff --git a/src/components/common/icons/index.js b/src/components/common/icons/index.js
index b95212559..5ff0993f9 100644
--- a/src/components/common/icons/index.js
+++ b/src/components/common/icons/index.js
@@ -92,3 +92,5 @@ export {default as Warning} from './warning';
export {default as DrawPolygon} from './draw-polygon';
export {default as Polygon} from './polygon';
export {default as Rectangle} from './rectangle';
+export {default as OrderByList} from './order-by-list';
+export {default as OrderByDataset} from './order-by-dataset';
diff --git a/src/components/common/icons/order-by-dataset.js b/src/components/common/icons/order-by-dataset.js
new file mode 100644
index 000000000..85993b5eb
--- /dev/null
+++ b/src/components/common/icons/order-by-dataset.js
@@ -0,0 +1,35 @@
+import React from 'react';
+import Base from './base';
+import PropTypes from 'prop-types';
+
+const OrderByDataset = props => (
+ <Base {...props}>
+ <path
+ d="M14.7225 13.7778C14.7225 14.1294 14.6183 14.4731 14.4229 14.7655C14.2276 15.0578 13.9499 15.2857 13.6251 15.4202C13.3003 15.5548 12.9428 15.59 12.5979 15.5214C12.2531 15.4528 11.9363 15.2835 11.6877 15.0349C11.4391 14.7862 11.2697 14.4695 11.2012 14.1246C11.1326 13.7798 11.1678 13.4223 11.3023 13.0975C11.4369 12.7726 11.6647 12.495 11.9571 12.2996C12.2494 12.1043 12.5932 12 12.9448 12C13.4163 12 13.8685 12.1873 14.2018 12.5207C14.5352 12.8541 14.7225 13.3063 14.7225 13.7778ZM23.5003 13.7778C23.5003 13.542 23.4067 13.3159 23.24 13.1492C23.0733 12.9825 22.8472 12.8889 22.6114 12.8889H18.2781C18.0424 12.8889 17.8163 12.9825 17.6496 13.1492C17.4829 13.3159 17.3892 13.542 17.3892 13.7778C17.3892 14.0135 17.4829 14.2396 17.6496 14.4063C17.8163 14.573 18.0424 14.6667 18.2781 14.6667H22.6114C22.8472 14.6667 23.0733 14.573 23.24 14.4063C23.4067 14.2396 23.5003 14.0135 23.5003 13.7778ZM12.9448 18.2222C12.5932 18.2222 12.2494 18.3265 11.9571 18.5218C11.6647 18.7172 11.4369 18.9948 11.3023 19.3197C11.1678 19.6445 11.1326 20.002 11.2012 20.3468C11.2697 20.6917 11.4391 21.0085 11.6877 21.2571C11.9363 21.5057 12.2531 21.675 12.5979 21.7436C12.9428 21.8122 13.3003 21.777 13.6251 21.6425C13.9499 21.5079 14.2276 21.28 14.4229 20.9877C14.6183 20.6953 14.7225 20.3516 14.7225 20C14.7225 19.5285 14.5352 19.0763 14.2018 18.7429C13.8685 18.4095 13.4163 18.2222 12.9448 18.2222ZM23.5003 20C23.5003 19.7643 23.4067 19.5382 23.24 19.3715C23.0733 19.2048 22.8472 19.1111 22.6114 19.1111H18.2781C18.0424 19.1111 17.8163 19.2048 17.6496 19.3715C17.4829 19.5382 17.3892 19.7643 17.3892 20C17.3892 20.2357 17.4829 20.4618 17.6496 20.6285C17.8163 20.7952 18.0424 20.8889 18.2781 20.8889H22.6114C22.8472 20.8889 23.0733 20.7952 23.24 20.6285C23.4067 20.4618 23.5003 20.2357 23.5003 20Z"
+ fill={props.fill}
+ />
+ <path
+ d="M6.77778 6C6.42617 6 6.08245 6.10426 5.7901 6.29961C5.49774 6.49495 5.26988 6.7726 5.13533 7.09745C5.00077 7.4223 4.96556 7.77975 5.03416 8.1246C5.10276 8.46946 5.27207 8.78623 5.5207 9.03486C5.76933 9.28348 6.0861 9.4528 6.43095 9.5214C6.77581 9.58999 7.13326 9.55479 7.4581 9.42023C7.78295 9.28567 8.0606 9.05781 8.25595 8.76546C8.45129 8.4731 8.55556 8.12939 8.55556 7.77778C8.55556 7.30628 8.36826 6.8541 8.03486 6.5207C7.70146 6.1873 7.24927 6 6.77778 6ZM23.3333 7.77778C23.3333 7.54203 23.2397 7.31594 23.073 7.14924C22.9063 6.98254 22.6802 6.88889 22.4444 6.88889H12.1111C11.8754 6.88889 11.6493 6.98254 11.4826 7.14924C11.3159 7.31594 11.2222 7.54203 11.2222 7.77778C11.2222 8.01353 11.3159 8.23962 11.4826 8.40632C11.6493 8.57302 11.8754 8.66667 12.1111 8.66667H22.4444C22.6802 8.66667 22.9063 8.57302 23.073 8.40632C23.2397 8.23962 23.3333 8.01353 23.3333 7.77778Z"
+ fill={props.fill}
+ />
+ <path
+ fillRule="evenodd"
+ clipRule="evenodd"
+ d="M7.2998 9H6.2998V19.5V20V20.5H11.2998V19.5H7.2998V14.4H11.4004V13.4H7.2998V9Z"
+ fill={props.fill}
+ />
+ </Base>
+);
+OrderByDataset.propTypes = {
+ /** Set the height of the icon, ex. '16px' */
+ height: PropTypes.string,
+ fill: PropTypes.string
+};
+OrderByDataset.defaultProps = {
+ height: '20px',
+ fill: 'currentColor',
+ viewBox: '0 0 24 24',
+ predefinedClassName: 'data-ex-icons-order-by-dataset'
+};
+
+export default OrderByDataset;
diff --git a/src/components/common/icons/order-by-list.js b/src/components/common/icons/order-by-list.js
new file mode 100644
index 000000000..90acf6b14
--- /dev/null
+++ b/src/components/common/icons/order-by-list.js
@@ -0,0 +1,25 @@
+import React from 'react';
+import Base from './base';
+import PropTypes from 'prop-types';
+
+const OrderByList = props => (
+ <Base {...props}>
+ <path
+ d="M8.55556 14C8.55556 14.3516 8.45129 14.6953 8.25595 14.9877C8.0606 15.28 7.78295 15.5079 7.4581 15.6425C7.13326 15.777 6.77581 15.8122 6.43095 15.7436C6.0861 15.675 5.76933 15.5057 5.5207 15.2571C5.27207 15.0085 5.10276 14.6917 5.03416 14.3468C4.96556 14.002 5.00077 13.6445 5.13533 13.3197C5.26988 12.9948 5.49774 12.7172 5.7901 12.5218C6.08245 12.3265 6.42617 12.2222 6.77778 12.2222C7.24927 12.2222 7.70146 12.4095 8.03486 12.7429C8.36826 13.0763 8.55556 13.5285 8.55556 14ZM23.3333 14C23.3333 13.7643 23.2397 13.5382 23.073 13.3715C22.9063 13.2048 22.6802 13.1111 22.4444 13.1111H12.1111C11.8754 13.1111 11.6493 13.2048 11.4826 13.3715C11.3159 13.5382 11.2222 13.7643 11.2222 14C11.2222 14.2357 11.3159 14.4618 11.4826 14.6285C11.6493 14.7952 11.8754 14.8889 12.1111 14.8889H22.4444C22.6802 14.8889 22.9063 14.7952 23.073 14.6285C23.2397 14.4618 23.3333 14.2357 23.3333 14ZM6.77778 6C6.42617 6 6.08245 6.10426 5.7901 6.29961C5.49774 6.49495 5.26988 6.7726 5.13533 7.09745C5.00077 7.4223 4.96556 7.77975 5.03416 8.1246C5.10276 8.46946 5.27207 8.78623 5.5207 9.03486C5.76933 9.28348 6.0861 9.4528 6.43095 9.5214C6.77581 9.58999 7.13326 9.55479 7.4581 9.42023C7.78295 9.28567 8.0606 9.05781 8.25595 8.76546C8.45129 8.4731 8.55556 8.12939 8.55556 7.77778C8.55556 7.30628 8.36826 6.8541 8.03486 6.5207C7.70146 6.1873 7.24927 6 6.77778 6ZM23.3333 7.77778C23.3333 7.54203 23.2397 7.31594 23.073 7.14924C22.9063 6.98254 22.6802 6.88889 22.4444 6.88889H12.1111C11.8754 6.88889 11.6493 6.98254 11.4826 7.14924C11.3159 7.31594 11.2222 7.54203 11.2222 7.77778C11.2222 8.01353 11.3159 8.23962 11.4826 8.40632C11.6493 8.57302 11.8754 8.66667 12.1111 8.66667H22.4444C22.6802 8.66667 22.9063 8.57302 23.073 8.40632C23.2397 8.23962 23.3333 8.01353 23.3333 7.77778ZM6.77778 18.4444C6.42617 18.4444 6.08245 18.5487 5.7901 18.7441C5.49774 18.9394 5.26988 19.217 5.13533 19.5419C5.00077 19.8667 4.96556 20.2242 5.03416 20.569C5.10276 20.9139 5.27207 21.2307 5.5207 21.4793C5.76933 21.7279 6.0861 21.8972 6.43095 21.9658C6.77581 22.0344 7.13326 21.9992 7.4581 21.8647C7.78295 21.7301 8.0606 21.5023 8.25595 21.2099C8.45129 20.9175 8.55556 20.5738 8.55556 20.2222C8.55556 19.7507 8.36826 19.2985 8.03486 18.9651C7.70146 18.6317 7.24927 18.4444 6.77778 18.4444ZM23.3333 20.2222C23.3333 19.9865 23.2397 19.7604 23.073 19.5937C22.9063 19.427 22.6802 19.3333 22.4444 19.3333H12.1111C11.8754 19.3333 11.6493 19.427 11.4826 19.5937C11.3159 19.7604 11.2222 19.9865 11.2222 20.2222C11.2222 20.458 11.3159 20.6841 11.4826 20.8508C11.6493 21.0175 11.8754 21.1111 12.1111 21.1111H22.4444C22.6802 21.1111 22.9063 21.0175 23.073 20.8508C23.2397 20.6841 23.3333 20.458 23.3333 20.2222Z"
+ fill={props.fill}
+ />
+ </Base>
+);
+OrderByList.propTypes = {
+ /** Set the height of the icon, ex. '16px' */
+ height: PropTypes.string,
+ fill: PropTypes.string
+};
+OrderByList.defaultProps = {
+ height: '20px',
+ fill: 'currentColor',
+ viewBox: '0 0 24 24',
+ predefinedClassName: 'data-ex-icons-order-by-list'
+};
+
+export default OrderByList;
diff --git a/src/components/index.js b/src/components/index.js
index 82a808fd7..b24959d10 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -59,12 +59,20 @@ export {CollapseButtonFactory, default as SidebarFactory} from './side-panel/sid
export {default as PanelToggleFactory} from './side-panel/panel-toggle';
export {default as PanelTabFactory} from './side-panel/panel-tab';
-export {AddDataButtonFactory, default as LayerManagerFactory} from './side-panel/layer-manager';
+export {default as LayerManagerFactory} from './side-panel/layer-manager';
export {default as LayerPanelFactory} from './side-panel/layer-panel/layer-panel';
export {default as LayerPanelHeaderFactory} from './side-panel/layer-panel/layer-panel-header';
export {default as LayerConfiguratorFactory} from './side-panel/layer-panel/layer-configurator';
export {default as TextLabelPanelFactory} from './side-panel/layer-panel/text-label-panel';
export {LayerConfigGroupLabelFactory} from './side-panel/layer-panel/layer-config-group';
+export {
+ AddDataButtonFactory,
+ default as DatasetSectionFactory
+} from './side-panel/layer-panel/dataset-section';
+export {default as DatasetLayerSectionFactory} from './side-panel/layer-panel/dataset-layer-section';
+export {default as DatasetLayerGroupFactory} from './side-panel/layer-panel/dataset-layer-group';
+export {default as PanelViewListToggleFactory} from './side-panel/layer-panel/panel-view-list-toggle';
+export {default as AddLayerButtonFactory} from './side-panel/layer-panel/add-layer-button';
export {default as LayerListFactory} from './side-panel/layer-panel/layer-list';
export {default as SourceDataCatalogFactory} from './side-panel/common/source-data-catalog';
diff --git a/src/components/side-panel.js b/src/components/side-panel.js
index e1eeae631..a90f25d7d 100644
--- a/src/components/side-panel.js
+++ b/src/components/side-panel.js
@@ -212,9 +212,11 @@ export default function SidePanelFactory(
/>
<StyledSidePanelContent className="side-panel__content">
<div className="side-panel__content__inner">
- <PanelTitle className="side-panel__content__title">
- <FormattedMessage id={currentPanel.label} />
- </PanelTitle>
+ {currentPanel.id !== 'layer' ? (
+ <PanelTitle className="side-panel__content__title">
+ <FormattedMessage id={currentPanel.label} />
+ </PanelTitle>
+ ) : null}
{PanelComponent ? (
<PanelComponent
datasets={datasets}
@@ -234,6 +236,8 @@ export default function SidePanelFactory(
showAddMapStyleModal={onShowAddMapStyleModal}
uiStateActions={uiStateActions}
visStateActions={visStateActions}
+ panelMetadata={currentPanel}
+ layerPanelListView={currentPanel.id === 'layer' && uiState.layerPanelListView}
/>
) : null}
<CustomPanels {...customPanelProps} activeSidePanel={activeSidePanel} />
diff --git a/src/components/side-panel/layer-manager.js b/src/components/side-panel/layer-manager.js
index 947a82a7c..b96972cb5 100644
--- a/src/components/side-panel/layer-manager.js
+++ b/src/components/side-panel/layer-manager.js
@@ -23,20 +23,29 @@ import React, {Component, useCallback} from 'react';
import PropTypes from 'prop-types';
import {injectIntl} from 'react-intl';
import {FormattedMessage} from 'localization';
+import styled from 'styled-components';
-import SourceDataCatalogFactory from './common/source-data-catalog';
import LayerListFactory from './layer-panel/layer-list';
-import {Add} from 'components/common/icons';
+import DatasetLayerGroupFactory from './layer-panel/dataset-layer-group';
+import PanelViewListToggleFactory from './layer-panel/panel-view-list-toggle';
+import PanelTitleFactory from './panel-title';
+import DatasetSectionFactory from './layer-panel/dataset-section';
+import AddLayerButtonFactory from './layer-panel/add-layer-button';
+
import ItemSelector from 'components/common/item-selector/item-selector';
-import {
- Button,
- PanelLabel,
- SidePanelDivider,
- SidePanelSection
-} from 'components/common/styled-components';
+import {PanelLabel, SidePanelDivider, SidePanelSection} from 'components/common/styled-components';
import {LAYER_BLENDINGS} from 'constants/default-settings';
+const LayerHeader = styled.div.attrs({
+ className: 'layer-manager-header'
+})`
+ display: flex;
+ justify-content: space-between;
+ align-items: flex-start;
+ margin-top: 16px;
+`;
+
const LayerBlendingSelector = ({layerBlending, updateLayerBlending, intl}) => {
const labeledLayerBlendings = Object.keys(LAYER_BLENDINGS).reduce(
(acc, current) => ({
@@ -67,26 +76,23 @@ const LayerBlendingSelector = ({layerBlending, updateLayerBlending, intl}) => {
);
};
-export function AddDataButtonFactory() {
- const AddDataButton = ({onClick, isInactive}) => (
- <Button
- className="add-data-button"
- onClick={onClick}
- isInactive={!isInactive}
- width="105px"
- secondary
- >
- <Add height="12px" />
- <FormattedMessage id={'layerManager.addData'} />
- </Button>
- );
-
- return AddDataButton;
-}
-
-LayerManagerFactory.deps = [AddDataButtonFactory, LayerListFactory, SourceDataCatalogFactory];
-
-function LayerManagerFactory(AddDataButton, LayerList, SourceDataCatalog) {
+LayerManagerFactory.deps = [
+ LayerListFactory,
+ DatasetLayerGroupFactory,
+ PanelViewListToggleFactory,
+ PanelTitleFactory,
+ DatasetSectionFactory,
+ AddLayerButtonFactory
+];
+
+function LayerManagerFactory(
+ LayerList,
+ DatasetLayerGroup,
+ PanelViewListToggle,
+ PanelTitle,
+ DatasetSection,
+ AddLayerButton
+) {
class LayerManager extends Component {
static propTypes = {
datasets: PropTypes.object.isRequired,
@@ -100,9 +106,14 @@ function LayerManagerFactory(AddDataButton, LayerList, SourceDataCatalog) {
updateTableColor: PropTypes.func.isRequired
};
- _addEmptyNewLayer = () => {
+ _addEmptyNewLayer = dataset => {
const {visStateActions} = this.props;
- visStateActions.addLayer();
+ visStateActions.addLayer(undefined, dataset);
+ };
+
+ _toggleLayerPanelListView = listView => {
+ const {uiStateActions} = this.props;
+ uiStateActions.toggleLayerPanelListView(listView);
};
render() {
@@ -116,39 +127,72 @@ function LayerManagerFactory(AddDataButton, LayerList, SourceDataCatalog) {
showDatasetTable,
removeDataset,
uiStateActions,
- visStateActions
+ visStateActions,
+ layerPanelListView,
+ panelMetadata
} = this.props;
const defaultDataset = Object.keys(datasets)[0];
+ const isSortByDatasetMode = layerPanelListView === 'sortByDataset';
return (
<div className="layer-manager">
- <SourceDataCatalog
+ <SidePanelSection>
+ <PanelViewListToggle
+ toggleLayerPanelListView={this._toggleLayerPanelListView}
+ layerPanelListViewMode={layerPanelListView}
+ />
+ </SidePanelSection>
+ <DatasetSection
datasets={datasets}
showDatasetTable={showDatasetTable}
updateTableColor={updateTableColor}
removeDataset={removeDataset}
showDeleteDataset
+ showDatasetList={!isSortByDatasetMode}
+ showAddDataModal={showAddDataModal}
+ defaultDataset={defaultDataset}
/>
- <AddDataButton onClick={showAddDataModal} isInactive={!defaultDataset} />
<SidePanelDivider />
<SidePanelSection>
- <LayerList
- layers={layers}
- datasets={datasets}
- layerOrder={layerOrder}
- uiStateActions={uiStateActions}
- visStateActions={visStateActions}
- layerClasses={this.props.layerClasses}
- />
+ <LayerHeader>
+ <PanelTitle className="layer-manager-title">
+ <FormattedMessage id={panelMetadata.label} />
+ </PanelTitle>
+ {defaultDataset ? (
+ <AddLayerButton
+ datasets={datasets}
+ typeaheadPlaceholder="Search datasets"
+ intl={intl}
+ onOptionSelected={this._addEmptyNewLayer}
+ />
+ ) : null}
+ </LayerHeader>
</SidePanelSection>
<SidePanelSection>
- {defaultDataset ? (
- <Button className="add-layer-button" onClick={this._addEmptyNewLayer} width="105px">
- <Add height="12px" />
- <FormattedMessage id={'layerManager.addLayer'} />
- </Button>
- ) : null}
+ {isSortByDatasetMode ? (
+ <DatasetLayerGroup
+ datasets={datasets}
+ showDatasetTable={showDatasetTable}
+ layers={layers}
+ updateTableColor={updateTableColor}
+ removeDataset={removeDataset}
+ layerOrder={layerOrder}
+ layerClasses={this.props.layerClasses}
+ uiStateActions={uiStateActions}
+ visStateActions={visStateActions}
+ showDeleteDataset
+ />
+ ) : (
+ <LayerList
+ layers={layers}
+ datasets={datasets}
+ layerOrder={layerOrder}
+ uiStateActions={uiStateActions}
+ visStateActions={visStateActions}
+ layerClasses={this.props.layerClasses}
+ />
+ )}
</SidePanelSection>
<LayerBlendingSelector
layerBlending={this.props.layerBlending}
diff --git a/src/components/side-panel/layer-panel/add-layer-button.d.ts b/src/components/side-panel/layer-panel/add-layer-button.d.ts
new file mode 100644
index 000000000..74983620a
--- /dev/null
+++ b/src/components/side-panel/layer-panel/add-layer-button.d.ts
@@ -0,0 +1,12 @@
+import React from 'react';
+import {Datasets} from 'reducers/vis-state-updaters';
+import {IntlShape} from 'react-intl';
+
+export type AddLayerButtonProps = {
+ datasets: Datasets;
+ onOptionSelected: (dataset) => {};
+ typeaheadPlaceholder?: string;
+ intl: IntlShape;
+};
+
+export default function AddLayerButtonFactory(): React.Component<AddLayerButtonProps>;
diff --git a/src/components/side-panel/layer-panel/add-layer-button.js b/src/components/side-panel/layer-panel/add-layer-button.js
new file mode 100644
index 000000000..a1aa746d9
--- /dev/null
+++ b/src/components/side-panel/layer-panel/add-layer-button.js
@@ -0,0 +1,201 @@
+// Copyright (c) 2021 Uber Technologies, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+import React, {useCallback, useMemo, useState} from 'react';
+import styled from 'styled-components';
+import {FormattedMessage} from 'localization';
+
+import Tippy from '@tippyjs/react';
+import {Add} from 'components/common/icons';
+import {Button} from 'components/common/styled-components';
+import {DatasetSquare} from 'components';
+import Typeahead from 'components/common/item-selector/typeahead';
+import Accessor from 'components/common/item-selector/accessor';
+
+const DropdownContainer = styled.div.attrs({
+ className: 'add-layer-menu-dropdown'
+})`
+ .list-selector {
+ border-top: 1px solid ${props => props.theme.secondaryInputBorderColor};
+ width: 100%;
+ /* disable scrolling, currently set to 280px internally */
+ max-height: unset;
+ }
+
+ .list__item > div {
+ display: flex;
+ flex-direction: row;
+ justify-content: flex-start;
+ line-height: 18px;
+ padding: 0;
+
+ svg {
+ margin-right: 10px;
+ }
+ }
+`;
+
+const AddLayerMenu = styled.div.attrs({
+ className: 'add-layer-menu'
+})`
+ display: flex;
+ flex-direction: column;
+ min-width: 240px;
+ max-width: 240px;
+ position: absolute;
+ top: 100%;
+ left: -53px;
+ z-index: 5;
+`;
+
+const ListItemWrapper = styled.div.attrs({
+ className: 'add-layer-menu-list-item-wrapper'
+})`
+ display: flex;
+ color: ${props => props.theme.textColor};
+ font-size: 11px;
+ letter-spacing: 0.2px;
+ overflow: auto;
+
+ .dataset-color {
+ flex-shrink: 0;
+ margin-top: 3px;
+ }
+
+ .dataset-name {
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ }
+`;
+
+const TYPEAHEAD_CLASS = 'typeahead';
+const TYPEAHEAD_INPUT_CLASS = 'typeahead__input';
+
+function AddLayerButtonFactory() {
+ const ListItem = ({value}) => (
+ <ListItemWrapper>
+ <DatasetSquare className="dataset-color" color={value.color} />
+ <div className="dataset-name" title={value.label}>
+ {value.label}
+ </div>
+ </ListItemWrapper>
+ );
+
+ const AddLayerButton = props => {
+ const {datasets, onOptionSelected, typeaheadPlaceholder, intl} = props;
+ const [showAddLayerDropdown, setShowAddLayerDropdown] = useState(false);
+
+ const toggleAddLayerDropdown = useCallback(() => {
+ setShowAddLayerDropdown(!showAddLayerDropdown);
+ }, [showAddLayerDropdown, setShowAddLayerDropdown]);
+
+ const _onBlur = useCallback(() => {
+ setShowAddLayerDropdown(false);
+ }, []);
+
+ const toggleSelectedOption = useCallback(
+ option => {
+ onOptionSelected(option.value);
+ _onBlur();
+ },
+ [onOptionSelected, _onBlur]
+ );
+
+ const onButtonBlur = useCallback(
+ event => {
+ if (
+ [TYPEAHEAD_CLASS, TYPEAHEAD_INPUT_CLASS].every(
+ cls => !event?.relatedTarget?.classList.contains(cls)
+ )
+ ) {
+ _onBlur();
+ }
+ },
+ [_onBlur]
+ );
+
+ const onSearchBlur = useCallback(() => {
+ _onBlur();
+ }, [_onBlur]);
+
+ const options = useMemo(() => {
+ return Object.values(datasets).map(ds => ({
+ label: ds.label,
+ value: ds.id,
+ color: ds.color
+ }));
+ }, [datasets]);
+
+ return (
+ <Tippy
+ visible={showAddLayerDropdown}
+ arrow={false}
+ interactive
+ placement="bottom"
+ appendTo="parent"
+ duration={0}
+ content={
+ <AddLayerMenu>
+ <DropdownContainer>
+ <Typeahead
+ onBlur={onSearchBlur}
+ className={TYPEAHEAD_CLASS}
+ customClasses={{
+ results: 'list-selector',
+ input: TYPEAHEAD_INPUT_CLASS,
+ listItem: 'list__item'
+ }}
+ placeholder={
+ typeaheadPlaceholder || intl
+ ? intl.formatMessage({id: 'placeholder.search'})
+ : 'Search'
+ }
+ selectedItems={null}
+ options={options}
+ displayOption={Accessor.generateOptionToStringFor('label')}
+ getOptionValue={'value'}
+ filterOption={'label'}
+ searchable
+ onOptionSelected={toggleSelectedOption}
+ customListItemComponent={ListItem}
+ />
+ </DropdownContainer>
+ </AddLayerMenu>
+ }
+ >
+ <Button
+ tabIndex={-1}
+ onBlur={onButtonBlur}
+ className="add-layer-button"
+ width="105px"
+ onClick={toggleAddLayerDropdown}
+ >
+ <Add height="12px" />
+ <FormattedMessage id={'layerManager.addLayer'} />
+ </Button>
+ </Tippy>
+ );
+ };
+
+ return AddLayerButton;
+}
+
+export default AddLayerButtonFactory;
diff --git a/src/components/side-panel/layer-panel/dataset-layer-group.js b/src/components/side-panel/layer-panel/dataset-layer-group.js
new file mode 100644
index 000000000..75a96f960
--- /dev/null
+++ b/src/components/side-panel/layer-panel/dataset-layer-group.js
@@ -0,0 +1,55 @@
+import React, {useMemo} from 'react';
+
+import DatasetLayerSectionFactory from './dataset-layer-section';
+
+DatasetLayerGroupFactory.deps = [DatasetLayerSectionFactory];
+
+function DatasetLayerGroupFactory(DatasetLayerSection) {
+ const DatasetLayerGroup = props => {
+ const {
+ datasets,
+ showDatasetTable,
+ layers,
+ updateTableColor,
+ showDeleteDataset,
+ removeDataset,
+ layerOrder,
+ layerClasses,
+ uiStateActions,
+ visStateActions
+ } = props;
+
+ const datasetLayerSectionData = useMemo(() => {
+ return Object.values(datasets).map(dataset => {
+ // Global layer order will contain the correct order of layers
+ // We just empty the positions in layers array (for each dataset)
+ // where the layer doesn't belong to a dataset and set it to null
+ const datasetLayers = layers.map(layer =>
+ layer.config.dataId === dataset.id ? layer : null
+ );
+
+ return {dataset, datasetLayers};
+ });
+ }, [datasets, layers]);
+
+ return datasetLayerSectionData.map(dlsData => (
+ <DatasetLayerSection
+ key={dlsData.dataset.id}
+ dataset={dlsData.dataset}
+ layers={dlsData.datasetLayers}
+ showDatasetTable={showDatasetTable}
+ updateTableColor={updateTableColor}
+ showDeleteDataset={showDeleteDataset}
+ removeDataset={removeDataset}
+ layerOrder={layerOrder}
+ layerClasses={layerClasses}
+ uiStateActions={uiStateActions}
+ visStateActions={visStateActions}
+ />
+ ));
+ };
+
+ return DatasetLayerGroup;
+}
+
+export default DatasetLayerGroupFactory;
diff --git a/src/components/side-panel/layer-panel/dataset-layer-section.js b/src/components/side-panel/layer-panel/dataset-layer-section.js
new file mode 100644
index 000000000..d733ba34a
--- /dev/null
+++ b/src/components/side-panel/layer-panel/dataset-layer-section.js
@@ -0,0 +1,59 @@
+import React, {useMemo} from 'react';
+import styled from 'styled-components';
+
+import SourceDataCatalogFactory from '../common/source-data-catalog';
+import LayerListFactory from './layer-list';
+
+const DatasetLayerSectionWrapper = styled.div.attrs({
+ className: 'dataset-layer-section'
+})`
+ margin-bottom: 16px;
+`;
+
+DatasetLayerSectionFactory.deps = [SourceDataCatalogFactory, LayerListFactory];
+
+function DatasetLayerSectionFactory(SourceDataCatalog, LayerList) {
+ const DatasetLayerSection = props => {
+ const {
+ dataset,
+ showDatasetTable,
+ layers,
+ updateTableColor,
+ showDeleteDataset,
+ removeDataset,
+ layerOrder,
+ layerClasses,
+ uiStateActions,
+ visStateActions
+ } = props;
+
+ const datasets = useMemo(() => {
+ return {[dataset.id]: dataset};
+ }, [dataset]);
+
+ return (
+ <DatasetLayerSectionWrapper>
+ <SourceDataCatalog
+ datasets={datasets}
+ showDatasetTable={showDatasetTable}
+ updateTableColor={updateTableColor}
+ removeDataset={removeDataset}
+ showDeleteDataset={showDeleteDataset}
+ />
+ <LayerList
+ datasets={datasets}
+ layerOrder={layerOrder}
+ layers={layers}
+ layerClasses={layerClasses}
+ uiStateActions={uiStateActions}
+ visStateActions={visStateActions}
+ isSortable={false}
+ />
+ </DatasetLayerSectionWrapper>
+ );
+ };
+
+ return DatasetLayerSection;
+}
+
+export default DatasetLayerSectionFactory;
diff --git a/src/components/side-panel/layer-panel/dataset-section.js b/src/components/side-panel/layer-panel/dataset-section.js
new file mode 100644
index 000000000..a01e34a72
--- /dev/null
+++ b/src/components/side-panel/layer-panel/dataset-section.js
@@ -0,0 +1,81 @@
+import React from 'react';
+import styled from 'styled-components';
+import {FormattedMessage} from 'localization';
+import {Add} from 'components/common/icons';
+import {Button} from 'components/common/styled-components';
+
+import SourceDataCatalogFactory from '../common/source-data-catalog';
+
+const StyledDatasetTitle = styled.div`
+ line-height: ${props => props.theme.sidePanelTitleLineHeight};
+ font-weight: 400;
+ letter-spacing: 1.25px;
+ color: ${props => props.theme.subtextColor};
+ font-size: 11px;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ margin-bottom: ${props => (props.showDatasetList ? '16px' : '4px')};
+`;
+
+const StyledDatasetSection = styled.div`
+ margin: 0 -32px 0 -16px;
+ padding: 0 32px 0 16px;
+ border-bottom: 1px solid ${props => props.theme.sidePanelBorderColor};
+`;
+
+export function AddDataButtonFactory() {
+ const AddDataButton = ({onClick, isInactive}) => (
+ <Button
+ className="add-data-button"
+ onClick={onClick}
+ isInactive={!isInactive}
+ width="105px"
+ secondary
+ >
+ <Add height="12px" />
+ <FormattedMessage id={'layerManager.addData'} />
+ </Button>
+ );
+
+ return AddDataButton;
+}
+
+DatasetSectionFactory.deps = [SourceDataCatalogFactory, AddDataButtonFactory];
+
+function DatasetSectionFactory(SourceDataCatalog, AddDataButton) {
+ const DatasetSection = props => {
+ const {
+ datasets,
+ showDatasetTable,
+ updateTableColor,
+ showDeleteDataset,
+ removeDataset,
+ showDatasetList,
+ showAddDataModal,
+ defaultDataset
+ } = props;
+ const datasetCount = Object.keys(datasets).length;
+ return (
+ <StyledDatasetSection>
+ <StyledDatasetTitle showDatasetList={showDatasetList}>
+ <span>Datasets ({datasetCount})</span>
+ <AddDataButton onClick={showAddDataModal} isInactive={!defaultDataset} />
+ </StyledDatasetTitle>
+ {showDatasetList && (
+ <SourceDataCatalog
+ datasets={datasets}
+ showDatasetTable={showDatasetTable}
+ updateTableColor={updateTableColor}
+ removeDataset={removeDataset}
+ showDeleteDataset={showDeleteDataset}
+ />
+ )}
+ </StyledDatasetSection>
+ );
+ };
+
+ return DatasetSection;
+}
+
+export default DatasetSectionFactory;
diff --git a/src/components/side-panel/layer-panel/layer-list.js b/src/components/side-panel/layer-panel/layer-list.js
index 2daba3f59..506bd9694 100644
--- a/src/components/side-panel/layer-panel/layer-list.js
+++ b/src/components/side-panel/layer-panel/layer-list.js
@@ -17,6 +17,7 @@
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
+
import React, {useCallback, useMemo, useState} from 'react';
import {arrayMove} from 'utils/data-utils';
import styled from 'styled-components';
@@ -86,6 +87,7 @@ function LayerListFactory(LayerPanel) {
}),
[layerClasses]
);
+
const layerActions = {
layerColorUIChange: visStateActions.layerColorUIChange,
layerConfigChange: visStateActions.layerConfigChange,
@@ -96,11 +98,13 @@ function LayerListFactory(LayerPanel) {
removeLayer: visStateActions.removeLayer,
duplicateLayer: visStateActions.duplicateLayer
};
+
const panelProps = {
datasets,
openModal,
layerTypeOptions
};
+
const _handleSort = useCallback(
({oldIndex, newIndex}) => {
visStateActions.reorderLayer(arrayMove(props.layerOrder, oldIndex, newIndex));
@@ -158,6 +162,7 @@ function LayerListFactory(LayerPanel) {
key={layers[layerIdx].id}
idx={layerIdx}
layer={layers[layerIdx]}
+ isDraggable={false}
/>
)
)}
diff --git a/src/components/side-panel/layer-panel/layer-panel-header.js b/src/components/side-panel/layer-panel/layer-panel-header.js
index 6aba2c471..4538478f3 100644
--- a/src/components/side-panel/layer-panel/layer-panel-header.js
+++ b/src/components/side-panel/layer-panel/layer-panel-header.js
@@ -58,6 +58,12 @@ const StyledLayerPanelHeader = styled(StyledPanelHeader)`
.layer__remove-layer {
opacity: 0;
}
+
+ .layer__drag-handle__placeholder {
+ height: 20px;
+ padding: 10px;
+ }
+
:hover {
cursor: pointer;
background-color: ${props => props.theme.panelBackgroundHover};
@@ -176,10 +182,12 @@ function LayerPanelHeaderFactory(LayerTitleSection, PanelHeaderAction) {
onClick={toggleLayerConfigurator}
>
<HeaderLabelSection className="layer-panel__header__content">
- {isDragNDropEnabled && (
+ {isDragNDropEnabled ? (
<DragHandle className="layer__drag-handle">
<VertDots height="20px" />
</DragHandle>
+ ) : (
+ <div className="layer__drag-handle__placeholder" />
)}
<LayerTitleSection
layerId={layerId}
diff --git a/src/components/side-panel/layer-panel/layer-panel.js b/src/components/side-panel/layer-panel/layer-panel.js
index 30bc282ae..d8a9f74db 100644
--- a/src/components/side-panel/layer-panel/layer-panel.js
+++ b/src/components/side-panel/layer-panel/layer-panel.js
@@ -55,7 +55,8 @@ function LayerPanelFactory(LayerConfigurator, LayerPanelHeader) {
layerVisualChannelConfigChange: PropTypes.func.isRequired,
layerColorUIChange: PropTypes.func.isRequired,
setLayerAnimationTime: PropTypes.func,
- updateLayerAnimationSpeed: PropTypes.func
+ updateLayerAnimationSpeed: PropTypes.func,
+ isDraggable: PropTypes.bool
};
updateLayerConfig = newProp => {
@@ -113,7 +114,7 @@ function LayerPanelFactory(LayerConfigurator, LayerPanelHeader) {
};
render() {
- const {layer, datasets, layerTypeOptions} = this.props;
+ const {layer, datasets, isDraggable, layerTypeOptions} = this.props;
const {config} = layer;
const {isConfigActive} = config;
@@ -137,6 +138,7 @@ function LayerPanelFactory(LayerConfigurator, LayerPanelHeader) {
onUpdateLayerLabel={this._updateLayerLabel}
onRemoveLayer={this._removeLayer}
onDuplicateLayer={this._duplicateLayer}
+ isDragNDropEnabled={isDraggable}
/>
{isConfigActive && (
<LayerConfigurator
diff --git a/src/components/side-panel/layer-panel/panel-view-list-toggle.js b/src/components/side-panel/layer-panel/panel-view-list-toggle.js
new file mode 100644
index 000000000..e39a8f15c
--- /dev/null
+++ b/src/components/side-panel/layer-panel/panel-view-list-toggle.js
@@ -0,0 +1,100 @@
+import React, {useMemo} from 'react';
+import styled from 'styled-components';
+import OrderByList from 'components/common/icons/order-by-list';
+import OrderByDataset from 'components/common/icons/order-by-dataset';
+import {Tooltip} from 'components/common/styled-components';
+import {FormattedMessage} from 'localization';
+
+const PanelViewListToggleContainer = styled.div.attrs({
+ className: 'panel-view-list-toggle'
+})``;
+
+const PanelViewListToggleWrapper = styled.div.attrs({
+ className: 'panel-view-list-toggle-inner'
+})`
+ display: flex;
+ justify-content: flex-end;
+ align-content: center;
+ gap: 10px;
+`;
+
+export const StyledToggleOption = styled.div.attrs({
+ className: 'layer-panel-toggle-option'
+})`
+ color: ${props =>
+ props.active
+ ? props.theme.layerPanelToggleOptionColorActive
+ : props.theme.layerPanelToggleOptionColor};
+ :hover {
+ cursor: pointer;
+ color: ${props => props.theme.layerPanelToggleOptionColorActive};
+ }
+`;
+
+function ToggleOptionFactory() {
+ const ToggleOption = ({isActive, onClick, option}) => (
+ <StyledToggleOption
+ data-tip
+ data-for={`${option.id}-toggle-option`}
+ active={isActive}
+ onClick={onClick}
+ >
+ <option.iconComponent height="20px" />
+ <Tooltip id={`${option.id}-toggle-option`} effect="solid" delayShow={500} place="bottom">
+ <span>
+ <FormattedMessage id={option.label} />
+ </span>
+ </Tooltip>
+ </StyledToggleOption>
+ );
+
+ return ToggleOption;
+}
+
+const TOGGLE_OPTIONS = [
+ {
+ id: 'list',
+ iconComponent: OrderByList,
+ value: 'list',
+ label: 'List'
+ },
+ {
+ id: 'sort-by-dataset',
+ iconComponent: OrderByDataset,
+ value: 'sortByDataset',
+ label: 'Sort by dataset'
+ }
+];
+
+PanelViewListToggleFactory.deps = [ToggleOptionFactory];
+
+function PanelViewListToggleFactory(ToggleOption) {
+ const PanelViewListToggle = props => {
+ const {layerPanelListViewMode, toggleLayerPanelListView} = props;
+
+ const toggleListView = listView => toggleLayerPanelListView(listView);
+ const options = useMemo(
+ () => TOGGLE_OPTIONS.map(opt => ({...opt, isActive: layerPanelListViewMode === opt.value})),
+ [layerPanelListViewMode]
+ );
+
+ return (
+ <PanelViewListToggleContainer>
+ <PanelViewListToggleWrapper>
+ {options.map(opt => (
+ <ToggleOption
+ key={opt.id}
+ onClick={() => toggleListView(opt.value)}
+ option={opt}
+ isActive={opt.isActive}
+ />
+ ))}
+ </PanelViewListToggleWrapper>
+ </PanelViewListToggleContainer>
+ );
+ };
+
+ return PanelViewListToggle;
+}
+
+export default PanelViewListToggleFactory;
diff --git a/src/components/side-panel/panel-title.js b/src/components/side-panel/panel-title.js
index d4dc9e1c9..2a81a7b45 100644
--- a/src/components/side-panel/panel-title.js
+++ b/src/components/side-panel/panel-title.js
@@ -20,7 +20,9 @@
import styled from 'styled-components';
-const PanelTitleFactory = () => styled.div`
+const PanelTitleFactory = () => styled.div.attrs({
+ className: 'panel-title'
+})`
color: ${props => props.theme.titleTextColor};
font-size: ${props => props.theme.sidePanelTitleFontsize};
line-height: ${props => props.theme.sidePanelTitleLineHeight};
diff --git a/src/constants/action-types.d.ts b/src/constants/action-types.d.ts
index 66649d23e..1dd2c461c 100644
--- a/src/constants/action-types.d.ts
+++ b/src/constants/action-types.d.ts
@@ -25,7 +25,7 @@ export type ActionType = {
REORDER_LAYER: string;
SET_FILTER: string;
SET_FILTER_ANIMATION_TIME: string;
- SET_FILTER_ANIMATION_TIME_CONFIG: string;
+ SET_FILTER_ANIMATION_TIME_CONFIG: string;
SET_FILTER_ANIMATION_WINDOW: string;
SHOW_DATASET_TABLE: string;
UPDATE_LAYER_BLENDING: string;
@@ -92,6 +92,7 @@ export type ActionType = {
ADD_NOTIFICATION: string;
REMOVE_NOTIFICATION: string;
SET_LOCALE: string;
+ TOGGLE_LAYER_PANEL_LIST_VIEW: string;
// uiState > export image
SET_EXPORT_IMAGE_SETTING: string;
diff --git a/src/constants/action-types.js b/src/constants/action-types.js
index 6afc0c8c1..0ef33f62b 100644
--- a/src/constants/action-types.js
+++ b/src/constants/action-types.js
@@ -143,6 +143,7 @@ const ActionTypes = {
ADD_NOTIFICATION: `${ACTION_PREFIX}ADD_NOTIFICATION`,
REMOVE_NOTIFICATION: `${ACTION_PREFIX}REMOVE_NOTIFICATION`,
SET_LOCALE: `${ACTION_PREFIX}SET_LOCALE`,
+ TOGGLE_LAYER_PANEL_LIST_VIEW: `${ACTION_PREFIX}TOGGLE_LAYER_PANEL_LIST_VIEW`,
// uiState > export image
SET_EXPORT_IMAGE_SETTING: `${ACTION_PREFIX}SET_EXPORT_IMAGE_SETTING`,
diff --git a/src/reducers/ui-state-updaters.d.ts b/src/reducers/ui-state-updaters.d.ts
index b7aad4a07..34be98db6 100644
--- a/src/reducers/ui-state-updaters.d.ts
+++ b/src/reducers/ui-state-updaters.d.ts
@@ -71,6 +71,8 @@ export type Notifications = {
export type Locale = string;
+export type LayerPanelListView = 'list' | 'sortByDataset'
+
export type UiState = {
readOnly: boolean;
activeSidePanel: string;
@@ -91,6 +93,7 @@ export type UiState = {
loadFiles: LoadFiles;
// Locale of the UI
locale: Locale;
+ layerPanelListView: LayerPanelListView;
};
export const DEFAULT_MAP_CONTROLS: MapControls;
@@ -186,6 +189,10 @@ export function setLocaleUpdater(
state: UiState,
action: UiStateActions.SetLocaleUpdaterAction
): UiState;
+export function toggleLayerPanelListViewUpdater(
+ state: UiState,
+ action: UiStateActions.ToggleLayerPanelListViewAction
+): UiState;
export function loadFilesUpdater(state: UiState, action: LoadFilesUpdaterAction): UiState;
export function loadFilesErrUpdater(state: UiState, action: LoadFilesErrUpdaterAction): UiState;
diff --git a/src/reducers/ui-state-updaters.js b/src/reducers/ui-state-updaters.js
index be34a6979..ff0c97ad5 100644
--- a/src/reducers/ui-state-updaters.js
+++ b/src/reducers/ui-state-updaters.js
@@ -250,7 +250,8 @@ export const INITIAL_UI_STATE = {
// load files
loadFiles: DEFAULT_LOAD_FILES,
// Locale of the UI
- locale: LOCALE_CODES.en
+ locale: LOCALE_CODES.en,
+ layerPanelListView: 'list'
};
/* Updaters */
@@ -764,3 +765,22 @@ export const setLocaleUpdater = (state, {payload: {locale}}) => ({
...state,
locale
});
+
+/**
+ * Toggle layer panel list view
+ * @memberof uiStateUpdaters
+ * @param state `uiState`
+ * @param action
+ * @param action.payload layer panel listView value. Can be 'list' or 'sortByDataset'
+ * @returns nextState
+ * @type {typeof import('./ui-state-updaters').toggleLayerPanelListViewUpdater}
+ * @public
+ */
+export const toggleLayerPanelListViewUpdater = (state, {payload: listView}) => {
+ return listView === state.layerPanelListView
+ ? state
+ : {
+ ...state,
+ layerPanelListView: listView
+ };
+};
diff --git a/src/reducers/ui-state.js b/src/reducers/ui-state.js
index d9fd68d40..f30b22e7d 100644
--- a/src/reducers/ui-state.js
+++ b/src/reducers/ui-state.js
@@ -58,7 +58,8 @@ const actionHandler = {
[ActionTypes.TOGGLE_SPLIT_MAP]: uiStateUpdaters.toggleSplitMapUpdater,
[ActionTypes.SHOW_DATASET_TABLE]: uiStateUpdaters.showDatasetTableUpdater,
- [ActionTypes.SET_LOCALE]: uiStateUpdaters.setLocaleUpdater
+ [ActionTypes.SET_LOCALE]: uiStateUpdaters.setLocaleUpdater,
+ [ActionTypes.TOGGLE_LAYER_PANEL_LIST_VIEW]: uiStateUpdaters.toggleLayerPanelListViewUpdater
};
/* Reducer */
diff --git a/src/reducers/vis-state-updaters.js b/src/reducers/vis-state-updaters.js
index 6e2670c5f..655f364b3 100644
--- a/src/reducers/vis-state-updaters.js
+++ b/src/reducers/vis-state-updaters.js
@@ -944,8 +944,8 @@ export const addLayerUpdater = (state, action) => {
newLayer = result.layer;
newLayerData = result.layerData;
} else {
- // create an empty layer with the first available dataset
- const defaultDataset = Object.keys(state.datasets)[0];
+ // create an empty layer with a specific dataset or a default one
+ const defaultDataset = action.datasetId ?? Object.keys(state.datasets)[0];
newLayer = new Layer({
isVisible: true,
isConfigActive: true,
diff --git a/src/styles/base.js b/src/styles/base.js
index 6cd239f86..1a2c930cc 100644
--- a/src/styles/base.js
+++ b/src/styles/base.js
@@ -273,6 +273,9 @@ export const layerTypeIconSizeL = 50;
export const layerTypeIconPdL = 12;
export const layerTypeIconSizeSM = 28;
+export const layerPanelToggleOptionColor = '#6A7485';
+export const layerPanelToggleOptionColorActive = '#F0F0F0';
+
// Sidepanel divider
export const sidepanelDividerBorder = '1px';
export const sidepanelDividerMargin = 12;
@@ -1311,6 +1314,9 @@ export const theme = {
layerTypeIconPdL,
layerTypeIconSizeSM,
+ layerPanelToggleOptionColor,
+ layerPanelToggleOptionColorActive,
+
// Text
fontFamily,
fontWeight,
diff --git a/test/browser/components/side-panel/index.js b/test/browser/components/side-panel/index.js
index 282d05b2d..2aeb7a328 100644
--- a/test/browser/components/side-panel/index.js
+++ b/test/browser/components/side-panel/index.js
@@ -25,3 +25,4 @@ import './layer-panel-header-test';
import './filter-manager-test';
import './layer-configurator-test';
import './layer-list-test';
+import './layer-manager-test';
diff --git a/test/browser/components/side-panel/layer-list-test.js b/test/browser/components/side-panel/layer-list-test.js
index 83e896deb..94b811d08 100644
--- a/test/browser/components/side-panel/layer-list-test.js
+++ b/test/browser/components/side-panel/layer-list-test.js
@@ -1,3 +1,23 @@
+// Copyright (c) 2021 Uber Technologies, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
import React from 'react';
import test from 'tape';
diff --git a/test/browser/components/side-panel/layer-manager-test.js b/test/browser/components/side-panel/layer-manager-test.js
new file mode 100644
index 000000000..dcb8bd407
--- /dev/null
+++ b/test/browser/components/side-panel/layer-manager-test.js
@@ -0,0 +1,147 @@
+// Copyright (c) 2021 Uber Technologies, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+
+import React from 'react';
+import test from 'tape';
+
+import {
+ LayerManagerFactory,
+ LayerListFactory,
+ DatasetLayerGroupFactory,
+ DatasetSectionFactory,
+ PanelViewListToggleFactory,
+ PanelTitleFactory,
+ AddLayerButtonFactory
+} from 'components';
+
+import {appInjector} from 'components/container';
+import {mountWithTheme, IntlWrapper} from 'test/helpers/component-utils';
+
+import * as VisStateActions from 'actions/vis-state-actions';
+import * as UIStateActions from 'actions/ui-state-actions';
+
+import {StateWMultiH3Layers} from 'test/helpers/mock-state';
+
+import {Layers} from 'components/common/icons';
+
+const LayerManager = appInjector.get(LayerManagerFactory);
+const LayerList = appInjector.get(LayerListFactory);
+const DatasetLayerGroup = appInjector.get(DatasetLayerGroupFactory);
+const DatasetSection = appInjector.get(DatasetSectionFactory);
+const PanelViewListToggle = appInjector.get(PanelViewListToggleFactory);
+const PanelTitle = appInjector.get(PanelTitleFactory);
+const AddLayerButton = appInjector.get(AddLayerButtonFactory);
+
+const nop = () => {};
+
+const defaultProps = {
+ datasets: StateWMultiH3Layers.visState.datasets,
+ layers: StateWMultiH3Layers.visState.layers,
+ layerOrder: StateWMultiH3Layers.visState.layerOrder,
+ layerClasses: StateWMultiH3Layers.visState.layerClasses,
+ intl: {},
+ showAddDataModal: nop,
+ updateTableColor: nop,
+ showDatasetTable: nop,
+ removeDataset: nop,
+ panelMetadata: {
+ id: 'layer',
+ label: 'sidebar.panels.layer',
+ iconComponent: Layers,
+ onClick: nop,
+ component: LayerManager
+ },
+ layerPanelListView: 'list',
+ uiStateActions: UIStateActions,
+ visStateActions: VisStateActions,
+ layerBlending: 'normal'
+};
+
+test('Components -> LayerManager -> render -> list view', t => {
+ // mount
+ let wrapper;
+ t.doesNotThrow(() => {
+ wrapper = mountWithTheme(
+ <IntlWrapper>
+ <LayerManager {...defaultProps} />
+ </IntlWrapper>
+ );
+ }, 'LayerManager should not fail');
+
+ t.ok(wrapper.find(DatasetLayerGroup).length === 0, 'should not render DatasetLayerGroup');
+ t.ok(wrapper.find(LayerList).length === 1, 'should render LayerList');
+ t.ok(wrapper.find(AddLayerButton).length === 1, 'should render AddLayerButton');
+ t.ok(wrapper.find(DatasetSection).length === 1, 'should render DatasetSection');
+ t.ok(wrapper.find(PanelViewListToggle).length === 1, 'should render PanelViewListToggle');
+ t.ok(wrapper.find(PanelTitle).length === 1, 'should render PanelTitle');
+
+ const titles = [];
+ const expectedTitles = [
+ 'H3 Hexagon 1',
+ 'H3 Hexagon 1',
+ 'H3 Hexagon 1',
+ 'H3 Hexagon 2',
+ 'H3 Hexagon 2',
+ 'H3 Hexagon 2'
+ ];
+ wrapper.find('.layer__title__editor').forEach(item => titles.push(item.getDOMNode().value));
+ t.deepEqual(titles, expectedTitles, 'should render panels in correct order');
+
+ const layers = wrapper.find('.layer-panel');
+ t.equal(layers.length, 6, 'should render 6 layer panels');
+
+ t.end();
+});
+
+test('Components -> LayerManager -> render -> order by dataset view', t => {
+ // mount
+ let wrapper;
+ t.doesNotThrow(() => {
+ wrapper = mountWithTheme(
+ <IntlWrapper>
+ <LayerManager {...defaultProps} layerPanelListView="sortByDataset" />
+ </IntlWrapper>
+ );
+ }, 'LayerManager should not fail');
+
+ t.ok(wrapper.find(DatasetLayerGroup).length === 1, 'should render DatasetLayerGroup');
+ t.ok(wrapper.find(LayerList).length === 1, 'should render LayerList');
+ t.ok(wrapper.find(AddLayerButton).length === 1, 'should render AddLayerButton');
+ t.ok(wrapper.find(DatasetSection).length === 1, 'should render DatasetSection');
+ t.ok(wrapper.find(PanelViewListToggle).length === 1, 'should render PanelViewListToggle');
+ t.ok(wrapper.find(PanelTitle).length === 1, 'should render PanelTitle');
+
+ const titles = [];
+ const expectedTitles = [
+ 'H3 Hexagon 1',
+ 'H3 Hexagon 1',
+ 'H3 Hexagon 1',
+ 'H3 Hexagon 2',
+ 'H3 Hexagon 2',
+ 'H3 Hexagon 2'
+ ];
+ wrapper.find('.layer__title__editor').forEach(item => titles.push(item.getDOMNode().value));
+ t.deepEqual(titles, expectedTitles, 'should render panels in correct order');
+
+ const layers = wrapper.find('.layer-panel');
+ t.equal(layers.length, 6, 'should render 6 layer panels');
+
+ t.end();
+});