From acf60723168ea565332cff2d905104eacbc5a37d Mon Sep 17 00:00:00 2001 From: Adhitya Mamallan Date: Tue, 15 Apr 2025 11:05:12 +0000 Subject: [PATCH 1/3] Change styles --- .docker_env | 2 +- Dockerfile | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.docker_env b/.docker_env index 3308a7818..4710cf685 100644 --- a/.docker_env +++ b/.docker_env @@ -1,5 +1,5 @@ CADENCE_CLUSTERS_NAMES=cluster0 -CADENCE_GRPC_PEERS="127.0.0.1:7833" +CADENCE_GRPC_PEERS="host.docker.internal:7833" CADENCE_GRPC_SERVICES_NAMES=cadence-frontend CADENCE_WEB_PORT=8088 CADENCE_WEB_HOSTNAME=0.0.0.0 diff --git a/Dockerfile b/Dockerfile index 305a4acf7..5fa8936f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,4 @@ -FROM node:18-alpine AS base - -RUN apk update -RUN apk --no-cache add git -# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed. -RUN apk add --no-cache libc6-compat +FROM node:18 AS base # Install dependencies only when needed FROM base AS deps From f275e477f5d7c52fab812557da1de6162a318af9 Mon Sep 17 00:00:00 2001 From: Adhitya Mamallan Date: Tue, 15 Apr 2025 13:06:11 +0200 Subject: [PATCH 2/3] Remove dockerenv and dockerfile --- .docker_env | 2 +- Dockerfile | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.docker_env b/.docker_env index 4710cf685..3308a7818 100644 --- a/.docker_env +++ b/.docker_env @@ -1,5 +1,5 @@ CADENCE_CLUSTERS_NAMES=cluster0 -CADENCE_GRPC_PEERS="host.docker.internal:7833" +CADENCE_GRPC_PEERS="127.0.0.1:7833" CADENCE_GRPC_SERVICES_NAMES=cadence-frontend CADENCE_WEB_PORT=8088 CADENCE_WEB_HOSTNAME=0.0.0.0 diff --git a/Dockerfile b/Dockerfile index 5fa8936f4..305a4acf7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,9 @@ -FROM node:18 AS base +FROM node:18-alpine AS base + +RUN apk update +RUN apk --no-cache add git +# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed. +RUN apk add --no-cache libc6-compat # Install dependencies only when needed FROM base AS deps From dcd388af1bb195f44e336f96d676d872882c53ed Mon Sep 17 00:00:00 2001 From: Adhitya Mamallan Date: Tue, 15 Apr 2025 13:26:13 +0000 Subject: [PATCH 3/3] Fix styles --- .../workflow-history-event-details-json.styles.ts | 12 ++++++++++++ .../workflow-history-event-details-json.tsx | 10 ++++++++-- .../workflow-queries-result-json.styles.ts | 11 +++++++++++ .../workflow-queries-result-json.tsx | 7 +++++-- .../workflow-summary-tab-json-view.styles.ts | 12 ++++++++++++ .../workflow-summary-tab-json-view.tsx | 7 +++++-- 6 files changed, 53 insertions(+), 6 deletions(-) diff --git a/src/views/workflow-history/workflow-history-event-details-json/workflow-history-event-details-json.styles.ts b/src/views/workflow-history/workflow-history-event-details-json/workflow-history-event-details-json.styles.ts index 988970eb3..aa35b12f0 100644 --- a/src/views/workflow-history/workflow-history-event-details-json/workflow-history-event-details-json.styles.ts +++ b/src/views/workflow-history/workflow-history-event-details-json/workflow-history-event-details-json.styles.ts @@ -1,3 +1,5 @@ +import { type ButtonOverrides } from 'baseui/button'; + import type { StyletronCSSObject, StyletronCSSObjectOf, @@ -25,3 +27,13 @@ const cssStylesObj = { export const cssStyles: StyletronCSSObjectOf = cssStylesObj; + +export const overrides = { + copyButton: { + BaseButton: { + style: { + backgroundColor: 'rgba(0, 0, 0, 0)', + }, + }, + } satisfies ButtonOverrides, +}; diff --git a/src/views/workflow-history/workflow-history-event-details-json/workflow-history-event-details-json.tsx b/src/views/workflow-history/workflow-history-event-details-json/workflow-history-event-details-json.tsx index fc9963d63..8d7709b62 100644 --- a/src/views/workflow-history/workflow-history-event-details-json/workflow-history-event-details-json.tsx +++ b/src/views/workflow-history/workflow-history-event-details-json/workflow-history-event-details-json.tsx @@ -6,7 +6,10 @@ import PrettyJson from '@/components/pretty-json/pretty-json'; import useStyletronClasses from '@/hooks/use-styletron-classes'; import losslessJsonStringify from '@/utils/lossless-json-stringify'; -import { cssStyles } from './workflow-history-event-details-json.styles'; +import { + cssStyles, + overrides, +} from './workflow-history-event-details-json.styles'; import type { Props } from './workflow-history-event-details-json.types'; export default function WorkflowHistoryEventDetailsJson({ entryValue }: Props) { @@ -19,7 +22,10 @@ export default function WorkflowHistoryEventDetailsJson({ entryValue }: Props) {
- +
diff --git a/src/views/workflow-queries/workflow-queries-result-json/workflow-queries-result-json.styles.ts b/src/views/workflow-queries/workflow-queries-result-json/workflow-queries-result-json.styles.ts index cec0048f9..22e54d332 100644 --- a/src/views/workflow-queries/workflow-queries-result-json/workflow-queries-result-json.styles.ts +++ b/src/views/workflow-queries/workflow-queries-result-json/workflow-queries-result-json.styles.ts @@ -1,4 +1,5 @@ import { styled as createStyled } from 'baseui'; +import { type ButtonOverrides } from 'baseui/button'; export const styled = { ViewContainer: createStyled<'div', { $isError: boolean }>( @@ -24,3 +25,13 @@ export const styled = { }) ), }; + +export const overrides = { + copyButton: { + BaseButton: { + style: { + backgroundColor: 'rgba(0, 0, 0, 0)', + }, + }, + } satisfies ButtonOverrides, +}; diff --git a/src/views/workflow-queries/workflow-queries-result-json/workflow-queries-result-json.tsx b/src/views/workflow-queries/workflow-queries-result-json/workflow-queries-result-json.tsx index dc0105843..fd70ea5a4 100644 --- a/src/views/workflow-queries/workflow-queries-result-json/workflow-queries-result-json.tsx +++ b/src/views/workflow-queries/workflow-queries-result-json/workflow-queries-result-json.tsx @@ -6,7 +6,7 @@ import PrettyJson from '@/components/pretty-json/pretty-json'; import losslessJsonStringify from '@/utils/lossless-json-stringify'; import getQueryJsonContent from './helpers/get-query-json-content'; -import { styled } from './workflow-queries-result-json.styles'; +import { overrides, styled } from './workflow-queries-result-json.styles'; import { type Props } from './workflow-queries-result-json.types'; export default function WorkflowQueriesResultJson(props: Props) { @@ -24,7 +24,10 @@ export default function WorkflowQueriesResultJson(props: Props) { {content !== undefined && ( <> - + )} diff --git a/src/views/workflow-summary-tab/workflow-summary-tab-json-view/workflow-summary-tab-json-view.styles.ts b/src/views/workflow-summary-tab/workflow-summary-tab-json-view/workflow-summary-tab-json-view.styles.ts index a7e1ae648..8956df200 100644 --- a/src/views/workflow-summary-tab/workflow-summary-tab-json-view/workflow-summary-tab-json-view.styles.ts +++ b/src/views/workflow-summary-tab/workflow-summary-tab-json-view/workflow-summary-tab-json-view.styles.ts @@ -1,3 +1,5 @@ +import { type ButtonOverrides } from 'baseui/button'; + import type { StyletronCSSObject, StyletronCSSObjectOf, @@ -19,3 +21,13 @@ const cssStylesObj = { export const cssStyles: StyletronCSSObjectOf = cssStylesObj; + +export const overrides = { + copyButton: { + BaseButton: { + style: { + backgroundColor: 'rgba(0, 0, 0, 0)', + }, + }, + } satisfies ButtonOverrides, +}; diff --git a/src/views/workflow-summary-tab/workflow-summary-tab-json-view/workflow-summary-tab-json-view.tsx b/src/views/workflow-summary-tab/workflow-summary-tab-json-view/workflow-summary-tab-json-view.tsx index addec7819..e9d3d719b 100644 --- a/src/views/workflow-summary-tab/workflow-summary-tab-json-view/workflow-summary-tab-json-view.tsx +++ b/src/views/workflow-summary-tab/workflow-summary-tab-json-view/workflow-summary-tab-json-view.tsx @@ -10,7 +10,7 @@ import useStyletronClasses from '@/hooks/use-styletron-classes'; import losslessJsonStringify from '@/utils/lossless-json-stringify'; import { jsonViewTabsOptions } from './workflow-summary-tab-json-view.constants'; -import { cssStyles } from './workflow-summary-tab-json-view.styles'; +import { cssStyles, overrides } from './workflow-summary-tab-json-view.styles'; import type { Props } from './workflow-summary-tab-json-view.types'; export default function WorkflowSummaryTabJsonView({ @@ -42,7 +42,10 @@ export default function WorkflowSummaryTabJsonView({ options={jsonViewTabsOptions} onChange={({ activeKey }) => setActiveTab(activeKey.toString())} /> - +
{activeTab === 'result' && isWorkflowRunning ? (