From a0f3e7fc0127c3997c4d56bc4a4403081302c061 Mon Sep 17 00:00:00 2001
From: Steve Rydz <steve.rydz@canonical.com>
Date: Thu, 5 Sep 2024 14:32:14 +0100
Subject: [PATCH] chore: Refactor publisher app

---
 .../components/Logo/Logo.tsx                                | 0
 .../components/Logo/index.ts                                | 0
 .../components/PrimaryNav/PrimaryNav.tsx                    | 6 +++++-
 .../components/PrimaryNav/index.ts                          | 0
 .../hooks/__tests__/useValidationSet.test.ts                | 0
 .../hooks/__tests__/useValidationSets.test.ts               | 0
 .../js/{validation-sets => publisher-pages}/hooks/index.ts  | 0
 .../hooks/useValidationSet.ts                               | 0
 .../hooks/useValidationSets.ts                              | 0
 static/js/{validation-sets => publisher-pages}/index.tsx    | 0
 .../pages/ValidationSet/ValidationSet.tsx                   | 0
 .../pages/ValidationSet/__tests__/ValidationSet.test.tsx    | 0
 .../pages/ValidationSet/index.ts                            | 0
 .../pages/ValidationSets/ValidationSets.tsx                 | 0
 .../pages/ValidationSets/__tests__/ValidationSets.test.tsx  | 0
 .../pages/ValidationSets/index.ts                           | 0
 .../js/{validation-sets => publisher-pages}/routes/root.tsx | 0
 .../{validation-sets => publisher-pages}/types/index.d.ts   | 0
 templates/_header.html                                      | 2 +-
 templates/store/{validation-sets.html => publisher.html}    | 2 +-
 webapp/store/views.py                                       | 2 +-
 webpack.config.entry.js                                     | 2 +-
 22 files changed, 9 insertions(+), 5 deletions(-)
 rename static/js/{validation-sets => publisher-pages}/components/Logo/Logo.tsx (100%)
 rename static/js/{validation-sets => publisher-pages}/components/Logo/index.ts (100%)
 rename static/js/{validation-sets => publisher-pages}/components/PrimaryNav/PrimaryNav.tsx (96%)
 rename static/js/{validation-sets => publisher-pages}/components/PrimaryNav/index.ts (100%)
 rename static/js/{validation-sets => publisher-pages}/hooks/__tests__/useValidationSet.test.ts (100%)
 rename static/js/{validation-sets => publisher-pages}/hooks/__tests__/useValidationSets.test.ts (100%)
 rename static/js/{validation-sets => publisher-pages}/hooks/index.ts (100%)
 rename static/js/{validation-sets => publisher-pages}/hooks/useValidationSet.ts (100%)
 rename static/js/{validation-sets => publisher-pages}/hooks/useValidationSets.ts (100%)
 rename static/js/{validation-sets => publisher-pages}/index.tsx (100%)
 rename static/js/{validation-sets => publisher-pages}/pages/ValidationSet/ValidationSet.tsx (100%)
 rename static/js/{validation-sets => publisher-pages}/pages/ValidationSet/__tests__/ValidationSet.test.tsx (100%)
 rename static/js/{validation-sets => publisher-pages}/pages/ValidationSet/index.ts (100%)
 rename static/js/{validation-sets => publisher-pages}/pages/ValidationSets/ValidationSets.tsx (100%)
 rename static/js/{validation-sets => publisher-pages}/pages/ValidationSets/__tests__/ValidationSets.test.tsx (100%)
 rename static/js/{validation-sets => publisher-pages}/pages/ValidationSets/index.ts (100%)
 rename static/js/{validation-sets => publisher-pages}/routes/root.tsx (100%)
 rename static/js/{validation-sets => publisher-pages}/types/index.d.ts (100%)
 rename templates/store/{validation-sets.html => publisher.html} (66%)

