feat: hide delete entry if open authoring (#5568)

packages/netlify-cms-core/src/components/Editor/EditorToolbar.js

@@ -215,7 +215,7 @@ const StatusDropdownItem = styled(DropdownItem)`
   }
 `;
 
-class EditorToolbar extends React.Component {
+export class EditorToolbar extends React.Component {
   static propTypes = {
     isPersisting: PropTypes.bool,
     isPublishing: PropTypes.bool,
@@ -502,6 +502,7 @@ class EditorToolbar extends React.Component {
       showDelete,
       hasChanged,
       hasUnpublishedChanges,
+      useOpenAuthoring,
       isPersisting,
       isDeleting,
       isNewEntry,
@@ -522,7 +523,7 @@ class EditorToolbar extends React.Component {
       <SaveButton key="save-button" onClick={() => hasChanged && onPersist()}>
         {isPersisting ? t('editor.editorToolbar.saving') : t('editor.editorToolbar.save')}
       </SaveButton>,
-      !showDelete && !hasUnpublishedChanges && !isModification ? null : (
+      (!showDelete || useOpenAuthoring) && !hasUnpublishedChanges && !isModification ? null : (
         <DeleteButton
           key="delete-button"
           onClick={hasUnpublishedChanges ? onDeleteUnpublishedChanges : onDelete}

packages/netlify-cms-core/src/components/Editor/__tests__/EditorToolbar.spec.js

@@ -0,0 +1,116 @@
+import React from 'react';
+import { render } from '@testing-library/react';
+import { fromJS } from 'immutable';
+
+import { EditorToolbar } from '../EditorToolbar';
+
+jest.mock('netlify-cms-ui-default', () => ({
+  // eslint-disable-next-line react/display-name
+  Icon: props => <mock-icon {...props} />,
+  // eslint-disable-next-line react/display-name
+  Dropdown: props => <mock-dropdown {...props} />,
+  // eslint-disable-next-line react/display-name
+  DropdownItem: props => <mock-dropdown-item {...props} />,
+  // eslint-disable-next-line react/display-name
+  StyledDropdownButton: props => <mock-dropdown-button {...props} />,
+  colorsRaw: {},
+  colors: {},
+  components: {},
+  buttons: {},
+  zIndex: {},
+}));
+jest.mock('../../UI', () => ({
+  // eslint-disable-next-line react/display-name
+  SettingsDropdown: props => <mock-settings-dropdown {...props} />,
+}));
+jest.mock('react-router-dom', () => {
+  return {
+    // eslint-disable-next-line react/display-name
+    Link: props => <mock-link {...props} />,
+  };
+});
+
+describe('EditorToolbar', () => {
+  const props = {
+    isPersisting: false,
+    isPublishing: false,
+    isUpdatingStatus: false,
+    isDeleting: false,
+    onPersist: jest.fn(),
+    onPersistAndNew: jest.fn(),
+    onPersistAndDuplicate: jest.fn(),
+    showDelete: true,
+    onDelete: jest.fn(),
+    onDeleteUnpublishedChanges: jest.fn(),
+    onChangeStatus: jest.fn(),
+    onPublish: jest.fn(),
+    unPublish: jest.fn(),
+    onDuplicate: jest.fn(),
+    onPublishAndNew: jest.fn(),
+    onPublishAndDuplicate: jest.fn(),
+    hasChanged: false,
+    collection: fromJS({ name: 'posts' }),
+    hasWorkflow: false,
+    useOpenAuthoring: false,
+    hasUnpublishedChanges: false,
+    isNewEntry: false,
+    isModification: false,
+    onLogoutClick: jest.fn(),
+    loadDeployPreview: jest.fn(),
+    t: jest.fn(key => key),
+    editorBackLink: '',
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should render with default props', () => {
+    const { asFragment } = render(<EditorToolbar {...props} />);
+    expect(asFragment()).toMatchSnapshot();
+  });
+
+  [false, true].forEach(useOpenAuthoring => {
+    it(`should render with workflow controls hasUnpublishedChanges=true,isNewEntry=false,isModification=true,useOpenAuthoring=${useOpenAuthoring}`, () => {
+      const { asFragment } = render(
+        <EditorToolbar
+          {...props}
+          hasWorkflow={true}
+          hasUnpublishedChanges={true}
+          isNewEntry={false}
+          isModification={true}
+          useOpenAuthoring={useOpenAuthoring}
+        />,
+      );
+      expect(asFragment()).toMatchSnapshot();
+    });
+
+    it(`should render with workflow controls hasUnpublishedChanges=true,isNewEntry=false,isModification=false,useOpenAuthoring=${useOpenAuthoring}`, () => {
+      const { asFragment } = render(
+        <EditorToolbar
+          {...props}
+          hasWorkflow={true}
+          hasUnpublishedChanges={true}
+          isNewEntry={false}
+          isModification={false}
+          useOpenAuthoring={useOpenAuthoring}
+        />,
+      );
+      expect(asFragment()).toMatchSnapshot();
+    });
+
+    it(`should render with workflow controls hasUnpublishedChanges=false,isNewEntry=false,isModification=false,useOpenAuthoring=${useOpenAuthoring}`, () => {
+      const { asFragment } = render(
+        <EditorToolbar
+          {...props}
+          hasWorkflow={true}
+          hasUnpublishedChanges={false}
+          isNewEntry={false}
+          isModification={false}
+          useOpenAuthoring={useOpenAuthoring}
+        />,
+      );
+      expect(asFragment()).toMatchSnapshot();
+    });
+  });
+});