NC 18 Workflow integration #10

Rello · Jan 9, 2020 · e7d7598 · e7d7598
1 parent 5f54962
commit e7d7598
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 30 deletions.
diff --git a/js/flow.js b/js/flow.js
@@ -4,9 +4,9 @@
         name: 'WorkflowScript',
         items: [],
         render: function (createElement) {
-            var self = this;
-            var items = [];
-            var selected;
+            let self = this;
+            let items = [];
+            let selected;
             for (let navigation of Component.items) {
                 if (parseInt(navigation.type) === 2) {
                     if (parseInt(self.value) === navigation.id) {

diff --git a/l10n/de.json b/l10n/de.json
@@ -76,7 +76,8 @@
     "<= less equal": "<= kleiner gleich",
     ">= greater equal": ">= größer gleich",
     "!= not equal": "!= ungleich",
-    "Single value or *": "Einzelwert oder *"
+    "Single value or *": "Einzelwert oder *",
+    "Read file and add its data to an existing report": "Datei auslesen und den Inhalt einem bestehenden Report hinzufügen"
   },
   "pluralForm": ""
 }
diff --git a/l10n/de_DE.json b/l10n/de_DE.json
@@ -76,7 +76,8 @@
     "<= less equal": "<= kleiner gleich",
     ">= greater equal": ">= größer gleich",
     "!= not equal": "!= ungleich",
-    "Single value or *": "Einzelwert oder *"
+    "Single value or *": "Einzelwert oder *",
+    "Read file and add its data to an existing report": "Datei auslesen und den Inhalt einem bestehenden Report hinzufügen"
   },
   "pluralForm": ""
 }
diff --git a/lib/Flow/Operation.php b/lib/Flow/Operation.php
@@ -61,12 +61,12 @@ public static function register(IEventDispatcher $dispatcher): void
 
     public function getDisplayName(): string
     {
-        return $this->l->t('Add to Analytics');
+        return $this->l->t('Data Analytics');
     }
 
     public function getDescription(): string
     {
-        return $this->l->t('Read a file and add its data to an existing report');
+        return $this->l->t('Read file and add its data to an existing report');
     }
 
     public function getIcon(): string
@@ -80,45 +80,40 @@ public function isAvailableForScope(int $scope): bool
     }
 
     /**
-     * Validates whether a configured workflow rule is valid. If it is not,
-     * an `\UnexpectedValueException` is supposed to be thrown.
-     *
      * @param $name
      * @param array $checks
      * @param $operation
      * @since 9.1
      */
     public function validateOperation($name, array $checks, $operation): void
     {
-        $this->logger->debug("validateOperation");
     }
 
     public function onEvent(string $eventName, Event $event, IRuleMatcher $ruleMatcher): void
     {
         $flow = $ruleMatcher->getFlows(true);
         $datasetId = (int)$flow['operation'];
 
-        try {
-            if ($eventName === '\OCP\Files::postRename') {
-                /** @var Node $oldNode */
-                list(, $node) = $event->getSubject();
-            } else {
-                $node = $event->getSubject();
-            }
+        if ($eventName === '\OCP\Files::postRename') {
+            /** @var Node $oldNode */
+            list(, $node) = $event->getSubject();
+        } else {
+            $node = $event->getSubject();
+        }
 
-            list(, , $folder, $file) = explode('/', $node->getPath(), 4);
-            if ($folder !== 'files' || $node instanceof Folder) {
-                return;
-            }
-            $file = '/' . $file;
+        list(, , $folder, $file) = explode('/', $node->getPath(), 4);
+        if ($folder !== 'files' || $node instanceof Folder) {
+            return;
+        }
+        $file = '/' . $file;
 
-            $this->logger->debug("Flow Operation 119: storing file '" . $file . "' in report " . $datasetId);
-            try {
-                $this->DataloadController->importFile($datasetId, $file);
-            } catch (NotFoundException $e) {
-            } catch (\Exception $e) {
-            }
-        } catch (\OCP\Files\NotFoundException $e) {
+        $this->logger->debug("Analytics Flow Operation 115: storing file '" . $file . "' in report " . $datasetId);
+        try {
+            $this->DataloadController->importFile($datasetId, $file);
+        } catch (NotFoundException $e) {
+            return;
+        } catch (\Exception $e) {
+            return;
         }
     }
 }