Merge branch 'main' into issue156

CHANGELOG.md

@@ -1,3 +1,23 @@
+## [6.14.9](https://git.datacontroller.io/dc/dc/compare/v6.14.8...v6.14.9) (2025-06-02)
+
+
+### Bug Fixes
+
+* default DC path for viya ([f3125ff](https://git.datacontroller.io/dc/dc/commit/f3125ff4641e47e33cb203228f5b1014ea3343bc))
+
+## [6.14.8](https://git.datacontroller.io/dc/dc/compare/v6.14.7...v6.14.8) (2025-05-28)
+
+
+### Bug Fixes
+
+* CSP issues, clarity local library build, fixed some style issues ([841201a](https://git.datacontroller.io/dc/dc/commit/841201adab582149b1cca3a42e75f7cac75167f9))
+* deploy page, makedata error handling, added local build of clarity, to address clr-stack-view CSP issues (inline styles) ([7b5e7ae](https://git.datacontroller.io/dc/dc/commit/7b5e7ae18414152f9b9d8f2d94fc94de43152003))
+* improved deploy flow for Viya ([9604661](https://git.datacontroller.io/dc/dc/commit/9604661f3b76111387bc9474cc26348d73ab112e))
+* requests modal causing VIYA CSP errors ([1dc6934](https://git.datacontroller.io/dc/dc/commit/1dc69341cadb837e1f11624d5cf35788bbb98d96))
+* sas viya service init timing issue ([9de04e9](https://git.datacontroller.io/dc/dc/commit/9de04e9a0ce016e1a9fb8b19c656077079ddcf2f))
+* scss of components transferred to the global styles.scss so we do not cause CSP (inline styles) issues when streaming to Viya ([6c171a6](https://git.datacontroller.io/dc/dc/commit/6c171a6394aba8104fe0f50aa8a4e6b9fa8023a2))
+* viya deploy page improved flow ([4bd2154](https://git.datacontroller.io/dc/dc/commit/4bd215491f8cdc68f78bade68e7cb98e07edc81e))
+
 ## [6.14.7](https://git.datacontroller.io/dc/dc/compare/v6.14.6...v6.14.7) (2025-05-08)
 
 

client/src/app/deploy/sections/automatic/automatic.component.ts

@@ -13,6 +13,7 @@ import { EventService } from 'src/app/services/event.service'
 import { LoggerService } from 'src/app/services/logger.service'
 import { SasViyaService } from 'src/app/services/sas-viya.service'
 import { SasService } from 'src/app/services/sas.service'
+import { ViyaApiCurrentUser } from 'src/app/viya-api-explorer/models/viya-api-current-user.model'
 import {
   Item,
   ViyaApiIdentities
@@ -48,7 +49,9 @@ export class AutomaticComponent implements OnInit {
   public recreateDatabase: boolean = true
   public createDatabaseLoading: boolean = false
   public adminGroupsLoading: boolean = false
+  public currentUserInfoLoading: boolean = false
   public adminGroups: { id: string; name: string }[] = []
+  public currentUserInfo: ViyaApiCurrentUser | null = null
 
   /** autoDeployStatus
    * This object presents the status for two steps that we have for deploy.
@@ -75,6 +78,21 @@ export class AutomaticComponent implements OnInit {
 
   ngOnInit(): void {
     this.getAdminGroups()
+    this.getCurrentUser()
+  }
+
+  public async getCurrentUser() {
+    this.currentUserInfoLoading = true
+
+    this.sasViyaService
+      .getCurrentUser()
+      .subscribe((res: ViyaApiCurrentUser) => {
+        this.currentUserInfoLoading = false
+
+        this.currentUserInfo = res
+
+        this.dcPath = `/export/viya/homes/${res.id}`
+      })
   }
 
   public async getAdminGroups() {

client/src/app/services/sas-viya.service.ts

@@ -7,6 +7,7 @@ import { ViyaApis } from '../viya-api-explorer/models/viya-apis.models'
 import { ViyaApiFolderMembers } from '../viya-api-explorer/models/viya-api-folder-content.model'
 import { ViyaApiFolder } from '../viya-api-explorer/models/viya-api-folder.model'
 import { ViyaApiIdentities } from '../viya-api-explorer/models/viya-api-identities.model'
+import { ViyaApiCurrentUser } from '../viya-api-explorer/models/viya-api-current-user.model'
 
 @Injectable({
   providedIn: 'root'
@@ -121,7 +122,7 @@ export class SasViyaService {
    * @returns The folder info object
    */
   getFolderByPath(path: string): Observable<ViyaApiFolder> {
-    return this.http.get<any>(
+    return this.http.get<ViyaApiFolder>(
       `${this.serverUrl}/folders/folders/@item?path=${path}`,
       {
         withCredentials: true
@@ -130,7 +131,7 @@ export class SasViyaService {
   }
 
   getFolderMembers(folderId: string): Observable<ViyaApiFolderMembers> {
-    return this.http.get<any>(
+    return this.http.get<ViyaApiFolderMembers>(
       `${this.serverUrl}/folders/folders/${folderId}/members`,
       {
         withCredentials: true
@@ -139,11 +140,20 @@ export class SasViyaService {
   }
 
   getAdminGroups(limit: number = 5000): Observable<ViyaApiIdentities> {
-    return this.http.get<any>(
+    return this.http.get<ViyaApiIdentities>(
       `${this.serverUrl}/identities/groups?sortBy=name&limit=${limit}`,
       {
         withCredentials: true
       }
     )
   }
+
+  getCurrentUser(): Observable<ViyaApiCurrentUser> {
+    return this.http.get<ViyaApiCurrentUser>(
+      `${this.serverUrl}/identities/users/@currentUser`,
+      {
+        withCredentials: true
+      }
+    )
+  }
 }

client/src/app/viya-api-explorer/models/viya-api-current-user.model.ts

@@ -0,0 +1,17 @@
+export interface ViyaApiCurrentUser {
+  creationTimeStamp: string
+  modifiedTimeStamp: string
+  id: string
+  type: string
+  name: string
+  links: Link[]
+  version: number
+}
+
+export interface Link {
+  method: string
+  rel: string
+  href: string
+  uri: string
+  type: string
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dcfrontend",
-  "version": "6.14.7",
+  "version": "6.14.9",
   "description": "Data Controller",
   "devDependencies": {
     "@saithodev/semantic-release-gitea": "^2.1.0",