Merge pull request #202 from assemblee-virtuelle/200-MoveViewComponen…

…tsToCommon

[Minor] 200 - Move view components to common layout folder

frontend/src/App.jsx

@@ -12,7 +12,7 @@ import dataProvider from './config/dataProvider';
 import theme from './config/theme';
 import resources from './resources';
 
-import { Layout } from './layout';
+import { Layout } from './common/layout';
 
 const queryClient = new QueryClient({
   defaultOptions: {

frontend/src/common/CreateOrImport.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { TextInput, useResourceContext } from 'react-admin';
 import { CreateOrImportForm } from '@semapps/interop-components';
 import { useDataModel } from '@semapps/semantic-data-provider';
-import { Create } from '../layout';
+import { Create } from './layout';
 
 const CreateOrImport = props => {
   const resource = useResourceContext({});

frontend/src/common/layout/Layout.tsx

@@ -0,0 +1,9 @@
+import React from 'react';
+import { LayoutProps } from 'react-admin';
+import { Layout } from '../../layout';
+
+const BaseLayout = (props: LayoutProps) => {
+  return <Layout  {...props} />;
+};
+
+export default BaseLayout;

frontend/src/layout/create/CreateView.tsx → frontend/src/common/layout/create/CreateView.tsx

@@ -2,7 +2,7 @@ import React, { PropsWithChildren, ReactElement } from 'react';
 import { useCreateContext } from 'react-admin';
 import { useCheckPermissions } from '@semapps/auth-provider';
 import { useCreateContainerUri } from '@semapps/semantic-data-provider';
-import { BaseView } from '../index';
+import { BaseView } from '../../../layout';
 
 type Props = {
   title?: string | ReactElement;

frontend/src/layout/edit/EditView.tsx → frontend/src/common/layout/edit/EditView.tsx

@@ -1,7 +1,7 @@
 import React, { PropsWithChildren, ReactElement } from 'react';
 import { RaRecord, useEditContext, useGetRecordRepresentation, useResourceContext } from 'react-admin';
 import { useCheckPermissions } from '@semapps/auth-provider';
-import { BaseView } from '../index';
+import { BaseView } from '../../../layout';
 
 type Props = {
   title?: string | ReactElement;

frontend/src/common/layout/index.ts

@@ -0,0 +1,13 @@
+export { default as Layout } from './Layout';
+
+export { default as Create } from './create/Create';
+export { default as CreateView } from './create/CreateView';
+
+export { default as Edit } from './edit/Edit';
+export { default as EditView } from './edit/EditView';
+
+export { default as List } from './list/List';
+export { default as ListView } from './list/ListView';
+
+export { default as Show } from './show/Show';
+export { default as ShowView } from './show/ShowView';

frontend/src/layout/list/ListView.tsx → frontend/src/common/layout/list/ListView.tsx

@@ -3,7 +3,7 @@ import { useListContext, Pagination } from 'react-admin';
 import { Box } from '@mui/material';
 import { useCheckPermissions } from '@semapps/auth-provider';
 import { useCreateContainerUri } from '@semapps/semantic-data-provider';
-import { BaseView } from '../index';
+import { BaseView } from '../../../layout';
 
 type Props = {
   title?: string | ReactElement;

frontend/src/layout/show/Show.tsx → frontend/src/common/layout/show/Show.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { ShowBase, ShowProps } from 'react-admin';
 import { ShowActionsWithPermissions } from '@semapps/auth-provider';
-import {ShowView} from '../index';
+import { ShowView } from '../index';
 
 const Show = ({ title, actions, children, ...rest }: ShowProps) => (
   <ShowBase {...rest}>

frontend/src/layout/show/ShowView.tsx → frontend/src/common/layout/show/ShowView.tsx

@@ -2,7 +2,7 @@ import React, { PropsWithChildren, ReactElement } from 'react';
 import { RaRecord, useGetRecordRepresentation, useResourceContext, useShowContext } from 'react-admin';
 import { Box } from '@mui/material';
 import { useCheckPermissions } from '@semapps/auth-provider';
-import { BaseView } from '../index';
+import { BaseView } from '../../../layout';
 
 type Props = {
   title?: string | ReactElement;

frontend/src/layout/index.ts

@@ -1,15 +1,3 @@
 export { default as Layout } from './Layout';
 export { default as BaseView } from './BaseView';
 export { default as Aside } from './Aside';
-
-export {default as Create } from './create/Create';
-export {default as CreateView } from './create/CreateView';
-
-export {default as Edit } from './edit/Edit';
-export {default as EditView } from './edit/EditView';
-
-export {default as List } from './list/List';
-export {default as ListView } from './list/ListView';
-
-export {default as Show } from './show/Show';
-export {default as ShowView } from './show/ShowView';

frontend/src/resources/Agent/Activity/Event/EventCreate.jsx

@@ -1,7 +1,7 @@
 import React from "react";
 import { CreateOrImportForm } from "@semapps/interop-components";
 import { useResourceContext, SimpleForm } from "react-admin";
-import { Create } from "../../../../layout";
+import { Create } from "../../../../common/layout";
 import EventForm from "./EventForm";
 import config from '../../../../config/config';
 

frontend/src/resources/Agent/Activity/Event/EventEdit.jsx

@@ -1,7 +1,7 @@
 import React from "react";
 import { SimpleForm } from "react-admin";
 import { EditToolbarWithPermissions } from "@semapps/auth-provider";
-import { Edit } from "../../../../layout";
+import { Edit } from "../../../../common/layout";
 import EventForm from "./EventForm";
 
 const EventEdit = (props) => (

frontend/src/resources/Agent/Activity/Event/EventList.jsx

@@ -7,7 +7,7 @@ import frLocale from '@fullcalendar/core/locales/fr';
 import ListIcon from '@mui/icons-material/List';
 import EventIcon from '@mui/icons-material/Event';
 import EventFilterSidebar from './EventFilterSidebar';
-import { List } from '../../../../layout';
+import { List } from '../../../../common/layout';
 
 const EventList = props => (
   <MultiViewsList

frontend/src/resources/Agent/Activity/Event/EventShow.jsx

@@ -6,7 +6,7 @@ import { GridList, ChipList } from '@semapps/list-components';
 import { MapField } from '@semapps/geo-components';
 import { MarkdownField } from '../../../../common/field';
 import { Hero, MainList, SideList } from '../../../../common/list';
-import { Show } from '../../../../layout';
+import { Show } from '../../../../common/layout';
 
 const EventShow = props => (
   <Show {...props}>

frontend/src/resources/Agent/Activity/Project/ProjectEdit.jsx

@@ -4,7 +4,7 @@ import { MarkdownInput } from '@semapps/markdown-components';
 import { ActorsInput, DocumentsInput, ThemesInput, ResourcesInput } from '../../../../common/input';
 import { ImageInput } from '@semapps/input-components';
 import { EditToolbarWithPermissions } from '@semapps/auth-provider';
-import { Edit } from '../../../../layout';
+import { Edit } from '../../../../common/layout';
 
 const ProjectEdit = props => (
   <Edit redirect="show" {...props}>

frontend/src/resources/Agent/Activity/Project/ProjectList.jsx

@@ -3,7 +3,7 @@ import ProjectFilterSidebar from './ProjectFilterSidebar';
 import { Avatar } from '@mui/material';
 import SettingsIcon from '@mui/icons-material/Settings';
 import SimpleList from "../../../../common/list/SimpleList";
-import { List } from '../../../../layout';
+import { List } from '../../../../common/layout';
 
 const ProjectList = props => (
   <List aside={<ProjectFilterSidebar />} {...props}>

frontend/src/resources/Agent/Activity/Project/ProjectShow.jsx

@@ -6,7 +6,7 @@ import { ChipList, GridList } from '@semapps/list-components';
 import DescriptionIcon from '@mui/icons-material/Description';
 import { MarkdownField } from '../../../../common/field';
 import { Hero, MainList, SideList } from '../../../../common/list';
-import { Show } from '../../../../layout';
+import { Show } from '../../../../common/layout';
 
 const ProjectShow = props => (
   <Show {...props}>

frontend/src/resources/Agent/Activity/Task/TaskEdit.jsx

@@ -4,7 +4,7 @@ import { ActorsInput, ThemesInput, TasksInput, SkillsInput, DocumentsInput, Acti
 import { MarkdownInput } from '@semapps/markdown-components';
 import { EditToolbarWithPermissions } from '@semapps/auth-provider';
 import { DateTimeInput } from "../../../../common/input";
-import { Edit } from '../../../../layout';
+import { Edit } from '../../../../common/layout';
 
 const TaskEdit = props => (
   <Edit redirect="show" {...props}>

frontend/src/resources/Agent/Activity/Task/TaskList.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { DateField } from 'react-admin';
 import { Avatar } from '@mui/material';
 import TaskIcon from '@mui/icons-material/PlaylistAddCheck';
-import { List } from '../../../../layout';
+import { List } from '../../../../common/layout';
 import TaskFilterSidebar from './TaskFilterSidebar';
 import SimpleList from "../../../../common/list/SimpleList";
 

frontend/src/resources/Agent/Activity/Task/TaskShow.jsx

@@ -5,7 +5,7 @@ import { AvatarWithLabelField, ReferenceArrayField, SeparatedListField } from '@
 import { GridList } from '@semapps/list-components';
 import { MarkdownField } from '../../../../common/field';
 import { Hero, MainList, SideList } from '../../../../common/list';
-import { Show } from '../../../../layout';
+import { Show } from '../../../../common/layout';
 
 const TaskShow = props => (
   <Show {...props}>

frontend/src/resources/Agent/Actor/Group/GroupEdit.jsx

@@ -4,7 +4,7 @@ import { ImageInput } from '@semapps/input-components';
 import { MarkdownInput } from '@semapps/markdown-components';
 import { EditToolbarWithPermissions } from '@semapps/auth-provider';
 import { UsersInput, EventsInput, ThemesInput, DocumentsInput } from '../../../../common/input';
-import { Edit } from '../../../../layout';
+import { Edit } from '../../../../common/layout';
 
 export const GroupEdit = props => (
   <Edit redirect="show" {...props}>

frontend/src/resources/Agent/Actor/Group/GroupList.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Avatar } from '@mui/material';
 import GroupIcon from '@mui/icons-material/Group';
-import { List } from '../../../../layout';
+import { List } from '../../../../common/layout';
 import SimpleList from "../../../../common/list/SimpleList";
 
 const GroupList = props => (

frontend/src/resources/Agent/Actor/Group/GroupShow.jsx

@@ -5,7 +5,7 @@ import { AvatarWithLabelField, QuickAppendReferenceArrayField, ReferenceArrayFie
 import { ChipList, GridList } from '@semapps/list-components';
 import { MarkdownField } from '../../../../common/field';
 import { Hero, MainList, SideList } from '../../../../common/list';
-import { Show } from '../../../../layout';
+import { Show } from '../../../../common/layout';
 
 const GroupShow = props => (
   <Show {...props}>

frontend/src/resources/Agent/Actor/Organization/OrganizationEdit.jsx

@@ -12,7 +12,7 @@ import { ImageInput } from '@semapps/input-components';
 import { MarkdownInput } from '@semapps/markdown-components';
 import { EditToolbarWithPermissions } from '@semapps/auth-provider';
 import { OrganizationsInput, EventsInput, DocumentsInput, LocationInput } from '../../../../common/input';
-import { Edit } from '../../../../layout';
+import { Edit } from '../../../../common/layout';
 import CustomTreeSelectArrayInput from '../../../../common/input/TreeComponent/CustomTreeSelectArrayInput';
 import MembershipAssociationInput from '../../../../common/input/MembershipAssociationInput';
 

frontend/src/resources/Agent/Actor/Organization/OrganizationList.jsx

@@ -7,7 +7,7 @@ import ListIcon from '@mui/icons-material/List';
 import HomeIcon from '@mui/icons-material/Home';
 import OrganizationFilterSidebar from './OrganizationFilterSidebar';
 import SimpleList from "../../../../common/list/SimpleList";
-import { List } from '../../../../layout';
+import { List } from '../../../../common/layout';
 
 const OrganizationList = props => (
   <MultiViewsList

frontend/src/resources/Agent/Actor/Organization/OrganizationShow.jsx

@@ -16,7 +16,7 @@ import ForumIcon from '@mui/icons-material/Forum';
 import VideocamOutlinedIcon from '@mui/icons-material/VideocamOutlined';
 import { MarkdownField } from '../../../../common/field';
 import { Hero, MainList, SideList } from '../../../../common/list';
-import { Show } from '../../../../layout';
+import { Show } from '../../../../common/layout';
 import MembershipAssociationField from "../../../../common/field/MembershipAssociationField";
 
 const domainMapping = {

frontend/src/resources/Agent/Actor/Person/PersonEdit.jsx

@@ -4,7 +4,7 @@ import { MarkdownInput } from '@semapps/markdown-components';
 import { ImageInput } from '@semapps/input-components';
 import { EditToolbarWithPermissions } from '@semapps/auth-provider';
 import { ActivitiesInput, LocationInput, SkillsInput, ThemesInput } from '../../../../common/input';
-import { Edit } from '../../../../layout';
+import { Edit } from '../../../../common/layout';
 import MembershipAssociationInput from '../../../../common/input/MembershipAssociationInput';
 
 export const PersonEdit = props => (

frontend/src/resources/Agent/Actor/Person/PersonList.jsx

@@ -9,7 +9,7 @@ import PersonIcon from '@mui/icons-material/Person';
 import AccountCircleIcon from '@mui/icons-material/AccountCircle';
 import PersonFilterSidebar from './PersonFilterSidebar';
 import SimpleList from "../../../../common/list/SimpleList";
-import { List } from '../../../../layout';
+import { List } from '../../../../common/layout';
 
 const PersonList = props => (
   <MultiViewsList

frontend/src/resources/Agent/Actor/Person/PersonShow.jsx

@@ -6,7 +6,7 @@ import { ChipList } from '@semapps/list-components';
 import { MapField } from '@semapps/geo-components';
 import { MarkdownField } from '../../../../common/field';
 import { Hero, MainList, SideList } from '../../../../common/list';
-import { Show } from '../../../../layout';
+import { Show } from '../../../../common/layout';
 import MembershipAssociationField from '../../../../common/field/MembershipAssociationField';
 
 const PersonShow = props => (

frontend/src/resources/Concept/MembershipRole/RoleCreate.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { SimpleForm, TextInput } from 'react-admin';
-import { Create } from '../../../layout';
+import { Create } from '../../../common/layout';
 
 const RoleCreate = props => (
   <Create {...props}>

frontend/src/resources/Concept/MembershipRole/RoleEdit.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { SimpleForm, TextInput } from 'react-admin';
 import { EditToolbarWithPermissions } from '@semapps/auth-provider';
-import { Edit } from '../../../layout';
+import { Edit } from '../../../common/layout';
 
 export const RoleEdit = props => (
   <Edit {...props}>

frontend/src/resources/Concept/MembershipRole/RoleList.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { Avatar } from '@mui/material';
 import FavoriteBorderIcon from '@mui/icons-material/Class';
 import SimpleList from "../../../common/list/SimpleList";
-import { List } from '../../../layout';
+import { List } from '../../../common/layout';
 
 const RoleList = props => (
   <List {...props}>

frontend/src/resources/Concept/Status/StatusCreate.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { SimpleForm, TextInput, SelectArrayInput } from 'react-admin';
-import { Create } from '../../../layout';
+import { Create } from '../../../common/layout';
 
 const StatusCreate = props => (
   <Create {...props}>

frontend/src/resources/Concept/Status/StatusEdit.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { SimpleForm, TextInput } from 'react-admin';
 import { EditToolbarWithPermissions } from '@semapps/auth-provider';
-import { Edit } from '../../../layout';
+import { Edit } from '../../../common/layout';
 
 export const ThemeEdit = props => (
   <Edit {...props}>

frontend/src/resources/Concept/Status/StatusList.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import VisibilityIcon from '@mui/icons-material/Visibility';
 import SimpleList from "../../../common/list/SimpleList";
-import { List } from '../../../layout';
+import { List } from '../../../common/layout';
 
 const StatusList = props => (
   <List {...props}>

frontend/src/resources/Concept/Theme/ThemeCreate.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Create } from '../../../layout';
+import { Create } from '../../../common/layout';
 import { LexiconImportForm, fetchWikidata } from "@semapps/interop-components";
 
 const ThemeCreate = (props) => (

frontend/src/resources/Concept/Theme/ThemeEdit.jsx

@@ -3,7 +3,7 @@ import { FormTab, TabbedForm, TextInput, useGetList, useGetRecordId, choices } f
 import { MarkdownInput } from '@semapps/markdown-components';
 import { EditToolbarWithPermissions } from '@semapps/auth-provider';
 import { AgentsInput } from '../../../common/input';
-import { Edit } from '../../../layout';
+import { Edit } from '../../../common/layout';
 import CustomTreeSelectInput from '../../../common/input/TreeComponent/CustomTreeSelectInput';
 
 export const ThemeEdit = props => {

frontend/src/resources/Concept/Theme/ThemeList.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { List } from '../../../layout';
+import { List } from '../../../common/layout';
 import TreeList from '../../../common/list/TreeList';
 
 const ThemeList = props => (

frontend/src/resources/Concept/Theme/ThemeShow.jsx

@@ -4,7 +4,7 @@ import { Grid } from '@mui/material';
 import { ReferenceArrayField } from '@semapps/field-components';
 import { MarkdownField } from '../../../common/field';
 import { MainList, SideList } from '../../../common/list';
-import { Show } from '../../../layout';
+import { Show } from '../../../common/layout';
 
 const ThemeShow = props => (
   <Show {...props}>

frontend/src/resources/Concept/Type/TypeCreate.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { SimpleForm, TextInput, SelectArrayInput } from 'react-admin';
-import { Create } from '../../../layout';
+import { Create } from '../../../common/layout';
 
 const TypeCreate = props => (
   <Create {...props}>

frontend/src/resources/Concept/Type/TypeEdit.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { SimpleForm, TextInput } from 'react-admin';
 import { EditToolbarWithPermissions } from '@semapps/auth-provider';
-import { Edit } from '../../../layout';
+import { Edit } from '../../../common/layout';
 
 export const ThemeEdit = props => (
   <Edit {...props}>

frontend/src/resources/Concept/Type/TypeList.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import StyleIcon from '@mui/icons-material/Style';
 import SimpleList from "../../../common/list/SimpleList";
-import { List } from '../../../layout';
+import { List } from '../../../common/layout';
 
 const TypeList = props => (
   <List {...props}>

frontend/src/resources/Idea/IdeaEdit.jsx

@@ -3,7 +3,7 @@ import { SimpleForm, TextInput, SelectInput, ReferenceInput } from 'react-admin'
 import { MarkdownInput } from '@semapps/markdown-components';
 import { EditToolbarWithPermissions } from '@semapps/auth-provider';
 import { ActorsInput, ActivitiesInput } from '../../common/input';
-import { Edit } from '../../layout';
+import { Edit } from '../../common/layout';
 
 const IdeaEdit = props => (
   <Edit redirect="show" {...props}>