Merge pull request #5304 from KKoukiou/anaconda-webui-split

Remove files as per-move of the Web UI to it's own repository
rhinstaller · Nov 16, 2023 · c9e9f96 · c9e9f96
2 parents 2a69623 + 32a8e48
commit c9e9f96
Show file tree

Hide file tree

Showing 136 changed files with 8 additions and 12,368 deletions.
diff --git a/.cockpit-ci/run b/.cockpit-ci/run
diff --git a/.github/codeql-config.yml b/.github/codeql-config.yml
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -17,18 +17,6 @@ updates:
     labels:
       - "infrastructure"
 
-  # Set update schedule for npm packages.
-  # FIXME: Update our npm development dependencies monthly.
-  # See: https://github.com/dependabot/dependabot-core/issues/2390
-  - package-ecosystem: "npm"
-    directory: "/ui/webui"
-    schedule:
-      interval: "weekly"
-    commit-message:
-      prefix: "infra"
-    labels:
-      - "sanity check required"
-
   # Set update schedule for pip in containers
   - package-ecosystem: "pip"
     directory: "/dockerfile"

diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -12,9 +12,6 @@
 f40:
 - '**'
 
-webui:
-- 'ui/webui/**'
-
 documentation:
 - 'docs/**'
 

diff --git a/.github/labeler.yml.j2 b/.github/labeler.yml.j2
@@ -9,9 +9,6 @@ f{$ distro_release $}:
 {% endif %}
 - '**'
 
-webui:
-- 'ui/webui/**'
-
 documentation:
 - 'docs/**'
 

