Add updated Leafcutter app

2023-03-31 08:34:35 +02:00 · 2023-03-31 08:34:35 +02:00 · 38343f4219
commit 38343f4219
parent 60f6061d49
10 changed files with 3391 additions and 20 deletions
--- a/apps/leafcutter/charts/Chart.yaml
+++ b/apps/leafcutter/charts/Chart.yaml
@ -2,5 +2,5 @@ apiVersion: v2
 name: leafcutter-web
 description: A Helm chart for Kubernetes
 type: application
-version: 0.1.51
-appVersion: "0.1.51"
+version: 0.1.53
+appVersion: "0.1.53"
--- a/apps/leafcutter/components/VisualizationDetailDialog.tsx
+++ b/apps/leafcutter/components/VisualizationDetailDialog.tsx
@ -127,6 +127,13 @@ export const VisualizationDetailDialog: FC<VisualizationDetailDialogProps> = ({
              </Button>
            </Grid>
          )}
+          {!editing && (
+            <Grid item>
+              <Button sx={buttonStyles} onClick={deleteAndClose} size="small">
+                {t("delete")}
+              </Button>
+            </Grid>
+          )}
          {editing && (
            <Grid item>
              <Button sx={buttonStyles} onClick={saveAndClose} size="small">
--- a/apps/leafcutter/config/unRegions.json
+++ b/apps/leafcutter/config/unRegions.json
--- a/apps/leafcutter/images/favicon.ico
+++ b/apps/leafcutter/images/favicon.ico
--- a/apps/leafcutter/lib/opensearch.ts
+++ b/apps/leafcutter/lib/opensearch.ts
@ -119,12 +119,22 @@ export const saveUserMetadata = async (username: string, metadata: any) => {
 const getCurrentUserIndex = async (email: string) => {
  const userIndexName = email.replace(/[\W\d_]/g, "").toLowerCase();
  const client = createClient();
+  const aliasesResponse = await client.indices.getAlias({
+    name: `.kibana_*_${userIndexName}`,
+  });
+
+  // prefer alias if it exists
+  if (Object.keys(aliasesResponse.body).length > 0) {
+    return Object.keys(aliasesResponse.body)[0];
+  }
+
  const indicesResponse = await client.indices.get({
    index: `.kibana_*_${userIndexName}_1`,
  })
  const currentUserIndex = Object.keys(indicesResponse.body)[0];
+
  return currentUserIndex;
-};
+}

 const getIndexPattern = async (index: string) => {
  const client = createClient();
--- a/apps/leafcutter/locales/en.json
+++ b/apps/leafcutter/locales/en.json
@ -181,5 +181,6 @@
  "shareDescription": "Externally or internally",
  "savedSearch": "Saved Search",
  "saveCurrentSearch": "Save Current Search",
-  "clear": "Clear"
+  "clear": "Clear",
+  "delete": "Delete"
 }
--- a/apps/leafcutter/package.json
+++ b/apps/leafcutter/package.json
@ -1,6 +1,6 @@
 {
  "name": "leafcutter",
-  "version": "0.1.51",
+  "version": "0.1.53",
  "scripts": {
    "dev": "next dev",
    "login": "aws sso login --profile cdr-leafcutter-dashboard-prod-sso",
@ -41,6 +41,7 @@
    "react-iframe": "^1.8.4",
    "react-markdown": "^8.0.3",
    "react-polyglot": "^0.7.2",
+    "sharp": "^0.31.3",
    "swr": "^1.3.0",
    "uuid": "^9.0.0"
  },
--- a/apps/leafcutter/pages/_app.tsx
+++ b/apps/leafcutter/pages/_app.tsx
@ -2,6 +2,7 @@
 import { AppProps } from "next/app";
 import { SessionProvider } from "next-auth/react";
 import { useRouter } from "next/router";
+import Head from "next/head";
 import { CssBaseline } from "@mui/material";
 import { CacheProvider, EmotionCache } from "@emotion/react";
 import { CookiesProvider } from "react-cookie";
@ -10,6 +11,7 @@ import { AdapterDateFns } from "@mui/x-date-pickers-pro/AdapterDateFns";
 import { LocalizationProvider } from "@mui/x-date-pickers-pro";
 import { AppProvider } from "components/AppProvider";
 import createEmotionCache from "lib/createEmotionCache";
+import Favicon from "images/favicon.ico";
 import en from "locales/en.json";
 import fr from "locales/fr.json";
 import "@fontsource/poppins/400.css";
@ -38,20 +40,25 @@ const LeafcutterWeb = (props: LeafcutterWebProps) => {
  const { Component, emotionCache = clientSideEmotionCache, pageProps } = props;

  return (
-    <SessionProvider session={(pageProps as any).session}>
-      <CacheProvider value={emotionCache}>
-        <CookiesProvider>
-          <CssBaseline />
-          <AppProvider>
-            <LocalizationProvider dateAdapter={AdapterDateFns}>
-              <I18n locale={locale} messages={messages[locale]}>
-                <Component {...pageProps} />
-              </I18n>
-            </LocalizationProvider>
-          </AppProvider>
-        </CookiesProvider>
-      </CacheProvider>
-    </SessionProvider>
+    <>
+      <Head>
+        <link rel="icon" type="image/png" href={Favicon.src} />
+      </Head>
+      <SessionProvider session={(pageProps as any).session}>
+        <CacheProvider value={emotionCache}>
+          <CookiesProvider>
+            <CssBaseline />
+            <AppProvider>
+              <LocalizationProvider dateAdapter={AdapterDateFns}>
+                <I18n locale={locale} messages={messages[locale]}>
+                  <Component {...pageProps} />
+                </I18n>
+              </LocalizationProvider>
+            </AppProvider>
+          </CookiesProvider>
+        </CacheProvider>
+      </SessionProvider>
+    </>
  );
 };

--- a/apps/leafcutter/pages/api/upload/index.ts
+++ b/apps/leafcutter/pages/api/upload/index.ts
@ -0,0 +1,53 @@
+/* eslint-disable no-restricted-syntax */
+import { NextApiRequest, NextApiResponse } from "next";
+import { Client } from "@opensearch-project/opensearch";
+import { v4 as uuid } from "uuid";
+import taxonomy from "config/taxonomy.json";
+import unRegions from "config/unRegions.json";
+
+const handler = async (req: NextApiRequest, res: NextApiResponse) => {
+  const { headers: { authorization }, body: { tickets } } = req;
+  const baseURL = `https://${process.env.OPENSEARCH_URL}`;
+  const client = new Client({
+    node: baseURL,
+    ssl: {
+      rejectUnauthorized: false,
+    },
+    headers: {
+      authorization
+    }
+  });
+
+  const succeeded = [];
+  const failed = [];
+
+  for await (const ticket of tickets) {
+    const { id } = ticket;
+    try {
+      const country = ticket.country[0] ?? "none";
+      const translatedCountry = taxonomy.country[country]?.display ?? "none";
+      const countryDetails = unRegions.find((c) => c.name === translatedCountry);
+      const augmentedTicket = {
+        ...ticket,
+        region: countryDetails['sub-region']?.toLowerCase().replace(" ", "-") ?? null,
+        continent: countryDetails.region?.toLowerCase().replace(" ", "-") ?? null,
+      }
+      const out = await client.create({
+        id: uuid(),
+        index: "sample_tagged_tickets",
+        refresh: true,
+        body: augmentedTicket,
+      });
+      console.log(out);
+      succeeded.push(id);
+    } catch (e) {
+      console.log(e)
+      failed.push(id);
+    }
+  }
+
+  const results = { succeeded, failed };
+  return res.json(results)
+};
+
+export default handler;
--- a/package-lock.json
+++ b/package-lock.json
@ -14,7 +14,7 @@
      ]
    },
    "apps/leafcutter": {
-      "version": "0.1.51",
+      "version": "0.1.53",
      "dependencies": {
        "@emotion/cache": "^11.10.3",
        "@emotion/react": "^11.10.4",
@ -44,6 +44,7 @@
        "react-iframe": "^1.8.4",
        "react-markdown": "^8.0.3",
        "react-polyglot": "^0.7.2",
+        "sharp": "^0.31.3",
        "swr": "^1.3.0",
        "uuid": "^9.0.0"
      },
@ -173,6 +174,17 @@
        }
      }
    },
