feat(Projects): add project page commands and repository (#176)

AxaFrance · Mar 22, 2022 · 2b78fb3 · 2b78fb3
1 parent 0a9621b
commit 2b78fb3
Show file tree

Hide file tree

Showing 58 changed files with 980 additions and 322 deletions.
diff --git a/Scripts/Release/SQL/Azure_R1/001_drop_tables.sql b/Scripts/Release/SQL/Azure_R1/001_drop_tables.sql
@@ -17,6 +17,10 @@ IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = object_id(N'[sch_ECOTAG].[T_D
 DROP table [sch_ECOTAG].[T_Dataset]
 GO
 
-    IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = object_id(N'[sch_ECOTAG].[T_File]'))
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = object_id(N'[sch_ECOTAG].[T_File]'))
 DROP table [sch_ECOTAG].[T_File]
     GO
+
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = object_id(N'[sch_ECOTAG].[T_Project]'))
+DROP table [sch_ECOTAG].[T_Project]
+    GO
diff --git a/Scripts/Release/SQL/Azure_R1/002_create_tables.sql b/Scripts/Release/SQL/Azure_R1/002_create_tables.sql
@@ -85,4 +85,21 @@ END
 
 GO
 
+/****** Object:  Table [sch_ECOTAG].[T_Project] ******/
+if not exists (select * from sysobjects where name='T_Project' and xtype='U')
+BEGIN
+CREATE TABLE [sch_ECOTAG].[T_Project](
+    [PRJ_Id] uniqueidentifier NOT NULL DEFAULT newid(),
+    [PRJ_DatasetId] uniqueidentifier NOT NULL,
+    [PRJ_GroupId] uniqueidentifier NOT NULL,
+    [PRJ_Name] [varchar](16) NOT NULL,
+    [PRJ_NumberCrossAnnotation] [int] NOT NULL CHECK (PRJ_NumberCrossAnnotation between 1 and 10),
+    [PRJ_CreateDate] BIGINT NOT NULL,
+    [PRJ_AnnotationType] int NOT NULL,
+    [PRJ_LabelsJson] [varchar](2048) NOT NULL,
+    [PRJ_CreatorNameIdentifier] [varchar](32) NOT NULL,
+    CONSTRAINT [PK_T_Project] UNIQUE([PRJ_Id])
+    )
+END
 
+GO
diff --git a/Scripts/Release/SQL/Azure_R1/004_insert_data.sql b/Scripts/Release/SQL/Azure_R1/004_insert_data.sql
@@ -9,6 +9,10 @@ DECLARE @firstGroupId uniqueidentifier
 DECLARE @secondGroupId uniqueidentifier
 DECLARE @thirdGroupId uniqueidentifier
 
+DECLARE @firstProjectId uniqueidentifier
+DECLARE @secondProjectId uniqueidentifier
+DECLARE @thirdProjectId uniqueidentifier
+
 SET @firstUserId = newid()
 SET @secondUserId = newid()
 SET @thirdUserId = newid()
@@ -17,6 +21,10 @@ SET @firstGroupId = newid()
 SET @secondGroupId = newid()
 SET @thirdGroupId = newid()
 
+SET @firstProjectId = newid()
+SET @secondProjectId = newid()
+SET @thirdProjectId = newid()
+
 INSERT INTO [sch_ECOTAG].[T_User]([USR_Id],[USR_Email],[USR_Subject]) VALUES (@firstUserId,"[email protected]","S111111")
 INSERT INTO [sch_ECOTAG].[T_User]([USR_Id],[USR_Email],[USR_Subject]) VALUES (@secondUserId,"[email protected]","S222222")
 INSERT INTO [sch_ECOTAG].[T_User]([USR_Id],[USR_Email],[USR_Subject]) VALUES (@thirdUserId,"[email protected]","S333333")
