Skip to content

ATLAS-5339: Atlas React UI: Clicking Create Entity while on an Entity Detail Page opens the Edit Form instead of Create Form #693

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

Open
Brijesh619 wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −4
Open

ATLAS-5339: Atlas React UI: Clicking Create Entity while on an Entity Detail Page opens the Edit Form instead of Create Form #693

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
1 change: 1 addition & 0 deletions dashboard/src/components/CreateDropdown/CreateDropdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ const CreateDropdown = () => {
<EntityForm
open={entityModal}
onClose={() => setEntityModal(false)}
isAdd={true}
/>
)}
{classificationModal && (
Expand Down
5 changes: 3 additions & 2 deletions dashboard/src/components/CreateDropdown/__tests__/CreateDropdown.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ jest.mock('react-router-dom', () => ({

jest.mock('@views/Entity/EntityForm', () => ({
__esModule: true,
default: ({ open, onClose }: { open: boolean; onClose: () => void }) =>
default: ({ open, onClose, isAdd }: { open: boolean; onClose: () => void; isAdd?: boolean }) =>
open ? (
<div data-testid="entity-form">
<div data-testid="entity-form" data-isadd={isAdd ? 'true' : 'false'}>
<button type="button" onClick={onClose}>
Close entity
</button>
Expand Down Expand Up @@ -84,6 +84,7 @@ describe('CreateDropdown (header Create menu)', () => {

fireEvent.click(screen.getByText('Entity'))
expect(await screen.findByTestId('entity-form')).toBeInTheDocument()
expect(screen.getByTestId('entity-form')).toHaveAttribute('data-isadd', 'true')

fireEvent.click(screen.getByText('Close entity'))
await waitFor(() => {
Expand Down
7 changes: 5 additions & 2 deletions dashboard/src/views/Entity/EntityForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,18 @@ export function reducer(state: State, action: Action): State {

const EntityForm = ({
open,
onClose
onClose,
isAdd = false
}: {
open: boolean;
onClose: () => void;
isAdd?: boolean;
}) => {
const key = "atlas.ui.editable.entity.types";
const dispatchApi = useAppDispatch();
const navigate = useNavigate();
const { guid }: any = useParams();
const { guid: urlGuid }: any = useParams();
const guid = isAdd ? undefined : urlGuid;
const [_searchParams, setSearchParams] = useSearchParams();

const { entityData = {} }: any = useAppSelector((state: any) => state.entity);
Expand Down