Merge branch 'development' into 'master'

1.0

See merge request b650/Deep-Lynx!361

Author: John Darrington

.docker-env

@@ -5,11 +5,11 @@ TIMESCALEDB_ENABLED=true
 WAIT_HOSTS=rabbitmq:5672
 
 # valid options are blank (defaults to memory), memory, or redis
-CACHE_PROVIDER=memory
+CACHE_PROVIDER=redis
 # default time in seconds
 CACHE_DEFAULT_TTL=21600
 # redis connection string - e.g redis://user:[email protected]:6379/
-CACHE_REDIS_CONNECTION_STRING=
+CACHE_REDIS_CONNECTION_STRING=redis://redis:6379
 
 # debug,info,warn,error,silent
 LOG_LEVEL=debug

.env-sample

@@ -9,6 +9,9 @@ MAX_REQUEST_BODY_SIZE=50
 # there are various processes that look for other compiled typescript files
 PROJECT_DIR=./dist
 
+# whether or not to use the server instance to also manage the jobs
+RUN_JOBS=true
+
 # comma separated CORs origins, defaults to *
 CORS_ORIGIN=
 

.github/workflows/build-dev.yml

@@ -0,0 +1,33 @@
+# This is a basic workflow to help you get started with Actions
+
+name: Build Development
+
+# Controls when the workflow will run
+on:
+  # Triggers the workflow on push or pull request events but only for the "main" branch
+  push:
+    branches: [ "development" ]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: [ self-hosted ]
+    container:
+      image: gcr.io/kaniko-project/executor:debug
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+      - uses: actions/checkout@v3
+
+      # Runs a set of commands using the runners shell
+      - name: Build & Push via kaniko
+        run: |
+          mkdir -p /kaniko/.docker
+          echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
+          /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY/$CI_REGISTRY_PATH/deep-lynx-dev:latest"

API Documentation/Core.swagger_collection.yaml

@@ -496,7 +496,9 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/Generic200Response'
+                type: array
+                items:
+                  $ref: '#/components/schemas/Node'
       deprecated: false
       x-codegen-request-body-name: Body
   '/containers/{container_id}/graphs/nodes/{node_id}':
@@ -1117,7 +1119,9 @@ paths:
           content:
             application/json:
               schema:
-                $ref: '#/components/schemas/Generic200Response'
+                type: array
+                items:
+                  $ref: '#/components/schemas/Edge'
       description: 'This endpoint will attempt to create a connection between two nodes. You can either pass in the node''s Deep Lynx IDs, or the node''s original id, metatype id, and data source id to create these edges.'
       requestBody:
         content:
@@ -4804,6 +4808,35 @@ paths:
         '200':
           description: OK
       description: Publishes an ontology version
+  '/containers/{container_id}/import/datasources/{sourceID}/mappings/{mappingID}/copy/{originalMappingID}':
+    parameters:
+      - schema:
+          type: string
+        name: container_id
+        in: path
+        required: true
+      - schema:
+          type: string
+        name: sourceID
+        in: path
+        required: true
+      - schema:
+          type: string
+        name: mappingID
+        in: path
+        required: true
+      - schema:
+          type: string
+        name: originalMappingID
+        in: path
+        required: true
+    post:
+      summary: ''
+      operationId: CopyTransformations
+      responses:
+        '200':
+          description: OK
+      description: 'This endpoint copies transformations from the {originalMappingID} type mapping (final parameter) to the {mappingID} type mapping. This POST has NO body.'
 components:
   securitySchemes:
     BearerAuth:

AdminWebApp/.env-sample

@@ -2,6 +2,8 @@ VUE_APP_DEEP_LYNX_API_URL=http://localhost:8090
 VUE_APP_DEEP_LYNX_API_AUTH_METHOD=token
 VUE_APP_APP_URL=http://localhost:8080
 VUE_APP_TIME_SERIES_ENABLED=false
+VUE_APP_DATA_MANAGEMENT_ENABLED=false
 
 # application URL created through Deep Lynx's Applications page
 VUE_APP_DEEP_LYNX_APP_ID=root
+VUE_APP_BUNDLED_BUILD=false