merging dev to test

DSL/Resql/training/POST/add-intent.sql

@@ -1,2 +1,2 @@
 INSERT INTO intent (intent, created, status, isForService)
-VALUES (:intent, CURRENT_TIMESTAMP, :status, false);
+VALUES (:intent, CURRENT_TIMESTAMP, :status, :isForService);

DSL/Resql/training/POST/get-intent-last-changed.sql

@@ -1,4 +1,4 @@
-SELECT id, intent, status, created
+SELECT id, intent, status, created, isForService
 FROM intent
 WHERE intent = :intent AND status = 'ACTIVE'
 ORDER BY created DESC

DSL/Ruuter.private/training/GET/rasa/intents/mark-for-service.yml

@@ -49,7 +49,7 @@ validateIntentExists:
 updateInDatabase:
   call: http.post
   args:
-    url: "[#TRAINING_RESQL]/mark-intent-for-service"
+    url: "[#TRAINING_RESQL]/add-intent"
     body:
       intent: ${intent}
       isForService: ${isForService}

DSL/Ruuter.private/training/POST/rasa/intents/add.yml

@@ -93,6 +93,7 @@ addInDatabase:
     body:
       intent: ${incoming.body.name}
       status: "ACTIVE"
+      isForService: false
   result: addIntentResult
 
 returnSuccess:

DSL/Ruuter.private/training/POST/rasa/intents/delete.yml

@@ -225,6 +225,7 @@ deleteInDatabase:
     body:
       intent: ${incoming.body.name}
       status: "DELETED"
+      isForService: false
   result: getIntentLastChangedResult
 
 getRuleByIntent:

DSL/Ruuter.private/training/POST/rasa/intents/examples/add.yml

@@ -182,13 +182,22 @@ addNewIntentInPipeline:
       input: ${intentYaml.response.body.json}
   result: updateSearchResult
 
+getIntentLatestState:
+  call: http.post
+  args:
+    url: "[#TRAINING_RESQL]/get-intent-last-changed"
+    body:
+      intent: ${incoming.body.intentName}    
+  result: latestStateRes   
+
 addInDatabase:
   call: http.post
   args:
     url: "[#TRAINING_RESQL]/add-intent"
     body:
       intent: ${incoming.body.intentName}
       status: "ACTIVE"
+      isForService: ${latestStateRes.response.body[0].isforservice ?? false}
   result: addInDatabaseResult
 
 returnSuccess:

DSL/Ruuter.private/training/POST/rasa/intents/examples/delete.yml

@@ -146,13 +146,22 @@ addNewIntentInPipeline:
       input: ${intentYaml.response.body.json}
   result: updateSearchResult
 
+getIntentLatestState:
+  call: http.post
+  args:
+    url: "[#TRAINING_RESQL]/get-intent-last-changed"
+    body:
+      intent: ${incoming.body.intentName}
+  result: latestStateRes  
+
 addInDatabase:
   call: http.post
   args:
     url: "[#TRAINING_RESQL]/add-intent"
     body:
       intent: ${incoming.body.intentName}
       status: "ACTIVE"
+      isForService: ${latestStateRes.response.body[0].isforservice ?? false}
   result: addInDatabaseResult
 
 saveIntentFile:

DSL/Ruuter.private/training/POST/rasa/intents/examples/update.yml

@@ -144,13 +144,22 @@ addIntentInPipeline:
       input: ${intentYaml.response.body.json}
   result: updateSearchResult
 
+getIntentLatestState:
+  call: http.post
+  args:
+    url: "[#TRAINING_RESQL]/get-intent-last-changed"
+    body:
+      intent: ${incoming.body.intentName}
+  result: latestStateRes  
+
 addInDatabase:
   call: http.post
   args:
     url: "[#TRAINING_RESQL]/add-intent"
     body:
       intent: ${incoming.body.intentName}
       status: "ACTIVE"
+      isForService: ${latestStateRes.response.body[0].isforservice ?? false}
   result: addInDatabaseResult
 
 saveIntentFile:

DSL/Ruuter.private/training/POST/rasa/intents/update.yml

@@ -288,13 +288,22 @@ addNewIntentInPipeline:
       input: ${intentYaml.response.body.json}
   result: updateSearchResult
 
+getIntentLatestState:
+  call: http.post
+  args:
+    url: "[#TRAINING_RESQL]/get-intent-last-changed"
+    body:
+      intent: ${intent_old_name}
+  result: latestStateRes   
+
 addInDatabase:
   call: http.post
   args:
     url: "[#TRAINING_RESQL]/add-intent"
     body:
-      intent: ${incoming.body.newName}
+      intent: ${intent}
       status: "ACTIVE"
+      isForService: ${latestStateRes.response.body[0].isforservice ?? false}
   result: addInDatabaseResult
 
 deleteOldIntentFile:

GUI/package.json

@@ -14,7 +14,7 @@
     "@buerokratt-ria/header": "^0.1.46",
     "@buerokratt-ria/menu": "^0.2.9",
     "@buerokratt-ria/styles": "^0.0.1",
-    "@buerokratt-ria/common-gui-components": "^0.0.30",
+    "@buerokratt-ria/common-gui-components": "^0.0.32",
     "@fontsource/roboto": "^4.5.8",
     "@formkit/auto-animate": "^1.0.0-beta.5",
     "@radix-ui/react-accessible-icon": "^1.0.1",