Skip to content

Commit

Permalink
Merge pull request #1538 from entando/ENG-5144_remove_data_models_dat…
Browse files Browse the repository at this point in the history
…a_types

suspense/ENG-5144 remove data models and data types
  • Loading branch information
ryanjpburgos authored Sep 13, 2023
2 parents cb6f628 + e7c2a42 commit f871965
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 38 deletions.
10 changes: 0 additions & 10 deletions src/ui/app/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,6 @@ import {
ROUTE_ROLE_DETAIL,
ROUTE_RELOAD_CONFIG,
ROUTE_RELOAD_CONFIRM,
ROUTE_DATA_MODEL_LIST,
ROUTE_DATA_MODEL_ADD,
ROUTE_DATA_MODEL_EDIT,
ROUTE_DATA_TYPE_LIST,
ROUTE_DATA_TYPE_ADD,
ROUTE_DATA_TYPE_EDIT,
Expand Down Expand Up @@ -108,9 +105,6 @@ import PageTemplateAddPage from 'ui/page-templates/add/PageTemplateAddPage';
import PageTemplateEditPage from 'ui/page-templates/edit/PageTemplateEditPage';
import PageTemplateClonePage from 'ui/page-templates/clone/PageTemplateClonePage';
import PageTemplateDetailPageContainer from 'ui/page-templates/detail/PageTemplateDetailPageContainer';
import AddDataModelPage from 'ui/data-models/add/AddDataModelPage';
import EditDataModelPage from 'ui/data-models/edit/EditDataModelPage';
import DataModelListPage from 'ui/data-models/list/DataModelListPage';
import ListGroupPage from 'ui/groups/list/ListGroupPage';
import AddGroupPage from 'ui/groups/add/AddGroupPage';
import EditGroupPage from 'ui/groups/edit/EditGroupPage';
Expand Down Expand Up @@ -295,10 +289,6 @@ const RouteComponent = () => {
path={ROUTE_FRAGMENT_DETAIL}
render={() => renderWithSuspense(<DetailFragmentPageContainer />)}
/>
{/* data models */}
<Route exact path={ROUTE_DATA_MODEL_LIST} component={DataModelListPage} />
<Route path={ROUTE_DATA_MODEL_ADD} component={AddDataModelPage} />
<Route path={ROUTE_DATA_MODEL_EDIT} component={EditDataModelPage} />
{/* data type */}
<Route exact path={ROUTE_DATA_TYPE_LIST} component={ListDataTypePage} />
<Route path={ROUTE_DATA_TYPE_ADD} component={AddDataTypesPage} />
Expand Down
28 changes: 0 additions & 28 deletions test/ui/app/App.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ import PagesAddPageContainer from 'ui/pages/add/PagesAddPageContainer';
import PagesEditPage from 'ui/pages/edit/PagesEditPage';
import PageSettingsPage from 'ui/pages/settings/PageSettings';
import PageConfigPageContainer from 'ui/pages/config/PageConfigPageContainer';
import AddDataModelPage from 'ui/data-models/add/AddDataModelPage';
import EditDataModelPage from 'ui/data-models/edit/EditDataModelPage';
import ListDataTypePage from 'ui/data-types/list/ListDataTypePage';
import UserListPage from 'ui/users/list/UserListPage';
import UserAuthorityPageContainer from 'ui/users/authority/UserAuthorityPageContainer';
import UserRestrictionsPage from 'ui/users/restrictions/UserRestrictionsPage';
Expand All @@ -35,7 +32,6 @@ import DetailUserPage from 'ui/users/detail/DetailUserPage';
import ListGroupPage from 'ui/groups/list/ListGroupPage';
import AddGroupPage from 'ui/groups/add/AddGroupPage';
import EditGroupPage from 'ui/groups/edit/EditGroupPage';
import DataModelListPage from 'ui/data-models/list/DataModelListPage';
import LabelsAndLanguagesPageContainer from 'ui/labels/list/LabelsAndLanguagesPageContainer';
import PageTemplateAddPage from 'ui/page-templates/add/PageTemplateAddPage';
import PageTemplateEditPage from 'ui/page-templates/edit/PageTemplateEditPage';
Expand Down Expand Up @@ -81,10 +77,6 @@ import {
ROUTE_PAGE_EDIT,
ROUTE_PAGE_SETTINGS,
ROUTE_PAGE_CONFIG,
ROUTE_DATA_MODEL_ADD,
ROUTE_DATA_MODEL_EDIT,
ROUTE_DATA_MODEL_LIST,
ROUTE_DATA_TYPE_LIST,
ROUTE_USER_LIST,
ROUTE_USER_AUTHORITY,
ROUTE_USER_ADD,
Expand Down Expand Up @@ -258,26 +250,6 @@ describe('App', () => {
expect(component.find(PageConfigPageContainer).exists()).toBe(true);
});

it('route to add data model page', () => {
const component = mountWithRoute(ROUTE_DATA_MODEL_ADD);
expect(component.find(AddDataModelPage).exists()).toBe(true);
});

it('route to edit data model page', () => {
const component = mountWithRoute(ROUTE_DATA_MODEL_EDIT);
expect(component.find(EditDataModelPage).exists()).toBe(true);
});

it('route to data model list page', () => {
const component = mountWithRoute(ROUTE_DATA_MODEL_LIST);
expect(component.find(DataModelListPage).exists()).toBe(true);
});

it('route to data type list page', () => {
const component = mountWithRoute(ROUTE_DATA_TYPE_LIST);
expect(component.find(ListDataTypePage).exists()).toBe(true);
});

it('route to user list page', async () => {
await waitFor(async () => {
const component = await mountWithRoute(ROUTE_USER_LIST);
Expand Down

0 comments on commit f871965

Please sign in to comment.