New sdk release

.gitignore

@@ -6,6 +6,7 @@
 /out-tsc
 # Only exists if Bazel was run
 /bazel-out
+@scicatproject/
 
 # dependencies
 /node_modules

package.json

@@ -12,7 +12,8 @@
     "lint:fix": "ng lint --fix",
     "betterer": "betterer",
     "cypress:open": "cypress open",
-    "cypress:run": "cypress run"
+    "cypress:run": "cypress run",
+    "generate:sdk:local": "node scripts/generate-nestjs-sdk"
   },
   "private": true,
   "dependencies": {
@@ -33,6 +34,7 @@
     "@ngrx/effects": "^16",
     "@ngrx/router-store": "^16",
     "@ngrx/store": "^16",
+    "@scicatproject/scicat-sdk-ts": "^4.6.5",
     "autolinker": "^4.0.0",
     "deep-equal": "^2.0.5",
     "exceljs": "^4.3.0",
@@ -41,6 +43,7 @@
     "lodash-es": "^4.17.21",
     "luxon": "^3.3.0",
     "mathjs": "^13.0.0",
+    "ngx-cookie-service": "^16.1.0",
     "ngx-json-viewer": "^3",
     "ngx-linky": "^4.0.0",
     "ngx-material-luxon": "^1.1.1",
@@ -67,7 +70,7 @@
     "@types/deep-equal": "^1.0.1",
     "@types/file-saver": "^2.0.2",
     "@types/jasmine": "^5.1.0",
-    "@types/lodash": "^4.14.172",
+    "@types/lodash-es": "^4.17.12",
     "@types/luxon": "^3.3.0",
     "@types/node": "^22.0.0",
     "@types/shortid": "2.2.0",

scripts/generate-nestjs-sdk.bash

@@ -0,0 +1,62 @@
+#!/bin/bash
+#
+#
+
+USER=`who am i | cut -d\  -f1`
+echo -e "\nUser running the script: ${USER}"
+
+echo -e "\nCleanup old files..."
+rm -rf node_modules/@scicatproject/scicat-sdk-ts
+rm -rf @scicatproject/scicat-sdk-ts
+
+echo -e "\nGenerating the new sdk..."
+docker run \
+	--rm \
+	--add-host host.docker.internal:host-gateway \
+	-v "`pwd`:/local" \
+	openapitools/openapi-generator-cli:v7.9.0 generate \
+	-i http://host.docker.internal:3000/explorer-json \
+	-g typescript-angular \
+	-o local/@scicatproject/scicat-sdk-ts \
+	--additional-properties=ngVersion=16.2.12,npmName=@scicatproject/scicat-sdk-ts,supportsES6=true,npmVersion=10.8.2,withInterfaces=true
+
+REMOVE_NPM_LINK=0
+if ! command -v npm 2>&1 1>/dev/null
+then
+	if [ "--`env | grep NVM_BIN`--" != "----" ]
+	then
+		echo -e "\nCreating links to npm and node versions"
+		ln -s "$NVM_BIN/npm" "/usr/local/bin/npm"
+		whereis npm
+		ln -s "$NVM_BIN/node" "/usr/local/bin/node"
+		whereis node
+		REMOVE_NPM_LINK=1
+	else
+		echo -e "\nNo npm found!!!"
+		exit 1
+	fi
+fi
+
+echo -e "\nInstalling dependencies and building the sdk..."
+cd @scicatproject/scicat-sdk-ts 
+npm install
+npm run build
+
+echo -e "\nCopying the build files in node_modules..."
+cd ../..
+cp -rv @scicatproject/scicat-sdk-ts/dist node_modules/@scicatproject/scicat-sdk-ts
+
+echo -e "\nAdjusting ownership to user ${USER}"
+chown -Rv ${USER} node_modules/@scicatproject/scicat-sdk-ts
+
+echo -e "\nFinal cleanup..."
+echo -e "Removing sdk folder"
+rm -rfv @scicatproject
+
+if [ $REMOVE_NPM_LINK -eq 1 ];
+then
+	echo -e "\nRemoving links to npm and node"
+	rm -fv "/usr/local/bin/npm"
+	rm -fv "/usr/local/bin/node"
+fi
+

scripts/generate-nestjs-sdk.js

@@ -0,0 +1,68 @@
+/**
+ * NOTE: This file contains commands that generate new typescript-angular sdk against the running scicat backend
+ * which overwrites the node_modules/@scicatproject/scicat-sdk-ts for development purpose
+ * It should NOT be used in production because the real (@scicatproject/scicat-sdk-ts) npm package will be installed and used.
+ */
+
+const execSync = require("child_process").execSync;
+const os = require("os");
+
+function isWindows() {
+  return os.platform() === "win32";
+}
+
+function getCurrentDirectory() {
+  if (isWindows()) {
+    return "%cd%";
+  }
+
+  return "$(pwd)";
+}
+
+if (isWindows()) {
+
+  // NOTE: First do some cleanup before starting the generation
+  console.log("Cleanup old files...");
+  execSync(
+    "rm -rf node_modules/@scicatproject/scicat-sdk-ts && rm -rf @scicatproject/scicat-sdk-ts",
+    { encoding: "utf-8" },
+  );
+
+  console.log("Generating the new sdk...");
+  const generationOutput = execSync(
+    `docker run --rm --add-host host.docker.internal:host-gateway -v "${getCurrentDirectory()}:/local" openapitools/openapi-generator-cli:v7.9.0 generate -i http://host.docker.internal:3000/explorer-json -g typescript-angular -o local/@scicatproject/scicat-sdk-ts --additional-properties=ngVersion=16.2.12,npmName=@scicatproject/scicat-sdk-ts,supportsES6=true,npmVersion=10.8.2,withInterfaces=true`,
+    { encoding: "utf-8" },
+  );
+  console.log(generationOutput);
+
+  console.log("Installing dependencies and building the sdk...");
+  const installBuildOutput = execSync(
+    "cd @scicatproject/scicat-sdk-ts && npm install && npm run build",
+    { encoding: "utf-8" },
+  );  
+  console.log(installBuildOutput);
+
+  console.log("Copying the build files in node_modules...");
+  const copyToNodeModulesOutput = execSync(
+    "cp -r @scicatproject/scicat-sdk-ts/dist node_modules/@scicatproject/scicat-sdk-ts",
+    { encoding: "utf-8" },
+  );
+  console.log(copyToNodeModulesOutput);
+
+  console.log("Final cleanup...");
+  execSync("rm -rf @scicatproject", {
+    encoding: "utf-8",
+  });
+
+  console.log("Local SDK generation completed");
+
+} else {
+  console.log("Your environment is a linux/unix");
+  console.log("Please run the following command on your terminal:");
+  console.log("> sudo -E ./scripts/generate-nestjs-sdk.bash");
+  console.log("");
+  console.log("IMPORTANT: the script runs under sudo. You will be asked your password.");
+  console.log("");
+
+}
+

src/app/app-config.service.ts

@@ -42,7 +42,7 @@
   datasetReduceEnabled: boolean;
   datasetDetailsShowMissingProposalId: boolean;
   datafilesActionsEnabled: boolean;
   datafilesActions: any[];
   editDatasetSampleEnabled: boolean;
   editMetadataEnabled: boolean;
   editPublishedData: boolean;
@@ -109,14 +109,16 @@
 
   async loadAppConfig(): Promise<void> {
     try {
-      this.appConfig = await this.http
+      const config = await this.http
         .get("/api/v3/admin/config")
         .pipe(timeout(2000))
         .toPromise();
+      this.appConfig = Object.assign({}, this.appConfig, config);
     } catch (err) {
       console.log("No config available in backend, trying with local config.");
       try {
-        this.appConfig = await this.http.get("/assets/config.json").toPromise();
+        const config = await this.http.get("/assets/config.json").toPromise();
+        this.appConfig = Object.assign({}, this.appConfig, config);
       } catch (err) {
         console.error("No config provided.");
       }

src/app/app-routing/auth.guard.ts

@@ -5,7 +5,7 @@ import {
   ActivatedRouteSnapshot,
   RouterStateSnapshot,
 } from "@angular/router";
-import { UserApi } from "shared/sdk/services";
+import { UsersService } from "@scicatproject/scicat-sdk-ts";
 
 /**
  * Ensure that the current user is logged in
@@ -19,7 +19,7 @@ import { UserApi } from "shared/sdk/services";
 })
 export class AuthGuard implements CanActivate {
   constructor(
-    private us: UserApi,
+    private us: UsersService,
     private router: Router,
   ) {}
 
@@ -31,7 +31,7 @@ export class AuthGuard implements CanActivate {
     state: RouterStateSnapshot,
   ): Promise<boolean> {
     return this.us
-      .getCurrent()
+      .usersControllerGetMyUser()
       .toPromise()
       .catch(() => {
         this.router.navigate(["/login"], {

src/app/app.component.ts

@@ -9,7 +9,6 @@
   ChangeDetectorRef,
 } from "@angular/core";
 import { Store } from "@ngrx/store";
-import { LoopBackConfig } from "shared/sdk";
 import {
   clearMessageAction,
   fetchCurrentUserAction,
@@ -25,6 +24,7 @@
 } from "state-management/selectors/user.selectors";
 import { MessageType } from "state-management/models";
 import { AppConfigService, AppConfig as Config } from "app-config.service";
+import { Configuration } from "@scicatproject/scicat-sdk-ts";
 
 @Component({
   selector: "app-root",
@@ -45,6 +45,7 @@
   constructor(
     @Inject(APP_CONFIG) public appConfig: AppConfig,
     private appConfigService: AppConfigService,
+    private apiConfigService: Configuration,
     private cdRef: ChangeDetectorRef,
     private metaService: Meta,
     public snackBar: MatSnackBar,
@@ -68,19 +69,19 @@
    * @memberof AppComponent
    */
   ngOnInit() {
-    LoopBackConfig.setBaseURL(this.config.lbBaseURL);
-    console.log(LoopBackConfig.getPath());
+    this.apiConfigService.basePath = this.config.lbBaseURL;
+    console.log(this.apiConfigService.basePath);
 
     this.store.dispatch(loadDefaultSettings({ config: this.config }));
 
     this.store.dispatch(fetchCurrentUserAction());
     if (window.location.pathname.indexOf("logout") !== -1) {
       this.logout();
     }
 
     this.userMessageSubscription = this.store
       .select(selectUserMessage)
       .subscribe((current) => {
         if (current && current.content !== undefined) {
           let panelClass = "";
           switch (current.type) {