From 808a0c7b1a4d57eb7b2561853c281e854bcac87d Mon Sep 17 00:00:00 2001
From: Gabe Esquivel Gaghi <gabe.gaghi@canonical.com>
Date: Mon, 29 Jun 2026 11:59:54 -0300
Subject: [PATCH 1/4] update forms

---
 .../PublishRepositoryExistingForm.tsx         |  6 +-
 .../PublishMirrorContentsBlock.tsx            | 14 ++--
 .../PublishMirrorExistingForm.tsx             |  6 +-
 .../PublishMirrorNewForm.tsx                  | 66 +++++++++++++++++--
 .../PublishMirrorNewForm/constants.ts         |  7 ++
 .../AddPublicationForm/AddPublicationForm.tsx | 59 +++++++++--------
 .../AddPublicationForm/constants.ts           |  1 -
 src/features/publications/index.ts            |  2 +-
 .../publications/types/PublishValues.ts       |  2 +
 src/tests/mocks/publications.ts               | 42 ++++++++++++
 10 files changed, 156 insertions(+), 49 deletions(-)
 create mode 100644 src/features/mirrors/components/PublishMirrorForm/components/PublishMirrorNewForm/constants.ts

diff --git a/src/features/local-repositories/components/PublishLocalRepositorySidePanel/components/PublishRepositoryExistingForm/PublishRepositoryExistingForm.tsx b/src/features/local-repositories/components/PublishLocalRepositorySidePanel/components/PublishRepositoryExistingForm/PublishRepositoryExistingForm.tsx
index 7b5b2f8a6b..c543c1ad1f 100644
--- a/src/features/local-repositories/components/PublishLocalRepositorySidePanel/components/PublishRepositoryExistingForm/PublishRepositoryExistingForm.tsx
+++ b/src/features/local-repositories/components/PublishLocalRepositorySidePanel/components/PublishRepositoryExistingForm/PublishRepositoryExistingForm.tsx
@@ -90,15 +90,13 @@ const PublishRepositoryExistingForm: FC<PublishRepositoryExistingFormProps> = ({
           <ReadOnlyField
             label="Publication target"
             value={publication.publicationTarget}
-            tooltipMessage={
-              "The publication target is defined by the publication."
-            }
+            tooltipMessage="The publication target is defined by the publication."
           />
 
           <ReadOnlyField
             label="Signing GPG key"
             value={publication.gpgKey?.armor}
-            tooltipMessage={"The GPG key is defined by the publication."}
+            tooltipMessage="The GPG key is defined by the publication."
           />
         </Blocks.Item>
 
diff --git a/src/features/mirrors/components/PublishMirrorForm/components/PublishMirrorContentsBlock/PublishMirrorContentsBlock.tsx b/src/features/mirrors/components/PublishMirrorForm/components/PublishMirrorContentsBlock/PublishMirrorContentsBlock.tsx
index 9715a9c358..d3c48afa82 100644
--- a/src/features/mirrors/components/PublishMirrorForm/components/PublishMirrorContentsBlock/PublishMirrorContentsBlock.tsx
+++ b/src/features/mirrors/components/PublishMirrorForm/components/PublishMirrorContentsBlock/PublishMirrorContentsBlock.tsx
@@ -1,31 +1,33 @@
 import Blocks from "@/components/layout/Blocks";
 import type { FC } from "react";
 import ReadOnlyField from "@/components/form/ReadOnlyField";
-import type { Mirror } from "@canonical/landscape-openapi";
+import type { Mirror, Publication } from "@canonical/landscape-openapi";
 
 interface PublishMirrorContentsBlockProps {
   readonly mirror: Mirror;
+  readonly publication: Publication;
 }
 
 const PublishMirrorContentsBlock: FC<PublishMirrorContentsBlockProps> = ({
   mirror,
+  publication,
 }) => {
   return (
     <Blocks.Item title="Contents">
       <ReadOnlyField
         label="Distribution"
-        value={mirror.distribution ?? ""}
-        tooltipMessage={"The distribution is defined by the mirror."}
+        value={publication.distribution ?? mirror.distribution}
+        tooltipMessage="You can’t change the contents of an existing publication."
       />
       <ReadOnlyField
         label="Components"
         value={mirror.components.join(", ")}
-        tooltipMessage={"The components are defined by the mirror."}
+        tooltipMessage="The components are defined by the mirror."
       />
       <ReadOnlyField
         label="Architectures"
-        value={mirror.architectures?.join(", ")}
-        tooltipMessage={"The architectures are defined by the mirror."}
+        value={(publication.architectures ?? mirror.architectures ?? []).join(", ")}
+        tooltipMessage="You can’t change the contents of an existing publication."
       />
     </Blocks.Item>
   );
diff --git a/src/features/mirrors/components/PublishMirrorForm/components/PublishMirrorExistingForm/PublishMirrorExistingForm.tsx b/src/features/mirrors/components/PublishMirrorForm/components/PublishMirrorExistingForm/PublishMirrorExistingForm.tsx
index 95c51b9c34..e5369118c8 100644
--- a/src/features/mirrors/components/PublishMirrorForm/components/PublishMirrorExistingForm/PublishMirrorExistingForm.tsx
+++ b/src/features/mirrors/components/PublishMirrorForm/components/PublishMirrorExistingForm/PublishMirrorExistingForm.tsx
@@ -38,7 +38,7 @@ const PublishMirrorExistingForm: FC<PublishMirrorExistingFormProps> = ({
 
     onSubmit: async (values) => {
       try {
-        await publishPublication({ name: values.name ?? "" });
+        await publishPublication({ name: values.name });
 
         closeSidePanel();
 
@@ -79,7 +79,7 @@ const PublishMirrorExistingForm: FC<PublishMirrorExistingFormProps> = ({
       <Blocks>
         <Blocks.Item title="Details">
           <Select
-            label="Publication"
+            label="Publication name"
             required
             options={publicationOptions}
             error={getFormikError(formik, "name")}
@@ -99,7 +99,7 @@ const PublishMirrorExistingForm: FC<PublishMirrorExistingFormProps> = ({
           />
         </Blocks.Item>
 
-        <PublishMirrorContentsBlock mirror={mirror} />
+        <PublishMirrorContentsBlock mirror={mirror} publication={publication} />
 
         <PublicationSettingsBlock publication={publication} />
       </Blocks>
diff --git a/src/features/mirrors/components/PublishMirrorForm/components/PublishMirrorNewForm/PublishMirrorNewForm.tsx b/src/features/mirrors/components/PublishMirrorForm/components/PublishMirrorNewForm/PublishMirrorNewForm.tsx
index 771ba17b26..7328103a99 100644
--- a/src/features/mirrors/components/PublishMirrorForm/components/PublishMirrorNewForm/PublishMirrorNewForm.tsx
+++ b/src/features/mirrors/components/PublishMirrorForm/components/PublishMirrorNewForm/PublishMirrorNewForm.tsx
@@ -3,7 +3,7 @@ import Blocks from "@/components/layout/Blocks";
 import useDebug from "@/hooks/useDebug";
 import usePageParams from "@/hooks/usePageParams";
 import { getFormikError } from "@/utils/formikErrors";
-import { Form, Input, Select, Textarea } from "@canonical/react-components";
+import { Form, Input, type MultiSelectItem, Select, Textarea } from "@canonical/react-components";
 import { useFormik } from "formik";
 import type { FC } from "react";
 import useNotify from "@/hooks/useNotify";
@@ -13,13 +13,13 @@ import {
   PublicationSettingsBlock,
   useCreatePublication,
   usePublishPublication,
-  VALIDATION_SCHEMA_NEW,
 } from "@/features/publications";
-import PublishMirrorContentsBlock from "../PublishMirrorContentsBlock";
 import type { Mirror, PublicationTarget } from "@canonical/landscape-openapi";
 import type { SelectOption } from "@/types/SelectOption";
 import ReadOnlyField from "@/components/form/ReadOnlyField";
 import type { PublishNewFormValues } from "@/features/publications";
+import MultiSelectField from "@/components/form/MultiSelectField/MultiSelectField";
+import { VALIDATION_SCHEMA_NEW_MIRROR } from "./constants";
 
 interface PublishMirrorNewFormProps {
   readonly mirror: Mirror;
@@ -39,7 +39,11 @@ const PublishMirrorNewForm: FC<PublishMirrorNewFormProps> = ({
     usePublishPublication();
 
   const formik = useFormik({
-    initialValues: getInitialValues(publicationTargets[0]?.name),
+    initialValues: {
+      ...getInitialValues(publicationTargets[0]?.name),
+      distribution: mirror.distribution,
+      architectures: mirror.architectures,
+    },
 
     onSubmit: async (values: PublishNewFormValues) => {
       const { notAutomatic, butAutomaticUpgrades } =
@@ -51,7 +55,8 @@ const PublishMirrorNewForm: FC<PublishMirrorNewFormProps> = ({
             displayName: values.name,
             publicationTarget: values.publicationTarget,
             source: mirror.name ?? "",
-            distribution: mirror.distribution,
+            distribution: values.distribution,
+            architectures: values.architectures,
             acquireByHash: values.hashIndexing,
             notAutomatic,
             butAutomaticUpgrades,
@@ -79,7 +84,7 @@ const PublishMirrorNewForm: FC<PublishMirrorNewFormProps> = ({
       }
     },
 
-    validationSchema: VALIDATION_SCHEMA_NEW,
+    validationSchema: VALIDATION_SCHEMA_NEW_MIRROR,
     validateOnMount: true,
   });
 
@@ -91,6 +96,21 @@ const PublishMirrorNewForm: FC<PublishMirrorNewFormProps> = ({
     }),
   );
 
+  const architectureOptions = mirror.architectures?.map((architecture) => ({
+    label: architecture,
+    value: architecture,
+  })) ?? [];
+
+  const handleArchitectureChange = async (
+    items: MultiSelectItem[],
+  ): Promise<void> => {
+    await formik.setFieldTouched("architectures", true);
+    await formik.setFieldValue(
+      "architectures",
+      items.map(({ value }) => String(value)),
+    );
+  };
+
   return (
     <Form onSubmit={formik.handleSubmit} noValidate>
       <Blocks>
@@ -128,7 +148,39 @@ const PublishMirrorNewForm: FC<PublishMirrorNewFormProps> = ({
           )}
         </Blocks.Item>
 
-        <PublishMirrorContentsBlock mirror={mirror} />
+        <Blocks.Item title="Contents">
+          {mirror.preserveSignatures ? (
+            <ReadOnlyField
+              label="Distribution"
+              value={formik.values.distribution ?? ""}
+              tooltipMessage="You can't change the distribution of a signature-preserving mirror."
+            />
+          ) : (
+            <Input
+              type="text"
+              label="Distribution"
+              required
+              {...formik.getFieldProps("distribution")}
+            />
+          )}
+          <ReadOnlyField
+            label="Components"
+            value={mirror.components.join(", ")}
+            tooltipMessage="The components are defined by the mirror."
+          />
+          <MultiSelectField
+            variant="condensed"
+            hasSelectedItemsFirst={false}
+            label="Architectures"
+            required
+            items={architectureOptions}
+            selectedItems={architectureOptions.filter(({ value }) =>
+              formik.values.architectures?.includes(value),
+            )}
+            onItemsUpdate={handleArchitectureChange}
+            error={getFormikError(formik, "architectures")}
+          />
+        </Blocks.Item>
 
         <PublicationSettingsBlock formik={formik} />
       </Blocks>
diff --git a/src/features/mirrors/components/PublishMirrorForm/components/PublishMirrorNewForm/constants.ts b/src/features/mirrors/components/PublishMirrorForm/components/PublishMirrorNewForm/constants.ts
new file mode 100644
index 0000000000..e25fe381ea
--- /dev/null
+++ b/src/features/mirrors/components/PublishMirrorForm/components/PublishMirrorNewForm/constants.ts
@@ -0,0 +1,7 @@
+import { VALIDATION_SCHEMA_NEW, REQUIRED_FIELD_MESSAGE } from "@/features/publications";
+import * as Yup from "yup";
+
+export const VALIDATION_SCHEMA_NEW_MIRROR = VALIDATION_SCHEMA_NEW.shape({
+  distribution: Yup.string().required(REQUIRED_FIELD_MESSAGE),
+  architectures: Yup.array().of(Yup.string()).min(1, REQUIRED_FIELD_MESSAGE),
+});
diff --git a/src/features/publications/components/AddPublicationForm/AddPublicationForm.tsx b/src/features/publications/components/AddPublicationForm/AddPublicationForm.tsx
index d29f7216e2..81f1fdabca 100644
--- a/src/features/publications/components/AddPublicationForm/AddPublicationForm.tsx
+++ b/src/features/publications/components/AddPublicationForm/AddPublicationForm.tsx
@@ -48,7 +48,7 @@ const AddPublicationForm: FC = () => {
   const formik = useFormik<FormProps>({
     initialValues: {
       ...getInitialValues(),
-      sourceType: "",
+      sourceType: SOURCE_TYPE_MIRROR,
       source: "",
       distribution: "",
       architectures: [],
@@ -65,7 +65,7 @@ const AddPublicationForm: FC = () => {
         notify.success({
           title: `You have successfully added ${values.name}`,
           message:
-            "The publication has been created and is now available to be published.",
+            "The publication has been created and marked to be published.",
         });
       } catch (error) {
         debug(error);
@@ -102,17 +102,16 @@ const AddPublicationForm: FC = () => {
     [locals],
   );
 
-  const selectableSources = useMemo(() => {
-    if (formik.values.sourceType === SOURCE_TYPE_MIRROR) {
-      return mirrorSources;
-    }
+  const isLocalSourceType =
+    formik.values.sourceType === SOURCE_TYPE_LOCAL_REPOSITORY;
 
-    if (formik.values.sourceType === SOURCE_TYPE_LOCAL_REPOSITORY) {
+  const selectableSources = useMemo(() => {
+    if (isLocalSourceType) {
       return localSources;
     }
 
-    return [];
-  }, [formik.values.sourceType, localSources, mirrorSources]);
+    return mirrorSources;
+  }, [isLocalSourceType, localSources, mirrorSources]);
 
   const sourceOptions = useMemo(
     () => [
@@ -126,12 +125,7 @@ const AddPublicationForm: FC = () => {
     ({ value }) => value === formik.values.source,
   );
 
-  const isLocalSourceType =
-    formik.values.sourceType === SOURCE_TYPE_LOCAL_REPOSITORY;
-
-  const isGettingSources =
-    formik.values.sourceType === SOURCE_TYPE_LOCAL_REPOSITORY &&
-    isGettingLocals;
+  const isGettingSources = isLocalSourceType && isGettingLocals;
 
   const publicationTargetOptions = useMemo<SelectOption[]>(
     () => [
@@ -212,7 +206,7 @@ const AddPublicationForm: FC = () => {
           <Select
             label="Source"
             required
-            disabled={!formik.values.sourceType || isGettingSources}
+            disabled={isGettingSources}
             options={sourceOptions}
             error={getFormikError(formik, "source")}
             {...formik.getFieldProps("source")}
@@ -228,15 +222,20 @@ const AddPublicationForm: FC = () => {
             {...formik.getFieldProps("publicationTarget")}
           />
 
-          {selectedSource?.sourceType === SOURCE_TYPE_MIRROR &&
-            selectedSource.preserveSignatures === false && (
-              <Textarea
-                label="Signing GPG key"
-                rows={4}
-                {...formik.getFieldProps("signingKey")}
-                error={getFormikError(formik, "signingKey")}
-              />
-            )}
+          {!selectedSource?.preserveSignatures ? (
+            <Textarea
+              label="Signing GPG key"
+              rows={4}
+              {...formik.getFieldProps("signingKey")}
+              error={getFormikError(formik, "signingKey")}
+            />
+          ) : (
+            <ReadOnlyField
+              label="Signing GPG key"
+              value={formik.values.signingKey}
+              tooltipMessage="The signing key can't be changed for signature-preserving mirrors."
+            />
+          )}
         </Blocks.Item>
 
         <Blocks.Item title="Contents">
@@ -244,7 +243,10 @@ const AddPublicationForm: FC = () => {
             <ReadOnlyField
               label="Distribution"
               value={formik.values.distribution}
-              tooltipMessage="The distribution is defined by the selected source."
+              tooltipMessage={isLocalSourceType
+                ? "The distribution is defined by the source repository."
+                : "The distribution can't be changed for signature-preserving mirrors."
+              }
             />
           ) : (
             <Input
@@ -259,7 +261,10 @@ const AddPublicationForm: FC = () => {
           <ReadOnlyField
             label={isLocalSourceType ? "Component" : "Components"}
             value={selectedSource?.components?.join(", ")}
-            tooltipMessage={`The ${isLocalSourceType ? "component is" : "components are"} defined by the selected source.`}
+            tooltipMessage={isLocalSourceType
+              ? "The component is defined by the source repository."
+              : "The components are defined by the source mirror."
+            }
           />
 
           {!isLocalSourceType && (
diff --git a/src/features/publications/components/AddPublicationForm/constants.ts b/src/features/publications/components/AddPublicationForm/constants.ts
index a8041824a9..7c380677ae 100644
--- a/src/features/publications/components/AddPublicationForm/constants.ts
+++ b/src/features/publications/components/AddPublicationForm/constants.ts
@@ -6,7 +6,6 @@ export const SOURCE_TYPE_MIRROR = "Mirror";
 export const SOURCE_TYPE_LOCAL_REPOSITORY = "Local repository";
 
 export const SOURCE_TYPE_OPTIONS: SelectOption[] = [
-  { label: "Select source type", value: "" },
   { label: SOURCE_TYPE_MIRROR, value: SOURCE_TYPE_MIRROR },
   {
     label: SOURCE_TYPE_LOCAL_REPOSITORY,
diff --git a/src/features/publications/index.ts b/src/features/publications/index.ts
index 31825bddc0..6a41f026ff 100644
--- a/src/features/publications/index.ts
+++ b/src/features/publications/index.ts
@@ -17,5 +17,5 @@ export {
   getInstallsAndUpgradesValues,
   getInitialValues,
 } from "./helpers";
-export { VALIDATION_SCHEMA_NEW, VALIDATION_SCHEMA_EXISTING } from "./constants";
+export { VALIDATION_SCHEMA_NEW, VALIDATION_SCHEMA_EXISTING, REQUIRED_FIELD_MESSAGE } from "./constants";
 export type { PublishNewFormValues } from "./types";
diff --git a/src/features/publications/types/PublishValues.ts b/src/features/publications/types/PublishValues.ts
index 9bc6b197db..57c2335ebd 100644
--- a/src/features/publications/types/PublishValues.ts
+++ b/src/features/publications/types/PublishValues.ts
@@ -10,5 +10,7 @@ export interface PublishSettingsValues {
 export interface PublishNewFormValues extends PublishSettingsValues {
   name: string;
   publicationTarget: string;
+  distribution?: string;
+  architectures?: string[];
   signingKey: string;
 }
diff --git a/src/tests/mocks/publications.ts b/src/tests/mocks/publications.ts
index 5b5efe0a84..39fcee5a71 100644
--- a/src/tests/mocks/publications.ts
+++ b/src/tests/mocks/publications.ts
@@ -64,7 +64,49 @@ export const publications = [
     multiDist: false,
     skipBz2: true,
     skipContents: true,
+    gpgKey: {
+      armor: "-----BEGIN PGP PRIVATE KEY BLOCK-----...",
+      fingerprint: "27592E0248E53FDA",
+    },
     publishTime: new Date("April 20, 2026"),
     lastOperation: "operations/publication-ffff-llll-dddd",
   },
+  {
+    name: "publications/g9h9999e-c9f9-9e99-ab9c-ef9a9c9af9c9",
+    publicationId: "g9h9999e-c9f9-9e99-ab9c-ef9a9c9af9c9",
+    displayName: "second local publication",
+    publicationTarget:
+      "publicationTargets/dddddddd-0000-0000-0000-000000000004",
+    source: "locals/bbbb-cccc-dddd",
+    distribution: "noble",
+    label: "Local publication",
+    origin: "Canonical",
+    architectures: ["amd64"],
+    acquireByHash: false,
+    butAutomaticUpgrades: true,
+    notAutomatic: true,
+    multiDist: false,
+    skipBz2: false,
+    skipContents: false,
+    publishTime: new Date("April 24, 2026"),
+  },
+  {
+    name: "publications/821d6c3f-0c4e-4d8e-8f2f-99d4f2d9a123",
+    publicationId: "821d6c3f-0c4e-4d8e-8f2f-99d4f2d9a123",
+    publicationTarget:
+      "publicationTargets/aaaaaaaa-0000-0000-0000-000000000001",
+    source: "mirrors/ubuntu-archive-mirror",
+    displayName: "custom publication",
+    distribution: "custom",
+    label: "Primary publication",
+    origin: "Canonical",
+    architectures: ["arm64"],
+    acquireByHash: true,
+    butAutomaticUpgrades: false,
+    notAutomatic: false,
+    multiDist: false,
+    skipBz2: false,
+    skipContents: false,
+    publishTime: new Date("March 12, 2026"),
+  },
 ] as const satisfies Publication[];

From 6c454f4c67000ce9709ef5f1c71944e86b686659 Mon Sep 17 00:00:00 2001
From: Gabe Esquivel Gaghi <gabe.gaghi@canonical.com>
Date: Mon, 29 Jun 2026 14:14:36 -0300
Subject: [PATCH 2/4] fix broken tests & lint issues

---
 .../MirrorPublicationsLink.test.tsx           |  2 +-
 .../PublishMirrorContentsBlock.tsx            |  3 +-
 .../PublishMirrorNewForm.tsx                  | 19 ++++---
 .../PublishMirrorNewForm/constants.ts         |  7 ---
 .../PublicationTargetList.test.tsx            |  5 +-
 .../AddPublicationForm.test.tsx               |  6 +--
 .../AddPublicationForm/AddPublicationForm.tsx | 14 +++---
 .../AssociatedPublicationsList.test.tsx       | 49 ++++++-------------
 .../PublicationsList.test.tsx                 |  4 +-
 src/features/publications/constants.ts        |  5 ++
 src/features/publications/index.ts            |  6 ++-
 src/tests/mocks/publications.ts               |  4 +-
 12 files changed, 58 insertions(+), 66 deletions(-)
 delete mode 100644 src/features/mirrors/components/PublishMirrorForm/components/PublishMirrorNewForm/constants.ts

diff --git a/src/features/mirrors/components/MirrorPublicationsLink/MirrorPublicationsLink.test.tsx b/src/features/mirrors/components/MirrorPublicationsLink/MirrorPublicationsLink.test.tsx
index 59724cea4c..a1008f75b5 100644
--- a/src/features/mirrors/components/MirrorPublicationsLink/MirrorPublicationsLink.test.tsx
+++ b/src/features/mirrors/components/MirrorPublicationsLink/MirrorPublicationsLink.test.tsx
@@ -29,7 +29,7 @@ describe("MirrorPublicationsLink", () => {
       </Suspense>,
     );
 
-    expect(await screen.findByText("1 publication")).toBeInTheDocument();
+    expect(await screen.findByText("2 publications")).toBeInTheDocument();
   });
 
   it("renders a link with a limited count", async () => {
diff --git a/src/features/mirrors/components/PublishMirrorForm/components/PublishMirrorContentsBlock/PublishMirrorContentsBlock.tsx b/src/features/mirrors/components/PublishMirrorForm/components/PublishMirrorContentsBlock/PublishMirrorContentsBlock.tsx
index d3c48afa82..75c1c3ba47 100644
--- a/src/features/mirrors/components/PublishMirrorForm/components/PublishMirrorContentsBlock/PublishMirrorContentsBlock.tsx
+++ b/src/features/mirrors/components/PublishMirrorForm/components/PublishMirrorContentsBlock/PublishMirrorContentsBlock.tsx
@@ -12,6 +12,7 @@ const PublishMirrorContentsBlock: FC<PublishMirrorContentsBlockProps> = ({
   mirror,
   publication,
 }) => {
+  const architectures = publication.architectures ?? mirror.architectures ?? [];
   return (
     <Blocks.Item title="Contents">
       <ReadOnlyField
@@ -26,7 +27,7 @@ const PublishMirrorContentsBlock: FC<PublishMirrorContentsBlockProps> = ({
       />
       <ReadOnlyField
         label="Architectures"
-        value={(publication.architectures ?? mirror.architectures ?? []).join(", ")}
+        value={architectures.join(", ")}
         tooltipMessage="You can’t change the contents of an existing publication."
       />
     </Blocks.Item>
diff --git a/src/features/mirrors/components/PublishMirrorForm/components/PublishMirrorNewForm/PublishMirrorNewForm.tsx b/src/features/mirrors/components/PublishMirrorForm/components/PublishMirrorNewForm/PublishMirrorNewForm.tsx
index 7328103a99..f05f6c2119 100644
--- a/src/features/mirrors/components/PublishMirrorForm/components/PublishMirrorNewForm/PublishMirrorNewForm.tsx
+++ b/src/features/mirrors/components/PublishMirrorForm/components/PublishMirrorNewForm/PublishMirrorNewForm.tsx
@@ -3,7 +3,13 @@ import Blocks from "@/components/layout/Blocks";
 import useDebug from "@/hooks/useDebug";
 import usePageParams from "@/hooks/usePageParams";
 import { getFormikError } from "@/utils/formikErrors";
-import { Form, Input, type MultiSelectItem, Select, Textarea } from "@canonical/react-components";
+import {
+  Form,
+  Input,
+  type MultiSelectItem,
+  Select,
+  Textarea,
+} from "@canonical/react-components";
 import { useFormik } from "formik";
 import type { FC } from "react";
 import useNotify from "@/hooks/useNotify";
@@ -13,13 +19,13 @@ import {
   PublicationSettingsBlock,
   useCreatePublication,
   usePublishPublication,
+  VALIDATION_SCHEMA_NEW_MIRROR,
 } from "@/features/publications";
 import type { Mirror, PublicationTarget } from "@canonical/landscape-openapi";
 import type { SelectOption } from "@/types/SelectOption";
 import ReadOnlyField from "@/components/form/ReadOnlyField";
 import type { PublishNewFormValues } from "@/features/publications";
 import MultiSelectField from "@/components/form/MultiSelectField/MultiSelectField";
-import { VALIDATION_SCHEMA_NEW_MIRROR } from "./constants";
 
 interface PublishMirrorNewFormProps {
   readonly mirror: Mirror;
@@ -96,10 +102,11 @@ const PublishMirrorNewForm: FC<PublishMirrorNewFormProps> = ({
     }),
   );
 
-  const architectureOptions = mirror.architectures?.map((architecture) => ({
-    label: architecture,
-    value: architecture,
-  })) ?? [];
+  const architectureOptions =
+    mirror.architectures?.map((architecture) => ({
+      label: architecture,
+      value: architecture,
+    })) ?? [];
 
   const handleArchitectureChange = async (
     items: MultiSelectItem[],
diff --git a/src/features/mirrors/components/PublishMirrorForm/components/PublishMirrorNewForm/constants.ts b/src/features/mirrors/components/PublishMirrorForm/components/PublishMirrorNewForm/constants.ts
deleted file mode 100644
index e25fe381ea..0000000000
--- a/src/features/mirrors/components/PublishMirrorForm/components/PublishMirrorNewForm/constants.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { VALIDATION_SCHEMA_NEW, REQUIRED_FIELD_MESSAGE } from "@/features/publications";
-import * as Yup from "yup";
-
-export const VALIDATION_SCHEMA_NEW_MIRROR = VALIDATION_SCHEMA_NEW.shape({
-  distribution: Yup.string().required(REQUIRED_FIELD_MESSAGE),
-  architectures: Yup.array().of(Yup.string()).min(1, REQUIRED_FIELD_MESSAGE),
-});
diff --git a/src/features/publication-targets/components/PublicationTargetList/PublicationTargetList.test.tsx b/src/features/publication-targets/components/PublicationTargetList/PublicationTargetList.test.tsx
index 973a7db45b..381c85f8b0 100644
--- a/src/features/publication-targets/components/PublicationTargetList/PublicationTargetList.test.tsx
+++ b/src/features/publication-targets/components/PublicationTargetList/PublicationTargetList.test.tsx
@@ -38,9 +38,10 @@ describe("PublicationTargetList", () => {
     renderWithProviders(<PublicationTargetList targets={publicationTargets} />);
 
     await waitFor(() => {
-      expect(screen.getAllByText("1 publication")).toHaveLength(3);
+      expect(screen.getByText("1 publication")).toBeInTheDocument();
+      expect(screen.getAllByText("2 publications")).toHaveLength(2);
+      expect(screen.getByText(NO_DATA_TEXT)).toBeInTheDocument();
     });
-    expect(screen.getByText(NO_DATA_TEXT)).toBeInTheDocument();
   });
 
   it("renders table correctly with empty targets array", () => {
diff --git a/src/features/publications/components/AddPublicationForm/AddPublicationForm.test.tsx b/src/features/publications/components/AddPublicationForm/AddPublicationForm.test.tsx
index d89e85f1a6..970e673f42 100644
--- a/src/features/publications/components/AddPublicationForm/AddPublicationForm.test.tsx
+++ b/src/features/publications/components/AddPublicationForm/AddPublicationForm.test.tsx
@@ -191,7 +191,7 @@ describe("AddPublicationForm", () => {
     expect(screen.getByText("distribution 1")).toBeInTheDocument();
   });
 
-  it("hides signing key field when local repository is selected", async () => {
+  it("shows signing key field when local repository is selected", async () => {
     const user = userEvent.setup();
 
     renderForm();
@@ -199,8 +199,8 @@ describe("AddPublicationForm", () => {
     await selectLocalSource(user);
 
     expect(
-      screen.queryByRole("textbox", { name: "Signing GPG key" }),
-    ).not.toBeInTheDocument();
+      screen.getByRole("textbox", { name: "Signing GPG key" }),
+    ).toBeInTheDocument();
   });
 
   it("shows validation error when all architectures are deselected", async () => {
diff --git a/src/features/publications/components/AddPublicationForm/AddPublicationForm.tsx b/src/features/publications/components/AddPublicationForm/AddPublicationForm.tsx
index 81f1fdabca..c9fcabc61f 100644
--- a/src/features/publications/components/AddPublicationForm/AddPublicationForm.tsx
+++ b/src/features/publications/components/AddPublicationForm/AddPublicationForm.tsx
@@ -243,9 +243,10 @@ const AddPublicationForm: FC = () => {
             <ReadOnlyField
               label="Distribution"
               value={formik.values.distribution}
-              tooltipMessage={isLocalSourceType
-                ? "The distribution is defined by the source repository."
-                : "The distribution can't be changed for signature-preserving mirrors."
+              tooltipMessage={
+                isLocalSourceType
+                  ? "The distribution is defined by the source repository."
+                  : "The distribution can't be changed for signature-preserving mirrors."
               }
             />
           ) : (
@@ -261,9 +262,10 @@ const AddPublicationForm: FC = () => {
           <ReadOnlyField
             label={isLocalSourceType ? "Component" : "Components"}
             value={selectedSource?.components?.join(", ")}
-            tooltipMessage={isLocalSourceType
-              ? "The component is defined by the source repository."
-              : "The components are defined by the source mirror."
+            tooltipMessage={
+              isLocalSourceType
+                ? "The component is defined by the source repository."
+                : "The components are defined by the source mirror."
             }
           />
 
diff --git a/src/features/publications/components/AssociatedPublicationsList/AssociatedPublicationsList.test.tsx b/src/features/publications/components/AssociatedPublicationsList/AssociatedPublicationsList.test.tsx
index 88ad520d27..c0336749b8 100644
--- a/src/features/publications/components/AssociatedPublicationsList/AssociatedPublicationsList.test.tsx
+++ b/src/features/publications/components/AssociatedPublicationsList/AssociatedPublicationsList.test.tsx
@@ -48,13 +48,14 @@ describe("AssociatedPublicationsList", () => {
   const user = userEvent.setup();
 
   describe("table structure and columns", () => {
-    it("renders table with correct column headers: Publication, Source, Distribution", () => {
+    it("renders table with correct column headers: Publication, Source, Date published", () => {
       renderWithProviders(
         <AssociatedPublicationsList publications={publications} />,
       );
 
       expect(screen.getByText("Publication")).toBeInTheDocument();
       expect(screen.getByText("Source")).toBeInTheDocument();
+      expect(screen.getByText(/Date published/i)).toBeInTheDocument();
     });
 
     it("renders all publications in rows with display_name", () => {
@@ -63,7 +64,7 @@ describe("AssociatedPublicationsList", () => {
       );
 
       publications.forEach((pub) => {
-        expect(screen.getByText(pub.source)).toBeInTheDocument();
+        expect(screen.getAllByText(pub.source).length).toBeGreaterThan(0);
       });
     });
   });
@@ -122,16 +123,6 @@ describe("AssociatedPublicationsList", () => {
         screen.getByRole("link", { name: pubWithoutLabel.displayName }),
       ).toBeInTheDocument();
     });
-
-    it("renders mirror value in Source column when available", () => {
-      renderWithProviders(
-        <AssociatedPublicationsList publications={publications} />,
-      );
-
-      publications.forEach((pub) => {
-        expect(screen.getByText(pub.source)).toBeInTheDocument();
-      });
-    });
   });
 
   describe("pagination", () => {
@@ -197,25 +188,23 @@ describe("AssociatedPublicationsList", () => {
       );
 
       // First page should show first pageSize items
-      const firstPageFirstPub = publications[0]?.source;
-      if (firstPageFirstPub) {
-        expect(screen.getByText(firstPageFirstPub)).toBeInTheDocument();
-      }
+      const [firstPageFirstPub] = publications;
+      assert(firstPageFirstPub);
+      expect(screen.getByText(firstPageFirstPub.source)).toBeInTheDocument();
 
-      // Find and click next button (may be labeled differently depending on component)
-      const nextButton = screen.getByRole("button", {
-        name: /next|right|forward/i,
-      });
+      const nextButton = screen.getByRole("button", { name: /next/i });
       await user.click(nextButton);
 
       // First page publication should no longer be visible (unless on all pages)
       // Second page publication should be visible
       const secondPagePublication = publications[pageSize];
-      if (secondPagePublication) {
-        expect(
-          screen.getByText(secondPagePublication.source),
-        ).toBeInTheDocument();
-      }
+      assert(secondPagePublication);
+      expect(
+        screen.queryByText(firstPageFirstPub.source),
+      ).not.toBeInTheDocument();
+      expect(
+        screen.getAllByText(secondPagePublication.source).length,
+      ).toBeGreaterThan(0);
     });
   });
 
@@ -243,16 +232,6 @@ describe("AssociatedPublicationsList", () => {
   });
 
   describe("props handling", () => {
-    it("renders all publications without pageSize prop", () => {
-      renderWithProviders(
-        <AssociatedPublicationsList publications={publications} />,
-      );
-
-      publications.forEach((pub) => {
-        expect(screen.getByText(pub.source)).toBeInTheDocument();
-      });
-    });
-
     it("applies custom pageSize when provided", () => {
       if (!publications || publications.length < 2) {
         throw new Error(
diff --git a/src/features/publications/components/PublicationsList/PublicationsList.test.tsx b/src/features/publications/components/PublicationsList/PublicationsList.test.tsx
index feb0f8ff6a..cb69fc9cb0 100644
--- a/src/features/publications/components/PublicationsList/PublicationsList.test.tsx
+++ b/src/features/publications/components/PublicationsList/PublicationsList.test.tsx
@@ -77,10 +77,10 @@ describe("PublicationsList", () => {
     expect(screen.getAllByText("Mirror")).toHaveLength(mirrorsCount);
     expect(screen.getAllByText("Local repository")).toHaveLength(localsCount);
     expect(
-      screen.getByRole("link", {
+      screen.getAllByRole("link", {
         name: sourceDisplayNames[publication.source],
       }),
-    ).toBeInTheDocument();
+    ).toHaveLength(2);
     expect(
       screen.getByRole("link", {
         name: publicationTargetDisplayNames[publication.publicationTarget],
diff --git a/src/features/publications/constants.ts b/src/features/publications/constants.ts
index 9e32c0bd52..c315f9fa21 100644
--- a/src/features/publications/constants.ts
+++ b/src/features/publications/constants.ts
@@ -18,6 +18,11 @@ export const VALIDATION_SCHEMA_NEW = Yup.object().shape({
   skipContentIndexing: Yup.boolean(),
 });
 
+export const VALIDATION_SCHEMA_NEW_MIRROR = VALIDATION_SCHEMA_NEW.shape({
+  distribution: Yup.string().required(REQUIRED_FIELD_MESSAGE),
+  architectures: Yup.array().of(Yup.string()).min(1, REQUIRED_FIELD_MESSAGE),
+});
+
 export const VALIDATION_SCHEMA_EXISTING = Yup.object().shape({
   name: Yup.string().required(REQUIRED_FIELD_MESSAGE),
 });
diff --git a/src/features/publications/index.ts b/src/features/publications/index.ts
index 6a41f026ff..d78d757b8f 100644
--- a/src/features/publications/index.ts
+++ b/src/features/publications/index.ts
@@ -17,5 +17,9 @@ export {
   getInstallsAndUpgradesValues,
   getInitialValues,
 } from "./helpers";
-export { VALIDATION_SCHEMA_NEW, VALIDATION_SCHEMA_EXISTING, REQUIRED_FIELD_MESSAGE } from "./constants";
+export {
+  VALIDATION_SCHEMA_NEW,
+  VALIDATION_SCHEMA_EXISTING,
+  VALIDATION_SCHEMA_NEW_MIRROR,
+} from "./constants";
 export type { PublishNewFormValues } from "./types";
diff --git a/src/tests/mocks/publications.ts b/src/tests/mocks/publications.ts
index 39fcee5a71..e9b21ecc49 100644
--- a/src/tests/mocks/publications.ts
+++ b/src/tests/mocks/publications.ts
@@ -76,7 +76,7 @@ export const publications = [
     publicationId: "g9h9999e-c9f9-9e99-ab9c-ef9a9c9af9c9",
     displayName: "second local publication",
     publicationTarget:
-      "publicationTargets/dddddddd-0000-0000-0000-000000000004",
+      "publicationTargets/cccccccc-0000-0000-0000-000000000003",
     source: "locals/bbbb-cccc-dddd",
     distribution: "noble",
     label: "Local publication",
@@ -94,7 +94,7 @@ export const publications = [
     name: "publications/821d6c3f-0c4e-4d8e-8f2f-99d4f2d9a123",
     publicationId: "821d6c3f-0c4e-4d8e-8f2f-99d4f2d9a123",
     publicationTarget:
-      "publicationTargets/aaaaaaaa-0000-0000-0000-000000000001",
+      "publicationTargets/bbbbbbbb-0000-0000-0000-000000000002",
     source: "mirrors/ubuntu-archive-mirror",
     displayName: "custom publication",
     distribution: "custom",

From 11febf2318167c9efb61fd3d0109f8f8446b4315 Mon Sep 17 00:00:00 2001
From: Gabe Esquivel Gaghi <gabe.gaghi@canonical.com>
Date: Mon, 29 Jun 2026 17:11:04 -0300
Subject: [PATCH 3/4] address comments

---
 .changeset/sweet-jars-stand.md                               | 5 +++++
 .../components/PublishMirrorNewForm/PublishMirrorNewForm.tsx | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/sweet-jars-stand.md

diff --git a/.changeset/sweet-jars-stand.md b/.changeset/sweet-jars-stand.md
new file mode 100644
index 0000000000..b2759c6143
--- /dev/null
+++ b/.changeset/sweet-jars-stand.md
@@ -0,0 +1,5 @@
+---
+"landscape-ui": patch
+---
+
+Make the behavior of adding a publication and publishing a mirror or local to a new publication consistent
diff --git a/src/features/mirrors/components/PublishMirrorForm/components/PublishMirrorNewForm/PublishMirrorNewForm.tsx b/src/features/mirrors/components/PublishMirrorForm/components/PublishMirrorNewForm/PublishMirrorNewForm.tsx
index f05f6c2119..633769ede5 100644
--- a/src/features/mirrors/components/PublishMirrorForm/components/PublishMirrorNewForm/PublishMirrorNewForm.tsx
+++ b/src/features/mirrors/components/PublishMirrorForm/components/PublishMirrorNewForm/PublishMirrorNewForm.tsx
@@ -25,7 +25,7 @@ import type { Mirror, PublicationTarget } from "@canonical/landscape-openapi";
 import type { SelectOption } from "@/types/SelectOption";
 import ReadOnlyField from "@/components/form/ReadOnlyField";
 import type { PublishNewFormValues } from "@/features/publications";
-import MultiSelectField from "@/components/form/MultiSelectField/MultiSelectField";
+import MultiSelectField from "@/components/form/MultiSelectField";
 
 interface PublishMirrorNewFormProps {
   readonly mirror: Mirror;
@@ -167,6 +167,7 @@ const PublishMirrorNewForm: FC<PublishMirrorNewFormProps> = ({
               type="text"
               label="Distribution"
               required
+              error={getFormikError(formik, "distribution")}
               {...formik.getFieldProps("distribution")}
             />
           )}

From ada8919ff7017680fc9d8b1661656900ffead4fa Mon Sep 17 00:00:00 2001
From: Gabe Esquivel Gaghi <gabe.gaghi@canonical.com>
Date: Tue, 30 Jun 2026 17:57:28 -0300
Subject: [PATCH 4/4] fix failing checks

---
 .../components/ViewLogsSidePanel/ViewLogsSidePanel.test.tsx   | 4 ++--
 src/tests/mocks/publications.ts                               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/features/operations/components/ViewLogsSidePanel/ViewLogsSidePanel.test.tsx b/src/features/operations/components/ViewLogsSidePanel/ViewLogsSidePanel.test.tsx
index 783d8a66b7..0bd85b5ff9 100644
--- a/src/features/operations/components/ViewLogsSidePanel/ViewLogsSidePanel.test.tsx
+++ b/src/features/operations/components/ViewLogsSidePanel/ViewLogsSidePanel.test.tsx
@@ -7,7 +7,7 @@ import { expectLoadingState } from "@/tests/helpers";
 import Suspense from "@/components/layout/SidePanel/Suspense";
 import LoadingState from "@/components/layout/SidePanel/LoadingState";
 import { mirrors } from "@/tests/mocks/mirrors";
-import type { Mirror } from "@canonical/landscape-openapi";
+import type { Mirror, Publication } from "@canonical/landscape-openapi";
 import { publications } from "@/tests/mocks/publications";
 
 const COPIED_FEEDBACK_TIMEOUT = 2010;
@@ -160,7 +160,7 @@ describe("ViewLogsSidePanel", () => {
   });
 
   it("shows empty state when operation has no error details", async () => {
-    const noLogsPublication = publications.find(
+    const noLogsPublication = (publications as Publication[]).find(
       (pub) => pub.lastOperation === "operations/ssss-cccc-dddd",
     );
     assert(
diff --git a/src/tests/mocks/publications.ts b/src/tests/mocks/publications.ts
index e9b21ecc49..3018975942 100644
--- a/src/tests/mocks/publications.ts
+++ b/src/tests/mocks/publications.ts
@@ -107,6 +107,6 @@ export const publications = [
     multiDist: false,
     skipBz2: false,
     skipContents: false,
-    publishTime: new Date("March 12, 2026"),
+    publishTime: new Date("March 1, 2026"),
   },
 ] as const satisfies Publication[];