refactor(kubernetes): move versionComment to common metadata (#2903)

Because the backend always emits the field, so it should go with the other "Loculus internal metadata fields".
loculus-project · Sep 30, 2024 · ff136d0 · ff136d0
1 parent af10e80
commit ff136d0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/backend/src/main/kotlin/org/loculus/backend/service/submission/SubmissionDatabaseService.kt b/backend/src/main/kotlin/org/loculus/backend/service/submission/SubmissionDatabaseService.kt
@@ -749,7 +749,8 @@ open class SubmissionDatabaseService(
                 SequenceEntriesTable.versionColumn,
                 SequenceEntriesTable.versionCommentColumn,
                 SequenceEntriesTable.submissionIdColumn,
-                SequenceEntriesTable.submitterColumn, SequenceEntriesTable.groupIdColumn,
+                SequenceEntriesTable.submitterColumn,
+                SequenceEntriesTable.groupIdColumn,
                 SequenceEntriesTable.submittedAtTimestampColumn,
                 SequenceEntriesTable.isRevocationColumn,
                 SequenceEntriesTable.organismColumn,

diff --git a/kubernetes/loculus/templates/_common-metadata.tpl b/kubernetes/loculus/templates/_common-metadata.tpl
@@ -95,6 +95,10 @@ fields:
     type: string
     notSearchable: true
     hideOnSequenceDetailsPage: true
+  - name: versionComment
+    type: string
+    displayName: Version comment
+    header: Submission details
   {{- if $.Values.dataUseTermsUrls }}
   - name: dataUseTermsUrl
     displayName: Data use terms URL

diff --git a/kubernetes/loculus/templates/keycloak-config-map.yaml b/kubernetes/loculus/templates/keycloak-config-map.yaml
@@ -114,7 +114,7 @@ data:
               ]
             }
           }, 
-          {{ end }}
+        {{ end }}
           {
             "username": "insdc_ingest_user",
             "enabled": true,
@@ -260,8 +260,7 @@ data:
             "http://localhost:3000/*"
           ]
         },
-              {
-          
+        {
           "clientId" : "account-console2",
           "name" : "${client_account-console}",
           "description" : "",
@@ -319,7 +318,7 @@ data:
          , "userProfileEnabled" : "true"
       },
       "components": {
-            "org.keycloak.userprofile.UserProfileProvider" : [ {
+        "org.keycloak.userprofile.UserProfileProvider" : [ {
           "providerId" : "declarative-user-profile",
           "subComponents" : { },
           "config" : {

diff --git a/kubernetes/loculus/values.yaml b/kubernetes/loculus/values.yaml
@@ -1059,9 +1059,6 @@ defaultOrganismConfig: &defaultOrganismConfig
           type: percentage
         preprocessing:
           inputs: {input: nextclade.coverage}
-      - name: versionComment
-        displayName: Version comment
-        header: Submission details
     website: &website
       tableColumns:
         - sampleCollectionDate