Merge pull request #44 from CSCfi/Crosswalk-Organization-Fix

Crosswalk organization fix

Author: konolak

mscr-ui/src/common/components/crosswalk-list/index.tsx

@@ -1,10 +1,7 @@
 import { useTranslation } from 'next-i18next';
-import { Button } from 'suomifi-ui-components';
-import { List, ListItem } from './crosswalk-list.styles';
-import { Grid, Table, TableBody, TableCell, TableContainer, TableHead, TableRow } from '@mui/material';
+import { Table, TableBody, TableCell, TableContainer, TableHead, TableRow, Typography } from '@mui/material';
 import router from 'next/router';
 import { Crosswalk } from '@app/common/interfaces/crosswalk.interface';
-import { getLanguageVersion } from '@app/common/utils/get-language-version';
 
 export interface CrosswalkListProps {
   items: Partial<Crosswalk>[];
@@ -31,7 +28,10 @@ export default function CrosswalkList({
   return (
     //Creating Header row
     <div>
-      <TableContainer>
+      <Typography marginTop={5}>
+        {'Crosswalks'}
+      </Typography>
+      <TableContainer >
         <Table aria-label={'Schemas'}>
           <TableHead>
             <TableRow>

mscr-ui/src/common/components/schema-list/index.tsx

@@ -11,6 +11,7 @@ import {
   TableContainer,
   TableHead,
   TableRow,
+  Typography,
 } from '@mui/material';
 import router from 'next/router';
 import { getLanguageVersion } from '@app/common/utils/get-language-version';
@@ -42,6 +43,9 @@ export default function SchemaList({ items }: SchemaListProps) {
     //Creating Header row
 
     <div>
+      <Typography marginTop={5}>
+        {'Schemas'}
+      </Typography>
       <TableContainer>
         <Table aria-label={'Schemas'}>
           <TableHead>

mscr-ui/src/common/components/table/index.tsx

@@ -1,5 +1,4 @@
 import * as React from 'react';
-import Separator from 'yti-common-ui/separator';
 import SchemaList from '../schema-list';
 import CrosswalkList from '../crosswalk-list';
 import { useGetPersonalContentQuery } from '@app/common/components/personal/personal.slice';
@@ -42,7 +41,6 @@ export default function BasicTable() {
 
   return (
     <div>
-      {'Schemas'}
       <SchemaList
         items={schemas ?? []}
         handleRemoval={function (value: string): void {
@@ -51,8 +49,6 @@ export default function BasicTable() {
         deleteDisabled={false}
       ></SchemaList>
 
-      {'Crosswalks'}
-
       <CrosswalkList
         items={crosswalks ?? []}
         handleRemoval={function (value: string): void {

mscr-ui/src/common/interfaces/crosswalk.interface.ts

@@ -6,15 +6,15 @@ import { Status } from './status.interface';
 export interface Crosswalk {
   pid?: string;
   format: string;
-  status: string | undefined;
+  status?: string | undefined;
   label: {
     [key: string]: string;
   };
   description: {
     [key: string]: string;
   };
-  languages: string[];
-  organizations: string[];
+  languages?: string[];
+  organizations?: string[];
   sourceSchema: string;
   targetSchema: string;
   state?: string;
@@ -28,7 +28,7 @@ export interface CrosswalkFormType {
   label: string;
   state?: string;
   languages: (LanguageBlockType & { selected: boolean })[];
-  organizations: MultiSelectData[];
+  organizations?: MultiSelectData[];
   status?: Status;
   sourceSchema: string;
   targetSchema: string;

mscr-ui/src/modules/crosswalk-form/generate-payload.tsx

@@ -29,11 +29,10 @@ export default function generatePayload(data: CrosswalkFormType): Crosswalk {
     languages: data.languages
       .filter((l) => l.title !== '')
       .map((l) => l.uniqueItemId),
-    organizations: data.organizations.map((o) => o.uniqueItemId),
     status: 'DRAFT',
     state: data.status,
     sourceSchema: data.sourceSchema,
     targetSchema: data.targetSchema,
-    versionLabel: "1"
+    versionLabel: '1',
   };
 }

mscr-ui/src/modules/crosswalk-form/index.tsx

@@ -61,11 +61,7 @@ export default function RegisterCrosswalkForm({
       ></CrosswalkForm>
       {renderCrosswalkFormat()}
       {renderLanguages()}
-
       {renderStaus()}
-      <BlockContainer>{!editMode && renderContributors()}</BlockContainer>
-      <Separator isLarge />
-      {editMode && renderContributors()}
     </ModelFormContainer>
   );
 
@@ -151,6 +147,7 @@ export default function RegisterCrosswalkForm({
     );
   }
 
+  //Currently Hidden from the form
   function renderContributors() {
     return (
       <WideMultiSelect

mscr-ui/src/modules/crosswalk-form/validate-form.tsx

@@ -39,10 +39,7 @@ export function validateForm(data: CrosswalkFormType) {
     errors.titleAmount = langsWithError ?? [];
   }
 
-  // Should have at least one organization set
-  if (data.organizations.length < 1) {
-    errors.organizations = true;
-  }
-
+  // Currently crosswalk is valif withou any organization also
+  
   return errors;
 }

mscr-ui/src/modules/front-page/index.tsx

@@ -65,7 +65,6 @@ export default function FrontPage() {
       </ButtonBlock>
       <Separator isLarge />
       <BasicTable></BasicTable>
-      <Separator isLarge />
     </main>
   );
 }