Clean Up Types (#255)

* Remove Logs

* Improve track() Types

* Simplify Server Action Types

apps/resources/app/resources/Resources/ResourcesTable/ResourcesList/DownloadButton/DownloadButtonClient.tsx

@@ -15,7 +15,7 @@ export const DownloadButtonClient = ({ csv }: Props) => {
       size="large"
       onClick={() => {
         downloadCsv(csv, 'lifecentereddesign-net-resources.csv');
-        track('Download Resources', {});
+        track('Download Resources');
       }}
     >
       <Download />

apps/resources/app/resources/Suggestion/SuggestionForm.tsx

@@ -21,7 +21,7 @@ export const SuggestionForm = () => {
         if (document.activeElement instanceof HTMLElement) {
           document.activeElement.blur();
         }
-        track('Resource Suggestion', {});
+        track('Resource Suggestion');
       },
       onError: () => {
         if (!linkInputRef.current) return;

apps/resources/components/Header/CO2Badge/CO2Badge.tsx

@@ -17,7 +17,7 @@ export const CO2Badge = ({ co2, cleanerThan }: Props) => {
 
   const onOpenChange = (open: boolean) => {
     if (open) {
-      track('Open CO2 Badge', {});
+      track('Open CO2 Badge');
     }
     setOpen(open);
   };

apps/resources/components/Newsletter/NewsletterForm.tsx

@@ -29,7 +29,7 @@ export const NewsletterForm = () => {
         if (document.activeElement instanceof HTMLElement) {
           document.activeElement.blur();
         }
-        track('Newsletter Signup', {});
+        track('Newsletter Signup');
       },
       onError: () => {
         if (!emailInputRef.current) return;

apps/resources/hooks/useFilter.tsx

@@ -81,11 +81,11 @@ export const useFilter = () => {
     }
 
     if (param === 'likes') {
-      track('Toggle filter resources by likes', {});
+      track('Toggle filter resources by likes');
     }
 
     if (param === 'comments') {
-      track('Toggle filter resources by comments', {});
+      track('Toggle filter resources by comments');
     }
 
     if (param === 'limit') {

apps/resources/lib/serverActions/client.ts

@@ -71,12 +71,11 @@ const createReducer =
 
 export const useAction = <
   TInputSchema extends z.ZodTypeAny,
-  TInput extends TInputSchema | undefined,
   TResponse extends any,
 >(
-  inputAction: ServerAction<TInputSchema, TInput, TResponse>,
+  inputAction: ServerAction<TInputSchema, TResponse>,
   options: {
-    onRunAction?: (input: InferInputType<TInputSchema, TInput>) => void;
+    onRunAction?: (input: InferInputType<TInputSchema>) => void;
     onSuccess?: (data: TResponse | null) => void;
     onError?: (
       error: string | null,
@@ -92,7 +91,7 @@ export const useAction = <
   const [isRunning, startTransition] = useTransition();
 
   const runAction = useCallback(
-    async (input: InferInputType<TInputSchema, TInput>) => {
+    async (input: InferInputType<TInputSchema>) => {
       startTransition(async () => {
         dispatch({
           type: 'RUN_ACTION',

apps/resources/lib/serverActions/server.ts

@@ -7,34 +7,30 @@ import {
 
 type MaybePromise<T> = Promise<T> | T;
 
-export type InferInputType<
-  TInputSchema extends z.ZodTypeAny,
-  TInput extends TInputSchema | undefined,
-> = z.ZodTypeAny extends TInput ? void : z.input<TInputSchema>;
+export type InferInputType<TInputSchema extends z.ZodTypeAny> =
+  z.ZodTypeAny extends TInputSchema ? void : z.infer<TInputSchema>;
 
 export type InferValidationErrors<TInputSchema extends z.ZodTypeAny> =
   z.inferFlattenedErrors<TInputSchema>['fieldErrors'];
 
-interface Result<TInputSchema extends z.ZodTypeAny, TResponse> {
+interface Result<TInputSchema extends z.ZodTypeAny, TResponse extends any> {
   data: TResponse | null;
   error: string | null;
   validationErrors: InferValidationErrors<TInputSchema> | null;
 }
 
 export type ServerAction<
   TInputSchema extends z.ZodTypeAny,
-  TInput extends TInputSchema | undefined,
-  TResponse,
+  TResponse extends any,
 > = (
-  input: InferInputType<TInputSchema, TInput>,
+  input: InferInputType<TInputSchema>,
 ) => Promise<Result<TInputSchema, TResponse>> | void;
 
 export const createActionClient = <Context>(createClientOpts?: {
   middleware?: () => MaybePromise<Context>;
 }) => {
   const actionBuilder = <
     TInputSchema extends z.ZodTypeAny,
-    TInput extends TInputSchema | undefined,
     TResponse extends any,
   >(actionBuilderOpts: {
     input?: TInputSchema;
@@ -43,7 +39,7 @@ export const createActionClient = <Context>(createClientOpts?: {
       ctx: Context;
     }) => MaybePromise<void> | MaybePromise<TResponse>;
   }) => {
-    const createAction: ServerAction<TInputSchema, TInput, TResponse> = async (
+    const createAction: ServerAction<TInputSchema, TResponse> = async (
       input,
     ) => {
       try {
@@ -82,7 +78,6 @@ export const createActionClient = <Context>(createClientOpts?: {
           isNextRedirectError(errorMessage) ||
           isNextNotFoundError(errorMessage)
         ) {
-          console.log('is next errror');
           throw error;
         }
 

apps/resources/lib/tracking.ts

@@ -1,8 +1,8 @@
 import { ContentType } from './resources';
 
 interface TrackingEvents {
-  'Download Resources': {};
-  'Resource Suggestion': {};
+  'Download Resources': null;
+  'Resource Suggestion': null;
   'Copy Resource Link': {
     link: string;
   };
@@ -28,7 +28,7 @@ interface TrackingEvents {
   'Uncaught error': {
     message: string;
   };
-  'Newsletter Signup': {};
+  'Newsletter Signup': null;
   'Filter resources by type': {
     type: string;
   };
@@ -41,17 +41,19 @@ interface TrackingEvents {
   'Sort resources': {
     by: string;
   };
-  'Toggle filter resources by likes': {};
-  'Toggle filter resources by comments': {};
+  'Toggle filter resources by likes': null;
+  'Toggle filter resources by comments': null;
   'Show more resources': {
     count: number;
   };
-  'Open CO2 Badge': {};
+  'Open CO2 Badge': null;
 }
 
 export const track = <TEventKey extends keyof TrackingEvents>(
   event: TEventKey,
-  data: TrackingEvents[TEventKey],
+  ...data: TrackingEvents[TEventKey] extends null
+    ? []
+    : [TrackingEvents[TEventKey]]
 ) => {
   splitbee.track(event, data);
 };

apps/resources/lib/utils/utils.test.ts

@@ -100,7 +100,6 @@ describe('getBaseUrl', () => {
     process.env.NEXT_PUBLIC_VERCEL_ENV = '';
     process.env.NEXT_PUBLIC_VERCEL_URL = '';
     process.env.PORT = '3000';
-    console.log(process.env.NEXT_PUBLIC_VERCEL_URL);
     const baseUrl = getBaseUrl();
     expect(baseUrl).toBe('http://localhost:3000');
   });