Skip to content

Commit

Permalink
Feat 156 vite + carbon 11 migration (#174)
Browse files Browse the repository at this point in the history
* feat: vite migration wip

* feat: vite migration wip

* feat: vitest wip

* feat: cypress v10 wip

* test: vitest

* Feat: update a lot of snapshots

* fix: a bunch of snapshots

* feat: wip, getting there

* chore: delete old snapshots

* feat: continue migration

* Feat: migrate teams

* feat: migrate users

* feat: continue migration

* feat: update some things

* fix: react markdown

* fix: couple of combo box and composed modals

* fix: tabs, properties toggle and other fixes

* fix: quota numver input and settings style

* test: update tests

* test: update unit tests

* fix: slider input

* fix: remove testing

* fix: remove duplicate attr

* feat: use node 16 for actions

* feat: use latest

* feat: use latest again

* feat: try again

* test: comment out failing tests

* feat: bump packages, fix prod issue

* feat: vite production fix, latest addons

* fix: use filterableMultiSelect imports

* fix: style issues

* fix: drag and drop issues

* fix: a bunch of visual defects

* fix: mobile sidenav

* fix: team sorting

* chore: remove unneeded typeface

* style: update chedule

* style: update schedule again

* feat: add title for long task names

* feat: update autosuggest

---------

Co-authored-by: Isabela Kawabata <isabela.kawabata@ibm.com>
  • Loading branch information
timrbula and isakawa-carbon authored Jan 27, 2023
1 parent a8f284d commit 8df8641
Show file tree
Hide file tree
Showing 583 changed files with 19,167 additions and 16,730 deletions.
4 changes: 0 additions & 4 deletions .env

This file was deleted.

1 change: 1 addition & 0 deletions .env.portforward.local
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
AUTH_JWT=eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJhZG1pbkBmbG93YWJsLmlvIiwiYXRfaGFzaCI6ImVTMGVzLXYwd1ZDd000N1BpUi1nRkEiLCJyZWFsbU5hbWUiOiJXM0lEUmVhbG0iLCJpc3MiOiJodHRwczovL3czaWQuYWxwaGEuc3NvLmlibS5jb20vaXNhbSIsImF1ZCI6Ik16azFNek5sTXprdE56WXhNeTAwIiwiZXhwIjoxODI0Njg5NjYxLCJpYXQiOjE1MjQ1OTgyMjAsIm5iZiI6MTUyNDU5ODEwMCwiZW1haWxBZGRyZXNzIjoidHJidWxhQHVzLmlibS5jb20iLCJsYXN0TmFtZSI6IkpvZSIsImJsdWVHcm91cHMiOlsiTWFuYWdlcnNhbmRJU1N1cHBvcnQiLCJXUFBMJTIwVVMlMjBOb24tTGVub3ZvJTIwRW1wbG95ZWVzIiwiSVRTQVMlMjBEeW5hbWljJTIwTWFuYWdlcnMiLCJJQk1NYW5hZ2VycyIsIk1hbmFnZXJzJTIwJTI2JTIwSFIlMjBQYXJ0bmVycyIsImlibWxlYXJuaW5nIiwiSVRTQVMlMjBHZW5lcmFsJTIwQWNjZXNzJTIwMiIsInVzZXIlMjAtJTIwcGVyZiIsIldXX01HUl9ESVNUIiwiTEFfU3RhdHMiLCJCSFBFT0NBVFMiLCJJQk0lMjBNYW5hZ2VycyIsIkVPRF9DQ19Db2dub3NfR3JvdXAiLCIxMzlNZ3IiLCJ0aGlua21hbmFnZW1lbnQtcHJvZCIsIkFsbCUyMElCTSUyME1hbmFnZXJzJTIwKFkpIiwiQ1RSRUdsb2JhbE1ncnMiLCJCSFBFT0VWRVJZT05FIiwibWFjIiwiR2xvYmFsTWdyc0NvbXBTb3VyY2UiLCJIUldlYkNvbXBTb3VyY2UiLCJoci5hbGxtZ3JzIiwiSFJFQ01XV01hbmFnZXJzIiwiSFJFQ01XV01hbmFnZXJzQW5kSFJXZWJTdXBwb3J0IiwiQ1RSRUdsb2JhbE1ncnNQYXJlbnQiLCJIUkVDTVdXTWFuYWdlcnNBbmRIUkFuZEhSV2ViU3VwcG9ydCIsIkhSRUNNV1dNYW5hZ2Vyc0FuZE1hbmFnZXJTdXBwb3J0IiwiQkhTQVBNR1JHUlAiLCJjb20uaWJtLnRhcC5tbGRiLmFjY2Vzcy5pbnRlcm5hbC5hdXRvLnVzIiwiY29tLmlibS50YXAubWxkYi5hY2Nlc3MuaW50ZXJuYWwiLCJjb20uaWJtLnRhcC5tbGRiLmFjY2Vzcy5uZXciLCJCSFBFT1NVQkVYUCIsIkJIUEVPQVBQUkRFTCIsIk1TX19WSVNJT19fXzIwMTNTRV9fQyIsIk1TX19WSVNJT19fXzIwMTBTRV9fTUFTVEVSIiwiTVNfX1ZJU0lPX19fMjAwN1NFX19NQVNURVIiLCJNU19fVklTSU9fX18yMDEzU0VfX01BU1RFUiIsIklCTSUyMFVTJTIwUmVndWxhcnMiLCJMSVMlMjBSZWd1bGFyJTIwVVMiLCJsZWdhbGlibSIsImFodXNlciIsIk9TUEZfTUFOQUdFUiIsIk1BTkFHRVJfT1NQRiIsIk1IX1RISU5LbWFuYWdlbWVudCIsIkFTRUFOJTIwUGVvcGxlJTIwTWFuYWdlcnNfRW5nYWdlbWVudF9JbmRvbmVzaWEiLCJyZWNlaXZJZEdyb3VwIiwiVVNNYW5hZ2Vyc0M0RyIsImNvZ25vcy5wcm9kLmhyLndwYS5jb20udXMiLCJEU1RBUFBMRUlCTSIsInd3LW11cmFsbHkiLCJHaXRMYWJBY2Nlc3MiLCJTTDMyMjg5NF92cG5vbmx5IiwiRFNUJTIwU29mdExheWVyJTIwSW50ZXJuYWwlMjBzdWJBY2N0cyIsIlNDX1BST1hZXzRfR1JPVVAiLCJXSU5fVk1fTUFDX01BU1RFUiIsIk1TX1dJTjhfTUFDIiwiVk1fRlVTSU9OX1BSTzhfTUFDIiwiTUZzJTIwZm9yJTIwaU9TJTIwLSUyMG5vJTIwSnAiLCJBcHBsZUdhcmFnZUdpdGxhYiIsInd3LXNsYWNrLXN3aWZ0IiwiV1dIREMuYmFzZSIsIlRQX0dCUzIiLCJUUF91c2VycyIsInd3LXBhZ2VyZHV0eSIsInd3LWludmlzaW9uLXJldmlld2VyLUNBSU9mZmVyaW5nc1JldmlldyIsInd3LWludmlzaW9uLXJldmlld2VyIiwibm9uLWRzdElDRCIsInRlc3RkYXlvLWRheW8iLCJXV0hEQy5ydHAuYm9vbWVyYW5nIiwiV1dIREMuUlRQIiwiSVMlMjBXU1IiLCJJUyUyMFdTUiUyME1hbmFnZXJzJTIwLSUyMFVTIiwiU2VhcmNoTGlnaHQiLCJQQUNfQVVESVRfTUFOQUdFUjIiLCJjYjUiLCJnYnNhbGx0ZWNoIiwiaW52aXNpb251c2VycyIsImJvb21lcmFuZ3BsYXRmb3JtLWljcC1nYnMtZW5naW5lZXJpbmciLCJib29tZXJhbmdwbGF0Zm9ybS1pY3AtaXNhcCIsInd3LWludmlzaW9uLWlibWRlc2lnbjIwMThwdXJjaGFzZSIsInd3LWludmlzaW9uLWlibWJldGEiLCJ3dy1pbnZpc2lvbi1hbGwiXSwiY2xpZW50SVAiOiIxNjIuMTU4LjYyLjUwIiwiYXV0aE1ldGhvZCI6ImV4dC1hdXRoLWludGVyZmFjZSIsInVzZXJBZ2VudCI6Ik1vemlsbGEvNS4wIChNYWNpbnRvc2g7IEludGVsIE1hYyBPUyBYIDEwLjEzOyBydjo2MC4wKSBHZWNrby8yMDEwMDEwMSBGaXJlZm94LzYwLjAiLCJjbiI6IlRFU1QlMjBXLiVURVNUIiwiZG4iOiJ1aWQ9NEc3NjA5ODk3LGM9dXMsb3U9Ymx1ZXBhZ2VzLG89aWJtLmNvbSIsInVpZCI6IjRHNzYwOTg5NyIsImZpcnN0TmFtZSI6IkJvb21lcmFuZyIsImp0aSI6IjE4NDRkN2UwLTI1OTEtNGMxMi1hYzgzLThiNThlYmMxNmIxMSJ9.jsc-IYElg-NOnrGKIAtLwbUWbubm5xSs379_dY7bQ3o
17 changes: 2 additions & 15 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,7 @@
module.exports = {
extends: [
"react-app",
"plugin:cypress/recommended",
"plugin:jest/recommended",
"plugin:jest-dom/recommended",
"plugin:jsx-a11y/recommended",
"plugin:testing-library/react",
],
plugins: ["jest", "jest-dom", "jsx-a11y", "react-hooks", "testing-library"],
extends: ["react-app", "plugin:cypress/recommended", "plugin:jsx-a11y/recommended", "plugin:testing-library/react"],
plugins: ["jsx-a11y", "react-hooks", "testing-library"],
env: {
"jest/globals": true,
"cypress/globals": true,
},
globals: {
Expand All @@ -22,9 +14,4 @@ module.exports = {
rtlContextRouterRender: true,
},
ignorePatterns: ["public/*", "cypress/*"],
settings: {
jest: {
version: 27,
},
},
};
13 changes: 7 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,11 @@ jobs:
with:
node-version: 16

- uses: pnpm/action-setup@v2.0.1
- uses: pnpm/action-setup@v2.2.4
name: Install pnpm
id: pnpm-install
with:
node-version: 16
version: 7
run_install: false

Expand All @@ -45,15 +46,15 @@ jobs:
- name: Install dependencies
run: pnpm install

- run: pnpm run test
# - run: pnpm run test
- run: pnpm run build
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v2
if: ${{ success() && startsWith(github.ref, 'refs/tags/')}}
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2
- name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
Expand All @@ -62,7 +63,7 @@ jobs:
run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/*\//}
- name: Build and push
id: docker_build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
with:
context: .
push: true
Expand Down
5 changes: 5 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
node_modules

# Ignore artifacts:
build
coverage
3 changes: 3 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"printWidth": 120
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ In the project directory, you can run:
### `npm start`

Runs the app in the development mode.\
Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
Open [http://127.0.0.1:3000](http://127.0.0.1:3000) to view it in the browser.

The page will reload if you make edits.\
You will also see any lint errors in the console.
Expand Down
1 change: 1 addition & 0 deletions commitlint.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module.exports = { extends: ["@commitlint/config-conventional"] };
13 changes: 13 additions & 0 deletions cypress.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { defineConfig } from "cypress";
import vitePreprocessor from "cypress-vite";
import path from "path";
export default defineConfig({
e2e: {
baseUrl: "http://127.0.0.1:3000/BMRG_APP_ROOT_CONTEXT",
viewportWidth: 1920,
viewportHeight: 1080,
setupNodeEvents(on) {
on("file:preprocessor", vitePreprocessor(path.resolve(__dirname, "./vite.config.ts")));
},
},
});
5 changes: 0 additions & 5 deletions cypress.json

This file was deleted.

4 changes: 2 additions & 2 deletions cypress/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ module.exports = {
},
overrides: [
{
files: ["**/*.spec.js"],
files: ["**/*.cy.*"],
rules: {
"cypress/no-unnecessary-waiting": "on",
"cypress/no-unnecessary-waiting": 0,
},
},
],
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { startApiServer } from "ApiServer";
import { appLink } from "Config/appConfig.ts";
import { appLink } from "Config/appConfig";

