Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #38249 - EditorModal update to pf5 + test #10468

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fixes #38249 - EditorModal update to pf5 + test #10468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 24 additions & 19 deletions webpack/assets/javascripts/react_app/components/Editor/components/EditorModal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { Modal, Icon, Button } from 'patternfly-react';
import { Modal, Title } from '@patternfly/react-core';
import PropTypes from 'prop-types';

import EditorView from './EditorView';
Expand All @@ -26,27 +26,32 @@ const EditorModal = ({
liveAutocompletion,
title,
toggleModal,
}) => (
<Modal show={isMaximized} onHide={toggleModal} className="editor-modal">
<Modal.Header className={`${selectedView} ${theme.toLowerCase()}`}>
<h4 id="editor-modal-h4">{title}</h4>
<Button
className="close"
onClick={toggleModal}
aria-hidden="true"
aria-label="Close"
bsStyle="link"
>
<Icon type="pf" name="close" />
</Button>
}) => {
const header = (
<div className={`${selectedView} ${theme.toLowerCase()}`}>
<Title headingLevel="h4" id="editor-modal-h4" ouiaId="editor-modal-title">
{title}
</Title>
{selectedView === 'diff' && (
<DiffToggle
stateView={diffViewType}
changeState={viewType => changeDiffViewType(viewType)}
/>
)}
</Modal.Header>
<Modal.Body className={selectedView}>
</div>
);
return (
<Modal
position="top"
ouiaId="editor-modal-component"
aria-labelledby="editor-modal-h4"
id="editor-modal"
className={`${selectedView} ${theme.toLowerCase()} editor-modal`}
variant="primary"
isOpen={isMaximized}
onClose={toggleModal}
header={header}
>
{selectedView === 'diff' ? (
<div id="diff-table">
<DiffView
Expand All @@ -70,9 +75,9 @@ const EditorModal = ({
liveAutocompletion={liveAutocompletion}
/>
)}
</Modal.Body>
</Modal>
);
</Modal>
);
};

EditorModal.propTypes = {
changeDiffViewType: PropTypes.func.isRequired,
Expand Down
222 changes: 86 additions & 136 deletions ...s/react_app/components/Editor/components/__tests__/__snapshots__/EditorModal.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,152 +2,102 @@

exports[`EditorModal should render renders EditorModal diff 1`] = `
<Modal
animation={true}
autoFocus={true}
backdrop={true}
bsClass="modal"
className="editor-modal"
dialogComponentClass={[Function]}
enforceFocus={true}
keyboard={true}
manager={
ModalManager {
"add": [Function],
"containers": Array [],
"data": Array [],
"handleContainerOverflow": true,
"hideSiblingNodes": true,
"isTopModal": [Function],
"modals": Array [],
"remove": [Function],
}
}
onHide={[Function]}
renderBackdrop={[Function]}
restoreFocus={true}
show={false}
>
<ModalHeader
bsClass="modal-header"
className="diff monokai"
closeButton={false}
closeLabel="Close"
>
<h4
id="editor-modal-h4"
/>
<Button
active={false}
aria-hidden="true"
aria-label="Close"
block={false}
bsClass="btn"
bsStyle="link"
className="close"
disabled={false}
onClick={[Function]}
>
<Icon
name="close"
type="pf"
/>
</Button>
<DiffToggle
changeState={[Function]}
stateView="split"
/>
</ModalHeader>
<ModalBody
bsClass="modal-body"
className="diff"
componentClass="div"
>
actions={Array []}
appendTo={[Function]}
aria-describedby=""
aria-label=""
aria-labelledby="editor-modal-h4"
className="diff monokai editor-modal"
hasNoBodyWrapper={false}
header={
<div
id="diff-table"
className="diff monokai"
>
<DiffView
newText="</>"
oldText="<? />"
patch=""
viewType="split"
<Title
headingLevel="h4"
id="editor-modal-h4"
ouiaId="editor-modal-title"
>

</Title>
<DiffToggle
changeState={[Function]}
stateView="split"
/>
</div>
</ModalBody>
}
id="editor-modal"
isOpen={false}
onClose={[Function]}
ouiaId="editor-modal-component"
ouiaSafe={true}
position="top"
showClose={true}
title=""
titleIconVariant={null}
titleLabel=""
variant="primary"
>
<div
id="diff-table"
>
<DiffView
newText="</>"
oldText="<? />"
patch=""
viewType="split"
/>
</div>
</Modal>
`;

exports[`EditorModal should render renders EditorModal editor 1`] = `
<Modal
animation={true}
autoFocus={true}
backdrop={true}
bsClass="modal"
className="editor-modal"
dialogComponentClass={[Function]}
enforceFocus={true}
keyboard={true}
manager={
ModalManager {
"add": [Function],
"containers": Array [],
"data": Array [],
"handleContainerOverflow": true,
"hideSiblingNodes": true,
"isTopModal": [Function],
"modals": Array [],
"remove": [Function],
}
actions={Array []}
appendTo={[Function]}
aria-describedby=""
aria-label=""
aria-labelledby="editor-modal-h4"
className="input monokai editor-modal"
hasNoBodyWrapper={false}
header={
<div
className="input monokai"
>
<Title
headingLevel="h4"
id="editor-modal-h4"
ouiaId="editor-modal-title"
>
</Title>
</div>
}
onHide={[Function]}
renderBackdrop={[Function]}
restoreFocus={true}
show={false}
id="editor-modal"
isOpen={false}
onClose={[Function]}
ouiaId="editor-modal-component"
ouiaSafe={true}
position="top"
showClose={true}
title=""
titleIconVariant={null}
titleLabel=""
variant="primary"
>
<ModalHeader
bsClass="modal-header"
className="input monokai"
closeButton={false}
closeLabel="Close"
>
<h4
id="editor-modal-h4"
/>
<Button
active={false}
aria-hidden="true"
aria-label="Close"
block={false}
bsClass="btn"
bsStyle="link"
className="close"
disabled={false}
onClick={[Function]}
>
<Icon
name="close"
type="pf"
/>
</Button>
</ModalHeader>
<ModalBody
bsClass="modal-body"
className="input"
componentClass="div"
>
<EditorView
autocompletion={true}
className="editor ace_editor_modal"
isMasked={false}
isSelected={true}
keyBinding="Default"
liveAutocompletion={false}
mode="Ruby"
name="editor"
onChange={[Function]}
readOnly={false}
theme="Monokai"
value="</>"
/>
</ModalBody>
<EditorView
autocompletion={true}
className="editor ace_editor_modal"
isMasked={false}
isSelected={true}
keyBinding="Default"
liveAutocompletion={false}
mode="Ruby"
name="editor"
onChange={[Function]}
readOnly={false}
theme="Monokai"
value="</>"
/>
</Modal>
`;
73 changes: 13 additions & 60 deletions webpack/assets/javascripts/react_app/components/Editor/editor.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,70 +25,23 @@
}
}

#editor-modal{
margin: 15px;
max-width: unset;
}

.editor-modal {
.modal-content {
height: -webkit-fill-available;
.pf-c-modal-box__body{
padding: 0;
}

.modal-header {
#diff-toggle-buttons {
margin-bottom: unset;
margin-right: 15px;

button {
outline: none;
}
}

#editor-modal-h4 {
margin-top: 4px;
margin-bottom: 0;
float: left;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
max-width: 700px;
}
.pf-c-modal-box__header{
margin-right: 0;
padding-bottom: 10px;
padding-top: 10px;
}

.modal-dialog {
padding: 15px;
width: auto !important;

.input.modal-body {
background-color: #363636;
}

.modal-body {
padding: 0;
overflow: auto;
height: 100%;

.ace_editor {
border: none !important;
}

#diff-table {
max-height: 80vh;

div {
border: none;
}
}
}

.input.modal-header.monokai,
.preview.modal-header.monokai {
background-color: #363636;

h4 {
color: #fff;
}

.pficon-close {
color: #fff;
}
}
.pf-c-button.pf-m-plain{
top: 7px;
}
}

Expand Down