merging V3.3.1 to main

.env.gui

@@ -1,4 +1,4 @@
 RELEASE=PRE-ALPHA-test
-VERSION=1
-BUILD=1
-FIX=16
+VERSION=3
+BUILD=3
+FIX=3-test

.github/workflows/ci-build-image.yml

@@ -0,0 +1,47 @@
+name: Build and publish GUI
+
+on:
+  push:
+    branches: [ v3.3.1 ]
+    paths:
+      - '.env.gui'
+
+jobs:
+  PackageDeploy:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Debugging Step
+        run: |
+          echo "Checking runner status..."
+          # Add more debugging commands as needed
+
+      - uses: actions/checkout@v2
+
+      - name: Docker Setup BuildX
+        uses: docker/setup-buildx-action@v2
+
+      - name: Load environment variables and set them
+        run: |
+          if [ -f .env.gui ]; then
+            export $(cat .env.gui | grep -v '^#' | xargs)
+          fi
+          echo "RELEASE=$RELEASE" >> $GITHUB_ENV
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
+          echo "BUILD=$BUILD" >> $GITHUB_ENV
+          echo "FIX=$FIX" >> $GITHUB_ENV
+      - name: Set repo
+        run: |
+           LOWER_CASE_GITHUB_REPOSITORY=$(echo $GITHUB_REPOSITORY | tr '[:upper:]' '[:lower:]')
+           echo "DOCKER_TAG_CUSTOM=ghcr.io/${LOWER_CASE_GITHUB_REPOSITORY}:$RELEASE-$VERSION.$BUILD.$FIX" >> $GITHUB_ENV
+           echo "$GITHUB_ENV"
+      - name: Docker Build
+        run: | 
+           cd GUI
+           docker image build --tag $DOCKER_TAG_CUSTOM .
+
+      - name: Log in to GitHub container registry
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin
+
+      - name: Push Docker image to ghcr
+        run: docker push $DOCKER_TAG_CUSTOM

.gitignore

@@ -12,6 +12,7 @@
 .DS_Store
 .vscode
 .env
+.env.gui
 
 **/node_modules
 **/dist

DSL/Resql/services/POST/get-service-status-by-name.sql

@@ -0,0 +1,6 @@
+SELECT current_state
+FROM services
+WHERE name = :service_name
+  AND NOT deleted
+ORDER BY id DESC
+LIMIT 1;

DSL/Resql/services/POST/get-services-list.sql

@@ -5,10 +5,11 @@ SELECT
   current_state AS state,
   ruuter_type AS type,
   slot,
-  CEIL((SELECT COUNT(DISTINCT service_id) FROM services WHERE NOT deleted AND (:is_common::TEXT = '' OR is_common = (:is_common::TEXT)::BOOLEAN)) / :page_size::DECIMAL) AS total_pages
+  CEIL((SELECT COUNT(DISTINCT service_id) FROM services WHERE NOT deleted AND (:is_common::TEXT = '' OR is_common = (:is_common::TEXT)::BOOLEAN) AND (:search IS NULL OR :search = '' OR LOWER(name) LIKE LOWER('%' || :search || '%'))) / :page_size::DECIMAL) AS total_pages
 FROM services
-WHERE NOT deleted 
+WHERE NOT deleted
   AND (:is_common::TEXT = '' OR is_common = (:is_common::TEXT)::BOOLEAN)
+  AND (:search IS NULL OR :search = '' OR LOWER(name) LIKE LOWER('%' || :search || '%'))
 ORDER BY 
   CASE WHEN :sorting = 'name asc' THEN name END ASC,
   CASE WHEN :sorting = 'name desc' THEN name END DESC,

DSL/Ruuter/services/POST/services.yml

@@ -19,7 +19,10 @@ declaration:
         description: "Body field 'sorting'"
       - field: is_common
         type: boolean
-        description: "Body field 'is_common'"  
+        description: "Body field 'is_common'"
+      - field: search
+        type: string
+        description: "Body field 'search'"
 
 get_services_list:
   call: http.post
@@ -30,6 +33,7 @@ get_services_list:
       page_size: ${incoming.body.page_size}
       sorting: ${incoming.body.sorting}
       is_common: ${incoming.body.is_common}
+      search: ${incoming.body.search}
   limit: 600
   result: services_res
 

DSL/Ruuter/services/POST/services/add.yml

@@ -112,7 +112,7 @@ delete_all_mcq_files:
     url: "[#SERVICE_DMAPPER]/file-manager/delete-all-that-starts-with"
     body:
       path: "[#RUUTER_SERVICES_PATH]/${type}/services/draft"
-      keyword: "${name}_"
+      keyword: "${name}_mcq_"
   result: deleteRes 
 
 convert_json_content_to_yml:

DSL/Ruuter/services/POST/services/delete.yml

@@ -130,7 +130,7 @@ delete_mcq_files:
     url: "[#SERVICE_DMAPPER]/file-manager/delete-all-that-starts-with"
     body:
       path: "[#RUUTER_SERVICES_PATH]/${ruuter_type}/[#RUUTER_SERVICES_DIR_PATH]/${old_file_status_path}"
-      keyword: "${name_res.response.body[0].name}_"
+      keyword: "${name_res.response.body[0].name}_mcq_"
   result: deleted_mcq
 
 return_ok:

DSL/Ruuter/services/POST/services/edit.yml

@@ -103,7 +103,7 @@ delete_old_mcq_files:
     url: "[#SERVICE_DMAPPER]/file-manager/delete-all-that-starts-with"
     body:
       path: "[#RUUTER_SERVICES_PATH]/${type}/services/active"
