fixed redundant typing

Author: eeen17

src/common/types/iam.ts

@@ -71,22 +71,22 @@ const userOrgSchema = z.object({
   netid: z.string().min(1),
   org: z.enum(OrganizationList),
 });
-const userOrgsSchema = z.array(userOrgSchema);
+// const userOrgsSchema = z.array(userOrgSchema);
 
 const userNameSchema = z.object({
   netid: z.string().min(1),
   firstName: z.string().min(1),
   middleName: z.string().optional(),
   lastName: z.string().min(1),
 });
-const userNamesSchema = z.array(userNameSchema);
+// const userNamesSchema = z.array(userNameSchema);
 
 const userSchema = userNameSchema.merge(userOrgSchema);
-const usersSchema = z.array(userSchema);
+// const usersSchema = z.array(userSchema);
 
 export type UserOrg = z.infer<typeof userOrgSchema>;
-export type UserOrgs = z.infer<typeof userOrgsSchema>;
+// export type UserOrgs = z.infer<typeof userOrgsSchema>;
 export type UserName = z.infer<typeof userNameSchema>;
-export type UserNames = z.infer<typeof userNamesSchema>;
+// export type UserNames = z.infer<typeof userNamesSchema>;
 export type User = z.infer<typeof userSchema>;
-export type Users = z.infer<typeof usersSchema>;
+// export type Users = z.infer<typeof usersSchema>;

src/ui/pages/screen/Screen.page.tsx

@@ -13,7 +13,7 @@ import { AuthGuard } from '@ui/components/AuthGuard';
 import { useApi } from '@ui/util/api';
 import { AppRoles } from '@common/roles.js';
 import { OrganizationList } from '@common/orgs';
-import { User, UserNames, UserOrgs, Users } from '@common/types/iam';
+import { User, UserName, UserOrg } from '@common/types/iam';
 
 // const repeatOptions = ['weekly', 'biweekly'] as const;
 
@@ -22,7 +22,7 @@ import { User, UserNames, UserOrgs, Users } from '@common/types/iam';
 // export type EventsGetResponse = z.infer<typeof getEventsSchema>;
 
 export const ScreenPage: React.FC = () => {
-  const [userList, setUserList] = useState<Users>([]);
+  const [userList, setUserList] = useState<User[]>([]);
   const api = useApi('core');
   const [opened, { open, close }] = useDisclosure(false);
   // const [showPrevious, { toggle: togglePrevious }] = useDisclosure(false); // Changed default to false
@@ -87,7 +87,7 @@ export const ScreenPage: React.FC = () => {
       // });
 
       // get request for user orgs
-      const userOrgsResponse: UserOrgs = [
+      const userOrgsResponse: UserOrg[] = [
         { netid: 'johnd01', org: 'SIGMusic' },
         { netid: 'miker44', org: 'SIGPLAN' },
         { netid: 'chrisb19', org: 'SIGCHI' },
@@ -118,7 +118,7 @@ export const ScreenPage: React.FC = () => {
       ];
 
       // retrieve from azure active directory (aad)
-      const userNamesResponse: UserNames = [
+      const userNamesResponse: UserName[] = [
         { netid: 'johnd01', firstName: 'John', lastName: 'Doe' },
         { netid: 'miker44', firstName: 'Michael', lastName: 'Roberts' },
         { netid: 'chrisb19', firstName: 'Christopher', lastName: 'Brown' },
@@ -148,7 +148,7 @@ export const ScreenPage: React.FC = () => {
         { netid: 'patrickh37', firstName: 'Patrick', middleName: 'Henry', lastName: 'Hill' },
       ];
 
-      const mergedResponse: Users = userOrgsResponse.map((orgObj) => {
+      const mergedResponse: User[] = userOrgsResponse.map((orgObj) => {
         const nameObj = userNamesResponse.find((name) => name.netid === orgObj.netid);
         return { ...orgObj, ...nameObj } as User;
       });