diff --git a/static/js/validation-sets/components/Logo/Logo.tsx b/static/js/publisher-pages/components/Logo/Logo.tsx
similarity index 100%
rename from static/js/validation-sets/components/Logo/Logo.tsx
rename to static/js/publisher-pages/components/Logo/Logo.tsx
diff --git a/static/js/validation-sets/components/Logo/index.ts b/static/js/publisher-pages/components/Logo/index.ts
similarity index 100%
rename from static/js/validation-sets/components/Logo/index.ts
rename to static/js/publisher-pages/components/Logo/index.ts
diff --git a/static/js/validation-sets/components/PrimaryNav/PrimaryNav.tsx b/static/js/publisher-pages/components/PrimaryNav/PrimaryNav.tsx
similarity index 96%
rename from static/js/validation-sets/components/PrimaryNav/PrimaryNav.tsx
rename to static/js/publisher-pages/components/PrimaryNav/PrimaryNav.tsx
index 60b0537a74..aee0e2d3ea 100644
--- a/static/js/validation-sets/components/PrimaryNav/PrimaryNav.tsx
+++ b/static/js/publisher-pages/components/PrimaryNav/PrimaryNav.tsx
@@ -39,10 +39,14 @@ function PrimaryNav({
                 href: "/snaps",
                 icon: "pods",
               },
+            ],
+          },
+          {
+            items: [
               {
                 label: "My validation sets",
                 href: "/validation-sets",
-                icon: "pods",
+                icon: "topic",
                 "aria-current": "page",
               },
             ],
diff --git a/static/js/validation-sets/components/PrimaryNav/index.ts b/static/js/publisher-pages/components/PrimaryNav/index.ts
similarity index 100%
rename from static/js/validation-sets/components/PrimaryNav/index.ts
rename to static/js/publisher-pages/components/PrimaryNav/index.ts
diff --git a/static/js/validation-sets/hooks/__tests__/useValidationSet.test.ts b/static/js/publisher-pages/hooks/__tests__/useValidationSet.test.ts
similarity index 100%
rename from static/js/validation-sets/hooks/__tests__/useValidationSet.test.ts
rename to static/js/publisher-pages/hooks/__tests__/useValidationSet.test.ts
diff --git a/static/js/validation-sets/hooks/__tests__/useValidationSets.test.ts b/static/js/publisher-pages/hooks/__tests__/useValidationSets.test.ts
similarity index 100%
rename from static/js/validation-sets/hooks/__tests__/useValidationSets.test.ts
rename to static/js/publisher-pages/hooks/__tests__/useValidationSets.test.ts
diff --git a/static/js/validation-sets/hooks/index.ts b/static/js/publisher-pages/hooks/index.ts
similarity index 100%
rename from static/js/validation-sets/hooks/index.ts
rename to static/js/publisher-pages/hooks/index.ts
diff --git a/static/js/validation-sets/hooks/useValidationSet.ts b/static/js/publisher-pages/hooks/useValidationSet.ts
similarity index 100%
rename from static/js/validation-sets/hooks/useValidationSet.ts
rename to static/js/publisher-pages/hooks/useValidationSet.ts
diff --git a/static/js/validation-sets/hooks/useValidationSets.ts b/static/js/publisher-pages/hooks/useValidationSets.ts
similarity index 100%
rename from static/js/validation-sets/hooks/useValidationSets.ts
rename to static/js/publisher-pages/hooks/useValidationSets.ts
diff --git a/static/js/validation-sets/index.tsx b/static/js/publisher-pages/index.tsx
similarity index 100%
rename from static/js/validation-sets/index.tsx
rename to static/js/publisher-pages/index.tsx
diff --git a/static/js/validation-sets/pages/ValidationSet/ValidationSet.tsx b/static/js/publisher-pages/pages/ValidationSet/ValidationSet.tsx
similarity index 100%
rename from static/js/validation-sets/pages/ValidationSet/ValidationSet.tsx
rename to static/js/publisher-pages/pages/ValidationSet/ValidationSet.tsx
diff --git a/static/js/validation-sets/pages/ValidationSet/__tests__/ValidationSet.test.tsx b/static/js/publisher-pages/pages/ValidationSet/__tests__/ValidationSet.test.tsx
similarity index 100%
rename from static/js/validation-sets/pages/ValidationSet/__tests__/ValidationSet.test.tsx
rename to static/js/publisher-pages/pages/ValidationSet/__tests__/ValidationSet.test.tsx
diff --git a/static/js/validation-sets/pages/ValidationSet/index.ts b/static/js/publisher-pages/pages/ValidationSet/index.ts
similarity index 100%
rename from static/js/validation-sets/pages/ValidationSet/index.ts
rename to static/js/publisher-pages/pages/ValidationSet/index.ts
diff --git a/static/js/validation-sets/pages/ValidationSets/ValidationSets.tsx b/static/js/publisher-pages/pages/ValidationSets/ValidationSets.tsx
similarity index 100%
rename from static/js/validation-sets/pages/ValidationSets/ValidationSets.tsx
rename to static/js/publisher-pages/pages/ValidationSets/ValidationSets.tsx
diff --git a/static/js/validation-sets/pages/ValidationSets/__tests__/ValidationSets.test.tsx b/static/js/publisher-pages/pages/ValidationSets/__tests__/ValidationSets.test.tsx
similarity index 100%
rename from static/js/validation-sets/pages/ValidationSets/__tests__/ValidationSets.test.tsx
rename to static/js/publisher-pages/pages/ValidationSets/__tests__/ValidationSets.test.tsx
diff --git a/static/js/validation-sets/pages/ValidationSets/index.ts b/static/js/publisher-pages/pages/ValidationSets/index.ts
similarity index 100%
rename from static/js/validation-sets/pages/ValidationSets/index.ts
rename to static/js/publisher-pages/pages/ValidationSets/index.ts
diff --git a/static/js/validation-sets/routes/root.tsx b/static/js/publisher-pages/routes/root.tsx
similarity index 100%
rename from static/js/validation-sets/routes/root.tsx
rename to static/js/publisher-pages/routes/root.tsx
diff --git a/static/js/validation-sets/types/index.d.ts b/static/js/publisher-pages/types/index.d.ts
similarity index 100%
rename from static/js/validation-sets/types/index.d.ts
rename to static/js/publisher-pages/types/index.d.ts
diff --git a/templates/_header.html b/templates/_header.html
index b255bde3dd..e0159d4f22 100644
--- a/templates/_header.html
+++ b/templates/_header.html
@@ -97,7 +97,7 @@
                       <a href="/account/snaps" class="p-navigation__dropdown-item">My published snaps</a>
                     </li>
                     <li>
-                      <a href="/validation-sets" class="p-navigation__dropdown-item">Validation sets</a>
+                      <a href="/validation-sets" class="p-navigation__dropdown-item">My validation sets</a>
                     </li>
                     <li class="js-nav-account--stores u-hide">
                       <a href="/admin" class="p-navigation__dropdown-item">My stores</a>
diff --git a/templates/store/validation-sets.html b/templates/store/publisher.html
similarity index 66%
rename from templates/store/validation-sets.html
rename to templates/store/publisher.html
index bc21b17ca1..de4a3386a5 100644
--- a/templates/store/validation-sets.html
+++ b/templates/store/publisher.html
@@ -3,5 +3,5 @@
 {% block content %}
 <div id="root">
 </div>
-<script src="{{ static_url('js/dist/validation-sets.js') }}"></script>
+<script src="{{ static_url('js/dist/publisher-pages.js') }}"></script>
 {% endblock %}
diff --git a/webapp/store/views.py b/webapp/store/views.py
index d1701285da..42fa3c2ba2 100644
--- a/webapp/store/views.py
+++ b/webapp/store/views.py
@@ -106,7 +106,7 @@ def get_validation_set(validation_set_id):
     @store.route("/validation-sets/<path:path>")
     @login_required
     def validation_sets(path):
-        return flask.render_template("store/validation-sets.html")
+        return flask.render_template("store/publisher.html")
 
     @store.route("/discover")
     def discover():
diff --git a/webpack.config.entry.js b/webpack.config.entry.js
index c4f6eac7cd..d2a0e3722c 100644
--- a/webpack.config.entry.js
+++ b/webpack.config.entry.js
@@ -21,5 +21,5 @@ module.exports = {
   "publisher-settings": "./static/js/publisher/settings/index.tsx",
   "about-listing": "./static/js/public/about/listing.ts",
   store: "./static/js/store/index.tsx",
-  "validation-sets": "./static/js/validation-sets/index.tsx",
+  "publisher-pages": "./static/js/publisher-pages/index.tsx",
 };