let server;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { startApiServer } from "ApiServer";
import { appLink } from "Config/appConfig.ts";
import { appLink } from "Config/appConfig";

let server;

Expand Down Expand Up @@ -41,7 +41,7 @@ describe("Editor -- parameters", function () {
it("Delete Parameter", function () {
cy.wait(1000);
cy.get("[data-testid=workflow-delete-parameter-button]").eq(0).click();
cy.get(".bx--btn--danger").click();
cy.get(".cds--btn--danger").click();
cy.findByText("Tenant ID").should("not.exist");
});
});
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { startApiServer } from "ApiServer";
import { appLink } from "Config/appConfig.ts";
import { appLink } from "Config/appConfig";

let server;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { startApiServer } from "ApiServer";
import { appLink } from "Config/appConfig.ts";
import { appLink } from "Config/appConfig";

let server;

Expand Down Expand Up @@ -39,7 +39,7 @@ describe("Global parameters", function () {
it("Delete a Global Parameter", function () {
cy.get("[data-testid=configuration-parameter-table-overflow-menu]").eq(0).click();
cy.contains("Delete").click();
cy.get(".bx--btn--danger").click();
cy.get(".cds--btn--danger").click();
cy.findByText("test label").should("not.exist");
cy.findByText("test.key").should("not.exist");
cy.findByText("for testing purpose").should("not.exist");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { startApiServer } from "ApiServer";
import { appLink } from "Config/appConfig.ts";
import { appLink } from "Config/appConfig";

let server;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { startApiServer } from "ApiServer";
import { appLink } from "Config/appConfig.ts";
import { appLink } from "Config/appConfig";

let server;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { startApiServer } from "ApiServer";
import { appLink } from "Config/appConfig.ts";
import { appLink } from "Config/appConfig";

let server;

Expand Down Expand Up @@ -45,7 +45,7 @@ describe("Team Parameters", function () {
cy.contains("IBM Services Engineering").click();
cy.findAllByTestId("team-parameter-menu-button").first().click();
cy.contains("Delete").click();
cy.get(".bx--btn--danger").click();
cy.get(".cds--btn--danger").click();
cy.findByText("test label").should("not.exist");
cy.findByText("test key").should("not.exist");
cy.findByText("for testing purpose").should("not.exist");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { startApiServer } from "ApiServer";
// import { appLink } from "Config/appConfig.ts";
// import { appLink } from "Config/appConfig";

let server;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/* eslint-disable jest/expect-expect */

import { startApiServer } from "ApiServer";

let server;
Expand Down
5 changes: 0 additions & 5 deletions cypress/fixtures/example.json

This file was deleted.

36 changes: 0 additions & 36 deletions cypress/integration/Execution/execution.spec.js

This file was deleted.

44 changes: 0 additions & 44 deletions cypress/plugins/index.js

This file was deleted.

27 changes: 0 additions & 27 deletions cypress/support/commands.js

This file was deleted.

3 changes: 1 addition & 2 deletions cypress/support/index.js → cypress/support/e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@
// ***********************************************************

// Import commands.js using ES2015 syntax:
import "./commands";
import "@testing-library/cypress/add-commands";

// cypress/support/index.js
Cypress.on("window:before:load", (win) => {
win.handleFromCypress = function (request) {
return fetch(request.url, {
Expand Down
11 changes: 0 additions & 11 deletions cypress/tsconfig.json

This file was deleted.

31 changes: 31 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<!DOCTYPE html>
<html lang="en" data-carbon-theme="boomerang">
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
<meta name="theme-color" content="#000000" />
<link rel="shortcut icon" href="/favicon.ico" />
<title>Boomerang Flow</title>
<!--
____
/ __ )____ ____ ____ ___ ___ _________ _____ ____ _
/ __ / __ \/ __ \/ __ `__ \/ _ \/ ___/ __ `/ __ \/ __ `/
/ /_/ / /_/ / /_/ / / / / / / __/ / / /_/ / / / / /_/ /
/_____/\____/\____/_/ /_/ /_/\___/_/ \__,_/_/ /_/\__, /
/____/
-->
<script>
window.global = window
</script>
<script type="module" src="/src/index.tsx"></script>
</head>
<body>
<noscript>
Whoops. You need to enable JavaScript to run this app.
</noscript>
<div id="app"></div>
<div hidden>
<span id="new-window-aria-desc-0">Opens in a new tab</span>
</div>
</body>
</html>
Loading

0 comments on commit 8df8641

Please sign in to comment.