Merge pull request #363 from mareklibra/openshift-assisted-ui-lib.rename

Changes after facet-lib to openshift-assisted-ui-lib rename

Author: Jiri Tomasek

Diff for: hacks/README.md

@@ -2,8 +2,8 @@
 
 These scripts simplify builds, deployments or development.
 
-## update-facet-lib
-Can be executed right after `facet-lib` release to update it's version in
+## update-assisted-ui-lib
+Can be executed right after `assisted-ui-lib` release to update it's version in
 - the facet application
 - the uhc-portal (OCM)
 
@@ -17,7 +17,7 @@ Recently not used.
 ## patch-react-scripts.sh
 Called from the yarn's `postinstall` phase to watch changes under `node_modules` within `yarn start`.
 
-With this change, the `facet-lib` can be updated on-the-fly during development.
+With this change, the `openshift-assisted-ui-lib` dependency can be updated on-the-fly during development.
 
 ## ocm-deployed-version.sh
 Used by QE to check recent version deployed in the staging environment.
@@ -28,52 +28,51 @@ Used to create a virtual machine from an ISO (like a discovery iso), tested in o
 See comments inside the script for further details.
 
 # The Release Process
-Please note, the `facet` application features heavily depend on the `facet-lib` JavaSript library which needs to be released along the `facet` application.
+Please note, the `facet` application features heavily depend on the `openshift-assisted-ui-lib` JavaSript library which needs to be released along the `facet` application.
 
 Recently release versions of both project are alligned to simplify testing.
 
 ## Prerequisities
 - Have [uhc-portal](https://gitlab.cee.redhat.com/service/uhc-portal) fork
 - Local username (`whoami`) is equal to the gitlab's username
-  - if not, use `GITLAB_USER=` env variable when calling `update-facet-lib.sh` script bellow
-- Privileges to write to `facet` master - for tags and `facet-lib` version update
+  - if not, use `GITLAB_USER=` env variable when calling `update-assisted-ui-lib.sh` script bellow
 ## Steps
 
 When releasing new version, following steps are executed:
 - **Approve and merge** open PRs in both
   - [facet pull requests](https://github.com/openshift-metal3/facet/pulls)
-  - [facet-lib pull requests](https://github.com/mareklibra/facet-lib/pulls)
+  - [assisted-ui-lib pull requests](https://github.com/openshift-assisted/assisted-ui-lib/pulls)
 
-- **Release** [facet-lib via GitHub](https://github.com/mareklibra/facet-lib/releases/new)
+- **Release** [openshift-assisted-ui-lib via GitHub](https://github.com/openshift-assisted/assisted-ui-lib/releases/new)
   - **Be careful** when providing following input
   - Tag version in format:
     - v1.4.8 or v1.4.8-1 ; notice the letter `v` prefixing the version
   - Release title:
     - use the same as the tag
   - Description:
     - Unless automated in the future, copy&paste all PR titles since last release.
-    - To do so, use this [sorted list of closed PRs](https://github.com/mareklibra/facet-lib/pulls?q=is%3Apr+is%3Aclosed+sort%3Aupdated-desc)
-  - *Note:* As a consequence, a GitHub action is trigerred on new tag created to build the library, publish to npmjs.com and generate a PR in the `facet-lib`
-  - *Note:* It is recommended to use GitHub web to compose a release to keep track of changes. However, the GitHub action doing majority of the work is trigerred by a new tag only.
-  - **Close/re-open** [a generated PR in the facet-lib](https://github.com/mareklibra/facet-lib/pulls) which is increasing project's version.
-    - **Approve this PR and merge a.s.a.p.** to avoid other PRs slipping in
+    - To do so, use this [sorted list of closed PRs](https://github.com/openshift-assisted/assisted-ui-lib/pulls?q=is%3Apr+is%3Aclosed+sort%3Aupdated-desc)
+  - *Note:* As a consequence, a GitHub action is trigerred on new tag created to build the library, publish to npmjs.com and generate a PR in the `assisted-ui-lib`
+  - *Note:* It is recommended to use GitHub web to compose a release to keep track of changes. However, the GitHub action doing majority of the work can be trigerred by a new tag only.
+  - **Close/re-open** [a generated PR in the assisted-ui-lib](https://github.com/openshift-assisted/assisted-ui-lib/pulls) which is increasing project's version.
+    - **Approve this PR and merge A.S.A.P.** to avoid other PRs slipping in
     - *Note:* It is a GitHub's feature that an action can not trigger execution of another action. So without close/reopen the CI will not be executed on this PR.
-  - **Wait till** new `facet-lib` version is automatically published to [npmjs.com](https://www.npmjs.com/package/facet-lib)
+  - **Wait till** new `openshift-assisted-ui-lib` version is automatically published to [npmjs.com](https://www.npmjs.com/package/openshift-assisted-ui-lib)
 
-- **Update** `facet-lib` in the `facet` and `uhc-portal`
+- **Update** `openshift-assisted-ui-lib` in the `facet` and `uhc-portal` via
   - ```
-     $ curl https://raw.githubusercontent.com/openshift-metal3/facet/master/hacks/update-facet-lib.sh | sh -
+     $ curl https://raw.githubusercontent.com/openshift-metal3/facet/master/hacks/update-assisted-ui-lib.sh | sh -
     ```
-    - Watch output of the script. It might happen in rare cases that new `facet-lib` version is not automatically found (i.e. due to short delay), so you can force it by:
+    - Watch output of the script. It might happen in rare cases that new `openshift-assisted-ui-lib` version is not automatically found (i.e. due to short delay), so you can force it by:
       ```
-      $ curl https://raw.githubusercontent.com/openshift-metal3/facet/master/hacks/update-facet-lib.sh | FACET_LIB_VERSION=1.4.8 sh -
+      $ curl https://raw.githubusercontent.com/openshift-metal3/facet/master/hacks/update-assisted-ui-lib.sh | ASSISTED_UI_LIB_VERSION=1.5.0 sh -
       ```
 - New browser tabs are opened, **finish the process** there by:
-  - merge `facet-lib` version (if you missed that in the steps above)
+  - merge `assisted-ui-lib` version update (if you missed that in the steps above)
   - open a merge request to `uhc-portal`
   - confirm new `facet` project release - **append** description if needed
 - Pass through all Jira and Bugzilla tickets and **fill `Fixed in version`**
-  - use [facet-lib's release notes](https://github.com/mareklibra/facet-lib/releases) to guide you
+  - use [assisted-ui-lib's release notes](https://github.com/openshift-assisted/assisted-ui-lib/releases) to guide you
   - *Note:* We are working on automating this step
 
 - **Announce** new release on `#forum-assisted-installer-qe` slack channel to trigger QA

Diff for: hacks/ocm-deployed-version.sh

@@ -1,9 +1,9 @@
 #!/bin/bash
 set -e
 
-# Prints facet-lib version currently deployed in OCM staging
+# Prints openshift-assisted-ui-lib version currently deployed in OCM staging
 
 export YARN_LOCK=${YARN_LOCK:-https://gitlab.cee.redhat.com/service/uhc-portal/-/raw/master/yarn.lock}
 
-curl --silent ${YARN_LOCK} | awk '/^facet-lib@/{getline; print}' - | sed -e 's/^.*"\(.*\)"/\1/'
+curl --silent ${YARN_LOCK} | awk '/^openshift-assisted-ui-lib@/{getline; print}' - | sed -e 's/^.*"\(.*\)"/\1/'
 

Diff for: hacks/patch-react-scripts.sh

@@ -1,3 +1,3 @@
-# Fixes issue with watching changes to node_modules/facet_lib by webpack dev server
+# Fixes issue with watching changes to node_modules/openshift-assisted-ui-lib by webpack dev server
 sed -i 's/ ignored: ignoredFiles/ \/\* See hacks\/patch-react-scripts.sh \*\/ \/\/ ignored: ignoredFiles/g' node_modules/react-scripts/config/webpackDevServer.config.js 
 

Diff for: hacks/update-facet-lib.sh renamed to hacks/update-assisted-ui-lib.sh

@@ -6,8 +6,8 @@ export GREEN_COLOR='\033[0;32m'
 export NC='\033[0m' # No Color
 
 # this is more handy than yarn-upgrade
-export FACET_LIB_VERSION=${FACET_LIB_VERSION:-"`npm cache clean --force ; npm search facet-lib --parseable|grep '^facet-lib'|cut -f 5`"}
-echo -e "${GREEN_COLOR}FACET_LIB_VERSION: ${RED_COLOR}$FACET_LIB_VERSION${NC}"
+export ASSISTED_UI_LIB_VERSION=${ASSISTED_UI_LIB_VERSION:-"`npm cache clean --force ; npm search openshift-assisted-ui-lib --parseable|grep '^openshift-assisted-ui-lib'|cut -f 5`"}
+echo -e "${GREEN_COLOR}ASSISTED_UI_LIB_VERSION: ${RED_COLOR}$ASSISTED_UI_LIB_VERSION${NC}"
 
 export GITHUB_USER=${GITHUB_USER:-"`whoami`"}
 echo GITHUB_USER: $GITHUB_USER
@@ -20,10 +20,10 @@ echo FACET_USER_REPO: $FACET_USER_REPO
 export UHC_PORTAL_REPO=${UHC_PORTAL_REPO:-"https://gitlab.cee.redhat.com/${GITLAB_USER}/uhc-portal.git"}
 echo UHC_PORTAL_REPO: ${UHC_PORTAL_REPO}
 
-export TAG=${TAG:-"facet-lib-${FACET_LIB_VERSION}"}
-export UPDATE_BRANCH="facet-lib.auto.v${FACET_LIB_VERSION}"
+export TAG=${TAG:-"assisted-ui-lib-${ASSISTED_UI_LIB_VERSION}"}
+export UPDATE_BRANCH="assisted-ui-lib.auto.v${ASSISTED_UI_LIB_VERSION}"
 
-export TMPDIR=`mktemp -d /tmp/facet-lib-XXXX`
+export TMPDIR=`mktemp -d /tmp/facet-XXXX`
 echo TMPDIR: $TMPDIR
 
 # update facet
@@ -35,14 +35,14 @@ git remote add upstream https://github.com/openshift-metal3/facet.git
 git fetch --all && git reset --hard upstream/master
 git checkout -b ${UPDATE_BRANCH}
 
-sed -i "s/^    \"facet-lib\": \".*\",$/    \"facet-lib\": \"^${FACET_LIB_VERSION}\",/g" package.json
+sed -i "s/^    \"openshift-assisted-ui-lib\": \".*\",$/    \"openshift-assisted-ui-lib\": \"^${ASSISTED_UI_LIB_VERSION}\",/g" package.json
 yarn install
 git status
 git diff
 git add package.json yarn.lock
 
-git commit -m "Update facet-lib to ${FACET_LIB_VERSION}"
-git tag -a ${TAG} -m "facet-lib updated to version ${FACET_LIB_VERSION}"
+git commit -m "Update openshift-assisted-ui-lib to ${ASSISTED_UI_LIB_VERSION}"
+git tag -a ${TAG} -m "openshift-assisted-ui-lib updated to version ${ASSISTED_UI_LIB_VERSION}"
 
 # update uhc-portal
 echo -e "${GREEN_COLOR}Updating uhc-portal${NC}"
@@ -53,13 +53,13 @@ git remote add upstream git@gitlab.cee.redhat.com:service/uhc-portal.git
 git fetch --all && git reset --hard upstream/master
 git checkout -b ${UPDATE_BRANCH}
 
-sed -i "s/^    \"facet-lib\": \".*\",$/    \"facet-lib\": \"^${FACET_LIB_VERSION}\",/g" package.json
+sed -i "s/^    \"openshift-assisted-ui-lib\": \".*\",$/    \"openshift-assisted-ui-lib\": \"^${ASSISTED_UI_LIB_VERSION}\",/g" package.json
 yarn install
 git status
 git diff
 git add package.json yarn.lock
 
-git commit -m "Update facet-lib to ${FACET_LIB_VERSION}"
+git commit -m "Update openshift-assisted-ui-lib to ${ASSISTED_UI_LIB_VERSION}"
 # no tag for uhc-portal, just commit
 
 # All remote changes at the end
@@ -74,9 +74,9 @@ echo Pushing to ${FACET_USER_REPO} to create a pull request there
 git push --set-upstream origin ${UPDATE_BRANCH} --follow-tags
 
 # The last mile in a browser for convenience
-xdg-open "https://github.com/mareklibra/facet-lib/pulls" & # to close/re-open generated PR (optional)
+xdg-open "https://github.com/openshift-assisted/assisted-ui-lib/pulls" & # to close/re-open generated PR (optional)
 xdg-open https://gitlab.cee.redhat.com/${GITLAB_USER}/uhc-portal/-/merge_requests/new?merge_request%5Bsource_branch%5D=${UPDATE_BRANCH} &
-xdg-open "https://github.com/openshift-metal3/facet/releases/new?tag=v${FACET_LIB_VERSION}&title=v${FACET_LIB_VERSION}&body=REMOVE THIS REMINDER: Do not forget to merge pull-request with facet-lib update BEFORE creating new release here.%0A%0A${TAG}: https://github.com/mareklibra/facet-lib/releases/tag/v${FACET_LIB_VERSION}" &
+xdg-open "https://github.com/openshift-metal3/facet/releases/new?tag=v${ASSISTED_UI_LIB_VERSION}&title=v${ASSISTED_UI_LIB_VERSION}&body=REMOVE THIS REMINDER: Do not forget to merge pull-request with openshift-assisted-ui-lib update BEFORE creating new release here.%0A%0A${TAG}: https://github.com/openshift-assisted/assisted-ui-lib/releases/tag/v${ASSISTED_UI_LIB_VERSION}" &
 xdg-open https://github.com/${GITHUB_USER}/facet/pull/new/${UPDATE_BRANCH} & # <--- Pay attention to this before creating a new release in facet!
 
 echo -e "All set. Continue by create and ${GREEN_COLOR}merge${NC} Pull Request in the facet project"

Diff for: package.json

@@ -34,7 +34,7 @@
     "@typescript-eslint/parser": "^2.24.0",
     "axios": "^0.19.2",
     "axios-case-converter": "^0.6.0",
-    "facet-lib": "^1.4.9",
+    "openshift-assisted-ui-lib": "^1.5.0-pre2",
     "file-saver": "^2.0.2",
     "formik": "^2.1.4",
     "http-proxy-middleware": "^1.0.3",

Diff for: src/components/AboutModal.tsx

@@ -5,7 +5,7 @@ import {
   TextContent,
   ButtonVariant,
 } from '@patternfly/react-core';
-import { Api, DetailList, DetailItem, Config } from 'facet-lib';
+import { Api, DetailList, DetailItem, Config } from 'openshift-assisted-ui-lib';
 import { GIT_SHA, VERSION, SERVICE_LABELS, IMAGE_REPO } from '../config/standalone';
 import redHatLogo from '../images/Logo-Red_Hat-OpenShift_Container_Platform-B-Reverse-RGB.png';
 
@@ -86,7 +86,7 @@ const AboutModal: React.FC<AboutModalProps> = ({ isOpen, onClose }) => {
             <DetailItem title="Assisted Installer UI version" value={getUIVersion()} />
             <DetailItem
               title="Assisted Installer UI library version"
-              value={Config.getFacetLibVersion()}
+              value={Config.getAssistedUiLibVersion()}
             />
             {Object.keys(versions || {}).map((key) => {
               const version = versions ? versions[key] : '';

Diff for: src/components/App.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { Provider } from 'react-redux';
 import { Router } from 'react-router-dom';
 import { Page } from '@patternfly/react-core';
-import { Store, Router as LibRouter } from 'facet-lib';
+import { Store, Router as LibRouter } from 'openshift-assisted-ui-lib';
 import history from '../history';
 import Header from './ui/Header';
 // import Sidebar from './Sidebar';

Diff for: src/components/ui/Header.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Brand, PageHeader, PageHeaderTools, Button, ButtonVariant } from '@patternfly/react-core';
-import { Config } from 'facet-lib';
+import { Config } from 'openshift-assisted-ui-lib';
 import metal3FacetLogo from '../../images/metal3_facet-whitetext.png';
 import redhatLogo from '../../images/Logo-Red_Hat-OpenShift_Container_Platform-B-Reverse-RGB.png';
 import { ExternalLinkAltIcon } from '@patternfly/react-icons';

Diff for: src/styles/index.css

@@ -6,4 +6,4 @@
 */
 @import '~@patternfly/patternfly/patternfly.css';
 @import '~@patternfly/patternfly/patternfly-addons.css';
-@import '~facet-lib/dist/index.css';
+@import '~openshift-assisted-ui-lib/dist/index.css';

Diff for: yarn.lock

@@ -5201,16 +5201,6 @@ extsprintf@^1.2.0:
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
   integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
-facet-lib@^1.4.9:
-  version "1.4.9"
-  resolved "https://registry.yarnpkg.com/facet-lib/-/facet-lib-1.4.9.tgz#c2857c2aa342c8b6ca8e06c8d3c64d31d41a8592"
-  integrity sha512-AitZN/a5zZoFb6sl7fjrZ+ZACnEc/wx4AHF0t7B3KTVbexeO+dfCN3sl8bFgvD2mqNOrV7e68ZEd2B3i12pHZQ==
-  dependencies:
-    axios-case-converter "^0.6.0"
-    ip-address "^7.1.0"
-    is-in-subnet "^3.1.0"
-    unique-names-generator "^4.2.0"
-
 fast-deep-equal@^3.1.1:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
@@ -8631,6 +8621,16 @@ open@^7.0.2:
     is-docker "^2.0.0"
     is-wsl "^2.1.1"
 
+openshift-assisted-ui-lib@^1.5.0-pre2:
+  version "1.5.0-pre2"
+  resolved "https://registry.yarnpkg.com/openshift-assisted-ui-lib/-/openshift-assisted-ui-lib-1.5.0-pre2.tgz#2197c469151df53f2639bd4e74f98a7aabc7ce22"
+  integrity sha512-4Eb5KyaPqUWKX50rhqtNL3uBL/a3TR513PslsnpKFHkb2iavzdo7W7gForbGt08+i3iWPzxTI6EdagpzQXUG6Q==
+  dependencies:
+    axios-case-converter "^0.6.0"
+    ip-address "^7.1.0"
+    is-in-subnet "^3.1.0"
+    unique-names-generator "^4.2.0"
+
 opn@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"