Skip to content

Enhance error handling in all package versions routes #1629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Oksamies wants to merge 1 commit into
base: 11-19-_ts-api-react-actions_enhance_error_handling_in_api_actions_and_hooks_with_user-facing_error_mapping
Choose a base branch
from
Draft

Enhance error handling in all package versions routes #1629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
91 changes: 49 additions & 42 deletions apps/cyberstorm-remix/app/p/tabs/Versions/PackageVersionVersions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import {
getPublicEnvVariables,
getSessionTools,
} from "cyberstorm/security/publicEnvVariables";
NimbusAwaitErrorElement,
NimbusDefaultRouteErrorBoundary,
} from "cyberstorm/utils/errors/NimbusErrorBoundary";
import { handleLoaderError } from "cyberstorm/utils/errors/handleLoaderError";
import { throwUserFacingPayloadResponse } from "cyberstorm/utils/errors/userFacingErrorResponse";
import { getLoaderTools } from "cyberstorm/utils/getLoaderTools";
import { rowSemverCompare } from "cyberstorm/utils/semverCompare";
import { Suspense } from "react";
import { Await, type LoaderFunctionArgs } from "react-router";
Expand All @@ -14,69 +17,69 @@ import {
NewTableSort,
SkeletonBox,
} from "@thunderstore/cyberstorm";
import { DapperTs } from "@thunderstore/dapper-ts";

import { columns } from "./Versions";
import { columns, packageVersionsErrorMappings } from "./Versions";
import "./Versions.css";
import { DownloadLink, InstallLink, ModManagerBanner } from "./common";

export async function loader({ params }: LoaderFunctionArgs) {
if (params.communityId && params.namespaceId && params.packageId) {
const publicEnvVariables = getPublicEnvVariables(["VITE_API_URL"]);
const dapper = new DapperTs(() => {
const { dapper } = getLoaderTools();
try {
const versions = await dapper.getPackageVersions(
params.namespaceId,
params.packageId
);

return {
apiHost: publicEnvVariables.VITE_API_URL,
sessionId: undefined,
communityId: params.communityId,
namespaceId: params.namespaceId,
packageId: params.packageId,
versions,
};
});
return {
communityId: params.communityId,
namespaceId: params.namespaceId,
packageId: params.packageId,
versions: dapper.getPackageVersions(params.namespaceId, params.packageId),
};
} catch (error) {
handleLoaderError(error, { mappings: packageVersionsErrorMappings });
}
}
return {
status: "error",
message: "Failed to load versions",
versions: [],
};
throwUserFacingPayloadResponse({
headline: "Package not found.",
description: "We could not find the requested package.",
category: "not_found",
status: 404,
});
}

