Skip to content

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

[Bug] Disable layer copy when layer is invalid (#1882)

Jacob Wasilkowski6c99bb04028f
diff --git a/src/components/side-panel/layer-panel/layer-panel-header.tsx b/src/components/side-panel/layer-panel/layer-panel-header.tsx
index 71b39f2c9..e7d341fb5 100644
--- a/src/components/side-panel/layer-panel/layer-panel-header.tsx
+++ b/src/components/side-panel/layer-panel/layer-panel-header.tsx
@@ -65,6 +65,7 @@ type LayerPanelHeaderProps = {
showRemoveLayer?: boolean;
label?: string;
layerType?: string | null;
+ allowDuplicate?: boolean;
isDragNDropEnabled?: boolean;
labelRCGColorValues?: RGBColor | null;
actionIcons?: {
@@ -138,15 +139,21 @@ const HeaderActionSection = styled.div<HeaderActionSectionProps>`
}
`;
+type StyledPanelHeaderHiddenActionsProps = {
+ isConfigActive: LayerPanelHeaderProps['isConfigActive'];
+};
+
// Hiden actions only show up on hover
const StyledPanelHeaderHiddenActions = styled.div.attrs({
className: 'layer-panel__header__actions__hidden'
-})`
+})<StyledPanelHeaderHiddenActionsProps>`
opacity: 0;
display: flex;
align-items: center;
- background-color: ${props => props.theme.panelBackground};
- transition: ${props => props.theme.transition};
+ background-color: ${props =>
+ props.isConfigActive ? props.theme.panelBackgroundHover : props.theme.panelBackground};
+ transition: opacity 0.4s ease, background-color 0.4s ease;
+
:hover {
opacity: 1;
}
@@ -250,6 +257,7 @@ function LayerPanelHeaderFactory(
) {
const LayerPanelHeader: React.FC<LayerPanelHeaderProps> = ({
isConfigActive,
+ allowDuplicate,
isDragNDropEnabled,
isVisible,
label,
@@ -264,14 +272,8 @@ function LayerPanelHeaderFactory(
showRemoveLayer,
actionIcons = defaultActionIcons
}) => {
- const [isOpen, setOpen] = useState(false);
const [isEditingLabel, setIsEditingLabel] = useState(false);
- const toggleLayerConfigurator = e => {
- setOpen(!isOpen);
- onToggleEnableConfig(e);
- };
-
return (
<StyledLayerPanelHeader
className={classnames('layer-panel__header', {
@@ -279,7 +281,7 @@ function LayerPanelHeaderFactory(
})}
active={isConfigActive}
labelRCGColorValues={labelRCGColorValues}
- onClick={toggleLayerConfigurator}
+ onClick={onToggleEnableConfig}
>
<HeaderLabelSection className="layer-panel__header__content">
{isDragNDropEnabled ? (
@@ -306,7 +308,7 @@ function LayerPanelHeaderFactory(
className="layer-panel__header__actions"
isEditingLabel={isEditingLabel}
>
- <StyledPanelHeaderHiddenActions>
+ <StyledPanelHeaderHiddenActions isConfigActive={isConfigActive}>
{showRemoveLayer ? (
<PanelHeaderAction
className="layer__remove-layer"
@@ -323,6 +325,7 @@ function LayerPanelHeaderFactory(
tooltip={'tooltip.duplicateLayer'}
onClick={onDuplicateLayer}
IconComponent={actionIcons.duplicate}
+ disabled={!allowDuplicate}
/>
</StyledPanelHeaderHiddenActions>
<PanelHeaderAction
@@ -334,11 +337,11 @@ function LayerPanelHeaderFactory(
/>
<PanelHeaderAction
className={classnames('layer__enable-config ', {
- 'is-open': isOpen
+ 'is-open': isConfigActive
})}
id={layerId}
tooltip={'tooltip.layerSettings'}
- onClick={toggleLayerConfigurator}
+ onClick={onToggleEnableConfig}
IconComponent={actionIcons.enableConfig}
/>
</HeaderActionSection>
diff --git a/src/components/side-panel/layer-panel/layer-panel.tsx b/src/components/side-panel/layer-panel/layer-panel.tsx
index 75a15c144..b0cc369da 100644
--- a/src/components/side-panel/layer-panel/layer-panel.tsx
+++ b/src/components/side-panel/layer-panel/layer-panel.tsx
@@ -140,6 +140,7 @@ function LayerPanelFactory(
const {layer, datasets, isDraggable, layerTypeOptions} = this.props;
const {config} = layer;
const {isConfigActive} = config;
+ const allowDuplicate = typeof layer.isValidToSave === 'function' && layer.isValidToSave();
return (
<PanelWrapper
@@ -156,6 +157,7 @@ function LayerPanelFactory(
label={config.label}
labelRCGColorValues={config.dataId ? datasets[config.dataId].color : null}
layerType={layer.type}
+ allowDuplicate={allowDuplicate}
onToggleEnableConfig={this._toggleEnableConfig}
onToggleVisibility={this._toggleVisibility}
onUpdateLayerLabel={this._updateLayerLabel}
diff --git a/src/reducers/vis-state-updaters.ts b/src/reducers/vis-state-updaters.ts
index 54e55932c..e9b94d305 100644
--- a/src/reducers/vis-state-updaters.ts
+++ b/src/reducers/vis-state-updaters.ts
@@ -1331,7 +1331,7 @@ export const duplicateLayerUpdater = (
const loadedLayer = serializeLayer(original);
// assign new id and label to copied layer
- if (!loadedLayer.config) {
+ if (!loadedLayer?.config) {
return state;
}
loadedLayer.config.label = newLabel;