Merge branch 'main' into MED-105-v3

app/auth/membership-confirmation/page.tsx

@@ -5,6 +5,10 @@ import pathsConfig from '@/config/paths.config';
 import { getSupabaseServerClient } from '@kit/supabase/server-client';
 
 import { withI18n } from '~/lib/i18n/with-i18n';
+import {
+  PAGE_VIEW_ACTION,
+  createPageViewLog,
+} from '~/lib/services/audit/pageView.service';
 
 import MembershipConfirmationNotification from './_components/membership-confirmation-notification';
 
@@ -18,6 +22,10 @@ async function MembershipConfirmation() {
   if (!user?.id) {
     redirect(pathsConfig.app.home);
   }
+  await createPageViewLog({
+    accountId: user.id,
+    action: PAGE_VIEW_ACTION.REGISTRATION_SUCCESS,
+  });
 
   return <MembershipConfirmationNotification userId={user.id} />;
 }

app/home/(user)/(dashboard)/analysis-results/page.tsx

@@ -1,5 +1,7 @@
 import Link from 'next/link';
+import { redirect } from 'next/navigation';
 
+import { loadCurrentUserAccount } from '@/app/home/(user)/_lib/server/load-user-account';
 import { createI18nServerInstance } from '@/lib/i18n/i18n.server';
 import { withI18n } from '@/lib/i18n/with-i18n';
 
@@ -7,16 +9,18 @@ import { Trans } from '@kit/ui/makerkit/trans';
 import { PageBody } from '@kit/ui/page';
 import { Button } from '@kit/ui/shadcn/button';
 
-import { loadUserAnalysis } from '../../_lib/server/load-user-analysis';
-import Analysis from './_components/analysis';
 import pathsConfig from '~/config/paths.config';
-import { redirect } from 'next/navigation';
-import { AnalysisOrder, getAnalysisOrders } from '~/lib/services/order.service';
 import { getAnalysisElements } from '~/lib/services/analysis-element.service';
-import { loadCurrentUserAccount } from '@/app/home/(user)/_lib/server/load-user-account';
-import { createPageViewLog } from '~/lib/services/audit/pageView.service';
+import {
+  PAGE_VIEW_ACTION,
+  createPageViewLog,
+} from '~/lib/services/audit/pageView.service';
+import { AnalysisOrder, getAnalysisOrders } from '~/lib/services/order.service';
 import { ButtonTooltip } from '~/components/ui/button-tooltip';
 
