Merge branch 'development' into 'master'

Development See merge request b650/Deep-Lynx!162
idaholab · Feb 1, 2022 · b7aa493 · b7aa493
2 parents 9e9aa18 + 38b6e07
commit b7aa493
Show file tree

Hide file tree

Showing 77 changed files with 2,466 additions and 1,473 deletions.
diff --git a/.env-sample b/.env-sample
@@ -58,10 +58,15 @@ EXPORT_INTERVAL=10m
 # controls how many exports can occur at once
 EXPORT_DATA_CONCURRENCY=4
 
-# controls which queue system to use, possible values are database
+# controls which queue system to use, possible values are database, rabbitmq and azure_service_bus
 QUEUE_SYSTEM=database
-# controls how often the job to check for new events is run
-EVENT_PROCESSING_INTERVAL=10s
+# RabbitMQ connection string
+RABBITMQ_URL=
+# Azure Service Bus connection string
+AZURE_SERVICE_BUS_CONNECTION_STRING=
+
+# controls whether or not Deep Lynx should emit data events
+EMIT_EVENTS=true
 
 # whether or not to create a superuser on initial boot, along with the values
 # for its email and password - password will be encrypted prior to storage

diff --git a/API Documentation/Core.swagger_collection.yaml b/API Documentation/Core.swagger_collection.yaml
@@ -408,11 +408,6 @@ paths:
           in: query
           name: metatypeID
           description: Return only nodes for the selected metatype
-        - schema:
-            type: string
-          in: query
-          name: dataSourceID
-          description: Return only nodes for the selected datasource
       responses:
         '200':
           description: ''
@@ -579,14 +574,6 @@ paths:
             type: string
           in: query
           name: relationshipPairName
-        - schema:
-            type: string
-          in: query
-          name: dataSourceID
-        - schema:
-            type: string
-          in: query
-          name: loadRelationshipPairs
       responses:
         '200':
           description: ''
@@ -3200,20 +3187,6 @@ paths:
                 file:
                   type: string
   /events:
-    get:
-      tags:
-        - Events
-      summary: List Events
-      description: Lists all events
-      operationId: ListEvents
-      responses:
-        '200':
-          description: ''
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/ListEventsResponse'
-      deprecated: false
     post:
       tags:
         - Events
@@ -3235,27 +3208,6 @@ paths:
                 $ref: '#/components/schemas/CreateEventResponse'
       deprecated: false
       x-codegen-request-body-name: Body
-  '/events/{event_id}':
-    get:
-      tags:
-        - Events
-      summary: Retrieve Event
-      description: Retrieve an event
-      operationId: RetrieveEvent
-      parameters:
-        - name: event_id
-          in: path
-          required: true
-          schema:
-            type: string
-      responses:
-        '200':
-          description: ''
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/GetEventResponse'
-      deprecated: false
   /event_actions:
     get:
       summary: List Event Actions
@@ -3360,6 +3312,12 @@ paths:
                 $ref: '#/components/schemas/ListEventActionStatusResponse'
       operationId: ListEventActionStatuses
       description: List all event action statuses
+      parameters:
+        - schema:
+            type: string
+          in: query
+          name: eventID
+          description: Filter returned statuses by the event ID
   '/event_action_status/{status_id}':
     parameters:
       - schema:
@@ -4315,16 +4273,6 @@ components:
           $ref: '#/components/schemas/CreateManualImport'
         isError:
           type: boolean
-    ListEventsResponse:
-      title: ListEventsResponse
-      type: object
-      properties:
-        value:
-          type: array
-          items:
-            $ref: '#/components/schemas/Event'
-        isError:
-          type: boolean
     CreateEventResponse:
       title: CreateEventResponse
       type: object
@@ -4333,14 +4281,6 @@ components:
           $ref: '#/components/schemas/Event'
         isError:
           type: boolean
-    GetEventResponse:
-      title: GetEventResponse
-      type: object
-      properties:
-        value:
-          $ref: '#/components/schemas/Event'
-        isError:
-          type: boolean
     Generic200Response:
       title: Generic200Response
       description: ''
@@ -6632,22 +6572,24 @@ components:
       properties:
         id:
           type: string
-        event_id:
-          type: string
         event_action_id:
           type: string
         status:
           type: string
         status_message:
           type: string
+          nullable: true
         created_at:
           type: string
         modified_at:
           type: string
+          nullable: true
         modified_by:
           type: string
+          nullable: true
+        event:
+          $ref: '#/components/schemas/Event'
       required:
-        - event_id
         - event_action_id
     CreateEventRequest:
       title: CreateEventRequest
@@ -6745,10 +6687,6 @@ components:
       title: UpdateEventActionStatusRequest
       type: object
       properties:
-        event_id:
-          type: string
-        event_action_id:
-          type: string
         status:
           type: string
         status_message:

diff --git a/AdminWebApp/src/views/DataTestCreation.vue b/AdminWebApp/src/views/DataTestCreation.vue
@@ -23,7 +23,7 @@
           class="elevation-1"
       >
         <template v-slot:top>
-          <v-col v-if="selectedDataSource.adapter_type === 'standard' || selectedDataSource.adapter_type === 'manual'">
+          <v-col>
             <create-node-dialog
                 :dataSourceID="selectedDataSource.id" 
                 :containerID="containerID" 
@@ -62,7 +62,7 @@
           class="elevation-1"
       >
         <template v-slot:top>
-          <v-col v-if="selectedDataSource.adapter_type === 'standard' || selectedDataSource.adapter_type === 'manual'">
+          <v-col>
             <create-edge-dialog
                 :dataSourceID="selectedDataSource.id" 
                 :containerID="containerID"