Merge branch 'feature/15227-process-spec-mqtt-airflow' into 'modis_ma…

…ster' #94 & #102 Specific process mqtt airflow See merge request datalake/docker_datalake!111
vincentnam · Oct 25, 2021 · b7a2fc3 · b7a2fc3
2 parents f05c8d0 + 0fbe382
commit b7a2fc3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 14 deletions.
diff --git a/process_zone/apache_airflow/dags/branching.py b/process_zone/apache_airflow/dags/branching.py
@@ -294,11 +294,12 @@ def default_application_json(**kwargs):
     # Récupération du fichier encoder dans l'object swift
     swift_result = swift_object[1]
     processed_data = {}
-    if "application/json" in metadata_doc[content_type]:
-        process_type = "time_series_json"
-        # Json parsing
-        processed_data = extract_transform_load_time_series_json(
-            swift_result, swift_container, swift_id, process_type)
+    if "x-object-meta-source" not in swift_object[0]:
+        if "application/json" in metadata_doc[content_type]:
+            process_type = "time_series_json"
+            # Json parsing
+            processed_data = extract_transform_load_time_series_json(
+                swift_result, swift_container, swift_id, process_type)
     return processed_data
 
 

diff --git a/service_zone/frontend/datalake-react-front/src/components/model/ModelAddForm.js b/service_zone/frontend/datalake-react-front/src/components/model/ModelAddForm.js
@@ -75,7 +75,7 @@ export class ModelAddForm extends React.Component {
         }
 
         if (this.state.selectedTypesFiles.length === 0) {
-            this.toastError("Veuillez ajouter au minimum un type de fichier accepter !");
+            this.toastError("Veuillez ajouter au minimum un type de fichier accepté !");
             nbErrors += 1;
         }
 
@@ -185,10 +185,6 @@ export class ModelAddForm extends React.Component {
         });
     }
 
-    //handleCallbackData = (childData) =>{
-    //    this.setState({dataFilters: childData})
-    //}
-
     render() {
         let Metadonnees = () => {
             let data = Array.from(this.state.metadonnees);

diff --git a/service_zone/frontend/datalake-react-front/src/components/model/ModelEditForm.js b/service_zone/frontend/datalake-react-front/src/components/model/ModelEditForm.js
@@ -215,10 +215,6 @@ export class ModelEditForm extends React.Component {
         });
     }
 
-    //handleCallbackData = (childData) =>{
-    //    this.setState({dataFilters: childData})
-    //}
-
     render() {
         let Metadonnees = () => {
             let data = Array.from(this.state.metadonnees);