From db6fb2de5e5111d09c4b59bf9b65a259aa22f515 Mon Sep 17 00:00:00 2001
From: Hao Liu <haoli@redhat.com>
Date: Tue, 21 Feb 2023 21:46:19 -0500
Subject: [PATCH] add ui-next to sdist manifest

---
 MANIFEST.in              | 1 +
 Makefile                 | 2 +-
 awx/ui-next/Makefile     | 4 ++++
 awx/ui-next/package.json | 9 +++++++++
 awx/ui-next/urls.py      | 5 ++++-
 awx/urls.py              | 2 +-
 6 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 awx/ui-next/Makefile
 create mode 100644 awx/ui-next/package.json

diff --git a/MANIFEST.in b/MANIFEST.in
index 04cde5e9f6..751b09db59 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -6,6 +6,7 @@ recursive-include awx/templates *.html
 recursive-include awx/api/templates *.md *.html *.yml
 recursive-include awx/ui/build *.html
 recursive-include awx/ui/build *
+recursive-include awx/ui-next/ansible-ui/build *
 recursive-include awx/playbooks *.yml
 recursive-include awx/lib/site-packages *
 recursive-include awx/plugins *.ps1
diff --git a/Makefile b/Makefile
index e1ff8f0e70..372cc9442e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-include awx/ui-next/Makefile
+# include awx/ui-next/Makefile
 
 PYTHON ?= python3.9
 OFFICIAL ?= no
diff --git a/awx/ui-next/Makefile b/awx/ui-next/Makefile
new file mode 100644
index 0000000000..da14ce19f2
--- /dev/null
+++ b/awx/ui-next/Makefile
@@ -0,0 +1,4 @@
+ui-next/clone:
+
+ui-next/build: ui-next/clone
+	$(MAKE) -C ui-next build
\ No newline at end of file
diff --git a/awx/ui-next/package.json b/awx/ui-next/package.json
new file mode 100644
index 0000000000..7870df4f20
--- /dev/null
+++ b/awx/ui-next/package.json
@@ -0,0 +1,9 @@
+{
+    "name": "ui-next",
+    "homepage": ".",
+    "private": true,
+    "engines": {
+      "node": ">=16.13.1"
+    },
+    
+}
\ No newline at end of file
diff --git a/awx/ui-next/urls.py b/awx/ui-next/urls.py
index 1d5a93b8ec..36bebdd81b 100644
--- a/awx/ui-next/urls.py
+++ b/awx/ui-next/urls.py
@@ -25,4 +25,7 @@ class MigrationsNotran(TemplateView):
 
 app_name = 'ui-next'
 
-urlpatterns = [re_path(r'^$', IndexView.as_view(), name='index'), re_path(r'^migrations_notran/$', MigrationsNotran.as_view(), name='migrations_notran')]
+urlpatterns = [
+    re_path(r'^$', IndexView.as_view(), name='index'),
+    re_path(r'^migrations_notran/$', MigrationsNotran.as_view(), name='migrations_notran'),
+]
diff --git a/awx/urls.py b/awx/urls.py
index 339a7e9641..af30cf361e 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'^controller/', include('awx.ui-next.urls', namespace='controller')),
+    re_path(r'^controller/.*$', include('awx.ui-next.urls', namespace='controller')),
     # 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')),