Merge branch 'charmed-snapcraft-io' into staging

Author: edisile

.github/workflows/deploy.yaml

@@ -17,6 +17,8 @@ on:
 jobs:
   setup:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
     environment: ${{ github.event.inputs.environment != '' && github.event.inputs.environment || (github.ref == 'refs/heads/main' && 'Production' || 'Staging') }}
     outputs:
       charm_name: ${{ steps.setup-vars.outputs.charm_name }}
@@ -38,6 +40,9 @@ jobs:
     needs: setup
     name: Deploy
     uses: canonical/webteam-devops/.github/workflows/deploy.yaml@main
+    permissions:
+      contents: read
+      deployments: write
     with:
       environment: ${{ needs.setup.outputs.environment }}
       charm_name: ${{ needs.setup.outputs.charm_name }}

.github/workflows/pr.yml

@@ -90,6 +90,8 @@ jobs:
 
   pack-rock:
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
     steps:
       - uses: actions/checkout@v4
 

HACKING.md

@@ -7,7 +7,7 @@ To use staging APIs locally you can add the following lines to an `.env.local` f
 
 ```bash
 DEVICE_GATEWAY_API_URL=https://api.staging.snapcraft.io/
-DASHBOARD_API_URL=https://dashboard.staging.snapcraft.io/
+SNAPSTORE_DASHBOARD_API_URL=https://dashboard.staging.snapcraft.io/
 LOGIN_URL=https://login.staging.ubuntu.com
 CANDID_API_URL=https://api.staging.jujucharms.com/identity/
 ```

konf/staging-api.snapcraft.io.yaml

@@ -6,9 +6,6 @@ env:
   - name: SNAPSTORE_DASHBOARD_API_URL
     value: https://dashboard.staging.snapcraft.io/
 
-  - name: DASHBOARD_API_URL
-    value: https://dashboard.staging.snapcraft.io/
-
   - name: LOGIN_URL
     value: https://login.staging.ubuntu.com
 

requirements.txt

@@ -5,7 +5,7 @@ canonicalwebteam.discourse==7.0.0
 canonicalwebteam.blog==6.5.0
 canonicalwebteam.search==2.1.2
 canonicalwebteam.image-template==1.9.0
-canonicalwebteam.store-api==7.3.1
+canonicalwebteam.store-api==7.3.3
 canonicalwebteam.launchpad==0.9.0
 django-openid-auth==0.17
 Flask-OpenID==1.3.0

static/js/publisher/pages/Builds/RepoSelector.tsx

