From 5d0c5352e84a630eca28aa51da646334ab6e531d Mon Sep 17 00:00:00 2001
From: Hao Liu <haoli@redhat.com>
Date: Mon, 27 Feb 2023 19:43:46 -0500
Subject: [PATCH] gitignore build

---
 .gitignore           |  1 +
 awx/ui_next/Makefile | 13 +++++++++----
 awx/urls.py          |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 30acd82ad9..1e48c997b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -163,3 +163,4 @@ use_dev_supervisor.txt
 /Dockerfile.kube-dev
 
 awx/ui_next/src
+awx/ui_next/build
diff --git a/awx/ui_next/Makefile b/awx/ui_next/Makefile
index b4b54a468d..b6fb1b70d5 100644
--- a/awx/ui_next/Makefile
+++ b/awx/ui_next/Makefile
@@ -56,12 +56,16 @@ $(UI_NEXT_SRC_DIR):
 	$(MAKE) ui_next
 
 .PHONY: ui_next/build
-## Build ui_next
-ui_next/build: ui_next
+## Build ui_next from source
+ui_next/src/build: ui_next
 	cd $(UI_NEXT_SRC_DIR) && \
 	npm install webpack && \
-	npm run build:awx && \
-	mv build ../
+	npm run build:awx
+
+.PHONY: ui_next/build
+## Copy ui_next/src/build to ui_next/build
+ui_next/build: ui_next/src/build
+	cp -r $(UI_NEXT_SRC_DIR)/build $(UI_NEXT_DIR)/build
 
 ## Alias for ui_next/build, will not run if build already exist
 $(UI_NEXT_DIR)/build:
@@ -77,3 +81,4 @@ ui_next/clean: ui_next/clean/build
 ui_next/clean/build:
 	rm -rf $$(UI_NEXT_DIR)/build
 
+
diff --git a/awx/urls.py b/awx/urls.py
index ea4248f7db..605f549d23 100644
--- a/awx/urls.py
+++ b/awx/urls.py
@@ -9,7 +9,7 @@ from awx.main.views import handle_400, handle_403, handle_404, handle_500, handl
 
 urlpatterns = [
     re_path(r'', include('awx.ui.urls', namespace='ui')),
-    re_path(r'^ui_next/.*$', include('awx.ui_next.urls', namespace='ui_next')),
+    re_path(r'^ui_next/.*', include('awx.ui_next.urls', namespace='ui_next')),
     re_path(r'^api/', include('awx.api.urls', namespace='api')),
     re_path(r'^sso/', include('awx.sso.urls', namespace='sso')),
     re_path(r'^sso/', include('social_django.urls', namespace='social')),