[Maps] Disable edit features if editing already enabled for layer (el…

…astic#103300)
cauemarcondes · Jun 24, 2021 · e1ef2ea · e1ef2ea
1 parent c0122f7
commit e1ef2ea
Show file tree

Hide file tree

Showing 5 changed files with 137 additions and 1 deletion.
diff --git a/...ght_side_controls/layer_control/layer_toc/toc_entry/__snapshots__/toc_entry.test.tsx.snap b/...ght_side_controls/layer_control/layer_toc/toc_entry/__snapshots__/toc_entry.test.tsx.snap
diff --git a/.../connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry.tsx b/.../connected_components/right_side_controls/layer_control/layer_toc/toc_entry/toc_entry.tsx
@@ -281,6 +281,7 @@ export class TOCEntry extends Component<Props, State> {
           openLayerSettings={this._openLayerPanelWithCheck}
           isEditButtonDisabled={this.props.isEditButtonDisabled}
           supportsFitToBounds={this.state.supportsFitToBounds}
+          editModeActiveForLayer={this.props.editModeActiveForLayer}
         />
 
         {this._renderQuickActions()}

diff --git a/...toc_entry/toc_entry_actions_popover/__snapshots__/toc_entry_actions_popover.test.tsx.snap b/...toc_entry/toc_entry_actions_popover/__snapshots__/toc_entry_actions_popover.test.tsx.snap
diff --git a/..._control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.test.tsx b/..._control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.test.tsx
@@ -48,6 +48,7 @@ const defaultProps = {
   enableShapeEditing: () => {},
   enablePointEditing: () => {},
   openLayerSettings: () => {},
+  editModeActiveForLayer: false,
 };
 
 describe('TOCEntryActionsPopover', () => {
@@ -100,4 +101,17 @@ describe('TOCEntryActionsPopover', () => {
 
     expect(component).toMatchSnapshot();
   });
+
+  test('should disable Edit features when edit mode active for layer', async () => {
+    const component = shallow(
+      <TOCEntryActionsPopover {...defaultProps} editModeActiveForLayer={true} />
+    );
+
+    // Ensure all promises resolve
+    await new Promise((resolve) => process.nextTick(resolve));
+    // Ensure the state changes are reflected
+    component.update();
+
+    expect(component).toMatchSnapshot();
+  });
 });
diff --git a/...layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.tsx b/...layer_control/layer_toc/toc_entry/toc_entry_actions_popover/toc_entry_actions_popover.tsx
@@ -36,6 +36,7 @@ export interface Props {
   removeLayer: (layerId: string) => void;
   supportsFitToBounds: boolean;
   toggleVisible: (layerId: string) => void;
+  editModeActiveForLayer: boolean;
 }
 
 interface State {
@@ -170,7 +171,7 @@ export class TOCEntryActionsPopover extends Component<Props, State> {
                 defaultMessage:
                   'Edit features only supported for document layers without clustering, joins, or time filtering',
               }),
-          disabled: !this.state.isFeatureEditingEnabled,
+          disabled: !this.state.isFeatureEditingEnabled || this.props.editModeActiveForLayer,
           onClick: async () => {
             this._closePopover();
             const supportedShapeTypes = await (this.props.layer.getSource() as ESSearchSource).getSupportedShapeTypes();