Merge branch 'main' into fix/grafana-datasource-url

Author: AbhishekA1509

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "1.10.0-patch-7",
+        "@devtron-labs/devtron-fe-common-lib": "1.10.0-patch-8",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",

src/components/v2/values/chartValuesDiff/ChartValuesEditor.tsx

@@ -344,13 +344,15 @@ export default function ChartValuesEditor({
             mode={MODES.YAML}
             loading={loading || valuesForDiffState.loadingValuesForDiff}
             customLoader={
-                <DetailsProgressing size={32}>
-                    {manifestView && !comparisonView && (
-                        <span className="fs-13 fw-4 cn-7 mt-8">
-                            Generating the manifest. <br /> Please wait...
-                        </span>
-                    )}
-                </DetailsProgressing>
+                <div className="flex h-100">
+                    <DetailsProgressing size={32}>
+                        {manifestView && !comparisonView && (
+                            <span className="fs-13 fw-4 cn-7 mt-8">
+                                Generating the manifest. <br /> Please wait...
+                            </span>
+                        )}
+                    </DetailsProgressing>
+                </div>
             }
             readOnly={manifestView}
             codeEditorProps={{

yarn.lock

@@ -1126,10 +1126,10 @@
   dependencies:
     "@jridgewell/trace-mapping" "0.3.9"
 
-"@devtron-labs/[email protected]7":
-  version "1.10.0-patch-7"
-  resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.10.0-patch-7.tgz#bd04608fd149cd0526677027b6bb8f9a00853d1b"
-  integrity sha512-uX8UZaPqYbAc5pOwW3Bq9HA8lCumeAMVP49A260rTvstD8XfonIjWl2QcohkgemuKK56zpvAFFXjWIiLjUOaKQ==
+"@devtron-labs/[email protected]8":
+  version "1.10.0-patch-8"
+  resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.10.0-patch-8.tgz#be4821a9a3d6b378b95448c1038acd267e083fb4"
+  integrity sha512-Q0Sc7FUU4+9pSHw+aqmjNvHe2EKNf8zpIeoJ/UJAetzQnnxWfeph3lz4jgEDdP95g+87U+jet8u4cz//7xVARg==
   dependencies:
     "@codemirror/lang-json" "6.0.1"
     "@codemirror/lang-yaml" "6.1.2"