Merge pull request #1542 from NASA-AMMOS/feature/fprime-sequencing

FPrime Dictionary Support
NASA-AMMOS · Oct 14, 2024 · 6f5a6aa · 6f5a6aa
2 parents 2a7ba3b + 3b46aad
commit 6f5a6aa
Show file tree

Hide file tree

Showing 30 changed files with 12,386 additions and 192 deletions.
diff --git a/deployment/docker-compose.yml b/deployment/docker-compose.yml
@@ -124,6 +124,7 @@ services:
       SEQUENCING_DB_USER: "${SEQUENCING_USERNAME}"
       SEQUENCING_DB_PASSWORD: "${SEQUENCING_PASSWORD}"
       SEQUENCING_LOCAL_STORE: /usr/src/app/sequencing_file_store
+      #DICTIONARY_PARSER_PLUGIN: "/fprime-dictionary-parser/fprime-parser.js" #-- Uncomment to use a different commmand dictionary parser
       SEQUENCING_WORKER_NUM: 8
       SEQUENCING_MAX_WORKER_NUM : 8
       SEQUENCING_MAX_WORKER_HEAP_MB: 1000

diff --git a/deployment/hasura/metadata/actions.graphql b/deployment/hasura/metadata/actions.graphql
@@ -26,7 +26,7 @@ type Mutation {
 }
 
 type Mutation {
-  uploadDictionary(dictionary: String!, type: String!): DictionaryResponse
+  uploadDictionary(dictionary: String!): DictionaryResponse
 }
 
 type Mutation {
@@ -212,13 +212,9 @@ type TypescriptFile {
 }
 
 type DictionaryResponse {
-  id: Int!
-  dictionary_path: String!
-  mission: String!
-  version: String!
-  parsed_json: Dictionary!
-  created_at: String!
-  type : String!
+  command: Dictionary
+  parameter: Dictionary
+  channel: Dictionary
 }
 
 type ExpansionSetResponse {

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -89,6 +89,7 @@ services:
       SEQUENCING_DB_USER: "${SEQUENCING_USERNAME}"
       SEQUENCING_DB_PASSWORD: "${SEQUENCING_PASSWORD}"
       SEQUENCING_LOCAL_STORE: /usr/src/app/sequencing_file_store
+      #DICTIONARY_PARSER_PLUGIN: "/fprime-dictionary-parser/fprime-parser.js" #-- Relative to sequencing-server/plugins, Uncomment to use a different command dictionary parser
       SEQUENCING_WORKER_NUM: 8
       SEQUENCING_MAX_WORKER_NUM : 8
       SEQUENCING_MAX_WORKER_HEAP_MB: 1000

diff --git a/sequencing-server/jest.config.js b/sequencing-server/jest.config.js
@@ -13,7 +13,7 @@ export default {
   testRunner: 'jest-circus/runner',
   // testRegex: "(/test/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
   testRegex: '((\\.|/)(test|spec))\\.(jsx?|tsx?)$',
-  testPathIgnorePatterns: ['/node_modules/', '/build/'],
+  testPathIgnorePatterns: ['/node_modules/', '/build/', '/plugins/'],
   coverageReporters: ['html'],
   setupFiles: ['dotenv/config', './src/polyfills.ts'],
   globalSetup: './jestGlobalSetup.js',