fixes

coderabbitai · Sep 3, 2024 · 34384b4 · 34384b4
1 parent 9f1a95d
commit 34384b4
Show file tree

Hide file tree

Showing 10 changed files with 303 additions and 462 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -189,7 +189,7 @@ jobs:
           tag: <<parameters.tag>>
       - when:
           condition:
-            equal: [fluxninja_micro_frontends, << pipeline.git.branch >>]
+            equal: [coderabbit_micro_frontend, << pipeline.git.branch >>]
           steps:
             - gcp-gcr/tag-image:
                 image: <<parameters.image>>
@@ -256,7 +256,7 @@ workflows:
           filters:
             branches:
               only:
-                - fluxninja_micro_frontends
+                - coderabbit_micro_frontend
           requires:
             - image-build-grafana-alpine
           environment-path: environments/latest/

diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   "version": "11.3.0-pre",
   "repository": "github:grafana/grafana",
   "scripts": {
-    "build": "NODE_ENV=production nx exec --verbose -- webpack --config scripts/webpack/webpack.prod.js",
+    "build": "NODE_ENV=dev nx exec --verbose -- webpack --config scripts/webpack/webpack.dev.js",
     "build:nominify": "yarn run build -- --env noMinify=1",
     "dev": "NODE_ENV=dev nx exec -- webpack --config scripts/webpack/webpack.dev.js",
     "e2e": "./e2e/start-and-run-suite",
@@ -247,7 +247,8 @@
   },
   "dependencies": {
     "@emotion/css": "11.11.2",
-    "@emotion/react": "11.11.4",
+    "@emotion/react": "^11.13.3",
+    "@emotion/styled": "^11.13.0",
     "@fingerprintjs/fingerprintjs": "^3.4.2",
     "@floating-ui/react": "0.26.23",
     "@formatjs/intl-durationformat": "^0.2.4",
@@ -361,6 +362,8 @@
     "rc-tree": "5.8.8",
     "re-resizable": "6.9.17",
     "react": "18.2.0",
+    "react-ace": "^12.0.0",
+    "react-datepicker": "^7.3.0",
     "react-diff-viewer": "^3.1.1",
     "react-dom": "18.2.0",
     "react-draggable": "4.4.6",

diff --git a/public/microfrontends/fn_dashboard/index.html b/public/microfrontends/fn_dashboard/index.html
@@ -1,6 +1,25 @@
-<!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 = {
+<!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 = {
     themePaths: {
-      light: '../../../public/build/grafana.light.e472367a4cf156a9b63a.css',
-      dark: '../../../public/build/grafana.dark.5f7207c2eacde948b7e9.css',
+      light: '../../../public/build/grafana.light.319cee20e7a8257eadf0.css',
+      dark: '../../../public/build/grafana.dark.75e907ac2464bdcdeb20.css',
     }
-  };</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>
+  };
+</script>
+
+
+    <script nonce="" src="../../../public/build/runtime~fn_dashboard.27b2008e9aab8f8985b3.js" type="text/javascript"></script>
+
+    <script nonce="" src="../../../public/build/fn_dashboard.1f9b5b453196a7012a75.js" type="text/javascript"></script>
+
+  </body>
+</html>
diff --git a/public/views/error-template.html b/public/views/error-template.html
diff --git a/public/views/error.html b/public/views/error.html
@@ -1 +1,60 @@
-<!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>
+<!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>