Skip to content

Commit 34384b4

Browse files
GurinderRawalaGurinderRawala
committed
fixes
1 parent 9f1a95d commit 34384b4

File tree

10 files changed

+303
-462
lines changed

10 files changed

+303
-462
lines changed

‎.circleci/config.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ jobs:
189189
tag: <<parameters.tag>>
190190
- when:
191191
condition:
192-
equal: [fluxninja_micro_frontends, << pipeline.git.branch >>]
192+
equal: [coderabbit_micro_frontend, << pipeline.git.branch >>]
193193
steps:
194194
- gcp-gcr/tag-image:
195195
image: <<parameters.image>>
@@ -256,7 +256,7 @@ workflows:
256256
filters:
257257
branches:
258258
only:
259-
- fluxninja_micro_frontends
259+
- coderabbit_micro_frontend
260260
requires:
261261
- image-build-grafana-alpine
262262
environment-path: environments/latest/

‎package.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"version": "11.3.0-pre",
77
"repository": "github:grafana/grafana",
88
"scripts": {
9-
"build": "NODE_ENV=production nx exec --verbose -- webpack --config scripts/webpack/webpack.prod.js",
9+
"build": "NODE_ENV=dev nx exec --verbose -- webpack --config scripts/webpack/webpack.dev.js",
1010
"build:nominify": "yarn run build -- --env noMinify=1",
1111
"dev": "NODE_ENV=dev nx exec -- webpack --config scripts/webpack/webpack.dev.js",
1212
"e2e": "./e2e/start-and-run-suite",
@@ -247,7 +247,8 @@
247247
},
248248
"dependencies": {
249249
"@emotion/css": "11.11.2",
250-
"@emotion/react": "11.11.4",
250+
"@emotion/react": "^11.13.3",
251+
"@emotion/styled": "^11.13.0",
251252
"@fingerprintjs/fingerprintjs": "^3.4.2",
252253
"@floating-ui/react": "0.26.23",
253254
"@formatjs/intl-durationformat": "^0.2.4",
@@ -361,6 +362,8 @@
361362
"rc-tree": "5.8.8",
362363
"re-resizable": "6.9.17",
363364
"react": "18.2.0",
365+
"react-ace": "^12.0.0",
366+
"react-datepicker": "^7.3.0",
364367
"react-diff-viewer": "^3.1.1",
365368
"react-dom": "18.2.0",
366369
"react-draggable": "4.4.6",

‎public/microfrontends/fn_dashboard/index.html

+23-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,25 @@
1-
<!doctype html><html lang="en"><head><title>CodeRabbit Micro-frontend</title><base href="/"/></head><body class="theme-light app-grafana"><div id="grafanaRoot"></div><script nonce="">window.fnData = {
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 = {
212
themePaths: {
3-
light: '../../../public/build/grafana.light.e472367a4cf156a9b63a.css',
4-
dark: '../../../public/build/grafana.dark.5f7207c2eacde948b7e9.css',
13+
light: '../../../public/build/grafana.light.319cee20e7a8257eadf0.css',
14+
dark: '../../../public/build/grafana.dark.75e907ac2464bdcdeb20.css',
515
}
6-
};</script><script nonce="" src="../../../public/build/runtime.8f71033f53a5958d3c24.js"></script><script nonce="" src="../../../public/build/6029.5c0893d1623856e7b325.js"></script><script nonce="" src="../../../public/build/1033.4ef94802ca8ffa5a7324.js"></script><script nonce="" src="../../../public/build/7783.31bf888e957aafd1d8db.js"></script><script nonce="" src="../../../public/build/2606.ac56ea7a480574e7be78.js"></script><script nonce="" src="../../../public/build/9569.f432c0a8a601f1ff6c30.js"></script><script nonce="" src="../../../public/build/6263.6ee5e784283ba3ba3e5e.js"></script><script nonce="" src="../../../public/build/6947.6ac9008a242a7bb28dc9.js"></script><script nonce="" src="../../../public/build/4894.1cb5c0ff1244aab9f814.js"></script><script nonce="" src="../../../public/build/530.1c5ae442b33495c705a5.js"></script><script nonce="" src="../../../public/build/2474.e4333765762244105575.js"></script><script nonce="" src="../../../public/build/4689.3f9a31238b173438998f.js"></script><script nonce="" src="../../../public/build/fn_dashboard.495129eb94b260ca5c05.js"></script></body></html>
16+
};
17+
</script>
18+
19+
20+
<script nonce="" src="../../../public/build/runtime~fn_dashboard.27b2008e9aab8f8985b3.js" type="text/javascript"></script>
21+
22+
<script nonce="" src="../../../public/build/fn_dashboard.1f9b5b453196a7012a75.js" type="text/javascript"></script>
23+
24+
</body>
25+
</html>

‎public/views/error-template.html

-60
This file was deleted.

‎public/views/error.html

+60-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,60 @@
1-
<!doctype html><html lang="en"><head><meta charset="utf-8"/><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/><meta name="viewport" content="width=device-width"/><meta name="theme-color" content="#000"/><title>[[.AppTitle]] - Error</title><base href="[[.AppSubUrl]]/"/>[[ if eq .ThemeType "light" ]]<link rel="stylesheet" href="[[.Assets.Light]]"/>[[ else ]]<link rel="stylesheet" href="[[.Assets.Dark]]"/>[[ end ]]<link rel="icon" type="image/png" href="public/img/fav32.png"/><link rel="mask-icon" href="public/img/grafana_mask_icon.svg" color="#F05A28"/></head><body class="theme-[[ .ThemeType ]]"><div class="main-view"><div class="page-container"><div class="page-header"><div class="page-header__inner"><span class="page-header__logo"><i class="page-header__icon fa fa-frown-o"></i></span><div class="page-header__info-block"><h1 class="page-header__title"><a class="text-link" href="login">Grafana</a><span> / Server Error</span><span></span></h1><div class="page-header__sub-title">Sadly something went wrong</div></div></div></div></div><div class="page-container page-body ng-scope" style="padding: 2rem"><div class="alert"><div class="alert-icon"><icon name="'exclamation-triangle'"></icon></div><div class="alert-body"><div class="alert-title">[[.Title]]</div></div></div><br/>[[if .ErrorMsg]]<h4 class="page-heading">Error details</h4><div class="alert-text"><pre>[[.ErrorMsg]]</pre></div>[[end]]<div style="padding: 2rem 0 0"><p>Check the Grafana server logs for the detailed error message.</p></div></div></div></body></html>
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<meta charset="utf-8" />
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
6+
<meta name="viewport" content="width=device-width" />
7+
<meta name="theme-color" content="#000" />
8+
9+
<title>[[.AppTitle]] - Error</title>
10+
11+
<base href="[[.AppSubUrl]]/" />
12+
13+
[[ if eq .ThemeType "light" ]]
14+
<link rel="stylesheet" href="[[.Assets.Light]]" />
15+
[[ else ]]
16+
<link rel="stylesheet" href="[[.Assets.Dark]]" />
17+
[[ end ]]
18+
19+
<link rel="icon" type="image/png" href="public/img/fav32.png" />
20+
<link rel="mask-icon" href="public/img/grafana_mask_icon.svg" color="#F05A28" />
21+
</head>
22+
23+
<body class="theme-[[ .ThemeType ]]">
24+
<div class="main-view">
25+
<div class="page-container">
26+
<div class="page-header">
27+
<div class="page-header__inner">
28+
<span class="page-header__logo">
29+
<i class="page-header__icon fa fa-frown-o"></i>
30+
</span>
31+
<div class="page-header__info-block">
32+
<h1 class="page-header__title">
33+
<a class="text-link" href="login">Grafana</a><span> / Server Error</span><span></span>
34+
</h1>
35+
<div class="page-header__sub-title">Sadly something went wrong</div>
36+
</div>
37+
</div>
38+
</div>
39+
</div>
40+
<div class="page-container page-body ng-scope" style="padding: 2rem">
41+
<div class="alert">
42+
<div class="alert-icon"><icon name="'exclamation-triangle'"></icon></div>
43+
<div class="alert-body">
44+
<div class="alert-title">[[.Title]]</div>
45+
</div>
46+
</div>
47+
<br />
48+
[[if .ErrorMsg]]
49+
<h4 class="page-heading">Error details</h4>
50+
<div class="alert-text">
51+
<pre>[[.ErrorMsg]]</pre>
52+
</div>
53+
[[end]]
54+
<div style="padding: 2rem 0 0">
55+
<p>Check the Grafana server logs for the detailed error message.</p>
56+
</div>
57+
</div>
58+
</div>
59+
</body>
60+
</html>

0 commit comments

Comments
 (0)