From 1d2079b89dbbd8da974209e36c9ceb9389fd7c9c Mon Sep 17 00:00:00 2001
From: Abbie Sims <abbie.sims@canonical.com>
Date: Tue, 12 Nov 2024 15:42:23 +0400
Subject: [PATCH] chore: move store directory and fix lint errors

---
 .../js/{ => src}/store/components/App/App.tsx |  0
 .../components/App/__tests__/App.test.tsx     |  0
 .../{ => src}/store/components/App/index.ts   |  0
 .../store/components/Banner/Banner.tsx        |  0
 .../Banner/__tests__/Banner.test.tsx          |  0
 .../store/components/Banner/index.ts          |  0
 .../store/components/Packages/Packages.tsx    | 42 ++++++++++++-------
 .../Packages/__tests__/Packages.test.tsx      | 14 ++++---
 .../store/components/Packages/index.ts        |  0
 .../store/components/Topics/Topics.tsx        |  0
 .../Topics/__tests__/Topics.test.tsx          |  6 +--
 .../store/components/Topics/index.ts          |  0
 .../js/{ => src}/store/data/package-types.js  |  0
 static/js/{ => src}/store/data/platforms.js   |  0
 static/js/{ => src}/store/index.tsx           |  0
 static/js/{ => src}/store/types/index.ts      |  0
 webpack.config.entry.js                       |  2 +-
 17 files changed, 40 insertions(+), 24 deletions(-)
 rename static/js/{ => src}/store/components/App/App.tsx (100%)
 rename static/js/{ => src}/store/components/App/__tests__/App.test.tsx (100%)
 rename static/js/{ => src}/store/components/App/index.ts (100%)
 rename static/js/{ => src}/store/components/Banner/Banner.tsx (100%)
 rename static/js/{ => src}/store/components/Banner/__tests__/Banner.test.tsx (100%)
 rename static/js/{ => src}/store/components/Banner/index.ts (100%)
 rename static/js/{ => src}/store/components/Packages/Packages.tsx (86%)
 rename static/js/{ => src}/store/components/Packages/__tests__/Packages.test.tsx (83%)
 rename static/js/{ => src}/store/components/Packages/index.ts (100%)
 rename static/js/{ => src}/store/components/Topics/Topics.tsx (100%)
 rename static/js/{ => src}/store/components/Topics/__tests__/Topics.test.tsx (94%)
 rename static/js/{ => src}/store/components/Topics/index.ts (100%)
 rename static/js/{ => src}/store/data/package-types.js (100%)
 rename static/js/{ => src}/store/data/platforms.js (100%)
 rename static/js/{ => src}/store/index.tsx (100%)
 rename static/js/{ => src}/store/types/index.ts (100%)

diff --git a/static/js/store/components/App/App.tsx b/static/js/src/store/components/App/App.tsx
similarity index 100%
rename from static/js/store/components/App/App.tsx
rename to static/js/src/store/components/App/App.tsx
diff --git a/static/js/store/components/App/__tests__/App.test.tsx b/static/js/src/store/components/App/__tests__/App.test.tsx
similarity index 100%
rename from static/js/store/components/App/__tests__/App.test.tsx
rename to static/js/src/store/components/App/__tests__/App.test.tsx
diff --git a/static/js/store/components/App/index.ts b/static/js/src/store/components/App/index.ts
similarity index 100%
rename from static/js/store/components/App/index.ts
rename to static/js/src/store/components/App/index.ts
diff --git a/static/js/store/components/Banner/Banner.tsx b/static/js/src/store/components/Banner/Banner.tsx
similarity index 100%
rename from static/js/store/components/Banner/Banner.tsx
rename to static/js/src/store/components/Banner/Banner.tsx
diff --git a/static/js/store/components/Banner/__tests__/Banner.test.tsx b/static/js/src/store/components/Banner/__tests__/Banner.test.tsx
similarity index 100%
rename from static/js/store/components/Banner/__tests__/Banner.test.tsx
rename to static/js/src/store/components/Banner/__tests__/Banner.test.tsx
diff --git a/static/js/store/components/Banner/index.ts b/static/js/src/store/components/Banner/index.ts
similarity index 100%
rename from static/js/store/components/Banner/index.ts
rename to static/js/src/store/components/Banner/index.ts
diff --git a/static/js/store/components/Packages/Packages.tsx b/static/js/src/store/components/Packages/Packages.tsx
similarity index 86%
rename from static/js/store/components/Packages/Packages.tsx
rename to static/js/src/store/components/Packages/Packages.tsx
index 6a2e0bc6c..f4b761555 100644
--- a/static/js/store/components/Packages/Packages.tsx
+++ b/static/js/src/store/components/Packages/Packages.tsx
@@ -20,6 +20,8 @@ import Topics from "../Topics";
 
 import platforms from "../../data/platforms";
 import packageTypes from "../../data/package-types";
