diff --git a/.github/workflows/common-jobs.yaml b/.github/workflows/common-jobs.yaml index b174b5914d..c6d55a55f6 100644 --- a/.github/workflows/common-jobs.yaml +++ b/.github/workflows/common-jobs.yaml @@ -18,9 +18,10 @@ jobs: - name: Install Helm run: | curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash - - name: Lint Helm Chart + - name: Lint Helm Chart run: | helm lint ./HelmChart/Public/oneuptime + helm lint ./HelmChart/Public/kubernetes-agent js-lint: runs-on: ubuntu-latest diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8fff4c3295..7c3444c032 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -134,11 +134,16 @@ jobs: helm lint oneuptime helm template oneuptime --values oneuptime/values.yaml helm package --sign --key 'key@oneuptime.com' --keyring ~/.gnupg/secring.gpg oneuptime --version ${{needs.read-version.outputs.major_minor}} --app-version ${{needs.read-version.outputs.major_minor}} - echo "Helm Chart Package created successfully" + echo "OneUptime Helm Chart Package created successfully" + helm lint kubernetes-agent + helm template kubernetes-agent --values kubernetes-agent/values.yaml + helm package --sign --key 'key@oneuptime.com' --keyring ~/.gnupg/secring.gpg kubernetes-agent --version ${{needs.read-version.outputs.major_minor}} --app-version ${{needs.read-version.outputs.major_minor}} + echo "Kubernetes Agent Helm Chart Package created successfully" cd .. ls echo "Copying the package to helm-chart repo" - rm -r ../../helm-chart/oneuptime + rm -rf ../../helm-chart/oneuptime + rm -rf ../../helm-chart/kubernetes-agent cp -r ./Public/* ../../helm-chart echo "Package copied successfully" cd .. && cd .. && cd helm-chart diff --git a/App/FeatureSet/Dashboard/src/Pages/Logs/Index.tsx b/App/FeatureSet/Dashboard/src/Pages/Logs/Index.tsx index af64865c06..9e42bc6ee8 100644 --- a/App/FeatureSet/Dashboard/src/Pages/Logs/Index.tsx +++ b/App/FeatureSet/Dashboard/src/Pages/Logs/Index.tsx @@ -1,7 +1,6 @@ import PageComponentProps from "../PageComponentProps"; import ErrorMessage from "Common/UI/Components/ErrorMessage/ErrorMessage"; import React, { - Fragment, FunctionComponent, ReactElement, useCallback, @@ -43,21 +42,22 @@ const LogsPage: FunctionComponent = ( ); } + if (hasData === false) { + return ; + } + return ( - - { - setShowDocs(true); - }} - /> - {hasData === false && } - + { + setShowDocs(true); + }} + /> ); };