Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(ui): Revert upgrade to react-lazylog #386

Merged
merged 3 commits into from
Jul 17, 2024
Merged

fix(ui): Revert upgrade to react-lazylog #386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0716ef3
Revert react-lazylog to gojekfarm fork
deadlycoconuts Jul 17, 2024
4a6e483
Remove custom styles in favour of prop-defined styles
deadlycoconuts Jul 17, 2024
e7b626c
Add node options to github action
deadlycoconuts Jul 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/turing.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
deadlycoconuts marked this conversation as resolved.
Show resolved Hide resolved

- name: Lint code
run: yarn lint
Expand Down
2 changes: 1 addition & 1 deletion ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 2 additions & 4 deletions ui/src/components/pod_logs_viewer/PodLogsViewer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -140,8 +138,7 @@ export const PodLogsViewer = ({
<EuiPanel>
<EuiFlexGroup
direction="column"
gutterSize="none"
className="euiFlexGroup---logsContainer">
gutterSize="none">
<EuiFlexItem grow={false}>
<EuiSearchBar {...search} />
</EuiFlexItem>
Expand All @@ -158,6 +155,7 @@ export const PodLogsViewer = ({
extraLines={1}
onScroll={onScroll}
follow={follow}
height={640}
caseInsensitive
enableSearch
selectableLines
Expand Down
3 changes: 0 additions & 3 deletions ui/src/components/pod_logs_viewer/PodLogsViewer.scss
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions ui/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading