Merge pull request #285 from fairdataihub/staging

fix: announcements and function being undefined

Author: aaronm-2112

src/renderer/src/scripts/globals.js

@@ -1433,7 +1433,7 @@ window.openDropdownPrompt = async (ev, dropdown, show_timer = true) => {
         // there is an account; but check check that the valid api key in the default profile is for the user's current workspace
         // IMP NOTE: There can be different API Keys for each workspace and the user can switch between workspaces. Therefore a valid api key
         //           under the default profile does not mean that key is associated with the user's current workspace.
-        let matching = await defaultProfileMatchesCurrentWorkspace();
+        let matching = await window.defaultProfileMatchesCurrentWorkspace();
         if (!matching) {
           log.info("Default api key is for a different workspace");
           await switchToCurrentWorkspace();

src/renderer/src/scripts/others/http-error-handler/error-handler.js

@@ -71,7 +71,7 @@ const authenticationError = (error) => {
   return error.response.status === 401;
 };
 
-const defaultProfileMatchesCurrentWorkspace = async () => {
+window.defaultProfileMatchesCurrentWorkspace = async () => {
   let userInfo = await api.getUserInformation();
   let currentWorkspace = userInfo["preferredOrganization"];
   // the default profile value, if one exists, has the current workspace id
@@ -87,7 +87,7 @@ const defaultProfileMatchesCurrentWorkspace = async () => {
 };
 
 const switchToCurrentWorkspace = async () => {
-  let workspacesMatch = await defaultProfileMatchesCurrentWorkspace();
+  let workspacesMatch = await window.defaultProfileMatchesCurrentWorkspace();
 
   if (workspacesMatch) {
     // obsolete/invalid api key and secret needs to be replaced
@@ -169,10 +169,4 @@ const switchToCurrentWorkspace = async () => {
   await window.addBfAccount(null, true);
 };
 
-export {
-  clientError,
-  userErrorMessage,
-  authenticationError,
-  switchToCurrentWorkspace,
-  defaultProfileMatchesCurrentWorkspace,
-};
+export { clientError, userErrorMessage, authenticationError, switchToCurrentWorkspace };

src/renderer/src/scripts/others/renderer.js

@@ -46,11 +46,7 @@ import {
 } from "../analytics/curation-analytics";
 import createEventDataPrepareMetadata from "../analytics/prepare-metadata-analytics";
 import determineDatasetLocation, { Destinations } from "../analytics/analytics-utils";
-import {
-  clientError,
-  userErrorMessage,
-  defaultProfileMatchesCurrentWorkspace,
-} from "./http-error-handler/error-handler";
+import { clientError, userErrorMessage } from "./http-error-handler/error-handler";
 import hasConnectedAccountWithPennsieve from "./authentication/auth";
 import api from "./api/api";
 import {
@@ -408,7 +404,7 @@ const startupServerAndApiCheck = async () => {
   if (launchAnnouncement) {
     await checkForAnnouncements("announcements");
     launchAnnouncement = false;
-    nodeStorage.setItem("announcements", false);
+    window.electron.ipcRenderer.invoke("set-nodestorage-key", "announcements", false);
   }
 
   apiVersionChecked = true;
@@ -579,7 +575,7 @@ window.run_pre_flight_checks = async (check_update = true) => {
       // check that the valid api key in the default profile is for the user's current workspace
       // IMP NOTE: There can be different API Keys for each workspace and the user can switch between workspaces. Therefore a valid api key
       //           under the default profile does not mean that key is associated with the user's current workspace.
-      let matching = await defaultProfileMatchesCurrentWorkspace();
+      let matching = await window.defaultProfileMatchesCurrentWorkspace();
       if (!matching) {
         log.info("Default api key is for a different workspace");
         await switchToCurrentWorkspace();