+import { Category } from "../../types";
+import { Package, Publisher } from "../../../publisher-admin/types";
 
 function Packages() {
   const ITEMS_PER_PAGE = 12;
@@ -27,7 +29,7 @@ function Packages() {
   const getData = async () => {
     const response = await fetch(`/store.json${search}`);
     const data = await response.json();
-    const packagesWithId = data.packages.map((item: any) => {
+    const packagesWithId = data.packages.map((item: string[]) => {
       return {
         ...item,
         id: crypto.randomUUID(),
@@ -48,6 +50,8 @@ function Packages() {
   const [hideFilters, setHideFilters] = useState(true);
   const currentPage = searchParams.get("page") || "1";
   const { data, status, refetch, isFetching } = useQuery("data", getData);
+  console.log(data);
+  console.log(typeof data);
 
   const topicsQuery = searchParams ? searchParams.get("categories") : null;
 
@@ -110,7 +114,7 @@ function Packages() {
                   selectedCategories={
                     searchParams.get("categories")?.split(",") || []
                   }
-                  setSelectedCategories={(items: any) => {
+                  setSelectedCategories={(items: string[]) => {
                     if (items.length > 0) {
                       searchParams.set("categories", items.join(","));
                     } else {
@@ -182,19 +186,27 @@ function Packages() {
               {!isFetching &&
                 status === "success" &&
                 data.packages.length > 0 &&
-                data.packages.map((packageData: any) => (
-                  <Col
-                    size={3}
-                    style={{ marginBottom: "1.5rem" }}
-                    key={packageData.id}
-                  >
-                    {packageData.package.type === "bundle" ? (
-                      <BundleCard data={packageData} />
-                    ) : (
-                      <CharmCard data={packageData} />
-                    )}
-                  </Col>
-                ))}
+                data.packages.map(
+                  (packageData: {
+                    categories: Category[];
+                    package: Package;
+                    publisher: Publisher;
+                    ratings: { count: string; value: string };
+                    id: string;
+                  }) => (
+                    <Col
+                      size={3}
+                      style={{ marginBottom: "1.5rem" }}
+                      key={packageData.id}
+                    >
+                      {packageData.package.type === "bundle" ? (
+                        <BundleCard data={packageData} />
+                      ) : (
+                        <CharmCard data={packageData} />
+                      )}
+                    </Col>
+                  )
+                )}
 
               {status === "success" && data.packages.length === 0 && (
                 <h1 className="p-heading--2">No packages match this filter</h1>
diff --git a/static/js/store/components/Packages/__tests__/Packages.test.tsx b/static/js/src/store/components/Packages/__tests__/Packages.test.tsx
similarity index 83%
rename from static/js/store/components/Packages/__tests__/Packages.test.tsx
rename to static/js/src/store/components/Packages/__tests__/Packages.test.tsx
index ab5a15b98..5ca1f4319 100644
--- a/static/js/store/components/Packages/__tests__/Packages.test.tsx
+++ b/static/js/src/store/components/Packages/__tests__/Packages.test.tsx
@@ -6,13 +6,17 @@ import Packages from "../Packages";
 import "@testing-library/jest-dom";
 
 jest.mock("@canonical/store-components", () => ({
-  CharmCard: ({ data }: { data: any }) => <div>{data.name}</div>,
-  BundleCard: ({ data }: { data: any }) => <div>{data.name}</div>,
+  CharmCard: ({ data }: { data: { name: string } }) => <div>{data.name}</div>,
+  BundleCard: ({ data }: { data: { name: string } }) => <div>{data.name}</div>,
   Filters: ({
     setSelectedCategories,
     setSelectedPlatform,
     setSelectedPackageType,
-  }: any) => (
+  }: {
+    setSelectedCategories: (categories: string[]) => void;
+    setSelectedPlatform: (platform: string) => void;
+    setSelectedPackageType: (packageType: string) => void;
+  }) => (
     <div>
       <button onClick={() => setSelectedCategories(["category1"])}>
         Set Categories
@@ -44,7 +48,7 @@ const renderPackages = () => {
 
 describe("Packages component", () => {
   beforeEach(() => {
-    jest.clearAllMocks();    
+    jest.clearAllMocks();
   });
 
   test("renders Banner and Topics components", async () => {
@@ -63,7 +67,7 @@ describe("Packages component", () => {
   });
 
   test("renders no packages message when there are no results", async () => {
-    (global as any).fetch = jest.fn(() =>
+    (global.fetch as jest.Mock) = jest.fn(() =>
       Promise.resolve({
         json: () =>
           Promise.resolve({
diff --git a/static/js/store/components/Packages/index.ts b/static/js/src/store/components/Packages/index.ts
similarity index 100%
rename from static/js/store/components/Packages/index.ts
rename to static/js/src/store/components/Packages/index.ts
diff --git a/static/js/store/components/Topics/Topics.tsx b/static/js/src/store/components/Topics/Topics.tsx
similarity index 100%
rename from static/js/store/components/Topics/Topics.tsx
rename to static/js/src/store/components/Topics/Topics.tsx
diff --git a/static/js/store/components/Topics/__tests__/Topics.test.tsx b/static/js/src/store/components/Topics/__tests__/Topics.test.tsx
similarity index 94%
rename from static/js/store/components/Topics/__tests__/Topics.test.tsx
rename to static/js/src/store/components/Topics/__tests__/Topics.test.tsx
index 9df63e194..e4b98da54 100644
--- a/static/js/store/components/Topics/__tests__/Topics.test.tsx
+++ b/static/js/src/store/components/Topics/__tests__/Topics.test.tsx
@@ -4,7 +4,7 @@ import Topics from "../Topics";
 import { QueryClient, QueryClientProvider } from "react-query";
 import "@testing-library/jest-dom";
 
-(global as any).fetch = jest.fn(() =>
+(global.fetch as jest.Mock) = jest.fn(() =>
   Promise.resolve({
     json: () => Promise.resolve({ topics: [] }),
   })
@@ -64,7 +64,7 @@ describe("Topics Component", () => {
       },
     ];
 
-    (global as any).fetch = jest.fn(() =>
+    (global.fetch as unknown as jest.Mock) = jest.fn(() =>
       Promise.resolve({
         json: () => Promise.resolve({ topics: mockTopics }),
       })
@@ -80,7 +80,7 @@ describe("Topics Component", () => {
   });
 
   test("renders empty state when no topics are available", async () => {
-    (global as any).fetch = jest.fn(() =>
+    (global.fetch as jest.Mock) = jest.fn(() =>
       Promise.resolve({
         json: () => Promise.resolve({ topics: [] }),
       })
diff --git a/static/js/store/components/Topics/index.ts b/static/js/src/store/components/Topics/index.ts
similarity index 100%
rename from static/js/store/components/Topics/index.ts
rename to static/js/src/store/components/Topics/index.ts
diff --git a/static/js/store/data/package-types.js b/static/js/src/store/data/package-types.js
similarity index 100%
rename from static/js/store/data/package-types.js
rename to static/js/src/store/data/package-types.js
diff --git a/static/js/store/data/platforms.js b/static/js/src/store/data/platforms.js
similarity index 100%
rename from static/js/store/data/platforms.js
rename to static/js/src/store/data/platforms.js
diff --git a/static/js/store/index.tsx b/static/js/src/store/index.tsx
similarity index 100%
rename from static/js/store/index.tsx
rename to static/js/src/store/index.tsx
diff --git a/static/js/store/types/index.ts b/static/js/src/store/types/index.ts
similarity index 100%
rename from static/js/store/types/index.ts
rename to static/js/src/store/types/index.ts
diff --git a/webpack.config.entry.js b/webpack.config.entry.js
index c585902d0..1f7ef0a68 100644
--- a/webpack.config.entry.js
+++ b/webpack.config.entry.js
@@ -15,7 +15,7 @@ module.exports = {
   "navigation-events": "./static/js/src/public/navigation-events.ts",
   "icon-validator": "./static/js/src/public/icon-validator/index.tsx",
   interfaces: "./static/js/src/interfaces/index.tsx",
-  store: "./static/js/store/index.tsx",
+  store: "./static/js/src/store/index.tsx",
   publisher: "./static/js/src/publisher-admin/index.tsx",
   search: "./static/js/src/search/App.tsx",
 };