-      keyword: "${get_service_result.response.body[0].name}_"
+      keyword: "${get_service_result.response.body[0].name}_mcq_"
   result: deleteOldRes
   next: delete_all_mcq_files
 
@@ -113,7 +113,7 @@ delete_all_mcq_files:
     url: "[#SERVICE_DMAPPER]/file-manager/delete-all-that-starts-with"
     body:
       path: "[#RUUTER_SERVICES_PATH]/${type}/services/active"
-      keyword: "${name}_"
+      keyword: "${name}_mcq_"
   result: deleteRes
   next: check_for_content
 

DSL/Ruuter/services/POST/services/status.yml

@@ -197,7 +197,7 @@ activate_all_mcq_services:
     body:
       file_path: "[#RUUTER_SERVICES_PATH]/${ruuter_type}/[#RUUTER_SERVICES_DIR_PATH]/${old_file_status_path}"
       new_path: "[#RUUTER_SERVICES_PATH]/${ruuter_type}/[#RUUTER_SERVICES_DIR_PATH]/active"
-      keyword: "${name}_"
+      keyword: "${name}_mcq_"
       format: "yml"
   result: active_move_results
   next: return_ok
@@ -257,7 +257,7 @@ dactivate_all_mcq_services:
     body:
       file_path: "[#RUUTER_SERVICES_PATH]/${ruuter_type}/[#RUUTER_SERVICES_DIR_PATH]/${old_file_status_path}"
       new_path: "[#RUUTER_SERVICES_PATH]/${ruuter_type}/[#RUUTER_SERVICES_DIR_PATH]/inactive"
-      keyword: "${name}_"
+      keyword: "${name}_mcq_"
       format: "tmp"
   result: inactive_move_results
   next: return_ok
@@ -279,7 +279,7 @@ draft_all_mcq_services:
     body:
       file_path: "[#RUUTER_SERVICES_PATH]/${ruuter_type}/[#RUUTER_SERVICES_DIR_PATH]/${old_file_status_path}"
       new_path: "[#RUUTER_SERVICES_PATH]/${ruuter_type}/[#RUUTER_SERVICES_DIR_PATH]/draft"
-      keyword: "${name}_"
+      keyword: "${name}_mcq_"
       format: "tmp"
   result: inactive_move_results
   next: return_ok

DSL/Ruuter/services/TEMPLATES/jump-to-service.yml

@@ -25,12 +25,35 @@ check_for_body:
   switch:
     - condition: ${incoming.body == null || incoming.body.serviceName == null || incoming.body.serviceName == ""}
       next: missing_service_name
+  next: get_service_status
+
+get_service_status:
+  call: http.post
+  args:
+    url: "[#SERVICE_RESQL]/get-service-status-by-name"
+    body:
+      service_name: ${incoming.body.serviceName}
+  result: service_status_res
+  next: assign_service_status
+
+assign_service_status:
+  assign:
+    service_status: "${service_status_res.response.body[0] && service_status_res.response.body[0].currentState === 'active' ? 'active' : 'draft'}"
+  next: get_new_nonce
+
+get_new_nonce:
+  call: http.post
+  args:
+    url: "[#SERVICE_TRAINING_RESQL]/get-new-nonce"
+  result: nonce_res
   next: trigger_service
 
 trigger_service:
   call: http.post
   args:
-    url: "[#SERVICE_RUUTER]/services/active/${incoming.body.serviceName}"
+    url: "[#SERVICE_RUUTER]/services/${service_status}/${incoming.body.serviceName}"
+    headers:
+      x-ruuter-nonce: ${nonce_res.response.body[0].nonce}
     body:
       chatId: ${incoming.body.chatId}
       authorId: ${incoming.body.authorId} 

GUI/src/services/service-tester.test.ts

@@ -1297,4 +1297,14 @@ describe('addSuccessMessages', () => {
     expect(mockAddBotMessage).toHaveBeenCalledWith('Test response content', undefined);
     expect(mockAddSuccess).toHaveBeenCalledWith('chat.service-test-success');
   });
+
+  it('should not throw and should skip the bot message when the response array is empty', () => {
+    const responseData = {
+      response: [],
+    };
+
+    expect(() => addSuccessMessages(responseData)).not.toThrow();
+    expect(mockAddBotMessage).not.toHaveBeenCalled();
+    expect(mockAddSuccess).toHaveBeenCalledWith('chat.service-test-success');
+  });
 });

GUI/src/services/service-tester.ts

@@ -232,8 +232,10 @@ export const executeService = async (state: ServiceState, name: string, input: s
 };
 
 export const addSuccessMessages = (responseData: ServiceResponse): void => {
-  const res = responseData.response[0];
+  const res = responseData.response?.[0];
   const store = useTestServiceStore.getState();
-  store.addBotMessage(res.content, res.buttons);
+  if (res) {
+    store.addBotMessage(res.content, res.buttons);
+  }
   store.addSuccess('chat.service-test-success');
 };

GUI/src/store/services.store.ts

@@ -70,6 +70,7 @@ const useServiceListStore = create<ServiceStoreState>()(
           page_size: pagination.pageSize,
           sorting: sort,
           is_common: false,
+          search: '',
         });
         const services =
           result.data.response[0].map?.((item: any) => ({
@@ -99,6 +100,7 @@ const useServiceListStore = create<ServiceStoreState>()(
           page_size: pagination.pageSize,
           sorting: sort,
           is_common: true,
+          search: '',
         });
         const services =
           result.data.response[0].map?.((item: any) => ({

release.env

@@ -1,4 +1,4 @@
 main
-MAJOR=1
-MINOR=1
-PATCH=45
+MAJOR=3
+MINOR=3
+PATCH=1