Skip to content

Commit 355ae05

Browse files
GurinderRawalaGurinderRawala
committed
fix
1 parent 26f25e6 commit 355ae05

File tree

10 files changed

+433
-519
lines changed

10 files changed

+433
-519
lines changed

‎go.work.sum

+2-1
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,6 @@ github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuP
526526
github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
527527
github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY=
528528
github.com/bitly/go-hostpool v0.0.0-20171023180738-a3a6125de932 h1:mXoPYz/Ul5HYEDvkta6I8/rnYM5gSdSV2tJ6XbZuEtY=
529-
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY=
530529
github.com/boombuler/barcode v1.0.1 h1:NDBbPmhS+EqABEs5Kg3n/5ZNjy73Pz7SIV+KCeqyXcs=
531530
github.com/bradleyjkemp/cupaloy/v2 v2.6.0 h1:knToPYa2xtfg42U3I6punFEjaGFKWQRXJwj0JTv4mTs=
532531
github.com/bradleyjkemp/cupaloy/v2 v2.6.0/go.mod h1:bm7JXdkRd4BHJk9HpwqAI8BoAY1lps46Enkdqw6aRX0=
@@ -1204,6 +1203,7 @@ golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
12041203
golang.org/x/oauth2 v0.20.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
12051204
golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
12061205
golang.org/x/sys v0.0.0-20190204203706-41f3e6584952/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
1206+
golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
12071207
golang.org/x/sys v0.0.0-20220823224334-20c2bfdbfe24/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
12081208
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
12091209
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
@@ -1227,6 +1227,7 @@ google.golang.org/api v0.187.0/go.mod h1:KIHlTc4x7N7gKKuVsdmfBXN13yEEWXWFURWY6SB
12271227
google.golang.org/api v0.188.0/go.mod h1:VR0d+2SIiWOYG3r/jdm7adPW9hI2aRv9ETOSCQ9Beag=
12281228
google.golang.org/api v0.189.0/go.mod h1:FLWGJKb0hb+pU2j+rJqwbnsF+ym+fQs73rbJ+KAUgy8=
12291229
google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=
1230+
google.golang.org/genproto v0.0.0-20220421151946-72621c1f0bd3 h1:SeX3QUcBj3fciwnfPT9kt5gBhFy/FCZtYZ+I/RB8agc=
12301231
google.golang.org/genproto v0.0.0-20240528184218-531527333157/go.mod h1:ubQlAQnzejB8uZzszhrTCU2Fyp6Vi7ZE5nn0c3W8+qQ=
12311232
google.golang.org/genproto v0.0.0-20240624140628-dc46fd24d27d/go.mod h1:s7iA721uChleev562UJO2OYB0PPT9CMFjV+Ce7VJH5M=
12321233
google.golang.org/genproto v0.0.0-20240722135656-d784300faade/go.mod h1:FfBgJBJg9GcpPvKIuHSZ/aE1g2ecGL74upMzGZjiGEY=

‎public/app/features/dashboard/dashgrid/DashboardPanel.tsx

+14-4
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ const mapStateToProps = (state: StoreState, props: OwnProps) => {
3434
return {
3535
plugin: panelState.plugin,
3636
instanceState: panelState.instanceState,
37-
fnGlobalState: state.fnGlobalState
37+
fnGlobalState: state.fnGlobalState,
3838
};
3939
};
4040

@@ -47,7 +47,6 @@ const connector = connect(mapStateToProps, mapDispatchToProps);
4747

4848
export type Props = OwnProps & ConnectedProps<typeof connector>;
4949
export class DashboardPanelUnconnected extends PureComponent<Props> {
50-
5150
static defaultProps: Partial<Props> = {
5251
lazy: true,
5352
};
@@ -74,7 +73,18 @@ export class DashboardPanelUnconnected extends PureComponent<Props> {
7473
};
7574

7675
renderPanel = (isInView: boolean) => {
77-
const { dashboard, panel, isViewing, isEditing, width, height, plugin, timezone, fnGlobalState, isDraggable = true } = this.props;
76+
const {
77+
dashboard,
78+
panel,
79+
isViewing,
80+
isEditing,
81+
width,
82+
height,
83+
plugin,
84+
timezone,
85+
fnGlobalState,
86+
isDraggable = true,
87+
} = this.props;
7888

7989
// console.log(this.props, "on render panel")
8090

@@ -125,7 +135,7 @@ export class DashboardPanelUnconnected extends PureComponent<Props> {
125135
{this.renderPanel}
126136
</LazyLoader>
127137
) : (
128-
this.renderPanel({ isInView: true })
138+
this.renderPanel(true)
129139
);
130140
}
131141
}