@@ -1,4 +1,11 @@
-import { ChangeEvent, Dispatch, SetStateAction, useState } from "react";
+import {
+  ChangeEvent,
+  Dispatch,
+  SetStateAction,
+  useState,
+  useEffect,
+  useRef,
+} from "react";
 import { useParams } from "react-router-dom";
 import { useSetAtom } from "jotai";
 import {
@@ -21,6 +28,14 @@ type Props = {
   setAutoTriggerBuild: Dispatch<SetStateAction<boolean>>;
 };
 
+// Utility function for formatting repository names with owner
+const getRepoNameWithOwner = (
+  selectedOrg: string | null,
+  repo: Repo,
+): string => {
+  return selectedOrg ? `${selectedOrg}/${repo.name}` : repo.nameWithOwner;
+};
+
 function generateYamlTemplateUrl(
   org: string | null,
   repo: string | undefined,
@@ -67,55 +82,79 @@ function RepoSelector({ githubData, setAutoTriggerBuild }: Props) {
   const [reposLoading, setReposLoading] = useState<boolean>(false);
   const [validRepo, setValidRepo] = useState<boolean | null>(null);
   const [validationError, setValidationError] = useState<boolean>(false);
-  const [missingYaml, setMissingYaml] = useState<boolean>(false);
-  const [defaultBranch, setDefaultBranch] = useState<string | null>(null);
+  const [repoInputValue, setRepoInputValue] = useState<string>("");
+  const [repoFetchError, setRepoFetchError] = useState<string>("");
+  const [repoConnectError, setRepoConnectError] = useState<string>("");
 
-  const getRepoNameWithOwner = (repo: Repo) =>
-    selectedOrg ? `${selectedOrg}/${repo.name}` : repo.nameWithOwner;
+  const [defaultBranch, setDefaultBranch] = useState<string | null>(null);
 
-  const validateRepo = async (repo: Repo | undefined) => {
-    setMissingYaml(false);
+  // Track autofill attempts to avoid unnecessary re-runs
+  const autofillAttemptedRef = useRef<string | null>(null);
 
+  const validateRepoInternal = async (repo: Repo | undefined) => {
     if (!repo) {
       return;
     }
 
     setValidating(true);
 
-    const repoName = getRepoNameWithOwner(repo);
+    const repoName = getRepoNameWithOwner(selectedOrg, repo);
 
-    const response = await fetch(
-      `/api/${snapId}/builds/validate-repo?repo=${repoName}`,
-    );
+    try {
+      const response = await fetch(
+        `/api/${snapId}/builds/validate-repo?repo=${repoName}`,
+      );
 
-    if (!response.ok) {
-      setValidationError(true);
-      throw new Error("Not a valid repo");
-    }
+      if (!response.ok) {
+        setValidationError(true);
+        throw new Error("Not a valid repo");
+      }
 
-    const responseData = await response.json();
+      const responseData = await response.json();
 
-    if (responseData.success) {
-      setValidRepo(true);
-      setValidationMessage("");
-      setValidationError(false);
-      setMissingYaml(false);
-    } else {
-      const error = responseData.error;
+      if (responseData.success) {
+        setValidRepo(true);
+        setValidationMessage("");
+        setValidationError(false);
+      } else {
+        const error = responseData.error;
 
-      if (error.type === "MISSING_YAML_FILE") {
-        setMissingYaml(true);
-        setDefaultBranch(responseData.data.default_branch);
-      }
+        if (error.type === "MISSING_YAML_FILE") {
+          setDefaultBranch(responseData.data.default_branch);
+        }
 
-      setValidationMessage(responseData.error.message);
+        setValidationMessage(responseData.error.message);
+        setValidationError(true);
+        setValidRepo(null);
+      }
+    } catch {
       setValidationError(true);
-      setValidRepo(null);
+    } finally {
+      setValidating(false);
     }
-
-    setValidating(false);
   };
 
+  // Autofill effect with proper dependencies
+  useEffect(() => {
+    const currentOrgKey = `${selectedOrg || "user"}-${snapId}`;
+
+    if (
+      repos.length > 0 &&
+      snapId &&
+      !repoInputValue &&
+      autofillAttemptedRef.current !== currentOrgKey
+    ) {
+      const matchingRepo = repos.find((repo: Repo) => repo.name === snapId);
+      if (matchingRepo) {
+        setRepoInputValue(matchingRepo.name);
+        setSelectedRepo(matchingRepo);
+        validateRepoInternal(matchingRepo);
+      }
+      // Mark autofill as attempted for this org/snap combination
+      autofillAttemptedRef.current = currentOrgKey;
+    }
+  }, [repos, snapId, repoInputValue, selectedOrg]);
+
   const getRepos = async (org?: string) => {
     setReposLoading(true);
 
@@ -125,17 +164,21 @@ function RepoSelector({ githubData, setAutoTriggerBuild }: Props) {
       apiUrl += `?org=${org}`;
     }
 
-    const response = await fetch(apiUrl);
-
-    if (!response.ok) {
-      throw Error("Unable to fetch repos");
-    }
-
-    const responseData = await response.json();
+    try {
+      const response = await fetch(apiUrl);
 
-    setReposLoading(false);
+      if (!response.ok) {
+        throw Error("Unable to fetch repos");
+      }
 
-    setRepos(responseData);
+      const responseData = await response.json();
+      setRepos(responseData);
+    } catch (_error) {
+      setRepoFetchError("Failed to fetch repositories. Please try again.");
+      setRepos([]);
+    } finally {
+      setReposLoading(false);
+    }
   };
 
   const getOrgs = (): { label: string; value: string }[] => {
@@ -166,9 +209,16 @@ function RepoSelector({ githubData, setAutoTriggerBuild }: Props) {
   const handleOrganizationChange = (e: ChangeEvent) => {
     const target = e.target as HTMLInputElement;
 
-    if (target.value) {
-      setReposLoading(true);
+    setRepoInputValue("");
+    setSelectedRepo(undefined);
+    setValidRepo(null);
+    setValidationError(false);
+    setRepoFetchError("");
+    setRepoConnectError("");
+    setRepos([]);
+    autofillAttemptedRef.current = null;
 
+    if (target.value) {
       const org = target.value;
 
       if (org === githubData.github_user.login) {
@@ -187,39 +237,53 @@ function RepoSelector({ githubData, setAutoTriggerBuild }: Props) {
     const target = e.target as HTMLInputElement;
     const searchTerm = target.value;
 
+    setRepoInputValue(searchTerm);
+    setRepoFetchError("");
+    setRepoConnectError("");
+
     if (!searchTerm) {
       setValidationError(false);
-      setValidRepo(false);
+      setValidRepo(null);
+      setSelectedRepo(undefined);
+      return;
     }
 
     const selectedRepo = repos.find((repo: Repo) => repo.name === searchTerm);
 
     setSelectedRepo(selectedRepo);
 
     if (selectedRepo) {
-      validateRepo(selectedRepo);
+      validateRepoInternal(selectedRepo);
     }
   };
 
   const connectRepo = async () => {
     setBuilding(true);
+    setRepoConnectError("");
     const formData = new FormData();
     formData.set("csrf_token", window.CSRF_TOKEN);
     if (selectedRepo) {
-      const repoName = getRepoNameWithOwner(selectedRepo);
+      const repoName = getRepoNameWithOwner(selectedOrg, selectedRepo);
       formData.set("github_repository", repoName);
     }
 
-    const response = await fetch(`/api/${snapId}/builds`, {
-      method: "POST",
-      body: formData,
-    });
+    try {
+      const response = await fetch(`/api/${snapId}/builds`, {
+        method: "POST",
+        body: formData,
+      });
 
-    if (response) {
-      setAutoTriggerBuild(true);
+      if (response.ok) {
+        setAutoTriggerBuild(true);
+        setRepoConnected(true);
+      } else {
+        setRepoConnectError("Failed to connect repository. Please try again.");
+      }
+    } catch (_error) {
+      setRepoConnectError("Failed to connect repository. Please try again.");
+    } finally {
+      setBuilding(false);
     }
-
-    setRepoConnected(true);
   };
 
   return (
@@ -257,6 +321,7 @@ function RepoSelector({ githubData, setAutoTriggerBuild }: Props) {
             placeholder="Search your repos"
             disabled={selectedOrg === null || validating}
             className="p-form-validation__input"
+            value={repoInputValue}
             onChange={handleRepoChange}
           />
           {reposLoading ||
@@ -270,6 +335,11 @@ function RepoSelector({ githubData, setAutoTriggerBuild }: Props) {
               <option value={repo.name} key={repo.name} />
             ))}
           </datalist>
+          {repoFetchError && (
+            <p className="p-form-validation__message" role="alert">
+              {repoFetchError}
+            </p>
+          )}
         </Col>
         <Col size={2}>
           <div style={{ display: "flex", alignItems: "end", height: "100%" }}>
@@ -289,7 +359,7 @@ function RepoSelector({ githubData, setAutoTriggerBuild }: Props) {
                 className="p-tooltip--btm-center"
                 aria-describedby="recheck-tooltip"
                 onClick={() => {
-                  validateRepo(selectedRepo);
+                  validateRepoInternal(selectedRepo);
                 }}
               >
                 <i className="p-icon--restart"></i>
@@ -298,14 +368,14 @@ function RepoSelector({ githubData, setAutoTriggerBuild }: Props) {
                   role="tooltip"
                   id="recheck-tooltip"
                 >
-                  Re-check
+                  Check again
                 </span>
               </Button>
             )}
           </div>
         </Col>
       </Row>
-      {missingYaml && (
+      {validationError && (
         <div className="u-fixed-width">
           <p>{validationMessage}</p>
           <p>
@@ -317,7 +387,7 @@ function RepoSelector({ githubData, setAutoTriggerBuild }: Props) {
                 selectedOrg,
                 selectedRepo?.name,
                 defaultBranch,
-                snapId,
+                snapId || "",
               )}
             >
               get started with a template
@@ -333,6 +403,15 @@ function RepoSelector({ githubData, setAutoTriggerBuild }: Props) {
           </p>
         </div>
       )}
+      {repoConnectError && (
+        <Row>
+          <Col size={12}>
+            <p className="p-form-validation__message" role="alert">
+              {repoConnectError}
+            </p>
+          </Col>
+        </Row>
+      )}
     </Strip>
   );
 }