Merge branch 'main' into 5269-task-move-data-card-from-mit-tr-to-goll…

…m-task
DARPA-ASKEM · Nov 13, 2024 · af4d36e · af4d36e
2 parents 29c36da + 843df68
commit af4d36e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/.github/workflows/lint-types.yaml b/.github/workflows/lint-types.yaml
@@ -4,11 +4,6 @@ name: Lint Generated Types
 # yamllint disable-line rule:truthy
 on:
   workflow_call:
-  push:
-    paths:
-      - 'packages/client/hmi-client/src/types/Types.ts'
-      - 'packages/server/src/main/java/**'
-    branches: ['main']
   pull_request:
     paths:
       - 'packages/client/hmi-client/src/types/Types.ts'
@@ -39,6 +34,14 @@ jobs:
         run: ./gradlew generateTypeScript
 
       - name: Commit all changed files
-        uses: stefanzweifel/git-auto-commit-action@7d0ca8f849305c56d36f992cfb1519b1af5b33f8
-        with:
-          commit_message: "chore: update generated types"
+        run: |
+          git diff --exit-code || {
+            echo "Files have changed. Committing changes..."
+            git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+            git config --global user.name "github-actions[bot]"
+            git fetch --depth=1;
+            git checkout  ${{ github.head_ref }} --
+            git add .
+            git commit --message "chore: lint types"
+            git push --set-upstream origin ${{ github.head_ref }}
+          }
diff --git a/packages/client/hmi-client/src/types/Types.ts b/packages/client/hmi-client/src/types/Types.ts
@@ -795,10 +795,10 @@ export interface ModelUnit {
 }
 
 export interface GroundedSemantic {
+    grounding?: ModelGrounding;
     id: string;
     name?: string;
     description?: string;
-    grounding?: ModelGrounding;
 }
 
 export interface Properties {

diff --git a/.../server/src/main/java/software/uncharted/terarium/hmiserver/utils/rebac/ReBACService.java b/.../server/src/main/java/software/uncharted/terarium/hmiserver/utils/rebac/ReBACService.java
@@ -235,7 +235,7 @@ void startup() throws Exception {
 	private String getUserId(final String name) {
 		final List<UserRepresentation> users = keycloak.realm(REALM_NAME).users().search(name);
 		for (final UserRepresentation user : users) {
-			if (user.getUsername().equals(API_SERVICE_USER_NAME) || user.getUsername().equals(ADMIN_API_SERVICE_USER_NAME)) {
+			if (user.getUsername().equals(name)) {
 				return user.getId();
 			}
 		}

diff --git a/packages/server/src/test/resources/application-test.properties b/packages/server/src/test/resources/application-test.properties
@@ -53,6 +53,8 @@ terarium.keycloak.admin-realm=master
 terarium.keycloak.admin-client-id=admin-cli
 terarium.keycloak.admin-username=admin
 terarium.keycloak.admin-password=admin123
+terarium.keycloak.api-service-name=api-service
+terarium.keycloak.admin-api-service-name=admin-api-service
 spring.security.oauth2.client.provider.keycloak.issuer-uri= "http://keycloak:8081/realms/Terarium"
 spring.security.oauth2.client.registration.keycloak.client-id= "app"
 spring.security.oauth2.resourceserver.jwt.issuer-uri= "http://keycloak:8081/realms/Terarium"