Merge branch 'development' into 'master'

0.4.23

See merge request b650/Deep-Lynx!324

.dockerignore

@@ -1,3 +1,5 @@
+.env
+.env-sample
 node_modules
 npm-debug.log
 dist

.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
 
+# comma separated CORs origins, defaults to *
+CORS_ORIGIN=
+
 # valid options are blank (defaults to memory), memory, or redis
 CACHE_PROVIDER=memory
 # default time in seconds
@@ -32,6 +35,7 @@ CONTAINER_INVITE_URL=http://localhost:8080/container-invite
 
 # debug,info,warn,error,silent
 LOG_LEVEL=debug
+LOG_JOBS=false
 
 # should be in the format postgresql://user:password@hostname:port/database_name
 # :port is optional and if included will usually be :5432

.eslintrc.js

@@ -17,7 +17,13 @@ module.exports = {
         es6: true,
         node: true,
     },
-    extends: ['plugin:@typescript-eslint/recommended', 'plugin:@typescript-eslint/recommended-requiring-type-checking', 'prettier', 'plugin:security-node/recommended'],
+    extends: [
+        'plugin:@typescript-eslint/recommended',
+        'plugin:@typescript-eslint/recommended-requiring-type-checking',
+        'prettier',
+        'plugin:security-node/recommended',
+        'plugin:security/recommended',
+    ],
     parser: '@typescript-eslint/parser',
     parserOptions: {
         sourceType: 'module',

.prettierignore

@@ -9,4 +9,5 @@ src/data_warehouse/ontology/metatype_relationship_pair.ts
 src/data_warehouse/data/node.ts
 src/data_access_layer/repositories/data_warehouse/etl/type_transformation_repository.ts
 src/data_access_layer/migrate.ts
-src/graphql/schema.ts
+src/graphql/schema.ts
+src/graphql/node_graph_schema.ts

API Documentation/Core.swagger_collection.yaml

@@ -400,6 +400,10 @@ paths:
             schema:
               type: string
               example: "{\r\n    nodes {\r\n        id\r\n        metatype{id}\r\n        archived\r\n    }\r\n}"
+          application/xml:
+            schema:
+              type: object
+              properties: {}
         required: true
         description: ''
       responses:
@@ -986,6 +990,29 @@ paths:
       tags:
         - Graph
         - TimeSeries
+  '/containers/{container_id}/import/datasources/{data_source_id}/data':
+    parameters:
+      - schema:
+          type: string
+        name: container_id
+        in: path
+        required: true
+      - schema:
+          type: string
+        name: data_source_id
+        in: path
+        required: true
+    post:
+      summary: Timeseries Data Source Query
+      operationId: TimeseriesDataSourceQuery
+      responses:
+        '200':
+          description: OK
+      description: This is an endpoint that accepts a GraphQL query and returns the results of that query. Primarily used for working with time series data without requiring attachment to a node.
+      parameters: []
+      tags:
+        - Graph
+        - TimeSeries
   '/containers/{container_id}/graphs/nodes/metatype/{metatype_id}':
     get:
       tags:
@@ -4880,11 +4907,7 @@ components:
           isError: false
       properties:
         value:
-          type: array
-          uniqueItems: true
-          minItems: 0
-          items:
-            $ref: '#/components/schemas/Container'
+          $ref: '#/components/schemas/Container'
         isError:
           type: boolean
     UpdateContainerResponse:

AdminWebApp/package.json

@@ -51,6 +51,7 @@
     "vue-flatpickr-component": "^8.1.7",
     "vue-i18n": "^8.25.0",
     "vue-json-component": "^0.4.1",
+    "vue-json-viewer": "^2.2.22",
     "vue-prism-editor": "^1.2.2",
     "vue-property-decorator": "^8.5.1",
     "vue-router": "^3.4.9",