Revert "Use bundled bootstrap.min.css (#145)"

See #148
projectnessie · Jul 11, 2024 · e7d6a85 · e7d6a85
1 parent 1d35c77
commit e7d6a85
Show file tree

Hide file tree

Showing 14 changed files with 48 additions and 42 deletions.
diff --git a/public/index.html b/public/index.html
@@ -32,6 +32,14 @@
     user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
   -->
   <link href="%PUBLIC_URL%/manifest.json" rel="manifest"/>
+
+  <link
+    crossorigin="anonymous"
+    href="https://maxcdn.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css"
+    integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh"
+    rel="stylesheet"
+  />
+
   <link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons" />
 
   <!--

diff --git a/src/App.test.tsx b/src/App.test.tsx
@@ -50,7 +50,7 @@ it("ExploreTree renders", async () => {
   const { getByText, asFragment } = render(
     <MemoryRouter initialEntries={["/tree/main"]}>
       <App />
-    </MemoryRouter>,
+    </MemoryRouter>
   );
   expect(asFragment()).toMatchSnapshot();
   await waitFor(() => getByText("Commit History"));
@@ -61,7 +61,7 @@ it("ExploreTree renders", async () => {
   expect(asFragment()).toMatchSnapshot();
   expect(screen.getByText("a").closest("a")).toHaveAttribute(
     "href",
-    "/tree/main/a",
+    "/tree/main/a"
   );
 });
 
@@ -101,7 +101,7 @@ it("ExploreTree renders commit", async () => {
   const { getByText, asFragment } = render(
     <MemoryRouter initialEntries={["/commits/main"]}>
       <App />
-    </MemoryRouter>,
+    </MemoryRouter>
   );
   expect(asFragment()).toMatchSnapshot();
   await waitFor(() => getByText("deadbeef"));
@@ -112,7 +112,7 @@ it("ExploreTree renders commit", async () => {
   // expect(asFragment()).toMatchSnapshot();
   expect(screen.getByText("commitMessage").closest("a")).toHaveAttribute(
     "href",
-    "/commits/main/deadbeef",
+    "/commits/main/deadbeef"
   );
 });
 
@@ -152,7 +152,7 @@ it("ExploreTree renders commit message", async () => {
   const { getByText, asFragment } = render(
     <MemoryRouter initialEntries={["/commits/main/deadbeef"]}>
       <App />
-    </MemoryRouter>,
+    </MemoryRouter>
   );
   expect(asFragment()).toMatchSnapshot();
   await waitFor(() => getByText("sally"));
@@ -173,7 +173,7 @@ it("ExploreTree renders with slug", async () => {
 
   const scope1 = nock("http://localhost/api/v1")
     .get(
-      "/trees/tree/main/entries?filter=entry.namespace.matches(%27%5Ea(%5C%5C.%7C%24)%27)&namespaceDepth=2",
+      "/trees/tree/main/entries?filter=entry.namespace.matches(%27%5Ea(%5C%5C.%7C%24)%27)&namespaceDepth=2"
     )
     .reply(200, { token: "foo", entries: [entry] });
   const scope2 = nock("http://localhost/api/v1")
@@ -194,7 +194,7 @@ it("ExploreTree renders with slug", async () => {
   const { getByText, asFragment } = render(
     <MemoryRouter initialEntries={["/tree/main/a"]}>
       <App />
-    </MemoryRouter>,
+    </MemoryRouter>
   );
   expect(asFragment()).toMatchSnapshot();
   await waitFor(() => getByText("a"));
@@ -205,7 +205,7 @@ it("ExploreTree renders with slug", async () => {
   expect(asFragment()).toMatchSnapshot();
   expect(screen.getByText("b").closest("a")).toHaveAttribute(
     "href",
-    "/tree/main/a/b",
+    "/tree/main/a/b"
   );
 });
 

diff --git a/src/CommitDetails/CommitDetails.test.tsx b/src/CommitDetails/CommitDetails.test.tsx
@@ -44,7 +44,7 @@ it("Commit details renders", async () => {
           />
         </Routes>
       </MemoryRouter>
-    </React.StrictMode>,
+    </React.StrictMode>
   );
   await waitFor(() => getByText("commitMessage"));
   expect(asFragment()).toMatchSnapshot();

diff --git a/src/CommitHeader/CommitHeader.test.tsx b/src/CommitHeader/CommitHeader.test.tsx
@@ -41,7 +41,7 @@ it("CommitHeader renders", async () => {
   const { getByText, asFragment } = render(
     <React.StrictMode>
       <CommitHeader currentRef={"main"} />
-    </React.StrictMode>,
+    </React.StrictMode>
   );
   expect(asFragment()).toMatchSnapshot();
   await waitFor(() => getByText("deadbeef"));

diff --git a/src/CommitHeader/CommitHeader.tsx b/src/CommitHeader/CommitHeader.tsx
@@ -80,7 +80,7 @@ const CommitHeader = (props: { currentRef: string }): React.ReactElement => {
           {prettyMilliseconds(
             new Date().getTime() -
               (currentLog.commitMeta.commitTime ?? new Date(0)).getTime(),
-            { compact: true },
+            { compact: true }
           )}
         </span>
       </span>

diff --git a/src/CommitLog/CommitLog.test.tsx b/src/CommitLog/CommitLog.test.tsx
@@ -63,7 +63,7 @@ it("Commit log renders", async () => {
           />
         </Routes>
       </MemoryRouter>
-    </React.StrictMode>,
+    </React.StrictMode>
   );
   // disable snapshots w/ unique ids until https://github.com/facebook/jest/issues/8618 is fixed
   // expect(asFragment()).toMatchSnapshot();
@@ -96,13 +96,13 @@ it("Commit redirects on an invalid ref", async () => {
         />
         <Route path={"/notfound"} element={<ShowPath />} />
       </Routes>
-    </MemoryRouter>,
+    </MemoryRouter>
   );
   expect(asFragment()).toMatchSnapshot();
   await waitFor(() =>
     getAllByText((content, element) => {
       return element?.tagName.toLowerCase() === "div";
-    }),
+    })
   );
 
   expect(asFragment()).toMatchSnapshot();

diff --git a/src/ContentView/ContentView.test.tsx b/src/ContentView/ContentView.test.tsx
@@ -25,13 +25,13 @@ import { Content } from "../utils";
 it("Render Iceberg Content", async () => {
   const scope = nock("http://localhost/api/v1")
     .get(
-      "/contents?hashOnRef=55cc2e40cbe2eed190f3987c53ffc34643d5cfa5ef878392d88b2eb4137e92e4&ref=dev",
+      "/contents?hashOnRef=55cc2e40cbe2eed190f3987c53ffc34643d5cfa5ef878392d88b2eb4137e92e4&ref=dev"
     )
     .reply(200, { contentList });
   const { getByAltText, asFragment } = render(
     <BrowserRouter>
       <ContentView tableContent={icebergTableContent} />
-    </BrowserRouter>,
+    </BrowserRouter>
   );
   expect(asFragment()).toMatchSnapshot();
   await waitFor(() => getByAltText("IcebergTable"));
@@ -41,20 +41,20 @@ it("Render Iceberg Content", async () => {
   expect(asFragment()).toMatchSnapshot();
   expect(screen.getByAltText("IcebergTable")).toHaveAttribute(
     "src",
-    "/iceberg.png",
+    "/iceberg.png"
   );
 });
 
 it("Render DeltaLake Content", async () => {
   const scope = nock("http://localhost/api/v1")
     .get(
-      "/contents?hashOnRef=55cc2e40cbe2eed190f3987c53ffc34643d5cfa5ef878392d88b2eb4137e92e4&ref=dev",
+      "/contents?hashOnRef=55cc2e40cbe2eed190f3987c53ffc34643d5cfa5ef878392d88b2eb4137e92e4&ref=dev"
     )
     .reply(200, { contentList });
   const { getByAltText, asFragment } = render(
     <BrowserRouter>
       <ContentView tableContent={deltaLakeContent} />
-    </BrowserRouter>,
+    </BrowserRouter>
   );
   expect(asFragment()).toMatchSnapshot();
   await waitFor(() => getByAltText("IcebergTable"));
@@ -64,20 +64,20 @@ it("Render DeltaLake Content", async () => {
   expect(asFragment()).toMatchSnapshot();
   expect(screen.getByAltText("IcebergTable")).toHaveAttribute(
     "src",
-    "/delta.png",
+    "/delta.png"
   );
 });
 
 it("Render Iceberg View Content", async () => {
   const scope = nock("http://localhost/api/v1")
     .get(
-      "/contents?hashOnRef=55cc2e40cbe2eed190f3987c53ffc34643d5cfa5ef878392d88b2eb4137e92e4&ref=dev",
+      "/contents?hashOnRef=55cc2e40cbe2eed190f3987c53ffc34643d5cfa5ef878392d88b2eb4137e92e4&ref=dev"
     )
     .reply(200, { contentList });
   const { getByText, asFragment } = render(
     <BrowserRouter>
       <ContentView tableContent={icebergViewContent} />
-    </BrowserRouter>,
+    </BrowserRouter>
   );
   expect(asFragment()).toMatchSnapshot();
   await waitFor(() => getByText("ICEBERG_VIEW"));

diff --git a/src/Contents/Contents.test.tsx b/src/Contents/Contents.test.tsx
@@ -35,7 +35,7 @@ it("TableListing renders object", async () => {
           <Route path={"/tree/:branch"} element={<TableListing />} />
         </Routes>
       </MemoryRouter>
-    </React.StrictMode>,
+    </React.StrictMode>
   );
   expect(asFragment()).toMatchSnapshot();
   await waitFor(() => getByText("b"));
@@ -44,6 +44,6 @@ it("TableListing renders object", async () => {
   expect(asFragment()).toMatchSnapshot();
   expect(screen.getByText("b").closest("a")).toHaveAttribute(
     "href",
-    "/content/main/b",
+    "/content/main/b"
   );
 });
diff --git a/src/ExploreLink/ExploreLink.test.tsx b/src/ExploreLink/ExploreLink.test.tsx
@@ -25,13 +25,13 @@ it("ExploreLink renders with container", () => {
       <ExploreLink path={["a", "b", "c"]} toRef={"main"}>
         xxx
       </ExploreLink>
-    </BrowserRouter>,
+    </BrowserRouter>
   );
 
   expect(asFragment()).toMatchSnapshot();
   expect(screen.getByText("xxx").closest("a")).toHaveAttribute(
     "href",
-    "/tree/main/a/b/c",
+    "/tree/main/a/b/c"
   );
 });
 
@@ -43,12 +43,12 @@ it("ExploreLink renders with object", () => {
           xxx
         </ExploreLink>
       </BrowserRouter>
-    </React.StrictMode>,
+    </React.StrictMode>
   );
 
   expect(asFragment()).toMatchSnapshot();
   expect(screen.getByText("xxx").closest("a")).toHaveAttribute(
     "href",
-    "/content/main/",
+    "/content/main/"
   );
 });
diff --git a/src/NotFound/NotFound.test.tsx b/src/NotFound/NotFound.test.tsx
@@ -22,7 +22,7 @@ it("Test not found", async () => {
   render(
     <BrowserRouter>
       <NotFound />
-    </BrowserRouter>,
+    </BrowserRouter>
   );
   await screen.findByText("404 - Not found");
 });
diff --git a/src/TableHead/TableHead.test.tsx b/src/TableHead/TableHead.test.tsx
@@ -38,13 +38,13 @@ it("TableHead renders with path", () => {
           }
         />
       </Routes>
-    </MemoryRouter>,
+    </MemoryRouter>
   );
 
   expect(asFragment()).toMatchSnapshot();
   expect(screen.getByText("c").closest("a")).toHaveAttribute(
     "href",
-    "/tree/main/a/b/c",
+    "/tree/main/a/b/c"
   );
 });
 
@@ -64,7 +64,7 @@ it("TableHead renders without path", () => {
           }
         />
       </Routes>
-    </MemoryRouter>,
+    </MemoryRouter>
   );
 
   expect(asFragment()).toMatchSnapshot();
@@ -90,7 +90,7 @@ it("TableHead renders without current ref", () => {
           />
         </Route>
       </Routes>
-    </MemoryRouter>,
+    </MemoryRouter>
   );
 
   expect(asFragment()).toMatchSnapshot();
@@ -112,7 +112,7 @@ it("CommitHead renders with current ref", () => {
           }
         />
       </Routes>
-    </MemoryRouter>,
+    </MemoryRouter>
   );
 
   expect(asFragment()).toMatchSnapshot();
@@ -134,7 +134,7 @@ it("TableHead renders with different current ref", () => {
           }
         />
       </Routes>
-    </MemoryRouter>,
+    </MemoryRouter>
   );
 
   expect(asFragment()).toMatchSnapshot();

diff --git a/src/TableListing/TableListing.test.tsx b/src/TableListing/TableListing.test.tsx
@@ -40,7 +40,7 @@ it("TableListing renders", async () => {
       <Routes>
         <Route path={"/tree/:branch"} element={<TableListing />} />
       </Routes>
-    </MemoryRouter>,
+    </MemoryRouter>
   );
   expect(asFragment()).toMatchSnapshot();
   await waitFor(() => getByText("a"));
@@ -49,7 +49,7 @@ it("TableListing renders", async () => {
   expect(asFragment()).toMatchSnapshot();
   expect(screen.getByText("a").closest("a")).toHaveAttribute(
     "href",
-    "/tree/main/a",
+    "/tree/main/a"
   );
 });
 
@@ -64,13 +64,13 @@ it("TableListing redirects on an invalid ref", async () => {
         <Route path="/tree/:branch" element={<TableListing />} />
         <Route path={"/notfound"} element={<ShowPath />} />
       </Routes>
-    </MemoryRouter>,
+    </MemoryRouter>
   );
   expect(asFragment()).toMatchSnapshot();
   await waitFor(() =>
     getAllByText((content, element) => {
       return element?.tagName.toLowerCase() === "div";
-    }),
+    })
   );
 
   scope.isDone();

diff --git a/src/index.tsx b/src/index.tsx
@@ -15,8 +15,6 @@
  */
 import React from "react";
 import ReactDOM from "react-dom";
-// eslint-disable-next-line import/no-internal-modules
-import "bootstrap/dist/css/bootstrap.min.css";
 import "./index.css";
 import { BrowserRouter as Router } from "react-router-dom";
 import { App } from "./App";

diff --git a/src/setupProxy.ts b/src/setupProxy.ts
@@ -25,6 +25,6 @@ app.use(
   createProxyMiddleware({
     target: "http://localhost:19120",
     changeOrigin: true,
-  }),
+  })
 );
 app.listen(3000);