Merge branch 'StanfordBDHG:main' into main

Author: jtlresearchit

.storybook/main.ts

@@ -9,17 +9,12 @@
 import type { StorybookConfig } from "@storybook/react-vite";
 
 const config: StorybookConfig = {
-  stories: ["../**/*.mdx", "../**/*.stories.@(js|jsx|mjs|ts|tsx)"],
-  addons: [
-    "@storybook/addon-onboarding",
-    "@storybook/addon-essentials",
-    "@storybook/addon-interactions",
-  ],
+  stories: ["../stories/**/*.stories.@(js|jsx|mjs|ts|tsx)"],
+  addons: [],
   framework: {
     name: "@storybook/react-vite",
     options: {},
   },
-  docs: {},
   typescript: {
     reactDocgen: "react-docgen-typescript",
   },

.storybook/preview.tsx .storybook/preview.ts.storybook/preview.tsx renamed to .storybook/preview.ts

@@ -1,17 +1,15 @@
 //
-// This source file is part of the Stanford Biodesign Digital Health Spezi Web Design System open-source project
+// This source file is part of the Stanford Biodesign Digital Health ENGAGE-HF open-source project
 //
-// SPDX-FileCopyrightText: 2024 Stanford University and the project authors (see CONTRIBUTORS.md)
+// SPDX-FileCopyrightText: 2023 Stanford University and the project authors (see CONTRIBUTORS.md)
 //
 // SPDX-License-Identifier: MIT
 //
 
-import { type Preview } from "@storybook/react";
-import "../modules/globals.css";
+import type { Preview } from "@storybook/react-vite";
 
 const preview: Preview = {
   parameters: {
-    layout: "centered",
     controls: {
       matchers: {
         color: /(background|color)$/i,

components/AsideEngageLayout/AsideEngageLayout.tsx

@@ -7,31 +7,33 @@
 //
 
 import {
-  type AsideBrandLayoutProps,
-  AsideBrandLayout,
+  AsideBrandLayoutAside,
+  AsideBrandLayoutMain,
+  AsideBrandLayoutRoot,
 } from "@stanfordspezi/spezi-web-design-system/molecules/AsideBrandLayout";
+import { type ReactNode } from "react";
 import { Logo } from "@/components/icons/Logo";
 import { LogoType } from "@/components/icons/LogoType";
 
-export const AsideEngageLayout = (
-  props: Omit<AsideBrandLayoutProps, "aside">,
-) => (
-  <AsideBrandLayout
-    aside={
-      <>
-        <div className="flex-center text-primary gap-6">
-          <div className="flex-center bg-primary size-20 rounded-lg">
-            <Logo className="w-10 text-white" />
-          </div>
-          <LogoType className="h-auto w-48" />
+interface AsideEngageLayoutProps {
+  children?: ReactNode;
+}
+
+export const AsideEngageLayout = ({ children }: AsideEngageLayoutProps) => (
+  <AsideBrandLayoutRoot>
+    <AsideBrandLayoutAside>
+      <div className="flex-center text-primary gap-6">
+        <div className="flex-center bg-primary size-20 rounded-lg">
+          <Logo className="w-10 text-white" />
         </div>
-        <img
-          src="/stanfordbiodesign.png"
-          alt="Stanford Biodesign Logo"
-          className="h-[193px]"
-        />
-      </>
-    }
-    {...props}
-  />
+        <LogoType className="h-auto w-48" />
+      </div>
+      <img
+        src="/stanfordbiodesign.png"
+        alt="Stanford Biodesign Logo"
+        className="h-[193px]"
+      />
+    </AsideBrandLayoutAside>
+    <AsideBrandLayoutMain>{children}</AsideBrandLayoutMain>
+  </AsideBrandLayoutRoot>
 );

eslint.config.js

@@ -6,6 +6,8 @@
 // SPDX-License-Identifier: MIT
 //
 
-const { getEslintConfig } = require("@stanfordspezi/spezi-web-configurations");
+const {
+  getEslintReactConfig,
+} = require("@stanfordspezi/spezi-web-configurations");
 
-module.exports = getEslintConfig({ tsconfigRootDir: __dirname });
+module.exports = getEslintReactConfig({ tsconfigRootDir: __dirname });

modules/user/patients.ts

@@ -42,6 +42,7 @@ export const parsePatientsQueries = async ({
     { userIds, includeUserData: true },
     ({ auth, user }, id) => ({
       ...parseAuthToUser(id, auth),
+      selfManaged: user?.selfManaged,
       organization: organizationMap.get(user?.organization ?? ""),
       disabled: user?.disabled,
     }),

modules/user/queries.tsx

@@ -39,6 +39,7 @@ export const parseInvitationToUser = (
   organization: organizationMap.get(invitation.user.organization ?? ""),
   type: invitation.user.type,
   disabled: invitation.user.disabled,
+  selfManaged: invitation.user.selfManaged,
 });
 
 export const parseAuthToUser = (