From 2fb2a1d22a69fda067974552b2bad7ce71617e36 Mon Sep 17 00:00:00 2001
From: Luis-Hebendanz <consulting@qube.email>
Date: Tue, 23 Jan 2024 12:17:29 +0100
Subject: [PATCH] Fixed ui openapi.json bug. Reverted buildDir settings

---
 .gitea/workflows/ui_assets.yaml | 3 ++-
 pkgs/ui/next.config.js          | 1 -
 pkgs/ui/shell.nix               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitea/workflows/ui_assets.yaml b/.gitea/workflows/ui_assets.yaml
index d4e1088..2b81123 100644
--- a/.gitea/workflows/ui_assets.yaml
+++ b/.gitea/workflows/ui_assets.yaml
@@ -58,7 +58,8 @@ jobs:
               git commit -am "update ui-assets.nix"
 
               echo "Current branch: $GITHUB_REF_NAME"
-              git push origin HEAD:$GITHUB_REF_NAME
+              git push origin HEAD:"$GITHUB_REF_NAME"
+              echo "Done uploading"
             fi
           else
             echo "No UI files changed. Skipping asset build and push"
diff --git a/pkgs/ui/next.config.js b/pkgs/ui/next.config.js
index c1904cb..316bb41 100644
--- a/pkgs/ui/next.config.js
+++ b/pkgs/ui/next.config.js
@@ -2,7 +2,6 @@
 const nextConfig = {
   output: "export",
   images: { unoptimized: true },
-  distDir: "build",
   eslint: {
     dirs: ["src"],
   },
diff --git a/pkgs/ui/shell.nix b/pkgs/ui/shell.nix
index 6c265bc..5de28bc 100644
--- a/pkgs/ui/shell.nix
+++ b/pkgs/ui/shell.nix
@@ -25,7 +25,7 @@ pkgs.mkShell {
     export NEXT_BUILD_ID=$(git log -1 --pretty=format:"%H")
 
     # re-generate the api code
-    rm -f openapi.json
+    rm -f --interactive=never openapi.json
     rm -rf src/api
     cp ${clanPkgs.clan-openapi}/openapi.json .
     orval