Skip to content

Remove Promise.withResolvers usage from package detail page #1519

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

Merged
merged 1 commit into from
Sep 4, 2025
Merged

Remove Promise.withResolvers usage from package detail page #1519

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
133 changes: 15 additions & 118 deletions apps/cyberstorm-remix/app/p/packageListing.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import {
import "./packageListing.css";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import {
ApiError,
fetchPackagePermissions,
packageListingApprove,
packageListingReject,
Expand Down Expand Up @@ -75,16 +74,12 @@ import {
getPublicEnvVariables,
getSessionTools,
} from "cyberstorm/security/publicEnvVariables";
import {
getPackagePermissions,
getPackageWiki,
} from "@thunderstore/dapper-ts/src/methods/package";
import { getPackagePermissions } from "@thunderstore/dapper-ts/src/methods/package";
import { useToast } from "@thunderstore/cyberstorm/src/newComponents/Toast/Provider";
import { ApiAction } from "@thunderstore/ts-api-react-actions";
import { TagVariants } from "@thunderstore/cyberstorm-theme/src/components";
import { SelectOption } from "@thunderstore/cyberstorm/src/newComponents/Select/Select";
import { useStrongForm } from "cyberstorm/utils/StrongForm/useStrongForm";
import { isPromise } from "cyberstorm/utils/typeChecks";

export const meta: MetaFunction<typeof loader> = ({ data, location }) => {
return [
Expand Down Expand Up @@ -144,21 +139,6 @@ export async function loader({ params }: LoaderFunctionArgs) {
};
});

let wiki: Awaited<ReturnType<typeof getPackageWiki>> | undefined;

try {
wiki = await dapper.getPackageWiki(params.namespaceId, params.packageId);
} catch (error) {
if (error instanceof ApiError) {
if (error.response.status === 404) {
wiki = undefined;
} else {
wiki = undefined;
console.error("Error fetching package wiki:", error);
}
}
}

return {
community: await dapper.getCommunity(params.communityId),
communityFilters: await dapper.getCommunityFilters(params.communityId),
Expand All @@ -169,7 +149,6 @@ export async function loader({ params }: LoaderFunctionArgs) {
),
team: await dapper.getTeamDetails(params.namespaceId),
permissions: undefined,
wiki: wiki,
};
}
throw new Response("Package not found", { status: 404 });
Expand Down Expand Up @@ -213,7 +192,6 @@ export async function clientLoader({ params }: LoaderFunctionArgs) {
),
team: await dapper.getTeamDetails(params.namespaceId),
permissions: permissionsPromise,
wiki: dapper.getPackageWiki(params.namespaceId, params.packageId),
};
}
throw new Response("Package not found", { status: 404 });
Expand All @@ -222,7 +200,7 @@ export async function clientLoader({ params }: LoaderFunctionArgs) {
clientLoader.hydrate = true;

export default function PackageListing() {
const { community, listing, team, permissions, wiki } = useLoaderData<
const { community, listing, team, permissions } = useLoaderData<
typeof loader | typeof clientLoader
>();

Expand Down Expand Up @@ -564,41 +542,6 @@ export default function PackageListing() {
</>
);

const canAccessWikiTabPromise = Promise.withResolvers<boolean>();
if (wiki && isPromise(wiki)) {
wiki
.then(async (a) => {
if (a.pages.length > 0) {
canAccessWikiTabPromise.resolve(true);
} else {
if ((await permissions)?.permissions.can_manage) {
canAccessWikiTabPromise.resolve(true);
} else {
canAccessWikiTabPromise.resolve(false);
}
}
})
.catch(async () => {
if ((await permissions)?.permissions.can_manage) {
canAccessWikiTabPromise.resolve(true);
} else {
canAccessWikiTabPromise.resolve(false);
}
});
} else {
if (permissions) {
permissions.then((a) => {
if (a?.permissions.can_manage) {
canAccessWikiTabPromise.resolve(true);
} else {
canAccessWikiTabPromise.resolve(false);
}
});
} else {
canAccessWikiTabPromise.resolve(false);
}
}

return (
<>
<div className="package-community__background">
Expand Down Expand Up @@ -761,66 +704,20 @@ export default function PackageListing() {
>
Required ({listing.dependency_count})
</NewLink>
<Suspense
fallback={
<NewLink
key="wiki"
primitiveType="cyberstormLink"
linkId="PackageWiki"
community={listing.community_identifier}
namespace={listing.namespace}
package={listing.name}
aria-current={currentTab === "wiki"}
rootClasses={`tabs-item${
currentTab === "wiki" ? " tabs-item--current" : ""
}`}
disabled={true}
>
Wiki
</NewLink>
}
<NewLink
key="wiki"
primitiveType="cyberstormLink"
linkId="PackageWiki"
community={listing.community_identifier}
namespace={listing.namespace}
package={listing.name}
aria-current={currentTab === "wiki"}
rootClasses={`tabs-item${
currentTab === "wiki" ? " tabs-item--current" : ""
}`}
>
<Await
resolve={canAccessWikiTabPromise.promise}
errorElement={
<NewLink
key="wiki"
primitiveType="cyberstormLink"
linkId="PackageWiki"
community={listing.community_identifier}
namespace={listing.namespace}
package={listing.name}
aria-current={currentTab === "wiki"}
rootClasses={`tabs-item${
currentTab === "wiki" ? " tabs-item--current" : ""
}`}
disabled={true}
>
Wiki
</NewLink>
}
>
{(resolvedValue) => {
return (
<NewLink
key="wiki"
primitiveType="cyberstormLink"
linkId="PackageWiki"
community={listing.community_identifier}
namespace={listing.namespace}
package={listing.name}
aria-current={currentTab === "wiki"}
rootClasses={`tabs-item${
currentTab === "wiki" ? " tabs-item--current" : ""
}`}
disabled={!resolvedValue}
>
Wiki
</NewLink>
);
}}
</Await>
</Suspense>
Wiki
</NewLink>
<NewLink
key="changelog"
primitiveType="cyberstormLink"
Expand Down
Loading