ui: cleanup and name changes

Drop the name Primate

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Author: yadvr

pom.xml

@@ -1005,33 +1005,7 @@
                             <exclude>tools/ngui/static/bootstrap/*</exclude>
                             <exclude>tools/ngui/static/js/lib/*</exclude>
                             <exclude>tools/transifex/.tx/config</exclude>
-                            <exclude>ui/legacy/css/src/scss/components/token-input-facebook.scss</exclude>
-                            <exclude>ui/l10n/*</exclude>
-                            <exclude>ui/legacy/lib/flot/jquery.colorhelpers.js</exclude>
-                            <exclude>ui/legacy/lib/flot/jquery.flot.crosshair.js</exclude>
-                            <exclude>ui/legacy/lib/flot/jquery.flot.fillbetween.js</exclude>
-                            <exclude>ui/legacy/lib/flot/jquery.flot.image.js</exclude>
-                            <exclude>ui/legacy/lib/flot/jquery.flot.js</exclude>
-                            <exclude>ui/legacy/lib/flot/jquery.flot.navigate.js</exclude>
-                            <exclude>ui/legacy/lib/flot/jquery.flot.pie.js</exclude>
-                            <exclude>ui/legacy/lib/flot/jquery.flot.resize.js</exclude>
-                            <exclude>ui/legacy/lib/flot/jquery.flot.selection.js</exclude>
-                            <exclude>ui/legacy/lib/flot/jquery.flot.stack.js</exclude>
-                            <exclude>ui/legacy/lib/flot/jquery.flot.symbol.js</exclude>
-                            <exclude>ui/legacy/lib/flot/jquery.flot.threshold.js</exclude>
-                            <exclude>ui/legacy/lib/jquery-ui/css/jquery-ui.css</exclude>
-                            <exclude>ui/legacy/lib/jquery-ui/index.html</exclude>
-                            <exclude>ui/legacy/lib/jquery-ui/js/jquery-ui.js</exclude>
-                            <exclude>ui/legacy/lib/jquery.cookies.js</exclude>
-                            <exclude>ui/legacy/lib/jquery.easing.js</exclude>
-                            <exclude>ui/legacy/lib/jquery.js</exclude>
-                            <exclude>ui/legacy/lib/jquery.md5.js</exclude>
-                            <exclude>ui/legacy/lib/jquery.validate.js</exclude>
-                            <exclude>ui/legacy/lib/jquery.tokeninput.js</exclude>
-                            <exclude>ui/legacy/lib/qunit/qunit.css</exclude>
-                            <exclude>ui/legacy/lib/qunit/qunit.js</exclude>
-                            <exclude>ui/legacy/lib/reset.css</exclude>
-                            <exclude>ui/legacy/lib/require.js</exclude>
+                            <exclude>ui/*</exclude>
                             <exclude>utils/testsmallfileinactive</exclude>
                         </excludes>
                     </configuration>

ui/.gitignore

@@ -1,5 +1,23 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 .DS_Store
 node_modules
+coverage
 /dist
 
 # local env files

ui/CONTRIBUTING.md

@@ -1,10 +1,10 @@
-# Contributing to Primate
+# Contributing to CloudStack UI
 
 ## Summary
 
-This document covers how to contribute to the Primate project. Primate uses Github PRs to manage code contributions.
+This document covers how to contribute to the UI project. It uses Github PRs to manage code contributions.
 These instructions assume you have a GitHub.com account, so if you don't have one you will have to create one.
-Your proposed code changes will be published to your own fork of the Primate project and you will submit a Pull Request for your changes to be added.
+Your proposed code changes will be published to your own fork of the project and you will submit a Pull Request for your changes to be added.
 
 Please refer to project [docs](docs) for reference on standard way of component
 configuration, development, usage, extension and testing.
@@ -27,18 +27,18 @@ No back porting / cherry-picking features to existing branches!
 
 ## Forking
 
-In your browser, navigate to: [https://github.com/apache/cloudstack-primate](https://github.com/apache/cloudstack-primate)
+In your browser, navigate to: [https://github.com/apache/cloudstack](https://github.com/apache/cloudstack)
 
 Fork the repository by clicking on the 'Fork' button on the top right hand side.
 The fork will happen and you will be taken to your own fork of the repository.
 Copy the Git repository URL by clicking on the clipboard next to the URL on the right hand side of the page under '**HTTPS** clone URL'.  You will paste this URL when doing the following `git clone` command.
 
-On your workstation, follow these steps to setup a local repository for working on Primate:
+On your workstation, follow these steps to setup a local repository for working on UI:
 
 ``` bash
-$ git clone https://github.com/YOUR_ACCOUNT/primate.git
-$ cd primate
-$ git remote add upstream https://github.com/apache/cloudstack-primate.git
+$ git clone https://github.com/YOUR_ACCOUNT/cloudstack.git
+$ cd cloudstack/ui
+$ git remote add upstream https://github.com/apache/cloudstack.git
 $ git checkout master
 $ git fetch upstream
 $ git rebase upstream/master
@@ -48,7 +48,7 @@ $ git rebase upstream/master
 
 
 It is important that you create a new branch to make changes on and that you do not change the `master` branch (other than to rebase in changes from `upstream/master`). In this example I will assume you will be making your changes to a branch called `feature_x`.
-This `feature_x` branch will be created on your local repository and will be pushed to your forked repository on GitHub. Once this branch is on your fork you will create a Pull Request for the changes to be added to the Primate project.
+This `feature_x` branch will be created on your local repository and will be pushed to your forked repository on GitHub. Once this branch is on your fork you will create a Pull Request for the changes to be added to the UI project.
 
 It is best practice to create a new branch each time you want to contribute to the project and only track the changes for that pull request in this branch.
 
@@ -101,7 +101,7 @@ Now that the `feature_x` branch has been pushed to your GitHub repository, you c
 
 To initiate the pull request, do the following:
 
-1. In your browser, navigate to your forked repository: [https://github.com/YOUR_ACCOUNT/primate](https://github.com/YOUR_ACCOUNT/primate)
+1. In your browser, navigate to your forked repository: [https://github.com/YOUR_ACCOUNT/cloudstack](https://github.com/YOUR_ACCOUNT/cloudstack)
 2. Click the new button called '**Compare & pull request**' that showed up just above the main area in your forked repository
 3. Validate the pull request will be into the upstream `master` and will be from your `feature_x` branch
 4. Enter a detailed description of the work you have done and then click '**Send pull request**'

ui/Dockerfile

@@ -15,12 +15,12 @@
 # specific language governing permissions and limitations
 # under the License.
 
-# Build example: docker build -t apache/cloudstack-primate:latest .
+# Build example: docker build -t <name> .
 
 FROM node:lts-stretch AS build
 
 MAINTAINER "Apache CloudStack" <dev@cloudstack.apache.org>
-LABEL Description="Apache CloudStack Primate; Modern role-base progressive UI for Apache CloudStack"
+LABEL Description="Apache CloudStack UI; Modern role-base progressive UI for Apache CloudStack"
 LABEL Vendor="Apache.org"
 LABEL License=ApacheV2
 LABEL Version=0.5.0
@@ -35,12 +35,12 @@ RUN npm run build
 
 FROM nginx:alpine AS runtime
 
-LABEL org.opencontainers.image.title="Apache CloudStack Primate" \
+LABEL org.opencontainers.image.title="Apache CloudStack UI" \
 	org.opencontainers.image.description="A modern role-based progressive CloudStack UI" \
 	org.opencontainers.image.authors="Apache CloudStack Contributors" \
-	org.opencontainers.image.url="https://github.com/apache/cloudstack-primate" \
-	org.opencontainers.image.documentation="https://github.com/apache/cloudstack-primate/README.md" \
-	org.opencontainers.image.source="https://github.com/apache/cloudstack-primate" \
+	org.opencontainers.image.url="https://github.com/apache/cloudstack" \
+	org.opencontainers.image.documentation="https://github.com/apache/cloudstack/blob/master/ui/README.md" \
+	org.opencontainers.image.source="https://github.com/apache/cloudstack" \
 	org.opencontainers.image.vendor="The Apache Software Foundation" \
 	org.opencontainers.image.licenses="Apache-2.0" \
 	org.opencontainers.image.ref.name="latest"

ui/README.md

@@ -1,8 +1,8 @@
-# CloudStack Primate [![Build Status](https://travis-ci.org/apache/cloudstack-primate.svg?branch=master)](https://travis-ci.org/apache/cloudstack-primate)
+# CloudStack UI
 
 A modern role-based progressive CloudStack UI based on VueJS and Ant Design.
 
-![Primate Screenshot](docs/screenshot-dashboard.png)
+![Screenshot](ui/docs/screenshot-dashboard.png)
 
 ## Getting Started
 
@@ -25,8 +25,8 @@ Optionally, you may also install system-wide dev tools:
 
 Clone the repository:
 
-    git clone https://github.com/apache/cloudstack-primate.git
-    cd cloudstack-primate
+    git clone https://github.com/apache/cloudstack.git
+    cd cloudstack/ui
     npm install
 
 Override the default `CS_URL` to a running CloudStack management server:
@@ -68,32 +68,32 @@ Fetch dependencies and build:
 This creates a static webpack application in `dist/`, which can then be served
 from any web server or CloudStack management server (jetty).
 
-To use CloudStack management server (jetty), you may copy the built Primate build
-to a new/existing webapp directory on the management server host. For example:
+To use CloudStack management server (jetty), you may copy the built UI to the
+webapp directory on the management server host. For example:
 
     npm install
     npm run build
     cd dist
-    mkdir -p /usr/share/cloudstack-management/webapp/primate
-    cp -vr . /usr/share/cloudstack-management/webapp/primate/
-    # Use Primate at {management-server}:8080/client/primate in browser
+    mkdir -p /usr/share/cloudstack-management/webapp/
+    cp -vr . /usr/share/cloudstack-management/webapp/
+    # Access UI at {management-server}:8080/client in browser
 
 If the webapp directory is changed, please change the `webapp.dir` in the
 `/etc/cloudstack/management/server.properties` and restart the management server host.
 
 To use a separate webserver, note that the API server is accessed through the path
 `/client`, which needs be forwarded to an actual CloudStack instance.
 
-For example, a simple way to serve Primate with nginx can be implemented with the
+For example, a simple way to serve UI with nginx can be implemented with the
 following nginx configuration (to be put into /etc/nginx/conf.d/default.conf or similar):
 
 ```nginx
 server {
     listen       80;
     server_name  localhost;
     location / {
-        # /src/primate/dist contains the built Primate webpack
-        root   /src/primate/dist;
+        # /src/ui/dist contains the built UI webpack
+        root   /src/ui/dist;
         index  index.html;
     }
     location /client/ {
@@ -107,18 +107,17 @@ server {
 ### Docker
 
 A production-ready Docker container can also be built with the provided
-Dockerfile and build script. Official builds are available here:
-https://hub.docker.com/r/apache/cloudstack-primate
+Dockerfile and build script.
 
 Make sure Docker is installed, then run:
 
-    bash tools/docker.sh
+    bash docker.sh
 
 Change the example configuration in `nginx/default.conf` according to your needs.
 
-Run Primate:
+Run UI:
 
-    docker run -ti --rm -p 8080:80 -v $(pwd)/nginx:/etc/nginx/conf.d:ro cloudstack-primate:latest
+    docker run -ti --rm -p 8080:80 -v $(pwd)/nginx:/etc/nginx/conf.d:ro cloudstack-ui:latest
 
 ### Packaging
 
@@ -138,13 +137,13 @@ docker container:
 
 - VueJS Guide: https://vuejs.org/v2/guide/
 - Vue Ant Design: https://www.antdv.com/docs/vue/introduce/
-- Primate Developer [Docs](docs)
+- UI Developer [Docs](docs)
 - JavaScript ES6 Reference: https://www.tutorialspoint.com/es6/
 - Introduction to ES6: https://scrimba.com/g/gintrotoes6
 
 ## Attributions
 
-Primate uses the following:
+The UI uses the following:
 
 - [VueJS](https://vuejs.org/)
 - [Ant Design Spec](https://ant.design/docs/spec/introduce)
@@ -156,13 +155,16 @@ Primate uses the following:
 
 ## History
 
-The project was created by [Rohit Yadav](https://rohityadav.cloud) over several
-weekends during late 2018 and early 2019. During ApacheCon CCCUS19, on 9th
-September 2019, Primate was introduced and demoed as part of the talk [Modern UI
+The modern UI, originally called Primate, was created by [Rohit
+Yadav](https://rohityadav.cloud) over several weekends during late 2018 and
+early 2019. During ApacheCon CCCUS19, on 9th September 2019, Primate was
+introduced and demoed as part of the talk [Modern UI
 for CloudStack](https://rohityadav.cloud/files/talks/cccna19-primate.pdf)
 ([video](https://www.youtube.com/watch?v=F2KwZhechzs)).
 [Primate](https://markmail.org/message/vxnskmwhfaagnm4r) was accepted by the
-Apache CloudStack project on 21 Oct 2019.
+Apache CloudStack project on 21 Oct 2019. The original repo was [merged with the
+main apache/cloudstack](https://markmail.org/message/bgnn4xkjnlzseeuv) repo on
+20 Jan 2021.
 
 ## License
 

ui/tools/docker.sh ui/docker.shui/tools/docker.sh renamed to ui/docker.sh

@@ -30,4 +30,4 @@ LABEL_DATE="--label \"org.opencontainers.image.created=${DATE}\""
 GIT_REV="$(git rev-parse HEAD)"
 LABEL_GIT_REV="--label \"org.opencontainers.image.revision=${GIT_REV}\""
 
-docker build -t cloudstack-primate ${LABEL_DATE} ${LABEL_GIT_REV} ${LABEL_GIT_TAG} ..
+docker build -t cloudstack-ui ${LABEL_DATE} ${LABEL_GIT_REV} ${LABEL_GIT_TAG} .

ui/docs/development.md

@@ -1,6 +1,6 @@
-# Primate Development
+# UI Development
 
-Primate is a modern role-based progressive CloudStack UI based on VueJS and Ant Design..
+The modern CloudStack UI is role-based progressive app that uses VueJS and Ant Design.
 
 Javascript, VueJS references:
 - https://www.w3schools.com/js/
@@ -29,8 +29,8 @@ The following tree shows the basic UI codebase filesystem:
 Clone the repository:
 
 ```
-git clone https://github.com/apache/cloudstack-primate.git
-cd cloudstack-primate
+git clone https://github.com/apache/cloudstack.git
+cd cloudstack/ui
 npm install
 ```
 Override the default `CS_URL` to a running CloudStack management server:
@@ -200,7 +200,7 @@ For example:
 ## Resource Detail View Customization
 
 From the List View of the resources, on can navigate to the individual
-  resource's detail view, which in CloudStack Primate we refer to as the
+  resource's detail view, which in CloudStack UI we refer to as the
   *Resource View* by click on the specific resource.
 The Resource View has 2 sections:
 - InfoCard to the left that has basic / minimal details of that resource along
@@ -229,4 +229,4 @@ For example,
     ]
 ```
 
-Additional tabs can be defined by adding on to the tabs section.
+Additional tabs can be defined by adding on to the tabs section.

…kaging/debian/cloudstack-primate.install ui/nginx.confui/packaging/debian/cloudstack-primate.install renamed to ui/nginx.conf ui/packaging/debian/cloudstack-primate.install renamed to ui/nginx.conf

@@ -15,4 +15,16 @@
 # specific language governing permissions and limitations
 # under the License.
 
-/usr/share/cloudstack-management/webapp/primate/*
+server {
+    listen       80;
+    server_name  localhost;
+    location / {
+        root   /usr/share/nginx/html;
+        index  index.html;
+    }
+    location /client/ {
+        # http://127.0.0.1:8080 should be replaced your CloudStack management
+        # Server's actual URI
+        proxy_pass   http://127.0.0.1:8080;
+    }
+}

ui/package-lock.json

@@ -1,11 +1,11 @@
 {
-  "name": "primate",
+  "name": "cloudstack-ui",
   "description": "Modern role-based Apache CloudStack UI",
   "version": "1.0.0",
   "homepage": "https://cloudstack.apache.org/",
   "repository": {
     "type": "git",
-    "url": "https://github.com/apache/cloudstack-primate.git"
+    "url": "https://github.com/apache/cloudstack.git"
   },
   "author": {
     "name": "Apache CloudStack Developers",
@@ -21,7 +21,7 @@
   ],
   "bugs": {
     "mail": "dev@cloudstack.apache.org",
-    "url": "https://github.com/apache/cloudstack-primate/issues"
+    "url": "https://github.com/apache/cloudstack/issues"
   },
   "scripts": {
     "start": "vue-cli-service lint --no-fix && vue-cli-service serve",