Session expiration message (merge commit)

Merge branch 'feature/mime-type' into 'main'
* Use verb 'update' instead of 'refresh'

* Update krakend version to 2026.4.0

* Fix FilesOpen() for macOS so that an open terminal does not prevent update

* Show session expiration in toast when running GUI

* Do not call IsValisOpen() when running on Linux to avoid overhead

* Add -race flag back to 'wails dev' after Go version update fixed segfault

* Make parameters in GetObjects clearer with no variable length parameters

Closes #68
See merge request https://gitlab.ci.csc.fi/sds-dev/sd-desktop/sda-filesystem/-/merge_requests/174

Approved-by: Teemu Kataja <teemu.kataja@csc.fi>
Merged by Emmi Rehn <emmi.rehn@csc.fi>

Author: emm1R

Makefile

@@ -94,7 +94,7 @@ gui: wails_update ## Run GUI version of filesystem on your own computer
 	@$(MAKE) _wait_for_container CONTAINER_NAME=data-upload
 	@export $$($(MAKE) envs); \
 	trap 'exit 0' SIGINT; cd cmd/gui; \
-	wails dev $(WAILS_FLAGS);
+	wails dev -race $(WAILS_FLAGS);
 
 gui_build: wails_update ## Compile a production-ready GUI binary and save it in build/bin
 	cd cmd/gui; wails build $(WAILS_FLAGS) -trimpath -clean -s

cmd/cli/import.go