‎public/microfrontends/fn_dashboard/index.html

+101-16
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,101 @@
1-
<!doctype html>
2-
<html lang="en">
3-
<head>
4-
<title>CodeRabbit Micro-frontend</title>
5-
<base href="/" />
6-
</head>
7-
8-
<body class="theme-light app-grafana">
9-
<div id="grafanaRoot"></div>
10-
<script nonce="">
11-
window.fnData = {
12-
themePaths: {
13-
light: '../../../public/build/grafana.light.f8726a58109a7bb444b7.css',
14-
dark: '../../../public/build/grafana.dark.64551cb66c1119442933.css',
15-
},
16-
};</script><script nonce="" src="../../../public/build/runtime.e887ee410b04048b93bb.js"></script><script nonce="" src="../../../public/build/9767.5d11687466af2e323217.js"></script><script nonce="" src="../../../public/build/6510.3c0ff62c6be1dabb1076.js"></script><script nonce="" src="../../../public/build/736.a7c1a735dcc89552444b.js"></script><script nonce="" src="../../../public/build/3880.2244b9f025ace4c25949.js"></script><script nonce="" src="../../../public/build/4000.3d7b8c06970ead030ece.js"></script><script nonce="" src="../../../public/build/4161.5d0fee404a7937384676.js"></script><script nonce="" src="../../../public/build/6406.78c224d72f4c255d0cd7.js"></script><script nonce="" src="../../../public/build/2253.8557a4046de15bdfe5f5.js"></script><script nonce="" src="../../../public/build/8200.4f6046fffc2bc4c0e99c.js"></script><script nonce="" src="../../../public/build/9334.3f47b65f852b47933f4e.js"></script><script nonce="" src="../../../public/build/5670.1b6e072b061193be2b12.js"></script><script nonce="" src="../../../public/build/2954.fb78b2a299991850d30f.js"></script><script nonce="" src="../../../public/build/8629.d45179333f04e81d2640.js"></script><script nonce="" src="../../../public/build/5446.061625ba71ddd711a34f.js"></script><script nonce="" src="../../../public/build/fn_dashboard.51fd59d60567e892f3c0.js"></script></body></html>
1+
Html Webpack Plugin:
2+
<pre>
3+
Error: Child compilation failed:
4+
Module not found: Error: Can't resolve '/home/gurinder/Work/coderabbitai/grafana/public/views/error-template.html' in '/home/gurinder/Work/coderabbitai/grafana'
5+
ModuleNotFoundError: Module not found: Error: Can't resolve '/home/gurinder/Work/coderabbitai/grafana/public/views/error-template.html' in '/home/gurinder/Work/coderabbitai/grafana'
6+
at /home/gurinder/Work/coderabbitai/grafana/node_modules/webpack/lib/Compilation.js:2094:28
7+
at /home/gurinder/Work/coderabbitai/grafana/node_modules/webpack/lib/NormalModuleFactory.js:895:13
8+
at eval (eval at create (/home/gurinder/Work/coderabbitai/grafana/node_modules/tapable/lib/HookCodeFactory.js:33:10), <anonymous>:10:1)
9+
at /home/gurinder/Work/coderabbitai/grafana/node_modules/webpack/lib/NormalModuleFactory.js:332:22
10+
at eval (eval at create (/home/gurinder/Work/coderabbitai/grafana/node_modules/tapable/lib/HookCodeFactory.js:33:10), <anonymous>:9:1)
11+
at /home/gurinder/Work/coderabbitai/grafana/node_modules/webpack/lib/NormalModuleFactory.js:509:22
12+
at /home/gurinder/Work/coderabbitai/grafana/node_modules/webpack/lib/NormalModuleFactory.js:151:11
13+
at /home/gurinder/Work/coderabbitai/grafana/node_modules/webpack/lib/NormalModuleFactory.js:767:25
14+
at /home/gurinder/Work/coderabbitai/grafana/node_modules/webpack/lib/NormalModuleFactory.js:979:8
15+
at /home/gurinder/Work/coderabbitai/grafana/node_modules/webpack/lib/NormalModuleFactory.js:1109:5
16+
Module not found: Error: Can't resolve '/home/gurinder/Work/coderabbitai/grafana/public/views/index-template.html' in '/home/gurinder/Work/coderabbitai/grafana'
17+
ModuleNotFoundError: Module not found: Error: Can't resolve '/home/gurinder/Work/coderabbitai/grafana/public/views/index-template.html' in '/home/gurinder/Work/coderabbitai/grafana'
18+
at /home/gurinder/Work/coderabbitai/grafana/node_modules/webpack/lib/Compilation.js:2094:28
19+
at /home/gurinder/Work/coderabbitai/grafana/node_modules/webpack/lib/NormalModuleFactory.js:895:13
20+
at eval (eval at create (/home/gurinder/Work/coderabbitai/grafana/node_modules/tapable/lib/HookCodeFactory.js:33:10), <anonymous>:10:1)
21+
at /home/gurinder/Work/coderabbitai/grafana/node_modules/webpack/lib/NormalModuleFactory.js:332:22
22+
at eval (eval at create (/home/gurinder/Work/coderabbitai/grafana/node_modules/tapable/lib/HookCodeFactory.js:33:10), <anonymous>:9:1)
23+
at /home/gurinder/Work/coderabbitai/grafana/node_modules/webpack/lib/NormalModuleFactory.js:509:22
24+
at /home/gurinder/Work/coderabbitai/grafana/node_modules/webpack/lib/NormalModuleFactory.js:151:11
25+
at /home/gurinder/Work/coderabbitai/grafana/node_modules/webpack/lib/NormalModuleFactory.js:767:25
26+
at /home/gurinder/Work/coderabbitai/grafana/node_modules/webpack/lib/NormalModuleFactory.js:979:8
27+
at /home/gurinder/Work/coderabbitai/grafana/node_modules/webpack/lib/NormalModuleFactory.js:1109:5
28+
29+
- Compilation.js:2094
30+
[grafana]/[webpack]/lib/Compilation.js:2094:28
31+
32+
- NormalModuleFactory.js:895
33+
[grafana]/[webpack]/lib/NormalModuleFactory.js:895:13
34+
35+
36+
- NormalModuleFactory.js:332
37+
[grafana]/[webpack]/lib/NormalModuleFactory.js:332:22
38+
39+
40+
- NormalModuleFactory.js:509
41+
[grafana]/[webpack]/lib/NormalModuleFactory.js:509:22
42+
43+
- NormalModuleFactory.js:151
44+
[grafana]/[webpack]/lib/NormalModuleFactory.js:151:11
45+
46+
- NormalModuleFactory.js:767
47+
[grafana]/[webpack]/lib/NormalModuleFactory.js:767:25
48+
49+
- NormalModuleFactory.js:979
50+
[grafana]/[webpack]/lib/NormalModuleFactory.js:979:8
51+
52+
- NormalModuleFactory.js:1109
53+
[grafana]/[webpack]/lib/NormalModuleFactory.js:1109:5
54+
55+
- Module not found: Error: Can't resolve '/home/gurinder/Work/coderabbitai/grafana/public/views/index-template.html' in '/home/gurinder/Work/coderabbitai/grafana'
56+
57+
- ModuleNotFoundError: Module not found: Error: Can't resolve '/home/gurinder/Work/coderabbitai/grafana/public/views/index-template.html' in '/home/gurinder/Work/coderabbitai/grafana'
58+
59+
- Compilation.js:2094
60+
[grafana]/[webpack]/lib/Compilation.js:2094:28
61+
62+
- NormalModuleFactory.js:895
63+
[grafana]/[webpack]/lib/NormalModuleFactory.js:895:13
64+
65+
66+
- NormalModuleFactory.js:332
67+
[grafana]/[webpack]/lib/NormalModuleFactory.js:332:22
68+
69+
70+
- NormalModuleFactory.js:509
71+
[grafana]/[webpack]/lib/NormalModuleFactory.js:509:22
72+
73+
- NormalModuleFactory.js:151
74+
[grafana]/[webpack]/lib/NormalModuleFactory.js:151:11
75+
76+
- NormalModuleFactory.js:767
77+
[grafana]/[webpack]/lib/NormalModuleFactory.js:767:25
78+
79+
- NormalModuleFactory.js:979
80+
[grafana]/[webpack]/lib/NormalModuleFactory.js:979:8
81+
82+
- NormalModuleFactory.js:1109
83+
[grafana]/[webpack]/lib/NormalModuleFactory.js:1109:5
84+
85+
- child-compiler.js:174
86+
[grafana]/[html-webpack-plugin]/lib/child-compiler.js:174:18
87+
88+
- Compiler.js:605 finalCallback
89+
[grafana]/[webpack]/lib/Compiler.js:605:5
90+
91+
- Compiler.js:640
92+
[grafana]/[webpack]/lib/Compiler.js:640:11
93+
94+
- Compiler.js:1329
95+
[grafana]/[webpack]/lib/Compiler.js:1329:17
96+
97+
98+
- task_queues:95 process.processTicksAndRejections
99+
node:internal/process/task_queues:95:5
100+
101+
</pre>