diff --git a/.github/workflows/cockpit-lib-update.yml b/.github/workflows/cockpit-lib-update.yml
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
diff --git a/.gitignore b/.gitignore
@@ -88,9 +88,4 @@ pyanaconda.*rst
 docs/tests/*.rst
 zanata.xml
 tests/rpm_tests/.cache/
-# these files are temporary files for webui
-ui/webui/node_modules
-ui/webui/dist
-ui/webui/test/common/
-ui/webui/bots/
 .ruff_cache
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +0,0 @@
-[submodule "ui/webui/test/reference"]
-	path = ui/webui/test/reference
-	url = https://github.com/rhinstaller/pixel-test-reference
-	branch = empty

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -21,16 +21,11 @@ If you are not interested in dealing with containers, just skip this part and co
 
     sudo dnf install toolbox
 
-To create and enter a development toolbx for Anaconda (not Web UI) just run these commands::
+To create and enter a development toolbx for Anaconda just run these commands::
 
     toolbox create
     toolbox enter
 
-To create and enter a development toolbx for Anaconda Web UI run this command instead::
-
-    toolbox create --image quay.io/cockpit/tasks -c anaconda-webui
-    toolbox enter anaconda-webui
-
 Installing dependencies
 -----------------------
 
@@ -42,10 +37,6 @@ on your system just run these commands::
 
     sudo ./scripts/testing/install_dependencies.sh
 
-For testing also the Web UI, you need to install additional dependencies::
-
-    sudo ./scripts/testing/install_webui_dependencies.sh
-
 
 How to run make commands
 ------------------------
@@ -112,10 +103,6 @@ Testing Anaconda changes
 
 To test changes in Anaconda you have a few options based on what you need to do.
 
-WebUI development
-^^^^^^^^^^^^^^^^^
-See ``ui/webui/README.rst`` and ``ui/webui/test/README.rst`` for more details about how to develop and test Web UI interface of Anaconda.
-
 Backend and TUI development
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 There are two options to develop and test changes which are not yet released.

diff --git a/Makefile.am b/Makefile.am
@@ -20,7 +20,7 @@ include ./po/l10n-config.mk
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = data docs dracut po pyanaconda scripts tests widgets ui utils
+SUBDIRS = data docs dracut po pyanaconda scripts tests widgets utils
 
 EXTRA_DIST = COPYING
 
@@ -305,7 +305,6 @@ container-ci:
 
 	$(CONTAINER_ENGINE) run \
 	--entrypoint /anaconda/dockerfile/anaconda-ci/run-build-and-arg \
-	-e CONFIGURE_ARGS="--disable-webui" \
 	$(CONTAINER_TEST_ARGS) \
 	$(CI_TEST_ARGS) \
 	$(CONTAINER_RUN_ARGS) \
@@ -490,9 +489,6 @@ run-rpm-tests-only: rpms
 	$(MAKE) TEST_SUITE_LOG=test-suite.log RPM_PATH=$(RPM_BUILD_DIR) \
 			ROOT_ANACONDA_PATH=$(abs_srcdir) TESTS=rpm_tests/rpm_tests.sh check
 
-webui-tests: srpm
-	$(MAKE) --directory ui/webui integration-test
-
 coverage-report:
 	$(COVERAGE) combine tests/.coverage.*
 	$(COVERAGE) xml -o tests/coverage-report.xml

diff --git a/anaconda.spec.in b/anaconda.spec.in
@@ -23,7 +23,6 @@ Source0: https://github.com/rhinstaller/%{name}/releases/download/%{name}-%{vers
 %bcond_with glade
 %bcond_with live
 %endif
-%define cockpitver 275
 %define dasbusver 1.3
 %define dbusver 1.2.3
 %define dnfver 3.6.0
@@ -270,20 +269,6 @@ The anaconda-install-img-deps metapackage lists all boot.iso installation
 image dependencies. Add this package to an image build (eg. with lorax) to
 ensure all Anaconda capabilities are supported in the resulting image.
 
-%package webui
-Summary: Cockpit based user interface for the Anaconda installer
-# ours + what npm brings in and we vendor
-License: GPL-2.0-or-later AND MIT AND 0BSD
-Requires: cockpit-bridge >= %{cockpitver}
-Requires: cockpit-ws >= %{cockpitver}
-# Firefox dependency needs to be specified there as cockpit web-view does not have a hard dependency on Firefox as
-# it can often fall back to a diferent browser. This does not work in the limited installer
-# environment, so we need to make sure Firefox is available.
-Requires: firefox
-
-%description webui
-This package contains Cockpit based user interface for the Anaconda installer.
-
 %package gui
 Summary: Graphical user interface for the Anaconda installer
 Requires: anaconda-core = %{version}-%{release}
@@ -445,30 +430,6 @@ rm -rf \
 
 %endif
 
-%files webui
-%dir %{_datadir}/cockpit/anaconda-webui
-%{_datadir}/cockpit/anaconda-webui/logo.svg
-%{_datadir}/cockpit/anaconda-webui/index.js.LEGAL.txt
-%{_datadir}/cockpit/anaconda-webui/index.css.LEGAL.txt
-%{_datadir}/cockpit/anaconda-webui/index.html
-%{_datadir}/cockpit/anaconda-webui/index.js.gz
-%{_datadir}/cockpit/anaconda-webui/index.js.map
-%{_datadir}/cockpit/anaconda-webui/index.css.gz
-%{_datadir}/cockpit/anaconda-webui/index.css.map
-%{_datadir}/cockpit/anaconda-webui/manifest.json
-%{_datadir}/metainfo/org.cockpit-project.anaconda-webui.metainfo.xml
-%{_datadir}/cockpit/anaconda-webui/po.*.js.gz
-%dir %{_datadir}/anaconda/firefox-theme
-%dir %{_datadir}/anaconda/firefox-theme/default
-%dir %{_datadir}/anaconda/firefox-theme/default/chrome
-%{_datadir}/anaconda/firefox-theme/default/user.js
-%{_datadir}/anaconda/firefox-theme/default/chrome/userChrome.css
-%dir %{_datadir}/anaconda/firefox-theme/live
-%dir %{_datadir}/anaconda/firefox-theme/live/chrome
-%{_datadir}/anaconda/firefox-theme/live/user.js
-%{_datadir}/anaconda/firefox-theme/live/chrome/userChrome.css
-%{_libexecdir}/webui-desktop
-
 %files gui
 %{python3_sitearch}/pyanaconda/ui/gui/*
 %{_datadir}/anaconda/pixmaps

diff --git a/configure.ac b/configure.ac
@@ -201,22 +201,9 @@ AC_CONFIG_FILES([Makefile
                  pyanaconda/modules/subscription/Makefile
                  data/pixmaps/Makefile
                  tests/Makefile
-                 ui/Makefile
                  utils/Makefile
                  utils/dd/Makefile])
 
-### Include Cockpit part to the make execution as optional ###
-# The main reason to have this is to speed up execution of the unit-tests by avoiding npm package download.
-AC_ARG_ENABLE([webui], AS_HELP_STRING([--disable-webui], [Build without the web ui; makes the build much faster]))
-
-# Do not include the ui/webui Makefile to the build process. Everything there will be ignored.
-AS_IF([test "x$enable_webui" != "xno"],
-      [AC_CONFIG_FILES([ui/webui/Makefile])])
-AS_IF([test "x$enable_webui" != "xno"],
-      [AC_SUBST(WEBUI_SUBDIR, "webui")],
-      [AC_SUBST(WEBUI_SUBDIR, "")])
-###
-
 AC_OUTPUT
 
 # Gently advise the user about the build failures they are about to encounter

diff --git a/dockerfile/anaconda-ci/run-build-and-arg b/dockerfile/anaconda-ci/run-build-and-arg
@@ -2,8 +2,7 @@
 set -eux
 
 # Avoid clobbering the host's checkout, so work from a copy
-# Also don't copy bots, it breaks things and is useless
-rsync -a /anaconda /tmp/ --exclude ui/webui/bots
+rsync -a /anaconda /tmp/
 cd /tmp/anaconda
 rm -rf test-logs
 

diff --git a/docs/ci-status.rst b/docs/ci-status.rst
@@ -71,9 +71,6 @@ Anaconda
 
   The PR runs the usual tests, where potential failures caused by translation changes are caught.
 
-|cockpit-lib-update|
-  Updates the COCKPIT_REPO_COMMIT in ui/webui/Makefile.am and opens a pull request.
-
 Dependabot_
   Checks Anaconda dependencies and opens pull requests for new versions.
 

diff --git a/docs/commit-log.rst b/docs/commit-log.rst
@@ -6,7 +6,7 @@ following are rules to follow when committing a change to the git repo:
 
 1) The first line of the commit message should be a short summary of the
    change in the patch. If the alterations pertain to a specific UI deliverable
-   in Anaconda, begin the line with the lowercase name - gui, webui, tui. We
+   in Anaconda, begin the line with the lowercase name - gui, tui. We
    also place (#BUGNUMBER) at the end of this line to indicate the
    bugzilla.redhat.com bug number addressed in this patch. The bug number is
    optional since there may be no bug number, but if you have one you are
@@ -18,7 +18,7 @@ following are rules to follow when committing a change to the git repo:
 
        Check partition and filesystem type on upgrade (#123456)
        Fix bootloader configuration setup on ppc64 (#987654)
-       webui: Introduce a new screen for setting your preferred email client
+       gui: Introduce a new screen for setting your preferred email client
 
    The last one would be a new feature that we didn't have a bug number
    for.