diff --git a/.github/workflows/turing.yaml b/.github/workflows/turing.yaml index 9bd6a2675..71a722bc7 100644 --- a/.github/workflows/turing.yaml +++ b/.github/workflows/turing.yaml @@ -180,7 +180,7 @@ jobs: cache-dependency-path: ui/yarn.lock - name: Install - run: yarn install --network-concurrency 1 + run: NODE_OPTIONS=--openssl-legacy-provider yarn install --network-concurrency 1 - name: Lint code run: yarn lint diff --git a/ui/package.json b/ui/package.json index d9d6aeb0e..fd1ac7162 100644 --- a/ui/package.json +++ b/ui/package.json @@ -24,7 +24,7 @@ "react-collapsed": "^4.1.2", "react-diff-viewer": "^3.1.1", "react-dom": "^18.3.1", - "react-lazylog": "^4.5.3", + "react-lazylog": "git+https://github.com/gojekfarm/react-lazylog#master", "react-router-dom": "^6.23.1", "react-scroll": "^1.9.0", "react-scroll-to-bottom": "^4.0.0", diff --git a/ui/src/components/pod_logs_viewer/PodLogsViewer.js b/ui/src/components/pod_logs_viewer/PodLogsViewer.js index 7dbc43e39..1eed3e049 100644 --- a/ui/src/components/pod_logs_viewer/PodLogsViewer.js +++ b/ui/src/components/pod_logs_viewer/PodLogsViewer.js @@ -12,8 +12,6 @@ import { LazyLog, ScrollFollow } from "react-lazylog"; import { slugify } from "@caraml-dev/ui-lib"; import isArray from "lodash/isArray"; -import "./PodLogsViewer.scss"; - export const PodLogsViewer = ({ components, emitter, @@ -140,8 +138,7 @@ export const PodLogsViewer = ({ + gutterSize="none"> @@ -158,6 +155,7 @@ export const PodLogsViewer = ({ extraLines={1} onScroll={onScroll} follow={follow} + height={640} caseInsensitive enableSearch selectableLines diff --git a/ui/src/components/pod_logs_viewer/PodLogsViewer.scss b/ui/src/components/pod_logs_viewer/PodLogsViewer.scss deleted file mode 100644 index 1d4af6b87..000000000 --- a/ui/src/components/pod_logs_viewer/PodLogsViewer.scss +++ /dev/null @@ -1,3 +0,0 @@ -.euiFlexGroup.euiFlexGroup---logsContainer { - height: 640px; -} diff --git a/ui/yarn.lock b/ui/yarn.lock index eb483f24e..af9460c18 100644 --- a/ui/yarn.lock +++ b/ui/yarn.lock @@ -11578,10 +11578,9 @@ react-is@^18.0.0: resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e" integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg== -react-lazylog@^4.5.3: +"react-lazylog@git+https://github.com/gojekfarm/react-lazylog#master": version "4.5.3" - resolved "https://registry.yarnpkg.com/react-lazylog/-/react-lazylog-4.5.3.tgz#289e24995b5599e75943556ac63f5e2c04d0001e" - integrity sha512-lyov32A/4BqihgXgtNXTHCajXSXkYHPlIEmV8RbYjHIMxCFSnmtdg4kDCI3vATz7dURtiFTvrw5yonHnrS+NNg== + resolved "git+https://github.com/gojekfarm/react-lazylog#e3a7f026983df0dc59d25843fe87ce7e37e24e82" dependencies: "@mattiasbuelens/web-streams-polyfill" "^0.2.0" fetch-readablestream "^0.2.0"