@@ -81,7 +81,7 @@ func applyCommand(ch <-chan []string) {
 			if filesystem.FilesOpen() {
 				logs.Errorf("You have files in use which prevents updating Data Gateway")
 			} else {
-				filesystem.RefreshFilesystem()
+				filesystem.UpdateFilesystem()
 			}
 		case "clear":
 			if len(input) > 1 {

cmd/cli/main.go

@@ -142,7 +142,7 @@ func main() {
 		logs.Fatal(err)
 	}
 
-	access, err := api.GetProfile()
+	access, err := api.GetProfileCLI()
 	if err != nil {
 		logs.Fatal(err)
 	}

cmd/gui/app.go

@@ -108,16 +108,13 @@ func (a *App) InitializeAPI() (bool, error) {
 		wailsruntime.EventsEmit(a.ctx, "setRepositories", reps)
 	}()
 
-	ch := make(chan bool)
-	go a.monitorScans(ch)
-
 	if err := api.Setup(certs.Files); err != nil {
 		logs.Error(err)
 		outer, _ := logs.Wrapper(err)
 
 		return false, errors.New(outer)
 	}
-	access, err := api.GetProfile(ch)
+	access, err := api.GetProfile(a.informSessionExpired, a.informScanningResult)
 	if err != nil {
 		logs.Error(err)
 		outer, _ := logs.Wrapper(err)
@@ -138,16 +135,18 @@ func (a *App) InitializeAPI() (bool, error) {
 	return access, nil
 }
 
-func (a *App) monitorScans(ch <-chan bool) {
-	for ok := range ch {
-		if ok {
-			wailsruntime.EventsEmit(a.ctx, "virusFound")
-		} else {
-			wailsruntime.EventsEmit(
-				a.ctx, "showToast", "Virus scanning was interrupted",
-				"Please check the logs for details or contact servicedesk@csc.fi (subject: SD Services) for support.",
-			)
-		}
+func (a *App) informSessionExpired() {
+	wailsruntime.EventsEmit(a.ctx, "sessionExpired")
+}
+
+func (a *App) informScanningResult(found bool) {
+	if found {
+		wailsruntime.EventsEmit(a.ctx, "virusFound")
+	} else {
+		wailsruntime.EventsEmit(
+			a.ctx, "showToast", "Virus scanning was interrupted",
+			"Please check the logs for details or contact servicedesk@csc.fi (subject: SD Services) for support.",
+		)
 	}
 }
 
@@ -195,7 +194,7 @@ func (a *App) InitFuse() {
 			go func() {
 				for {
 					<-cmd
-					wailsruntime.EventsEmit(a.ctx, "refresh")
+					wailsruntime.EventsEmit(a.ctx, "update")
 				}
 			}()
 			go func() {
@@ -244,11 +243,11 @@ func (a *App) FilesOpen() bool {
 	return filesystem.FilesOpen()
 }
 
-func (a *App) RefreshFuse() {
+func (a *App) UpdateFuse() {
 	time.Sleep(200 * time.Millisecond)
 
 	a.ph.DeleteProjects()
-	filesystem.RefreshFilesystem()
+	filesystem.UpdateFilesystem()
 
 	buckets := filesystem.GetNodeChildren(api.SDConnect.ForPath() + "/" + api.GetProjectName())
 	if len(buckets) > 0 {

dev-tools/compose/docker-compose.yml

@@ -100,7 +100,7 @@ services:
         condition: service_healthy
 
   krakend:
-    image: "${ARTIFACTORY_SERVER}/sds/krakend-api-gateway:2026.3.11"
+    image: "${ARTIFACTORY_SERVER}/sds/krakend-api-gateway:2026.4.0"
     container_name: krakend
     env_file:
       - .env

frontend/src/App.vue

@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { CToastMessage, CToastType } from "@cscfi/csc-ui/dist/types";
 import { ref, computed, onMounted } from "vue";
-import { EventsOn, EventsEmit } from "../wailsjs/runtime";
+import { EventsOn, EventsEmit, EventsOnce } from "../wailsjs/runtime";
 import { InitializeAPI, Quit } from "../wailsjs/go/main/App";
 import { mdiLogoutVariant } from "@mdi/js";
 import { TabType } from "./types/common";
@@ -40,27 +40,31 @@ const visibleTabs = computed(() => componentData.value.filter((data) => data.vis
 // eslint-disable-next-line no-undef
 const toasts = ref<HTMLCToastsElement | null>(null);
 
+const sessionMessage: CToastMessage = {
+  message: "Data Gateway connection needs to be refreshed. Please log out from the virtual machine and SD Desktop, and log in again.",
+  type: "warning" as CToastType,
+  persistent: true,
+  indeterminate: true
+};
+
 onMounted(() => {
   InitializeAPI().then((access: boolean) => {
     console.log("Initializing Data Gateway finished");
     initialized.value = true;
     if (!access) {
       disabled.value = true;
-      const message: CToastMessage = {
-        message: "Data Gateway connection needs to be refreshed. Please log out from the virtual machine and SD Desktop, and log in again.",
-        type: "warning" as CToastType,
-        persistent: true,
-        indeterminate: true
-      };
-
-      toasts.value?.addToast(message);
+      toasts.value?.addToast(sessionMessage);
     }
   }).catch((e) => {
     disabled.value = true;
     EventsEmit("showToast", "Initializing Data Gateway failed", e as string);
   });
 });
 
+EventsOnce("sessionExpired", () => {
+  toasts.value?.addToast(sessionMessage);
+});
+
 EventsOn("showToast", (title: string, err: string) => {
   const message: CToastMessage = {
     title: title,

frontend/src/pages/AccessPage.vue

@@ -4,7 +4,7 @@ import { reactive, ref, onMounted, computed } from "vue";
 import {
   GetDefaultMountPoint,
   OpenFuse,
-  RefreshFuse,
+  UpdateFuse,
   ChangeMountPoint,
   FilesOpen,
   InitFuse,
@@ -93,7 +93,7 @@ EventsOn("updateProjectProgress", (name: string, repository: string, progress: n
 
 EventsOn("fuseReady", () => {pageIdx.value = 4; updating.value = false;});
 
-EventsOn("refresh", () => refresh());
+EventsOn("update", () => update());
 
 EventsOn("virusFound", () => {virusFound.value = true;});
 
@@ -105,14 +105,14 @@ function changeMountPoint() {
   });
 }
 
-function refresh() {
+function update() {
   updating.value = true;
 
   FilesOpen().then((open: boolean) => {
     if (open) {
       EventsEmit(
         "showToast",
-        "Refresh not possible",
+        "Update not possible",
         "You have files in use which prevents updating Data Gateway"
       );
       updating.value = false;
@@ -126,7 +126,7 @@ function refresh() {
       });
       projectKey.value = 0;
 
-      RefreshFuse();
+      UpdateFuse();
     }
   });
 }
@@ -161,10 +161,10 @@ function refresh() {
     <div v-else>
       <h2>{{ pageIdx == 2 ? "Preparing access" : "Access ready" }}</h2>
       <div v-if="pageIdx > 2">
-        <p>If you update the contents of projects, please refresh access.</p>
+        <p>If you update the contents of projects, please update access.</p>
         <c-row gap="20" justify="end">
-          <c-button outlined :disabled="updating" @click="refresh">
-            Refresh access
+          <c-button outlined :disabled="updating" @click="update">
+            Update access
           </c-button>
           <c-button :disabled="updating" @click="OpenFuse">
             Open folder

frontend/wailsjs/go/main/App.d.ts

@@ -28,10 +28,10 @@ export function Panic():Promise<void>;
 
 export function Quit():Promise<void>;
 
-export function RefreshFuse():Promise<void>;
-
 export function SelectFiles():Promise<Array<string>>;
 
+export function UpdateFuse():Promise<void>;
+
 export function UpdateRepositorySelection(arg1:Record<string, boolean>):Promise<void>;
 
 export function ValidateEmail(arg1:string):Promise<string>;

frontend/wailsjs/go/main/App.js

@@ -54,14 +54,14 @@ export function Quit() {
   return window['go']['main']['App']['Quit']();
 }
 
-export function RefreshFuse() {
-  return window['go']['main']['App']['RefreshFuse']();
-}
-
 export function SelectFiles() {
   return window['go']['main']['App']['SelectFiles']();
 }
 
+export function UpdateFuse() {
+  return window['go']['main']['App']['UpdateFuse']();
+}
+
 export function UpdateRepositorySelection(arg1) {
   return window['go']['main']['App']['UpdateRepositorySelection'](arg1);
 }

go.mod

@@ -2,7 +2,7 @@ module sda-filesystem
 
 go 1.25.7
 
-toolchain go1.26.1
+toolchain go1.26.2
 
 require (
 	github.com/aws/aws-sdk-go-v2 v1.41.4