‎public/sass/_variables.dark.generated.scss

+13-13
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ $layer0: #312D2B;
6565
$layer1: #3B3835;
6666
$layer2: #5E5855;
6767

68-
$divider: rgba(219, 217, 215, 0.07);
68+
$divider: rgba(219, 217, 215, 0.12);
6969

70-
$border0: rgba(219, 217, 215, 0.07);
71-
$border1: rgba(219, 217, 215, 0.15);
70+
$border0: rgba(219, 217, 215, 0.12);
71+
$border1: rgba(219, 217, 215, 0.20);
7272

7373
// Accent colors
7474
// -------------------------
@@ -134,7 +134,7 @@ $hr-border-color: $dark-9;
134134
// Panel
135135
// -------------------------
136136
$panel-bg: #3B3835;
137-
$panel-border: 1px solid rgba(219, 217, 215, 0.07);
137+
$panel-border: 1px solid rgba(219, 217, 215, 0.12);
138138
$panel-header-hover-bg: rgba(219, 217, 215, 0.16);
139139
$panel-box-shadow: none;
140140
$panel-corner: $panel-bg;
@@ -174,7 +174,7 @@ $scrollbarBorder: black;
174174
// Tables
175175
// -------------------------
176176
$table-bg-accent: #5E5855;
177-
$table-border: rgba(219, 217, 215, 0.15);
177+
$table-border: rgba(219, 217, 215, 0.20);
178178
$table-bg-odd: rgb(62, 59, 57);
179179
$table-bg-hover: rgb(68, 65, 63);
180180