+    "apps/leafcutter/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
    "apps/leafcutter/node_modules/material-ui-popup-state": {
      "version": "4.1.0",
      "resolved": "https://registry.npmjs.org/material-ui-popup-state/-/material-ui-popup-state-4.1.0.tgz",
@ -187,6 +199,42 @@
        "react": "^15.0.0 || ^16.0.0 || ^17.0.0 || ^18.0.0"
      }
    },
+    "apps/leafcutter/node_modules/semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "apps/leafcutter/node_modules/sharp": {
+      "version": "0.31.3",
+      "resolved": "https://registry.npmjs.org/sharp/-/sharp-0.31.3.tgz",
+      "integrity": "sha512-XcR4+FCLBFKw1bdB+GEhnUNXNXvnt0tDo4WsBsraKymuo/IAuPuCBVAL2wIkUw2r/dwFW5Q5+g66Kwl2dgDFVg==",
+      "hasInstallScript": true,
+      "dependencies": {
+        "color": "^4.2.3",
+        "detect-libc": "^2.0.1",
+        "node-addon-api": "^5.0.0",
+        "prebuild-install": "^7.1.1",
+        "semver": "^7.3.8",
+        "simple-get": "^4.0.1",
+        "tar-fs": "^2.1.1",
+        "tunnel-agent": "^0.6.0"
+      },
+      "engines": {
+        "node": ">=14.15.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/libvips"
+      }
+    },
    "apps/leafcutter/node_modules/swr": {
      "version": "1.3.0",
      "license": "MIT",
@ -194,6 +242,11 @@
        "react": "^16.11.0 || ^17.0.0 || ^18.0.0"
      }
    },
+    "apps/leafcutter/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
    "apps/link": {
      "version": "0.0.1",
      "dependencies": {