Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ export default async function Layout({
<SecondaryMenu
items={[
{ path: `/${orgId}/vendors`, label: t("vendors.dashboard.title") },
// {
// path: `/${orgId}/vendors/register`,
// label: t("vendors.register.title"),
// },
{
path: `/${orgId}/vendors/register`,
label: t("vendors.register.title"),
},
]}
/>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,28 +14,28 @@ interface LayoutProps {
export default async function Layout({ children, params }: LayoutProps) {
const t = await getI18n();
const session = await auth();
const user = session?.user;
const orgId = user?.organizationId;

if (!session || !session.user.organizationId) {
if (!session || !orgId) {
redirect("/");
}

const riskId = await params;
const risk = await getRisk(riskId.riskId, session.user.organizationId);
const risk = await getRisk(riskId.riskId, orgId);

if (!risk) {
redirect("/risk");
}

return (
<div className="max-w-[1200px] space-y-4 m-auto">
<div className="max-w-[1200px] m-auto">
<SecondaryMenu
showBackButton
backButtonHref="/risk/register"
items={[
{ path: `/risk/${riskId.riskId}`, label: t("risk.overview") },
{ path: `/${orgId}/vendors`, label: t("vendors.dashboard.title") },
{
path: `/risk/${riskId.riskId}/comments`,
label: t("common.comments.title"),
path: `/${orgId}/vendors/register`,
label: t("vendors.register.title"),
},
]}
/>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import { auth } from "@/auth";
import { getI18n } from "@/locales/server";
import { SecondaryMenu } from "@bubba/ui/secondary-menu";

export default async function Layout({
children,
}: {
children: React.ReactNode;
}) {
const t = await getI18n();
const session = await auth();
const user = session?.user;
const orgId = user?.organizationId;

return (
<div className="max-w-[1200px] m-auto">
<SecondaryMenu
items={[
{ path: `/${orgId}/vendors`, label: t("vendors.dashboard.title") },
{
path: `/${orgId}/vendors/register`,
label: t("vendors.register.title"),
},
]}
/>

<main className="mt-8">{children}</main>
</div>
);
}

This file was deleted.

2 changes: 1 addition & 1 deletion packages/integrations/src/azure/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const config: {
category: string;
fetch: any;
} = {
name: "AZURE",
name: "Azure",
id: "azure",
active: true,
logo: imageBase64(),
Expand Down