+import Analysis from './_components/analysis';
+import { loadUserAnalysis } from '../../_lib/server/load-user-analysis';
+
 export const generateMetadata = async () => {
   const i18n = await createI18nServerInstance();
   const title = i18n.t('analysis-results:pageTitle');
@@ -27,13 +31,15 @@ export const generateMetadata = async () => {
 };
 
 async function AnalysisResultsPage() {
-  const account = await loadCurrentUserAccount()
+  const account = await loadCurrentUserAccount();
   if (!account) {
     throw new Error('Account not found');
   }
 
   const analysisResponses = await loadUserAnalysis();
-  const analysisResponseElements = analysisResponses?.flatMap(({ elements }) => elements);
+  const analysisResponseElements = analysisResponses?.flatMap(
+    ({ elements }) => elements,
+  );
 
   const analysisOrders = await getAnalysisOrders().catch(() => null);
 
@@ -43,7 +49,7 @@ async function AnalysisResultsPage() {
 
   await createPageViewLog({
     accountId: account.id,
-    action: 'VIEW_ANALYSIS_RESULTS',
+    action: PAGE_VIEW_ACTION.VIEW_ANALYSIS_RESULTS,
   });
 
   const getAnalysisElementIds = (analysisOrders: AnalysisOrder[]) => [

app/home/[account]/_components/team-account-layout-sidebar.tsx

@@ -1,5 +1,6 @@
 import type { User } from '@supabase/supabase-js';
 
+import { ApplicationRole } from '@kit/accounts/types/accounts';
 import {
   Sidebar,
   SidebarContent,
@@ -18,6 +19,7 @@ type AccountModel = {
   label: string | null;
   value: string | null;
   image: string | null;
+  application_role: ApplicationRole | null;
 };
 
 export function TeamAccountLayoutSidebar(props: {
@@ -73,7 +75,10 @@ function SidebarContainer(props: {
 
       <SidebarFooter>
         <SidebarContent>
-          <ProfileAccountDropdownContainer user={props.user} />
+          <ProfileAccountDropdownContainer
+            user={props.user}
+            accounts={accounts}
+          />
         </SidebarContent>
       </SidebarFooter>
     </Sidebar>

app/home/[account]/_components/team-account-navigation-menu.tsx

@@ -1,7 +1,4 @@
-import {
-  BorderedNavigationMenu,
-  BorderedNavigationMenuItem,
-} from '@kit/ui/bordered-navigation-menu';
+import { useMemo } from 'react';
 
 import { AppLogo } from '~/components/app-logo';
 import { ProfileAccountDropdownContainer } from '~/components/personal-account-dropdown-container';
@@ -10,18 +7,22 @@ import { getTeamAccountSidebarConfig } from '~/config/team-account-navigation.co
 // local imports
 import { TeamAccountWorkspace } from '../_lib/server/team-account-workspace.loader';
 import { TeamAccountNotifications } from './team-account-notifications';
-import { useMemo } from 'react';
 
 export function TeamAccountNavigationMenu(props: {
   workspace: TeamAccountWorkspace;
 }) {
   const { account, user, accounts: rawAccounts } = props.workspace;
 
-  const accounts = useMemo(() => rawAccounts.map((account) => ({
-            label: account.name,
-            value: account.slug,
-            image: account.picture_url,
-          })),[rawAccounts])
+  const accounts = useMemo(
+    () =>
+      rawAccounts.map((account) => ({
+        label: account.name,
+        value: account.slug,
+        image: account.picture_url,
+        application_role: account.application_role,
+      })),
+    [rawAccounts],
+  );
 
   const routes = getTeamAccountSidebarConfig(account.slug).routes.reduce<
     Array<{
@@ -48,7 +49,7 @@ export function TeamAccountNavigationMenu(props: {
         <AppLogo />
       </div>
 
-      <div className={'flex items-center justify-end space-x-2.5 gap-2'}>
+      <div className={'flex items-center justify-end gap-2 space-x-2.5'}>
         <TeamAccountNotifications accountId={account.id} userId={user.id} />
         <ProfileAccountDropdownContainer
           user={user}

app/home/[account]/billing/_components/health-benefit-form.tsx

@@ -43,6 +43,7 @@ const HealthBenefitForm = ({
       amount: currentCompanyParams.benefit_amount || 0,
     },
   });
+  const isDirty = form.formState.isDirty;
 
   const onSubmit = (data: { occurance: string; amount: number }) => {
     const promise = async () => {
@@ -55,6 +56,7 @@ const HealthBenefitForm = ({
           benefit_occurance: data.occurance,
         }));
       } finally {
+        form.reset(data);
         setIsLoading(false);
       }
     };
@@ -83,7 +85,11 @@ const HealthBenefitForm = ({
               <Trans i18nKey="billing:description" />
             </p>
           </div>
-          <Button type="submit" className="relative" disabled={isLoading}>
+          <Button
+            type="submit"
+            className="relative"
+            disabled={!isDirty || isLoading}
+          >
             {isLoading && (
               <div className="absolute inset-0 flex items-center justify-center">
                 <Spinner />

app/home/[account]/layout.tsx

@@ -45,11 +45,14 @@ function SidebarLayout({
   const data = use(loadTeamWorkspace(account));
   const state = use(getLayoutState(account));
 
-  const accounts = data.accounts.map(({ name, slug, picture_url }) => ({
-    label: name,
-    value: slug,
-    image: picture_url,
-  }));
+  const accounts = data.accounts.map(
+    ({ name, slug, picture_url, application_role }) => ({
+      label: name,
+      value: slug,
+      image: picture_url,
+      application_role,
+    }),
+  );
 
   return (
     <TeamAccountWorkspaceContextProvider value={data}>
@@ -91,11 +94,14 @@ function HeaderLayout({
 }>) {
   const data = use(loadTeamWorkspace(account));
 
-  const accounts = data.accounts.map(({ name, slug, picture_url }) => ({
-    label: name,
-    value: slug,
-    image: picture_url,
-  }));
+  const accounts = data.accounts.map(
+    ({ name, slug, picture_url, application_role }) => ({
+      label: name,
+      value: slug,
+      image: picture_url,
+      application_role,
+    }),
+  );
 
   return (
     <TeamAccountWorkspaceContextProvider value={data}>

components/personal-account-dropdown-container.tsx

@@ -3,6 +3,7 @@
 import type { User } from '@supabase/supabase-js';
 
 import { PersonalAccountDropdown } from '@kit/accounts/personal-account-dropdown';
+import { ApplicationRole } from '@kit/accounts/types/accounts';
 import { useSignOut } from '@kit/supabase/hooks/use-sign-out';
 import { useUser } from '@kit/supabase/hooks/use-user';
 
@@ -13,7 +14,7 @@ const paths = {
   home: pathsConfig.app.home,
   admin: pathsConfig.app.admin,
   doctor: pathsConfig.app.doctor,
-  personalAccountSettings: pathsConfig.app.personalAccountSettings
+  personalAccountSettings: pathsConfig.app.personalAccountSettings,
 };
 
 const features = {
@@ -28,11 +29,13 @@ export function ProfileAccountDropdownContainer(props: {
     id: string | null;
     name: string | null;
     picture_url: string | null;
+    application_role: ApplicationRole | null;
   };
   accounts: {
     label: string | null;
     value: string | null;
     image?: string | null;
+    application_role: ApplicationRole | null;
   }[];
 }) {
   const signOut = useSignOut();

lib/services/audit/pageView.service.ts

@@ -1,11 +1,16 @@
 import { getSupabaseServerClient } from '@kit/supabase/server-client';
 
+export enum PAGE_VIEW_ACTION {
+  VIEW_ANALYSIS_RESULTS = 'VIEW_ANALYSIS_RESULTS',
+  REGISTRATION_SUCCESS = 'REGISTRATION_SUCCESS',
+}
+
 export const createPageViewLog = async ({
   accountId,
   action,
 }: {
   accountId: string;
-  action: 'VIEW_ANALYSIS_RESULTS';
+  action: PAGE_VIEW_ACTION;
 }) => {
   try {
     const supabase = getSupabaseServerClient();
@@ -32,4 +37,4 @@ export const createPageViewLog = async ({
   } catch (error) {
     console.error('Failed to insert page view log', error);
   }
-}
+};

packages/features/accounts/src/components/personal-account-dropdown.tsx

@@ -32,6 +32,7 @@ import { cn } from '@kit/ui/utils';
 import { toTitleCase } from '~/lib/utils';
 
 import { usePersonalAccountData } from '../hooks/use-personal-account-data';
+import { ApplicationRole, ApplicationRoleEnum } from '../types/accounts';
 
 const PERSONAL_ACCOUNT_SLUG = 'personal';
 
@@ -51,13 +52,13 @@ export function PersonalAccountDropdown({
     id: string | null;
     name: string | null;
     picture_url: string | null;
-    application_role: string;
+    application_role: ApplicationRole | null;
   };
   accounts: {
     label: string | null;
     value: string | null;
     image?: string | null;
-    application_role: string;
+    application_role: ApplicationRole | null;
   }[];
   signOutRequested: () => unknown;
 
@@ -97,13 +98,14 @@ export function PersonalAccountDropdown({
 
   const isSuperAdmin = useMemo(() => {
     const hasAdminRole =
-      personalAccountData?.application_role === 'super_admin';
+      personalAccountData?.application_role === ApplicationRoleEnum.SuperAdmin;
 
     return hasAdminRole && hasTotpFactor;
   }, [user, personalAccountData, hasTotpFactor]);
 
   const isDoctor = useMemo(() => {
-    const hasDoctorRole = personalAccountData?.application_role === 'doctor';
+    const hasDoctorRole =
+      personalAccountData?.application_role === ApplicationRoleEnum.Doctor;
 
     return hasDoctorRole && hasTotpFactor;
   }, [user, personalAccountData, hasTotpFactor]);

packages/features/accounts/src/types/accounts.ts

@@ -1,7 +1,17 @@
 import { Database } from '@kit/supabase/database';
 
-export type UserAnalysisElement = Database['medreport']['Tables']['analysis_response_elements']['Row'];
-export type UserAnalysisResponse = Database['medreport']['Tables']['analysis_responses']['Row'] & {
-  elements: UserAnalysisElement[];
-};
+export type UserAnalysisElement =
+  Database['medreport']['Tables']['analysis_response_elements']['Row'];
+export type UserAnalysisResponse =
+  Database['medreport']['Tables']['analysis_responses']['Row'] & {
+    elements: UserAnalysisElement[];
+  };
 export type UserAnalysis = UserAnalysisResponse[];
+
+export type ApplicationRole =
+  Database['medreport']['Tables']['accounts']['Row']['application_role'];
+export enum ApplicationRoleEnum {
+  User = 'user',
+  Doctor = 'doctor',
+  SuperAdmin = 'super_admin',
+}

packages/features/team-accounts/src/server/api.ts

@@ -114,7 +114,8 @@ export class TeamAccountsApi {
         role,
         name,
         slug,
-        picture_url
+        picture_url,
+        application_role
       )
     `,
       )

packages/supabase/src/database.types.ts

@@ -1563,6 +1563,9 @@ export type Database = {
     Views: {
       user_account_workspace: {
         Row: {
+          application_role:
+            | Database["medreport"]["Enums"]["application_role"]
+            | null
           id: string | null
           name: string | null
           picture_url: string | null
@@ -1574,6 +1577,9 @@ export type Database = {
       }
       user_accounts: {
         Row: {
+          application_role:
+            | Database["medreport"]["Enums"]["application_role"]
+            | null
           id: string | null
           name: string | null
           picture_url: string | null
@@ -1634,7 +1640,9 @@ export type Database = {
         Returns: Json
       }
       create_team_account: {
-        Args: { account_name: string; new_personal_code: string }
+        Args:
+          | { account_name: string }
+          | { account_name: string; new_personal_code: string }
         Returns: {
           application_role: Database["medreport"]["Enums"]["application_role"]
           city: string | null
@@ -1801,6 +1809,7 @@ export type Database = {
           primary_owner_user_id: string
           subscription_status: Database["medreport"]["Enums"]["subscription_status"]
           permissions: Database["medreport"]["Enums"]["app_permissions"][]
+          application_role: Database["medreport"]["Enums"]["application_role"]
         }[]
       }
       transfer_team_account_ownership: {

supabase/migrations/20250814071257_update_accounts_view.sql

@@ -0,0 +1,76 @@
+CREATE OR REPLACE VIEW medreport.user_accounts AS 
+SELECT 
+    account.id,
+    account.name,
+    account.picture_url,
+    account.slug,
+    membership.account_role AS role,
+    COALESCE(account.application_role, 'user') AS application_role
+FROM medreport.accounts account
+JOIN medreport.accounts_memberships membership ON (account.id = membership.account_id)
+WHERE (
+    membership.user_id = (SELECT auth.uid())
+    AND account.is_personal_account = false
+    AND account.id IN (
+        SELECT accounts_memberships.account_id
+        FROM medreport.accounts_memberships
+        WHERE accounts_memberships.user_id = (SELECT auth.uid())
+    )
+);
+
+GRANT SELECT ON medreport.user_accounts TO authenticated, service_role;
+
+
+DROP FUNCTION IF EXISTS medreport.team_account_workspace(text);
+
+CREATE FUNCTION medreport.team_account_workspace(account_slug text)
+ RETURNS TABLE(id uuid, name character varying, picture_url character varying, slug text, role character varying, role_hierarchy_level integer, primary_owner_user_id uuid, subscription_status medreport.subscription_status, permissions medreport.app_permissions[], application_role medreport.application_role)
+ LANGUAGE plpgsql
+ SET search_path TO ''
+AS $function$begin
+    return QUERY
+    select
+        accounts.id,
+        accounts.name,
+        accounts.picture_url,
+        accounts.slug,
+        accounts.application_role,
+        accounts_memberships.account_role,
+        roles.hierarchy_level,
+        accounts.primary_owner_user_id,
+        subscriptions.status,
+        array_agg(role_permissions.permission)
+    from
+        medreport.accounts
+        join medreport.accounts_memberships on accounts.id = accounts_memberships.account_id
+        left join medreport.subscriptions on accounts.id = subscriptions.account_id
+        join medreport.roles on accounts_memberships.account_role = roles.name
+        left join medreport.role_permissions on accounts_memberships.account_role = role_permissions.role
+    where
+        accounts.slug = account_slug
+        and medreport.accounts_memberships.user_id = (select auth.uid())
+    group by
+        accounts.id,
+        accounts_memberships.account_role,
+        subscriptions.status,
+        roles.hierarchy_level;
+end;$function$;
+
+GRANT EXECUTE ON FUNCTION medreport.team_account_workspace(text) TO authenticated, service_role;
+
+create or replace view medreport.user_account_workspace as SELECT accounts.id,
+    accounts.name,
+    accounts.picture_url,
+    ( SELECT subscriptions.status
+           FROM medreport.subscriptions
+          WHERE (subscriptions.account_id = accounts.id)
+         LIMIT 1) AS subscription_status,
+    accounts.application_role
+   FROM medreport.accounts
+  WHERE ((accounts.primary_owner_user_id = ( SELECT auth.uid() AS uid)) AND (accounts.is_personal_account = true))
+ LIMIT 1;
+
+grant
+    select
+    on medreport.user_account_workspace to authenticated,
+    service_role;