From 8d78fd61d81202ad4b13facd98f1193ad8057bb8 Mon Sep 17 00:00:00 2001 From: Cam Otts Date: Wed, 28 Jun 2023 12:38:28 -0500 Subject: [PATCH 1/3] updated ui lintintg to be stricter and fixed relevant errors --- .github/workflows/ci-build.yml | 3 +-- ui/src/components/password.js | 3 ++- ui/src/console/detail/environment/MetricsTab.js | 2 ++ ui/src/console/visualizer/graph.js | 1 - 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index f1b1f1dc..7a6b1373 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -33,8 +33,7 @@ jobs: - run: npm run build working-directory: ui env: - CI: "" - + CI: "true" - name: go install run: go install -ldflags "-X github.com/openziti/zrok/build.Version=${{ github.ref }} -X github.com/openziti/zrok/build.Hash=${{ github.sha }}" ./... diff --git a/ui/src/components/password.js b/ui/src/components/password.js index 4b708e50..5e83d251 100644 --- a/ui/src/components/password.js +++ b/ui/src/components/password.js @@ -1,5 +1,5 @@ import React, {useEffect, useState, Fragment} from "react"; -import {Button, Container, Form, Row} from "react-bootstrap"; +import {Container, Form, Row} from "react-bootstrap"; const PasswordForm = (props) => { const [password, setPassword] = useState(''); @@ -38,6 +38,7 @@ const PasswordForm = (props) => { return; } props.setParentPassword(password) + // eslint-disable-next-line react-hooks/exhaustive-deps }, [password, confirm]) return ( diff --git a/ui/src/console/detail/environment/MetricsTab.js b/ui/src/console/detail/environment/MetricsTab.js index bf234580..4e46dd6f 100644 --- a/ui/src/console/detail/environment/MetricsTab.js +++ b/ui/src/console/detail/environment/MetricsTab.js @@ -21,6 +21,7 @@ const MetricsTab = (props) => { .then(resp => { setMetrics1(buildMetrics(resp.data)); }); + // eslint-disable-next-line react-hooks/exhaustive-deps }, [props.selection.id]); useEffect(() => { @@ -45,6 +46,7 @@ const MetricsTab = (props) => { mounted = false; clearInterval(interval); } + // eslint-disable-next-line react-hooks/exhaustive-deps }, [props.selection.id]); return ( diff --git a/ui/src/console/visualizer/graph.js b/ui/src/console/visualizer/graph.js index f5fb00f1..3f1c28f2 100644 --- a/ui/src/console/visualizer/graph.js +++ b/ui/src/console/visualizer/graph.js @@ -34,7 +34,6 @@ export const mergeGraph = (oldGraph, user, accountLimited, newOverview) => { let allShares = {}; let allFrontends = []; newOverview.forEach(env => { - let limited = !!env.limited; let envNode = { id: 'env:' + env.environment.zId, envZId: env.environment.zId, From 28a105f33e47ecc74a0c4d394a4dbe21ce234732 Mon Sep 17 00:00:00 2001 From: Cam Otts Date: Wed, 28 Jun 2023 12:39:52 -0500 Subject: [PATCH 2/3] readded old newling --- .github/workflows/ci-build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 7a6b1373..d1126705 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -34,6 +34,7 @@ jobs: working-directory: ui env: CI: "true" + - name: go install run: go install -ldflags "-X github.com/openziti/zrok/build.Version=${{ github.ref }} -X github.com/openziti/zrok/build.Hash=${{ github.sha }}" ./... From 15a3ef92f4d78498085974cd0100bb32a3c24f44 Mon Sep 17 00:00:00 2001 From: Cam Otts Date: Wed, 28 Jun 2023 12:41:16 -0500 Subject: [PATCH 3/3] added ci strictness to release pipeline --- .github/workflows/release.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bee224a5..a6352002 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,7 +37,7 @@ jobs: - run: npm run build working-directory: ui env: - CI: "" + CI: "true" - uses: goreleaser/goreleaser-action@v2 with: @@ -79,7 +79,7 @@ jobs: - run: npm run build working-directory: ui env: - CI: "" + CI: "true" - uses: goreleaser/goreleaser-action@v2 with: @@ -121,7 +121,7 @@ jobs: - run: npm run build working-directory: ui env: - CI: "" + CI: "true" - uses: goreleaser/goreleaser-action@v2 with: @@ -170,7 +170,7 @@ jobs: - run: npm run build working-directory: ui env: - CI: "" + CI: "true" - uses: goreleaser/goreleaser-action@v2 with: @@ -214,7 +214,7 @@ jobs: - run: npm run build working-directory: ui env: - CI: "" + CI: "true" - uses: goreleaser/goreleaser-action@v2 with: