HotFix: Admin Apps Listing (#6282)

This commit is contained in:
Hariom Balhara
2023-01-05 17:20:41 +05:30
committed by GitHub
parent fc4203e963
commit aaac491dc7
5 changed files with 10 additions and 5 deletions
@@ -11,7 +11,7 @@ function AdminAppsView() {
return (
<>
<Meta title={t("apps")} description={t("admin_apps_description")} />
<AdminAppsList baseURL="/settings/admin/apps" className="w-0" />
<AdminAppsList baseURL="/settings/admin/apps" />
</>
);
}
@@ -0,0 +1,2 @@
export { getServerSideProps } from "./[category]";
export { default } from "./[category]";
@@ -20,7 +20,7 @@ const AppCategoryNavigation = ({
fromAdmin?: boolean;
}) => {
const [animationRef] = useAutoAnimate<HTMLDivElement>();
const appCategories = useMemo(() => getAppCategories(baseURL, fromAdmin), [baseURL, fromAdmin]);
const appCategories = useMemo(() => getAppCategories(baseURL), [baseURL]);
return (
<div className={classNames("flex flex-col p-2 md:p-0 xl:flex-row", className)}>
@@ -1,10 +1,13 @@
import { WEBAPP_URL } from "@calcom/lib/constants";
import { Icon } from "@calcom/ui";
function getHref(baseURL: string, category: string, useQueryParam: boolean) {
return useQueryParam ? `${baseURL}&category=${category}` : `${baseURL}/${category}`;
const baseUrlParsed = new URL(baseURL, WEBAPP_URL);
baseUrlParsed.searchParams.set("category", category);
return useQueryParam ? `${baseUrlParsed.toString()}` : `${baseURL}/${category}`;
}
const getAppCategories = (baseURL: string, useQueryParam = false) => {
const getAppCategories = (baseURL: string, useQueryParam = true) => {
return [
{
name: "calendar",
+1 -1
View File
@@ -187,7 +187,7 @@ const AdminAppsList = ({ baseURL, className }: { baseURL: string; className?: st
<AppCategoryNavigation
baseURL={baseURL}
fromAdmin
containerClassname="w-full xl:ml-5 max-h-97 overflow-scroll"
containerClassname="w-full xl:mx-5 xl:w-2/3 xl:pr-5"
className={className}>
<AdminAppsListContainer />
</AppCategoryNavigation>