@@ -216,7 +216,7 @@ $input-bg: #312D2B;
216216
$input-bg-disabled: rgba(219, 217, 215, 0.04);
217217

218218
$input-color: #DBD9D7;
219-
$input-border-color: rgba(219, 217, 215, 0.15);
219+
$input-border-color: rgba(219, 217, 215, 0.20);
220220
$input-box-shadow: none;
221221
$input-border-focus: #ffffff00;
222222
$input-box-shadow-focus: #ffffff00 !default;
@@ -235,10 +235,10 @@ $typeahead-selected-color: $yellow;
235235
// Dropdowns
236236
// -------------------------
237237
$dropdownBackground: #3B3835;
238-
$dropdownBorder: rgba(219, 217, 215, 0.07);
239-
$dropdownDividerTop: rgba(219, 217, 215, 0.07);
240-
$dropdownDividerBottom: rgba(219, 217, 215, 0.07);
241-
$dropdownShadow: 0px 8px 24px rgb(1,4,9);
238+
$dropdownBorder: rgba(219, 217, 215, 0.12);
239+
$dropdownDividerTop: rgba(219, 217, 215, 0.12);
240+
$dropdownDividerBottom: rgba(219, 217, 215, 0.12);
241+
$dropdownShadow: 0px 8px 24px rgb(1, 4, 9);
242242

243243
$dropdownLinkColor: $link-color;
244244
$dropdownLinkColorHover: $white;
@@ -268,7 +268,7 @@ $side-menu-header-color: #DBD9D7;
268268
// -------------------------
269269
$menu-dropdown-bg: #3B3835;
270270
$menu-dropdown-hover-bg: rgba(219, 217, 215, 0.16);
271-
$menu-dropdown-shadow: 0px 8px 24px rgb(1,4,9);
271+
$menu-dropdown-shadow: 0px 8px 24px rgb(1, 4, 9);
272272

273273
// Tabs
274274
// -------------------------
@@ -300,9 +300,9 @@ $tooltipShadow: 0px 4px 8px rgba(1, 4, 9, 0.75);
300300

301301
$popover-bg: #3B3835;
302302
$popover-color: #DBD9D7;
303-
$popover-border-color: rgba(219, 217, 215, 0.07);
303+
$popover-border-color: rgba(219, 217, 215, 0.12);
304304
$popover-header-bg: #5E5855;
305-
$popover-shadow: 0px 8px 24px rgb(1,4,9);
305+
$popover-shadow: 0px 8px 24px rgb(1, 4, 9);
306306

307307
$popover-help-bg: $tooltipBackground;
308308
$popover-help-color: $text-color;

‎public/sass/_variables.generated.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,9 @@ $headings-line-height: 1.5 !default;
132132

133133
$border-width: 1px !default;
134134

135-
$border-radius: 6px !default;
135+
$border-radius: 2px !default;
136136
$border-radius-lg: 18px !default;
137-
$border-radius-sm: 6px !default;
137+
$border-radius-sm: 2px !default;
138138

139139
// Page
140140

0 commit comments

Comments
 (0)