Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .changeset/lucky-donkeys-kneel.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import usePageParams from "@/hooks/usePageParams";
import { TablePagination } from "@/components/layout/TablePagination";
import LocalRepositoriesListActions from "./components/LocalRepositoriesListActions";
import LocalRepositoryPackagesCount from "./components/LocalRepositoryPackagesCount";
import LocalRepositoryPublicationsCount from "./components/LocalRepositoryPublicationsCount";
import { AssociatedPublicationsCount } from "@/features/publications";

interface LocalRepositoriesListProps {
readonly repositories: Local[];
Expand Down Expand Up @@ -60,7 +60,7 @@ const LocalRepositoriesList: FC<LocalRepositoriesListProps> = ({
{
Header: "Publications",
Cell: ({ row: { original: repository } }: CellProps<Local>) => (
<LocalRepositoryPublicationsCount repository={repository} />
<AssociatedPublicationsCount sourceName={repository.name ?? ""} />
),
},
{
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ const RemoveLocalRepositoryModal: FC<RemoveLocalRepositoryModalProps> = ({
openInNewTab
showSources={false}
/>
<br />
<p>
After removal you won&apos;t be able to update any of these
publications, but they will continue to be available.{" "}
Expand Down
2 changes: 0 additions & 2 deletions src/features/mirrors/api/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
export * from "./useListMirrors";
export * from "./useListMirrorPackages";
export * from "./useListPublications";
export * from "./useDeleteMirror";
export * from "./useUpdateMirror";
export * from "./useSyncMirror";
Expand All @@ -9,4 +8,3 @@ export * from "./useGetUbuntuEsmInfo";
export * from "./useCreateMirror";
export * from "./useGetMirror";
export * from "./useBatchGetMirrors";
export * from "./useListPublicationTargets";
32 changes: 0 additions & 32 deletions src/features/mirrors/api/useListPublicationTargets.ts

This file was deleted.

31 changes: 0 additions & 31 deletions src/features/mirrors/api/useListPublications.ts

This file was deleted.

20 changes: 8 additions & 12 deletions src/features/mirrors/components/MirrorActions/MirrorActions.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ import type { FC } from "react";
import { useBoolean } from "usehooks-ts";
import UpdateMirrorModal from "../UpdateMirrorModal";
import RemoveMirrorModal from "../RemoveMirrorModal";
import { useListPublications, useListPublicationTargets } from "../..";
import { NoPublicationTargetsModal } from "@/features/publication-targets";
import {
NoPublicationTargetsModal,
useGetPublicationTargets,
} from "@/features/publication-targets";

interface MirrorActionsProps {
readonly mirrorDisplayName: string;
Expand All @@ -17,15 +19,8 @@ const MirrorActions: FC<MirrorActionsProps> = ({
mirrorName,
}) => {
const { setPageParams, createPageParamsSetter } = usePageParams();

const { publicationTargets = [] } = useListPublicationTargets({
pageSize: 1000,
}).data.data;

const { publications = [] } = useListPublications({
filter: `source="${mirrorName}"`,
pageSize: 1000,
}).data.data;
const { publicationTargets, isGettingPublicationTargets } =
useGetPublicationTargets();

const {
value: isUpdateModalOpen,
Expand All @@ -44,7 +39,7 @@ const MirrorActions: FC<MirrorActionsProps> = ({
} = useBoolean();

const tryPublish = () => {
if (publicationTargets.length || publications.length) {
if (publicationTargets.length) {
setPageParams({
sidePath: ["publish"],
name: mirrorName,
Expand Down Expand Up @@ -83,6 +78,7 @@ const MirrorActions: FC<MirrorActionsProps> = ({
icon: "upload",
label: "Publish",
onClick: tryPublish,
disabled: isGettingPublicationTargets,
},
]}
destructiveActions={[
Expand Down
15 changes: 9 additions & 6 deletions src/features/mirrors/components/MirrorDetails/MirrorDetails.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
} from "@canonical/react-components";
import Blocks from "@/components/layout/Blocks";
import InfoGrid from "@/components/layout/InfoGrid";
import { useGetMirror, useListPublicationTargets } from "../../api";
import { useGetMirror } from "../../api";
import usePageParams from "@/hooks/usePageParams";
import { getSourceType, shouldShowAuthentication } from "./helpers";
import MirrorPackagesCount from "../MirrorPackagesCount";
Expand All @@ -23,7 +23,10 @@ import UpdateMirrorModal from "../UpdateMirrorModal";
import { useBoolean } from "usehooks-ts";
import RemoveMirrorModal from "../RemoveMirrorModal";
import { boolToLabel } from "@/utils/output";
import { NoPublicationTargetsModal } from "@/features/publication-targets";
import {
NoPublicationTargetsModal,
useGetPublicationTargets,
} from "@/features/publication-targets";
import {
AssociatedPublicationsList,
useGetPublicationsBySource,
Expand Down Expand Up @@ -73,12 +76,11 @@ const MirrorDetails: FC = () => {
const { publications, isGettingPublications } =
useGetPublicationsBySource(name);

const { publicationTargets = [] } = useListPublicationTargets({
pageSize: 1000,
}).data.data;
const { publicationTargets, isGettingPublicationTargets } =
useGetPublicationTargets();

const tryPublish = () => {
if (publicationTargets.length || publications.length) {
if (publicationTargets.length) {
setPageParams({
sidePath: [...sidePath, "publish"],
});
Expand Down Expand Up @@ -173,6 +175,7 @@ const MirrorDetails: FC = () => {
hasIcon
className="p-segmented-control__button"
onClick={tryPublish}
disabled={isGettingPublicationTargets}
>
<Icon name="upload" />
<span>Publish</span>
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

6 changes: 2 additions & 4 deletions src/features/mirrors/components/MirrorsList/MirrorsList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import moment from "moment";
import { Suspense, useMemo, type FC } from "react";
import type { CellProps, Column } from "react-table";
import { LIST_ACTIONS_COLUMN_PROPS } from "@/components/layout/ListActions";
import MirrorPublicationsLink from "../MirrorPublicationsLink";
import NoData from "@/components/layout/NoData";
import usePageParams from "@/hooks/usePageParams";
import MirrorPackagesCount from "../MirrorPackagesCount";
Expand All @@ -21,6 +20,7 @@ import {
getOperationStatusIcon,
} from "@/features/operations";
import { TablePagination } from "@/components/layout/TablePagination";
import { AssociatedPublicationsCount } from "@/features/publications";

interface MirrorsListProps {
readonly mirrors: Mirror[];
Expand Down Expand Up @@ -115,9 +115,7 @@ const MirrorsList: FC<MirrorsListProps> = ({ mirrors, emptyMsg }) => {
Header: "Publications",
Cell: ({ row: { original: mirror } }: CellProps<Mirror>) =>
mirror.name ? (
<Suspense fallback={<LoadingState inline />}>
<MirrorPublicationsLink mirrorName={mirror.name} />
</Suspense>
<AssociatedPublicationsCount sourceName={mirror.name} />
Comment thread
gesquivelgaghi marked this conversation as resolved.
) : (
<NoData />
),
Expand Down
Loading
Loading