@@ -30,4 +38,10 @@ INSERT INTO [sch_ECOTAG].[T_GroupUsers]([GPU_Id],[GRP_Id],[USR_Id]) VALUES (newi
 INSERT INTO [sch_ECOTAG].[T_GroupUsers]([GPU_Id],[GRP_Id],[USR_Id]) VALUES (newid(), @firstGroupId, @thirdUserId)
 INSERT INTO [sch_ECOTAG].[T_GroupUsers]([GPU_Id],[GRP_Id],[USR_Id]) VALUES (newid(), @secondGroupId, @secondUserId)
 
+INSERT INTO [sch_ECOTAG].[T_Project](
+    [PRJ_Id],[PRJ_DatasetId],[PRJ_GroupId],[PRJ_Name],[PRJ_NumberCrossAnnotation],[PRJ_CreateDate],[PRJ_AnnotationType],[PRJ_LabelsJson],[PRJ_CreatorNameIdentifier]
+) VALUES (
+    newid(), newid(), @firstGroupId, "firstproject", 10, 1647129600, 0, '[{"name": "Recto", "color": "#212121", "id": "0"}, {"name": "Verso", "color": "#ffbb00", "id": "1"}, {"name": "Signature", "color": "#f20713", "id": "2"}]',"s666666"
+)
+
 GO
diff --git a/docker/dockerfile b/docker/dockerfile
@@ -2,5 +2,5 @@
 ENV ACCEPT_EULA=Y
 ENV SA_PASSWORD=Your_password123
 COPY ./ /
-#ENTRYPOINT [ "/bin/bash", "entrypoint.sh" ]
+ENTRYPOINT [ "/bin/bash", "entrypoint.sh" ]
 CMD [ "/opt/mssql/bin/sqlservr" ]
diff --git a/docker/initBase.sql b/docker/initBase.sql
@@ -150,6 +150,26 @@ END
 GO
 
 
+/****** Object:  Table [sch_ECOTAG].[T_Project] ******/
+if not exists (select * from sysobjects where name='T_Project' and xtype='U')
+BEGIN
+CREATE TABLE [sch_ECOTAG].[T_Project](
+    [PRJ_Id] uniqueidentifier NOT NULL DEFAULT newid(),
+    [PRJ_DatasetId] uniqueidentifier NOT NULL,
+    [PRJ_GroupId] uniqueidentifier NOT NULL,
+    [PRJ_Name] [varchar](16) NOT NULL,
+    [PRJ_NumberCrossAnnotation] [int] NOT NULL CHECK (PRJ_NumberCrossAnnotation between 1 and 10),
+    [PRJ_CreateDate] BIGINT NOT NULL,
+    [PRJ_AnnotationType] int NOT NULL,
+    [PRJ_LabelsJson] [varchar](2048) NOT NULL,
+    [PRJ_CreatorNameIdentifier] [varchar](32) NOT NULL,
+    CONSTRAINT [PK_T_Project] UNIQUE([PRJ_Id])
+    )
+END
+
+GO
+
+
 CREATE CLUSTERED INDEX [IND_DatasetIsLocked] ON [sch_ECOTAG].[T_Dataset]
 (
     [DTS_IsLocked] ASC
@@ -176,6 +196,10 @@ DECLARE @firstGroupId uniqueidentifier
 DECLARE @secondGroupId uniqueidentifier
 DECLARE @thirdGroupId uniqueidentifier
 
+DECLARE @firstProjectId uniqueidentifier
+DECLARE @secondProjectId uniqueidentifier
+DECLARE @thirdProjectId uniqueidentifier
+
 SET @firstUserId = newid()
 SET @secondUserId = newid()
 SET @thirdUserId = newid()
@@ -184,6 +208,10 @@ SET @firstGroupId = newid()
 SET @secondGroupId = newid()
 SET @thirdGroupId = newid()
 
+SET @firstProjectId = newid()
+SET @secondProjectId = newid()
+SET @thirdProjectId = newid()
+
 INSERT INTO [sch_ECOTAG].[T_User]([USR_Id],[USR_Email],[USR_Subject]) VALUES (@firstUserId,"[email protected]","S111111")
 INSERT INTO [sch_ECOTAG].[T_User]([USR_Id],[USR_Email],[USR_Subject]) VALUES (@secondUserId,"[email protected]","S222222")
 INSERT INTO [sch_ECOTAG].[T_User]([USR_Id],[USR_Email],[USR_Subject]) VALUES (@thirdUserId,"[email protected]","S333333")
@@ -197,6 +225,12 @@ INSERT INTO [sch_ECOTAG].[T_GroupUsers]([GPU_Id],[GRP_Id],[USR_Id]) VALUES (newi
 INSERT INTO [sch_ECOTAG].[T_GroupUsers]([GPU_Id],[GRP_Id],[USR_Id]) VALUES (newid(), @firstGroupId, @thirdUserId)
 INSERT INTO [sch_ECOTAG].[T_GroupUsers]([GPU_Id],[GRP_Id],[USR_Id]) VALUES (newid(), @secondGroupId, @secondUserId)
 
+INSERT INTO [sch_ECOTAG].[T_Project](
+    [PRJ_Id],[PRJ_DatasetId],[PRJ_GroupId],[PRJ_Name],[PRJ_NumberCrossAnnotation],[PRJ_CreateDate],[PRJ_AnnotationType],[PRJ_LabelsJson],[PRJ_CreatorNameIdentifier]
+) VALUES (
+    newid(), newid(), @firstGroupId, "firstproject", 10, 1647129600, 0, '[{"name": "Recto", "color": "#212121", "id": "0"}, {"name": "Verso", "color": "#ffbb00", "id": "1"}, {"name": "Signature", "color": "#f20713", "id": "2"}]',"s666666"
+)
+
 GO
 
 USE [ecotag]

diff --git a/src/Ml.Cli.WebApp/ClientApp/src/Server/Project/Add/New/New.container.js b/src/Ml.Cli.WebApp/ClientApp/src/Server/Project/Add/New/New.container.js
@@ -12,7 +12,7 @@ import {
   TYPE,
   MSG_REQUIRED,
   LABELS,
-  MSG_PROJECT_NAME_ALREADY_EXIST
+  MSG_PROJECT_NAME_ALREADY_EXIST, MSG_MIN_LENGTH, MSG_MAX_LENGTH, MSG_TEXT_REGEX, MSG_MAX_LABELS_LENGTH
 } from './constants';
 import compose from '../../../compose';
 import withCustomFetch from '../../../withCustomFetch';
@@ -69,7 +69,26 @@ export const reducer = (state, action) => {
       let newFields;
       switch (name) {
         case LABELS:
-          const message = newValues.length > 0 ? null : MSG_REQUIRED
+          let message = null;
+          if(newValues.length === 0){
+            message = MSG_REQUIRED
+          }
+          else if(newValues.length > 10){
+            message = MSG_MAX_LABELS_LENGTH
+          }
+          else{
+            newValues.forEach(function(value, index){
+              if(value.name.length < 3){
+                message = `Label numéro ${index + 1} : ${MSG_MIN_LENGTH}`
+              }
+              else if(value.name.length > 16){
+                message = `Label numéro ${index + 1} : ${MSG_MAX_LENGTH}`
+              }
+              else if(!value.name.match(/^[a-zA-Z-_]*$/)){
+                message = `Label numéro ${index + 1} : ${MSG_TEXT_REGEX}`
+              }
+            })
+          }
           newFields = {
             ...fields,
                 [name]: {
@@ -92,24 +111,24 @@ export const reducer = (state, action) => {
             }else if(DATASET === name) {
 
               const options = [{
-                    value: 'CROPPING',
-                    label: "Séléction de zone d'image",
+                    value: 'Cropping',
+                    label: "Sélection de zone d'image",
                     type: "Image"
                   },
                   {
                     value: 'ImageClassifier',
-                    label: 'Saisi de texte contenu dans une image',
+                    label: 'Saisie de texte contenu dans une image',
                     type: "Image"
                   },
                   {
-                    value: 'NAMED_ENTITY',
-                    label: 'Séléction de zone de texte',
+                    value: 'NamedEntity',
+                    label: 'Sélection de zone de texte',
                     type: "Text"
                   }];
               const datasetId = event.value
-              const datsetType = state.datasets.find(dataset => dataset.id === datasetId).type;
+              const datasetType = state.datasets.find(dataset => dataset.id === datasetId).type;
               const reducer = (previousValue, currentValue) => {
-                if(currentValue.type === datsetType) {
+                if(currentValue.type === datasetType) {
                   previousValue.push({value:currentValue.value, label:currentValue.label});
                 }
                 return previousValue;
@@ -163,12 +182,11 @@ export const createProject = async (history, fetch, state, dispatch) => {
     return;
   }
   dispatch({ type: 'onSubmitStarted'});
-    const datasetId = state.fields[DATASET].value
     const newProject = {
       name: state.fields[NAME].value,
       dataSetId: state.fields[DATASET].value,
       groupId: state.fields[GROUP].value,
-      typeAnnotation: state.fields[TYPE].value,
+      annotationType: state.fields[TYPE].value,
       numberCrossAnnotation: state.fields[NUMBER_CROSS_ANNOTATION].value,
       labels: state.fields[LABELS].values,
     };

diff --git a/src/Ml.Cli.WebApp/ClientApp/src/Server/Project/Add/New/New.container.spec.js b/src/Ml.Cli.WebApp/ClientApp/src/Server/Project/Add/New/New.container.spec.js
@@ -23,7 +23,6 @@ const fetch = () => {
       "id": "0001",
       "name": "Relevé d'information",
       "dataSetId": "0004",
-      "classification": "Publique",
       "numberTagToDo": 10,
       "createDate": new Date("04-04-2011").getTime(),
       "typeAnnotation": "NER",
@@ -136,7 +135,7 @@ describe('New.container', () => {
       jest.clearAllMocks();
     });
 
-    it('should call fetchDeleteProject and dispatch', async () => {
+    it('should call createProject and dispatch', async () => {
       try {
         await createProject(givenHistory, givenFetch, givenState, givenDispatch);
         expect(givenFetch).toHaveBeenCalledTimes(1);

diff --git a/src/Ml.Cli.WebApp/ClientApp/src/Server/Project/Add/New/New.validation.rules.js b/src/Ml.Cli.WebApp/ClientApp/src/Server/Project/Add/New/New.validation.rules.js
@@ -1,3 +1,4 @@
+
 import { NAME, DATASET, NUMBER_CROSS_ANNOTATION, TYPE, MSG_REQUIRED, LABELS, GROUP } from './constants';
 
 const rulesRequired = {
@@ -8,23 +9,35 @@ const rulesRequired = {
 
 const rulesMaxLength = max => ({
   maxLength: {
-    maxLength: max,
-    message: 'Le champ contient trop de caractères',
+    maxLength: max
   },
 });
 
+const rulesMinLength = min => ({
+  minLength: {
+    minLength: min
+  }
+});
+
+const ruleText = {
+  pattern: {
+    regex: /^[a-zA-Z0-9-_]*$/,
+    message: "Veuillez saisir un caractère alpha numérique, – et _ inclus, accents exclus"
+  }
+}
+
 const ruleNumber = {
   pattern: {
-    regex: /^[0-9]*$/,
-    message: 'Veuillez saisir un nombre',
+    regex: /^([1-9]|10)$/,
+    message: 'Veuillez saisir un nombre entier compris entre 1 et 10',
   },
 };
 
 export const rules = {
-  [NAME]: [rulesRequired],
+  [NAME]: [rulesRequired, rulesMaxLength(16), rulesMinLength(3), ruleText],
   [DATASET]: [rulesRequired],
   [TYPE]: [rulesRequired],
   [LABELS]: [],
-  [NUMBER_CROSS_ANNOTATION]: [rulesMaxLength(10), ruleNumber],
+  [NUMBER_CROSS_ANNOTATION]: [ruleNumber],
   [GROUP]: [rulesRequired],
 };
diff --git a/src/Ml.Cli.WebApp/ClientApp/src/Server/Project/Add/New/constants.js b/src/Ml.Cli.WebApp/ClientApp/src/Server/Project/Add/New/constants.js
@@ -1,10 +1,13 @@
 export const NAME = 'NAME';
 export const DATASET = 'DATASET';
-export const CLASSIFICATION = 'CLASSIFICATION';
 export const TYPE = 'TYPE';
 export const NUMBER_CROSS_ANNOTATION = 'NUMBER_CROSS_ANNOTATION';
 export const LABELS = 'LABELS';
 export const GROUP = 'GROUP';
 
-export const MSG_REQUIRED = 'Le champs est obligatoire';
+export const MSG_REQUIRED = 'Le champ est obligatoire';
+export const MSG_MAX_LABELS_LENGTH = 'Le nombre de labels maximum est limité à 10';
+export const MSG_MIN_LENGTH = 'Le champ ne contient pas assez de caractères (3 min)';
+export const MSG_MAX_LENGTH = 'Le champ contient trop de caractères (16 max)';
+export const MSG_TEXT_REGEX = "Veuillez respecter le bon format (Lettres, '-' ou '_' uniquement)";
 export const MSG_PROJECT_NAME_ALREADY_EXIST = 'Un projet avec ce nom existe déjà';
diff --git a/src/Ml.Cli.WebApp/ClientApp/src/Server/Project/Annotations/Annotation.stories.js b/src/Ml.Cli.WebApp/ClientApp/src/Server/Project/Annotations/Annotation.stories.js
@@ -14,7 +14,6 @@ export const fetch = async (url, config) => {
                     await sleep(1);
 
                     return {
-                        classification: "Publique",
                         createDate: "1977-04-22T06:00:00Z",
                         dataSetId: "0001",
                         groupId: "0002",

diff --git a/....Cli.WebApp/ClientApp/src/Server/Project/Annotations/AnnotationDispatch.container.spec.js b/....Cli.WebApp/ClientApp/src/Server/Project/Annotations/AnnotationDispatch.container.spec.js
@@ -8,7 +8,6 @@ const fetch = () => Promise.resolve({
   "id": "0001",
   "name": "Relevé d'information",
   "dataSetId": "0004",
-  "classification": "Publique",
   "numberTagToDo": 10,
   "createDate": "04/04/2011",
   "typeAnnotation": "NER",
@@ -33,15 +32,13 @@ describe('AnnotationDispatch.container', () => {
     "id": "0001",
     "name": "Carte verte",
     "type": "Image",
-    "classification": "Publique",
     "numberFiles": 300,
     "createDate": "30/10/2019"
   };
   const givenProject = {
     "id": "0001",
     "name": "Relevé d'information",
     "dataSetId": "0004",
-    "classification": "Publique",
     "numberTagToDo": 10,
     "createDate": new Date("04-04-2011").getTime(),
     "typeAnnotation": "NER",

diff --git a/src/Ml.Cli.WebApp/ClientApp/src/Server/Project/Annotations/PageAnnotation.js b/src/Ml.Cli.WebApp/ClientApp/src/Server/Project/Annotations/PageAnnotation.js
@@ -5,7 +5,7 @@ import {withResilience} from "../../shared/Resilience";
 
 export const PageAnnotation = ({project, currentItem, onSubmit, onNext, onPrevious, hasPrevious, hasNext, reservationStatus, documentId, annotationStatus, apiUrl}) => <>
     <Title title={project.name}
-           subtitle={`Project de type ${project.typeAnnotation} classification ${project.classification}`}
+           subtitle={`Project de type ${project.typeAnnotation}`}
            goTo={`/projects/${project.id}`}/>
     <Content reservationStatus={reservationStatus}
              annotationStatus={annotationStatus}

diff --git a/src/Ml.Cli.WebApp/ClientApp/src/Server/Project/List/Home.container.js b/src/Ml.Cli.WebApp/ClientApp/src/Server/Project/List/Home.container.js
@@ -8,7 +8,7 @@ import { computeNumberPages, filterPaging, getItemsFiltered, getItemsSorted } fr
 const HomeWithResilience = withResilience(Home);
 
 export const HomeContainer = ({ fetch }) => {
-  const { state, onChangePaging, onChangeFilter, onChangeSort, onDeleteProject } = useHome(fetch);
+  const { state, onChangePaging, onChangeFilter, onChangeSort } = useHome(fetch);
   let filtersState = state.filters;
   const itemsFiltered = getItemsFiltered(state.items, filtersState.filterValue);
   const itemsSorted = getItemsSorted(itemsFiltered, filtersState.columns);
@@ -32,7 +32,6 @@ export const HomeContainer = ({ fetch }) => {
       onChangePaging={onChangePaging}
       onChangeSort={onChangeSort}
       onChangeFilter={onChangeFilter}
-      onDeleteProject={onDeleteProject}
     />
   );
 };