chore: remove v1beta1 types

Author: rsbh

sdks/js/packages/core/react/components/organization/members/member.types.tsx

@@ -1,8 +1,8 @@
 import { MemberWithInvite } from '~/react/hooks/useOrganizationMembers';
-import {  V1Beta1User, V1Beta1Role } from '~/src';
+import { User, Role } from '@raystack/proton/frontier';
 
 export type MembersType = {
-  users: V1Beta1User[];
+  users: User[];
 };
 
 export enum MemberActionmethods {
@@ -15,7 +15,7 @@ export type MembersTableType = {
   organizationId: string;
   canCreateInvite?: boolean;
   canDeleteUser?: boolean;
-  memberRoles: Record<string, V1Beta1Role[]>;
-  roles: V1Beta1Role[];
+  memberRoles: Record<string, Role[]>;
+  roles: Role[];
   refetch?: () => void;
 };

sdks/js/packages/core/react/components/organization/plans/helpers/helpers.test.ts

@@ -145,7 +145,7 @@ describe('Plans:helpers:groupPlansPricingByInterval', () => {
             interval: 'year',
             weightage: 0,
             productNames: ['', ''],
-            trial_days: '',
+            trialDays: '',
             features: {}
           },
           month: {
@@ -156,7 +156,7 @@ describe('Plans:helpers:groupPlansPricingByInterval', () => {
             interval: 'month',
             weightage: 0,
             productNames: ['', ''],
-            trial_days: '',
+            trialDays: '',
             features: {}
           }
         },
@@ -176,7 +176,7 @@ describe('Plans:helpers:groupPlansPricingByInterval', () => {
             interval: 'month',
             weightage: 0,
             productNames: ['', ''],
-            trial_days: '',
+            trialDays: '',
             features: {}
           }
         },
@@ -331,7 +331,7 @@ describe('Plans:helpers:groupPlansPricingByInterval', () => {
             interval: 'year',
             weightage: 1,
             productNames: ['', ''],
-            trial_days: '',
+            trialDays: '',
             features: {}
           },
           month: {
@@ -342,7 +342,7 @@ describe('Plans:helpers:groupPlansPricingByInterval', () => {
             interval: 'month',
             weightage: 2,
             productNames: ['', ''],
-            trial_days: '',
+            trialDays: '',
             features: {}
           }
         },
@@ -362,7 +362,7 @@ describe('Plans:helpers:groupPlansPricingByInterval', () => {
             interval: 'month',
             weightage: 5,
             productNames: ['', ''],
-            trial_days: '',
+            trialDays: '',
             features: {}
           }
         },
@@ -525,7 +525,7 @@ describe('Plans:helpers:groupPlansPricingByInterval', () => {
             interval: 'year',
             weightage: 1,
             productNames: ['', ''],
-            trial_days: '',
+            trialDays: '',
             features: {}
           },
           month: {
@@ -536,7 +536,7 @@ describe('Plans:helpers:groupPlansPricingByInterval', () => {
             interval: 'month',
             weightage: 2,
             productNames: ['', ''],
-            trial_days: '',
+            trialDays: '',
             features: {}
           },
           week: {
@@ -547,7 +547,7 @@ describe('Plans:helpers:groupPlansPricingByInterval', () => {
             interval: 'week',
             weightage: 5,
             productNames: ['', ''],
-            trial_days: '',
+            trialDays: '',
             features: {}
           }
         },

sdks/js/packages/core/react/components/organization/plans/helpers/index.ts

@@ -29,7 +29,7 @@ export function groupPlansPricingByInterval(plans: Plan[]) {
       interval: planInterval,
       weightage: planMetadata?.weightage ? Number(planMetadata?.weightage) : 0,
       productNames: [],
-      trial_days: plan?.trialDays || '',
+      trialDays: plan?.trialDays || '',
       features: {},
       ...productPrices
     };

sdks/js/packages/core/react/components/organization/plans/pricing-column.tsx

@@ -326,7 +326,7 @@ export const PlanPricingColumn = ({
     _.isEmpty(paymentMethod) && selectedIntervalPricing?.amount > 0;
 
   const planHasTrial = useMemo(
-    () => plans.some(p => Number(p.trial_days) > 0),
+    () => plans.some(p => Number(p.trialDays) > 0),
     [plans]
   );
   const planIds = useMemo(() => plans.map(p => p.planId), [plans]);

sdks/js/packages/core/react/components/organization/project/project.tsx

@@ -27,13 +27,11 @@ import styles from './project.module.css';
 
 interface ProjectGroupRolePair {
   groupId?: string;
-  group_id?: string;
   roles: ProtoRole[];
 }
 
 interface ProjectUserRolePair {
   userId?: string;
-  user_id?: string;
   roles: ProtoRole[];
 }
 
@@ -69,7 +67,7 @@ export const ProjectPage = () => {
   const projectGroups = useMemo(() => ({
     groups: projectGroupsData?.groups ?? [],
     groupRoles: (projectGroupsData?.rolePairs ?? []).reduce((acc: Record<string, ProtoRole[]>, gr: ProjectGroupRolePair) => {
-      const key = gr.groupId ?? gr.group_id;
+      const key = gr.groupId;
       if (key) acc[key] = gr.roles;
       return acc;
     }, {})
@@ -101,7 +99,7 @@ export const ProjectPage = () => {
   const projectUsers = useMemo(() => ({
     users: projectUsersData?.users ?? [],
     memberRoles: (projectUsersData?.rolePairs ?? []).reduce((acc: Record<string, ProtoRole[]>, mr: ProjectUserRolePair) => {
-      const key = mr.userId ?? mr.user_id;
+      const key = mr.userId;
       if (key) acc[key] = mr.roles;
       return acc;
     }, {})

sdks/js/packages/core/react/components/organization/teams/index.tsx

@@ -16,7 +16,7 @@ import { useFrontier } from '~/react/contexts/FrontierContext';
 
 import { useOrganizationTeams } from '~/react/hooks/useOrganizationTeams';
 import { usePermissions } from '~/react/hooks/usePermissions';
-import type { V1Beta1Group } from '~/src';
+import type { Group } from '@raystack/proton/frontier';
 import { PERMISSIONS, shouldShowComponent } from '~/utils';
 import { getColumns } from './teams.columns';
 import { AuthTooltipMessage } from '~/react/utils';
@@ -31,7 +31,7 @@ const teamsSelectOptions = [
 ];
 
 interface WorkspaceTeamProps {
-  teams: V1Beta1Group[];
+  teams: Group[];
   isLoading?: boolean;
   canCreateGroup?: boolean;
   userAccessOnTeam: Record<string, string[]>;

sdks/js/packages/core/react/components/organization/teams/teams.columns.tsx

@@ -5,12 +5,12 @@ import {
 } from '@radix-ui/react-icons';
 import { Text, DropdownMenu, DataTableColumnDef } from '@raystack/apsara';
 import { Link } from '@tanstack/react-router';
-import type { V1Beta1Group } from '~/src';
+import type { Group } from '@raystack/proton/frontier';
 import styles from '../organization.module.css';
 
 export const getColumns: (
   userAccessOnTeam: Record<string, string[]>
-) => DataTableColumnDef<V1Beta1Group, unknown>[] = userAccessOnTeam => [
+) => DataTableColumnDef<Group, unknown>[] = userAccessOnTeam => [
   {
     header: 'Title',
     accessorKey: 'title',
@@ -44,7 +44,7 @@ export const getColumns: (
     enableSorting: false,
     cell: ({ row, getValue }) => (
       <TeamActions
-        team={row.original as V1Beta1Group}
+        team={row.original as Group}
         userAccessOnTeam={userAccessOnTeam}
       />
     )
@@ -55,7 +55,7 @@ const TeamActions = ({
   team,
   userAccessOnTeam
 }: {
-  team: V1Beta1Group;
+  team: Group;
   userAccessOnTeam: Record<string, string[]>;
 }) => {
   const canUpdateTeam = (userAccessOnTeam[team.id!] ?? []).includes('update');

sdks/js/packages/core/react/hooks/useOrganizationMembers.ts

@@ -1,28 +1,30 @@
 import { useCallback, useEffect, useState, useMemo } from 'react';
-import { V1Beta1User, V1Beta1Role, V1Beta1Invitation } from '~/src';
+import { User, Role, Invitation } from '@raystack/proton/frontier';
 import { PERMISSIONS } from '~/utils';
 import { useFrontier } from '../contexts/FrontierContext';
 import { useQuery } from '@connectrpc/connect-query';
 import { FrontierServiceQueries, ListOrganizationUsersRequestSchema, ListRolesRequestSchema, ListOrganizationInvitationsRequestSchema } from '@raystack/proton/frontier';
 import { create } from '@bufbuild/protobuf';
 
 
-export type MemberWithInvite = V1Beta1User & V1Beta1Invitation & {invited?: boolean}
+export type MemberWithInvite = User & Invitation & { invited?: boolean };
 
 export interface UseOrganizationMembersReturn {
   isFetching: boolean;
   members: MemberWithInvite[];
-  memberRoles: Record<string, V1Beta1Role[]>;
-  roles: V1Beta1Role[];
+  memberRoles: Record<string, Role[]>;
+  roles: Role[];
   refetch: () => void;
   error: unknown;
 }
 
-export const useOrganizationMembers = ({ showInvitations = false }): UseOrganizationMembersReturn => {
-  const [users, setUsers] = useState<V1Beta1User[]>([]);
+export const useOrganizationMembers = ({
+  showInvitations = false
+}): UseOrganizationMembersReturn => {
+  const [users, setUsers] = useState<User[]>([]);
   const [invitations, setInvitations] = useState<MemberWithInvite[]>([]);
 
-  const [memberRoles, setMemberRoles] = useState<Record<string, V1Beta1Role[]>>({});
+  const [memberRoles, setMemberRoles] = useState<Record<string, Role[]>>({});
 
   const { activeOrganization: organization } = useFrontier();
 
@@ -40,9 +42,12 @@ export const useOrganizationMembers = ({ showInvitations = false }): UseOrganiza
       const { users, rolePairs } = organizationUsersData;
       setUsers(users || []);
       setMemberRoles(
-        (rolePairs || []).reduce((previous: Record<string, V1Beta1Role[]>, mr: { userId: string; roles: V1Beta1Role[] }) => {
-          return { ...previous, [mr.userId]: mr.roles };
-        }, {})
+        (rolePairs || []).reduce(
+          (previous: Record<string, Role[]>, mr: { userId: string; roles: Role[] }) => {
+            return { ...previous, [mr.userId]: mr.roles };
+          },
+          {}
+        )
       );
     }
   }, [organizationUsersData]);
@@ -70,7 +75,7 @@ export const useOrganizationMembers = ({ showInvitations = false }): UseOrganiza
 
   useEffect(() => {
     if (invitationsData) {
-      const invitedUsers: MemberWithInvite[] = (invitationsData.invitations || []).map((user: V1Beta1User) => ({
+      const invitedUsers: MemberWithInvite[] = (invitationsData.invitations || []).map((user: User) => ({
         ...user,
         invited: true
       }));

sdks/js/packages/core/src/types.ts

@@ -88,7 +88,7 @@ export interface IntervalPricingWithPlan extends IntervalPricing {
   interval: IntervalKeys;
   weightage: number;
   features: Record<string, Feature>;
-  trial_days: string;
+  trialDays: string;
   productNames: string[];
 }
 

sdks/js/packages/core/utils/index.ts

@@ -1,4 +1,4 @@
-import { V1Beta1User } from '~/src';
+import { User } from '@raystack/proton/frontier';
 
 export const hasWindow = (): boolean => typeof window !== 'undefined';
 
@@ -16,10 +16,7 @@ export const getInitials = function (name: string = '') {
   return initials;
 };
 
-export const filterUsersfromUsers = (
-  arr: V1Beta1User[] = [],
-  exclude: V1Beta1User[] = []
-) => {
+export const filterUsersfromUsers = (arr: User[] = [], exclude: User[] = []) => {
   const excludeIds = exclude.map(e => e.id);
   return arr
     .filter(user => !excludeIds.includes(user.id))