refactor: enhance type safety for upstream utility function parameters and add non-null assertions in E2E tests.

Author: DSingh0304

e2e/tests/protos.crud-all-fields.spec.ts

@@ -77,7 +77,7 @@ test.describe('CRUD proto with all fields', () => {
       expect(createdProto).toBeDefined();
       expect(createdProto?.value.id).toBeDefined();
 
-      createdProtoId = createdProto?.value.id || '';
+      createdProtoId = createdProto!.value.id!;
 
       // Verify content matches
       expect(createdProto?.value.content).toBe(protoContent);

e2e/tests/protos.crud-required-fields.spec.ts

@@ -76,7 +76,7 @@ test.describe('CRUD proto with required fields only', () => {
       expect(createdProto).toBeDefined();
       expect(createdProto?.value.id).toBeDefined();
 
-      createdProtoId = createdProto?.value.id || '';
+      createdProtoId = createdProto!.value.id!;
 
       // Verify content matches
       expect(createdProto?.value.content).toBe(protoContent);

src/components/form-slice/FormPartUpstream/util.ts

@@ -37,29 +37,42 @@ const isAllUndefined = (obj: Record<string, unknown>) =>
     (v) => v === undefined || v === null || v === '' || Number.isNaN(v)
   );
 
-export const produceRmEmptyUpstreamFields = produce((draft: Record<string, any>) => {
-  if (draft.timeout && isAllUndefined(draft.timeout)) {
-    delete draft.timeout;
-  }
-  if (draft.keepalive_pool && isAllUndefined(draft.keepalive_pool)) {
-    delete draft.keepalive_pool;
-  }
-  if (draft.tls && isAllUndefined(draft.tls)) {
-    delete draft.tls;
-  }
-
-  if (draft.upstream) {
-    if (draft.upstream.timeout && isAllUndefined(draft.upstream.timeout)) {
-      delete draft.upstream.timeout;
+export const produceRmEmptyUpstreamFields = produce(
+  (
+    draft: {
+      timeout?: Record<string, unknown>;
+      keepalive_pool?: Record<string, unknown>;
+      tls?: Record<string, unknown>;
+      upstream?: {
+        timeout?: Record<string, unknown>;
+        keepalive_pool?: Record<string, unknown>;
+        tls?: Record<string, unknown>;
+      };
+    } & Record<string, unknown>
+  ) => {
+    if (draft.timeout && isAllUndefined(draft.timeout)) {
+      delete draft.timeout;
+    }
+    if (draft.keepalive_pool && isAllUndefined(draft.keepalive_pool)) {
+      delete draft.keepalive_pool;
     }
-    if (
-      draft.upstream.keepalive_pool &&
-      isAllUndefined(draft.upstream.keepalive_pool)
-    ) {
-      delete draft.upstream.keepalive_pool;
+    if (draft.tls && isAllUndefined(draft.tls)) {
+      delete draft.tls;
     }
-    if (draft.upstream.tls && isAllUndefined(draft.upstream.tls)) {
-      delete draft.upstream.tls;
+
+    if (draft.upstream) {
+      if (draft.upstream.timeout && isAllUndefined(draft.upstream.timeout)) {
+        delete draft.upstream.timeout;
+      }
+      if (
+        draft.upstream.keepalive_pool &&
+        isAllUndefined(draft.upstream.keepalive_pool)
+      ) {
+        delete draft.upstream.keepalive_pool;
+      }
+      if (draft.upstream.tls && isAllUndefined(draft.upstream.tls)) {
+        delete draft.upstream.tls;
+      }
     }
   }
-});
+);

src/routes/services/add.tsx

@@ -25,10 +25,10 @@ import { postServiceReq, type ServicePostType } from '@/apis/services';
 import { FormSubmitBtn } from '@/components/form/Btn';
 import { FormPartService } from '@/components/form-slice/FormPartService';
 import { ServicePostSchema } from '@/components/form-slice/FormPartService/schema';
+import { produceRmEmptyUpstreamFields } from '@/components/form-slice/FormPartUpstream/util';
 import { FormTOCBox } from '@/components/form-slice/FormSection';
 import PageHeader from '@/components/page/PageHeader';
 import { req } from '@/config/req';
-import { produceRmEmptyUpstreamFields } from '@/components/form-slice/FormPartUpstream/util';
 import { produceRmUpstreamWhenHas } from '@/utils/form-producer';
 import { pipeProduce } from '@/utils/producer';
 

src/routes/services/detail.$id/index.tsx

@@ -32,6 +32,7 @@ import { getServiceQueryOptions } from '@/apis/hooks';
 import { putServiceReq } from '@/apis/services';
 import { FormSubmitBtn } from '@/components/form/Btn';
 import { FormPartService } from '@/components/form-slice/FormPartService';
+import { produceRmEmptyUpstreamFields } from '@/components/form-slice/FormPartUpstream/util';
 import { FormTOCBox } from '@/components/form-slice/FormSection';
 import { FormSectionGeneral } from '@/components/form-slice/FormSectionGeneral';
 import { DeleteResourceBtn } from '@/components/page/DeleteResourceBtn';
@@ -41,7 +42,6 @@ import { req } from '@/config/req';
 import { APISIX, type APISIXType } from '@/types/schema/apisix';
 import { produceRmUpstreamWhenHas } from '@/utils/form-producer';
 import { pipeProduce } from '@/utils/producer';
-import { produceRmEmptyUpstreamFields } from '@/components/form-slice/FormPartUpstream/util';
 
 type Props = {
   readOnly: boolean;