export async function clientLoader({ params }: LoaderFunctionArgs) {
export function clientLoader({ params }: LoaderFunctionArgs) {
if (params.communityId && params.namespaceId && params.packageId) {
const tools = getSessionTools();
const dapper = new DapperTs(() => {
return {
apiHost: tools?.getConfig().apiHost,
sessionId: tools?.getConfig().sessionId,
};
});
const { dapper } = getLoaderTools();
const versions = dapper.getPackageVersions(
params.namespaceId,
params.packageId
);

return {
communityId: params.communityId,
namespaceId: params.namespaceId,
packageId: params.packageId,
versions: dapper.getPackageVersions(params.namespaceId, params.packageId),
versions,
};
}
return {
status: "error",
message: "Failed to load versions",
versions: [],
};
throwUserFacingPayloadResponse({
headline: "Package not found.",
description: "We could not find the requested package.",
category: "not_found",
status: 404,
});
}

export default function Versions() {
const { communityId, namespaceId, packageId, status, message, versions } =
useLoaderData<typeof loader | typeof clientLoader>();

if (status === "error") {
return <div>{message}</div>;
}
const { communityId, namespaceId, packageId, versions } = useLoaderData<
typeof loader | typeof clientLoader
>();

return (
<Suspense fallback={<SkeletonBox className="package-versions__skeleton" />}>
<Await resolve={versions}>
<Await resolve={versions} errorElement={<NimbusAwaitErrorElement />}>
{(resolvedValue) => (
<div className="package-versions">
<ModManagerBanner />
Expand Down Expand Up @@ -134,3 +137,7 @@ export default function Versions() {
</Suspense>
);
}

export function ErrorBoundary() {
return <NimbusDefaultRouteErrorBoundary />;
}
86 changes: 46 additions & 40 deletions apps/cyberstorm-remix/app/p/tabs/Versions/PackageVersionWithoutCommunityVersions.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import {
getPublicEnvVariables,
getSessionTools,
} from "cyberstorm/security/publicEnvVariables";
NimbusAwaitErrorElement,
NimbusDefaultRouteErrorBoundary,
} from "cyberstorm/utils/errors/NimbusErrorBoundary";
import { handleLoaderError } from "cyberstorm/utils/errors/handleLoaderError";
import { throwUserFacingPayloadResponse } from "cyberstorm/utils/errors/userFacingErrorResponse";
import { getLoaderTools } from "cyberstorm/utils/getLoaderTools";
import { rowSemverCompare } from "cyberstorm/utils/semverCompare";
import { Suspense } from "react";
import { Await, type LoaderFunctionArgs } from "react-router";
Expand All @@ -14,68 +17,67 @@ import {
NewTableSort,
SkeletonBox,
} from "@thunderstore/cyberstorm";
import { DapperTs } from "@thunderstore/dapper-ts";

import { columns } from "./Versions";
import { columns, packageVersionsErrorMappings } from "./Versions";
import "./Versions.css";
import { DownloadLink, InstallLink, ModManagerBanner } from "./common";

export async function loader({ params }: LoaderFunctionArgs) {
if (params.namespaceId && params.packageId) {
const publicEnvVariables = getPublicEnvVariables(["VITE_API_URL"]);
const dapper = new DapperTs(() => {
const { dapper } = getLoaderTools();
try {
const versions = await dapper.getPackageVersions(
params.namespaceId,
params.packageId
);

return {
apiHost: publicEnvVariables.VITE_API_URL,
sessionId: undefined,
namespaceId: params.namespaceId,
packageId: params.packageId,
versions,
};
});
return {
namespaceId: params.namespaceId,
packageId: params.packageId,
versions: dapper.getPackageVersions(params.namespaceId, params.packageId),
};
} catch (error) {
handleLoaderError(error, { mappings: packageVersionsErrorMappings });
}
}
return {
status: "error",
message: "Failed to load versions",
versions: [],
};
throwUserFacingPayloadResponse({
headline: "Package not found.",
description: "We could not find the requested package.",
category: "not_found",
status: 404,
});
}

export async function clientLoader({ params }: LoaderFunctionArgs) {
export function clientLoader({ params }: LoaderFunctionArgs) {
if (params.namespaceId && params.packageId) {
const tools = getSessionTools();
const dapper = new DapperTs(() => {
return {
apiHost: tools?.getConfig().apiHost,
sessionId: tools?.getConfig().sessionId,
};
});
const { dapper } = getLoaderTools();
const versions = dapper.getPackageVersions(
params.namespaceId,
params.packageId
);

return {
namespaceId: params.namespaceId,
packageId: params.packageId,
versions: dapper.getPackageVersions(params.namespaceId, params.packageId),
versions,
};
}
return {
status: "error",
message: "Failed to load versions",
versions: [],
};
throwUserFacingPayloadResponse({
headline: "Package not found.",
description: "We could not find the requested package.",
category: "not_found",
status: 404,
});
}

export default function Versions() {
const { namespaceId, packageId, status, message, versions } = useLoaderData<
const { namespaceId, packageId, versions } = useLoaderData<
typeof loader | typeof clientLoader
>();

if (status === "error") {
return <div>{message}</div>;
}

return (
<Suspense fallback={<SkeletonBox className="package-versions__skeleton" />}>
<Await resolve={versions}>
<Await resolve={versions} errorElement={<NimbusAwaitErrorElement />}>
{(resolvedValue) => (
<div className="package-versions">
<ModManagerBanner />
Expand Down Expand Up @@ -132,3 +134,7 @@ export default function Versions() {
</Suspense>
);
}

export function ErrorBoundary() {
return <NimbusDefaultRouteErrorBoundary />;
}
Loading
Loading