Merge pull request #483 from CedricProfessionnel/RefactorImport

Refactor import (Feature Aws Part)

Author: CedricProfessionnel

src/components/ImportFromCognitoS3Dialog/header-table-import.js

@@ -8,7 +8,7 @@ import { Button, IconButton } from "@material-ui/core/"
 
 const selectedStyle = { color: "DodgerBlue" }
 
-export default ({ configImport, setConfigImport }) => {
+const HeaderTable = ({ configImport, setConfigImport }) => {
   const { t } = useTranslation()
   const loadAssetsOrAnnotations = () => {
     setConfigImport({
@@ -52,11 +52,12 @@ export default ({ configImport, setConfigImport }) => {
         }}
       >
         {configImport.contentDialogBoxIsSetting ? (
-          <StorageIcon></StorageIcon>
+          <StorageIcon id="StorageIcon" />
         ) : (
-          <SettingsIcon></SettingsIcon>
+          <SettingsIcon id="SettingIcon" />
         )}
       </IconButton>
     </div>
   )
 }
+export default HeaderTable

src/components/ImportFromCognitoS3Dialog/index.js

@@ -15,7 +15,6 @@ import HeaderTableImport from "./header-table-import"
 import { Radio, Grid } from "@material-ui/core/"
 import importConfigIsReady from "./config-import-is-ready"
 import WarningHeader from "./warning-header"
-import getSources from "./get-sources"
 import { useTranslation } from "react-i18next"
 
 export default ({ open, onClose, onAddSamples }) => {
@@ -107,12 +106,8 @@ export default ({ open, onClose, onAddSamples }) => {
       dataFolder.map(async (obj, index) => {
         const folder = obj
         var isSelected = false
-        const rowAnnotationsContent = await dm.getListSamples({
-          projectName: obj,
-        })
-        const rowAssetsContent = await dm.getListAssets({
-          projectName: obj,
-        })
+        const rowAnnotationsContent = await dm.getListSamples(obj)
+        const rowAssetsContent = await dm.getListAssets(obj)
         if (projectToFetch && projectToFetch.folder === folder)
           isSelected = true
         return {
@@ -173,38 +168,57 @@ export default ({ open, onClose, onAddSamples }) => {
         )
       })
     )
-    onAddSamples(jsons)
+    return jsons
   }
 
   const createJsonFromUrlAWS = async (projectName, imageName) => {
     var url = await dm.getAssetUrl(imageName, projectName)
     var json = await setUrl(url, configImport, dm)
-    if (json) json = setIn(json, ["_id"], imageName)
-    if (json) json = setIn(json, ["source"], projectName)
+    if (json)
+      json = await setIn(
+        json,
+        ["_id"],
+        "s" + Math.random().toString(36).slice(-8)
+      )
+    if (json) json = await setIn(json, ["sampleName"], imageName)
+    if (json) json = await setIn(json, ["source"], projectName)
     return json
   }
 
   const createJsonFromAnnotation = async () => {
     var jsons = await dm.readJSONAllSamples(projectToFetch.rowAnnotationsUrl)
-    var sources = getSources(jsons)
-    if (sources) {
-      jsons = await Promise.all(
-        jsons.map(async (json) => {
-          if (json.source)
-            json = await createJsonFromUrlAWS(json.source, json._id)
-          return json
-        })
-      )
-    }
-    onAddSamples(jsons)
+    return jsons
+  }
+
+  const checkIfJsonsContainsDouble = (jsons) => {
+    var newJsons = []
+    var oldUrl = oldData.samples.map((json) => {
+      var url = dm.getSampleUrl(json)
+      if (url) return url.match("(http.*)\\?|(http.*)$")[1]
+      return url
+    })
+
+    newJsons = jsons.filter((json) => {
+      var url = dm.getSampleUrl(json)
+      if (url && oldUrl.includes(url.match("(http.*)\\?|(http.*)$")[1]))
+        return false
+      return true
+    })
+
+    return newJsons
   }
 
   const handleAddSample = async () => {
+    if (!dm) return
+    var jsons
     if (configImport.loadAssetsIsSelected) {
-      createJsonFromAsset()
+      jsons = await createJsonFromAsset()
     } else {
-      createJsonFromAnnotation()
+      jsons = await createJsonFromAnnotation()
     }
+    jsons = await checkIfJsonsContainsDouble(jsons)
+
+    onAddSamples(jsons)
   }
 
   return (

src/components/ImportFromCognitoS3Dialog/interface-setting-import.js

@@ -1,4 +1,5 @@
 import React from "react"
+import { useTranslation } from "react-i18next"
 import {
   Radio,
   RadioGroup,
@@ -7,8 +8,7 @@ import {
   FormLabel,
   Grid,
 } from "@material-ui/core/"
-import { useTranslation } from "react-i18next"
-export default ({ configImport, setConfigImport }) => {
+const Setting = ({ configImport, setConfigImport, tableStyle }) => {
   const { t } = useTranslation()
   return (
     <Grid container item xs={12} spacing={0} justify="center">
@@ -35,12 +35,14 @@ export default ({ configImport, setConfigImport }) => {
               control={<Radio />}
               label={t("keep-incoming-annotations")}
               checked={configImport.annotationToKeep === "incoming"}
+              disabled={true}
             />
             <FormControlLabel
               value="current"
               control={<Radio />}
               label={t("keep-current-annotations")}
               checked={configImport.annotationToKeep === "current"}
+              disabled={true}
             />
           </RadioGroup>
         </FormControl>
@@ -91,9 +93,17 @@ export default ({ configImport, setConfigImport }) => {
               disabled={configImport.typeOfFileToDisable.Text}
               checked={configImport.typeOfFileToLoad === "Text"}
             />
+            <FormControlLabel
+              value="Time"
+              control={<Radio />}
+              label="Load time file"
+              disabled={configImport.typeOfFileToDisable.Time}
+              checked={configImport.typeOfFileToLoad === "Time"}
+            />
           </RadioGroup>
         </FormControl>
       )}
     </Grid>
   )
 }
+export default Setting

src/components/ImportFromCognitoS3Dialog/warning-header.js

@@ -1,6 +1,6 @@
 import React from "react"
 const WarningHeader = ({ configImport, projectToFetch }) => {
-  const orangeText = { color: "orange" }
+  const orangeText = { color: "orange", textAlign: "center" }
   var text = ``
   if (!configImport.isReady) text += `Warning :`
   else return <p style={orangeText}>{text}</p>