Skip to content

Commit 239b317

Browse files
authored
Rename portal-ui to web-app (#3178)
Signed-off-by: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com>
1 parent b465b74 commit 239b317

File tree

871 files changed

+220
-209
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

871 files changed

+220
-209
lines changed

.dockerignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ dist/
33
target/
44
console
55
!console/
6-
portal-ui/node_modules/
6+
web-app/node_modules/
77
.git/

.github/workflows/jobs.yaml

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
# https://github.com/actions/checkout/issues/334
5959
sudo apt install -y python3-pip || apt install -y python3-pip
6060
pip3 install semgrep
61-
semgrep --config semgrep.yaml $(pwd)/portal-ui --error
61+
semgrep --config semgrep.yaml $(pwd)/web-app --error
6262
6363
ui-assets:
6464
name: "React Code Has No Warnings & Prettified"
@@ -77,31 +77,31 @@ jobs:
7777
with:
7878
node-version: ${{ env.NVMRC }}
7979
cache: "yarn"
80-
cache-dependency-path: portal-ui/yarn.lock
80+
cache-dependency-path: web-app/yarn.lock
8181
- uses: actions/cache@v3
8282
id: assets-cache
8383
name: Assets Cache
8484
with:
8585
path: |
86-
./portal-ui/build/
86+
./web-app/build/
8787
key: ${{ runner.os }}-assets-${{ github.run_id }}
8888
- name: Install Dependencies
89-
working-directory: ./portal-ui
89+
working-directory: ./web-app
9090
continue-on-error: false
9191
run: |
9292
yarn install --frozen-lockfile --immutable
9393
- name: Check for Warnings in build output
94-
working-directory: ./portal-ui
94+
working-directory: ./web-app
9595
continue-on-error: false
9696
run: |
9797
./check-warnings.sh
9898
- name: Check if Files are Prettified
99-
working-directory: ./portal-ui
99+
working-directory: ./web-app
100100
continue-on-error: false
101101
run: |
102102
./check-prettier.sh
103103
- name: Check for dead code
104-
working-directory: ./portal-ui
104+
working-directory: ./web-app
105105
continue-on-error: false
106106
run: |
107107
./check-deadcode.sh
@@ -191,7 +191,7 @@ jobs:
191191
name: Assets Cache
192192
with:
193193
path: |
194-
./portal-ui/build/
194+
./web-app/build/
195195
key: ${{ runner.os }}-assets-${{ github.run_id }}
196196
- name: Build on ${{ matrix.os }}
197197
env:
@@ -242,7 +242,7 @@ jobs:
242242
run: npm install testcafe@3.0.0
243243

244244
- name: Run TestCafe Tests
245-
run: npx testcafe "chrome:headless" portal-ui/tests/subpath-nginx/ -q --skip-js-errors -c 3
245+
run: npx testcafe "chrome:headless" web-app/tests/subpath-nginx/ -q --skip-js-errors -c 3
246246

247247
- name: Clean up docker
248248
if: always()
@@ -291,7 +291,7 @@ jobs:
291291
run: npm install testcafe@3.0.0
292292

293293
- name: Run TestCafe Tests
294-
run: npx testcafe "chrome:headless" portal-ui/tests/permissions-1/ -q --skip-js-errors -c 3
294+
run: npx testcafe "chrome:headless" web-app/tests/permissions-1/ -q --skip-js-errors -c 3
295295

296296
- name: Clean up users & policies
297297
run: |
@@ -338,7 +338,7 @@ jobs:
338338
run: npm install testcafe@3.0.0
339339

340340
- name: Run TestCafe Tests
341-
run: npx testcafe "chrome:headless" portal-ui/tests/permissions-2/ -q --skip-js-errors -c 3
341+
run: npx testcafe "chrome:headless" web-app/tests/permissions-2/ -q --skip-js-errors -c 3
342342

343343
- name: Clean up users & policies
344344
run: |
@@ -385,7 +385,7 @@ jobs:
385385
run: npm install testcafe@3.0.0
386386

387387
- name: Run TestCafe Tests
388-
run: npx testcafe "chrome:headless" portal-ui/tests/permissions-3/ -q --skip-js-errors -c 3
388+
run: npx testcafe "chrome:headless" web-app/tests/permissions-3/ -q --skip-js-errors -c 3
389389

390390
- name: Clean up users & policies
391391
run: |
@@ -433,7 +433,7 @@ jobs:
433433

434434
- name: Run TestCafe Tests
435435
timeout-minutes: 10
436-
run: npx testcafe "chrome:headless" portal-ui/tests/permissions-4/ --skip-js-errors
436+
run: npx testcafe "chrome:headless" web-app/tests/permissions-4/ --skip-js-errors
437437

438438
all-permissions-5:
439439
name: Permissions Tests Part 5
@@ -476,7 +476,7 @@ jobs:
476476

477477
- name: Run TestCafe Tests
478478
timeout-minutes: 5
479-
run: npx testcafe "chrome:headless" portal-ui/tests/permissions-5/ --skip-js-errors
479+
run: npx testcafe "chrome:headless" web-app/tests/permissions-5/ --skip-js-errors
480480

481481
all-permissions-6:
482482
name: Permissions Tests Part 6
@@ -519,7 +519,7 @@ jobs:
519519

520520
- name: Run TestCafe Tests
521521
timeout-minutes: 5
522-
run: npx testcafe "chrome:headless" portal-ui/tests/permissions-6/ --skip-js-errors
522+
run: npx testcafe "chrome:headless" web-app/tests/permissions-6/ --skip-js-errors
523523

524524
all-permissions-7:
525525
name: Permissions Tests Part 7
@@ -561,7 +561,7 @@ jobs:
561561

562562
- name: Run TestCafe Tests
563563
timeout-minutes: 5
564-
run: npx testcafe "chrome:headless" portal-ui/tests/permissions-7/ --skip-js-errors
564+
run: npx testcafe "chrome:headless" web-app/tests/permissions-7/ --skip-js-errors
565565

566566
all-permissions-8:
567567
name: Permissions Tests Part 8
@@ -604,7 +604,7 @@ jobs:
604604

605605
- name: Run TestCafe Tests
606606
timeout-minutes: 5
607-
run: npx testcafe "chrome:headless" portal-ui/tests/permissions-8/ --skip-js-errors
607+
run: npx testcafe "chrome:headless" web-app/tests/permissions-8/ --skip-js-errors
608608

609609
all-permissions-9:
610610
name: Permissions Tests Part 9
@@ -646,7 +646,7 @@ jobs:
646646
run: npm install testcafe@3.0.0
647647

648648
- name: Run TestCafe Tests
649-
run: npx testcafe "chrome:headless" portal-ui/tests/permissions-9/ --skip-js-errors -c 3
649+
run: npx testcafe "chrome:headless" web-app/tests/permissions-9/ --skip-js-errors -c 3
650650

651651
- name: Clean up users & policies
652652
run: |
@@ -692,7 +692,7 @@ jobs:
692692
run: npm install testcafe@3.0.0
693693

694694
- name: Run TestCafe Tests
695-
run: npx testcafe "chrome:headless" portal-ui/tests/permissions-A/ --skip-js-errors -c 3
695+
run: npx testcafe "chrome:headless" web-app/tests/permissions-A/ --skip-js-errors -c 3
696696

697697
- name: Clean up users & policies
698698
run: |
@@ -738,7 +738,7 @@ jobs:
738738
run: npm install testcafe@3.0.0
739739

740740
- name: Run TestCafe Tests
741-
run: npx testcafe "chrome:headless" portal-ui/tests/permissions-B/ --skip-js-errors -c 3
741+
run: npx testcafe "chrome:headless" web-app/tests/permissions-B/ --skip-js-errors -c 3
742742

743743
- name: Clean up users & policies
744744
run: |
@@ -902,10 +902,10 @@ jobs:
902902
steps:
903903
- uses: actions/checkout@v3
904904
- name: Install modules
905-
working-directory: ./portal-ui
905+
working-directory: ./web-app
906906
run: yarn
907907
- name: Run tests
908-
working-directory: ./portal-ui
908+
working-directory: ./web-app
909909
run: yarn test
910910
replication:
911911
name: Site Replication Test
@@ -1223,21 +1223,21 @@ jobs:
12231223
with:
12241224
node-version: ${{ env.NVMRC }}
12251225
cache: "yarn"
1226-
cache-dependency-path: portal-ui/yarn.lock
1226+
cache-dependency-path: web-app/yarn.lock
12271227
- uses: actions/cache@v3
12281228
id: assets-cache-istanbul-coverage
12291229
name: Assets Cache Istanbul Coverage
12301230
with:
12311231
path: |
1232-
./portal-ui/build/
1232+
./web-app/build/
12331233
key: ${{ runner.os }}-assets-istanbul-coverage-${{ github.run_id }}
12341234
- name: Install Dependencies
1235-
working-directory: ./portal-ui
1235+
working-directory: ./web-app
12361236
continue-on-error: false
12371237
run: |
12381238
yarn install --frozen-lockfile --immutable
12391239
- name: Check for Warnings in build output
1240-
working-directory: ./portal-ui
1240+
working-directory: ./web-app
12411241
continue-on-error: false
12421242
run: |
12431243
./check-warnings-istanbul-coverage.sh
@@ -1275,7 +1275,7 @@ jobs:
12751275
name: Assets Cache Istanbul Coverage
12761276
with:
12771277
path: |
1278-
./portal-ui/build/
1278+
./web-app/build/
12791279
key: ${{ runner.os }}-assets-istanbul-coverage-${{ github.run_id }}
12801280
- name: Build on ${{ matrix.os }}
12811281
env:
@@ -1298,7 +1298,7 @@ jobs:
12981298
- name: Install dependencies
12991299
run: |
13001300
echo "Install dependencies"
1301-
cd $GITHUB_WORKSPACE/portal-ui
1301+
cd $GITHUB_WORKSPACE/web-app
13021302
yarn add -D playwright
13031303
yarn add -D babel-plugin-istanbul
13041304
yarn add -D nyc
@@ -1326,7 +1326,7 @@ jobs:
13261326
- name: Run Playwright tests
13271327
run: |
13281328
echo "Run tests under playwright folder only"
1329-
cd $GITHUB_WORKSPACE/portal-ui
1329+
cd $GITHUB_WORKSPACE/web-app
13301330
yarn remove playwright
13311331
yarn add --dev @playwright/test
13321332
echo "npx playwright test"

.github/workflows/vulncheck.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ jobs:
4545
with:
4646
node-version: ${{ env.NVMRC }}
4747
cache: "yarn"
48-
cache-dependency-path: portal-ui/yarn.lock
48+
cache-dependency-path: web-app/yarn.lock
4949
- name: Checks for known security issues with the installed packages
50-
working-directory: ./portal-ui
50+
working-directory: ./web-app
5151
continue-on-error: false
5252
run: |
5353
yarn audit --groups dependencies

.gitignore

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Playwright Data
2-
portal-ui/storage/
3-
portal-ui/playwright/.auth/admin.json
2+
web-app/storage/
3+
web-app/playwright/.auth/admin.json
44

55
# Report from Playwright
6-
portal-ui/playwright-report/
6+
web-app/playwright-report/
77

88
# Coverage from Playwright
9-
portal-ui/.nyc_output/
9+
web-app/.nyc_output/
1010

1111
# Binaries for programs and plugins
1212
*.exe
@@ -37,7 +37,7 @@ dist/
3737

3838
# Ignore node_modules
3939

40-
portal-ui/node_modules/
40+
web-app/node_modules/
4141

4242
# Ignore tls cert and key
4343
private.key

.semgrepignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
# Common large paths
77
node_modules/
8-
portal-ui/node_modules/
8+
web-app/node_modules/
99
build/
1010
dist/
1111
.idea/

DEVELOPMENT.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
11
# Developing MinIO Console
22

3-
The MinIO Console requires the [MinIO Server](https://github.com/minio/minio). For development purposes, you also need to run both the MinIO Console web app and the MinIO Console server.
3+
The MinIO Console requires the [MinIO Server](https://github.com/minio/minio). For development purposes, you also need
4+
to run both the MinIO Console web app and the MinIO Console server.
45

56
## Running MinIO Console server
67

78
Build the server in the main folder by running:
9+
810
```
911
make
1012
```
11-
> Note: If it's the first time running the server, you might need to run `go mod tidy` to ensure you have all modules required.
12-
To start the server run:
13+
14+
> Note: If it's the first time running the server, you might need to run `go mod tidy` to ensure you have all modules
15+
> required.
16+
> To start the server run:
17+
1318
```
1419
CONSOLE_ACCESS_KEY=<your-access-key>
1520
CONSOLE_SECRET_KEY=<your-secret-key>
@@ -19,8 +24,8 @@ CONSOLE_DEV_MODE=on
1924
```
2025

2126
## Running MinIO Console web app
22-
Refer to `/portal-ui` [instructions](/portal-ui/README.md) to run the web app locally.
2327

28+
Refer to `/web-app` [instructions](/web-app/README.md) to run the web app locally.
2429

2530
# Building with MinIO
2631

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ FROM node:$NODE_VERSION as uilayer
33

44
WORKDIR /app
55

6-
COPY ./portal-ui/package.json ./
7-
COPY ./portal-ui/yarn.lock ./
6+
COPY ./web-app/package.json ./
7+
COPY ./web-app/yarn.lock ./
88
RUN yarn install
99

10-
COPY ./portal-ui .
10+
COPY ./web-app .
1111

1212
RUN make build-static
1313

@@ -29,7 +29,7 @@ WORKDIR /go/src/github.com/minio/console/
2929

3030
ENV CGO_ENABLED=0
3131

32-
COPY --from=uilayer /app/build /go/src/github.com/minio/console/portal-ui/build
32+
COPY --from=uilayer /app/build /go/src/github.com/minio/console/web-app/build
3333
RUN go build --tags=kqueue,operator -ldflags "-w -s" -a -o console ./cmd/console
3434

3535
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7

Dockerfile.assets

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ FROM node:$NODE_VERSION as uilayer
33

44
WORKDIR /app
55

6-
COPY ./portal-ui/package.json ./
7-
COPY ./portal-ui/yarn.lock ./
6+
COPY ./web-app/package.json ./
7+
COPY ./web-app/yarn.lock ./
88
RUN yarn install
99

10-
COPY ./portal-ui .
10+
COPY ./web-app .
1111

1212
RUN yarn install && make build-static
1313

0 commit comments

Comments
 (0)