Merge pull request #45 from Jandiasnow/m

fix: update organization sdk
bestchains · Feb 17, 2023 · c935d08 · c935d08
2 parents cebc689 + 0bf1223
commit c935d08
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 6 deletions.
diff --git a/bff-sdk/sdk.ts b/bff-sdk/sdk.ts
@@ -256,7 +256,7 @@ export type Organization = {
   /** name */
   name: Scalars['ID'];
   /** 所在网络 */
-  networks?: Maybe<Array<Scalars['String']>>;
+  networks?: Maybe<Array<Network>>;
   /** 原因（状态为非Deplyed时） */
   reason?: Maybe<Scalars['String']>;
   /** 状态 */
@@ -710,8 +710,8 @@ export type GetOrganizationsQuery = {
     admin?: string | null;
     status?: StatusType | null;
     reason?: string | null;
-    networks?: Array<string> | null;
     federations?: Array<string> | null;
+    networks?: Array<{ __typename?: 'Network'; name: string }> | null;
   }>;
 };
 
@@ -731,8 +731,19 @@ export type GetOrganizationQuery = {
     admin?: string | null;
     status?: StatusType | null;
     reason?: string | null;
-    networks?: Array<string> | null;
     federations?: Array<string> | null;
+    networks?: Array<{
+      __typename?: 'Network';
+      name: string;
+      creationTimestamp?: string | null;
+      lastHeartbeatTime?: string | null;
+      expiredTime?: string | null;
+      clusterSize?: number | null;
+      organizations?: Array<{
+        __typename?: 'Organization';
+        name: string;
+      }> | null;
+    }> | null;
     users?: Array<{
       __typename?: 'User';
       name: string;
@@ -1076,7 +1087,9 @@ export const GetOrganizationsDocument = gql`
       admin
       status
       reason
-      networks
+      networks {
+        name
+      }
       federations
     }
   }
@@ -1092,7 +1105,16 @@ export const GetOrganizationDocument = gql`
       admin
       status
       reason
-      networks
+      networks {
+        name
+        creationTimestamp
+        lastHeartbeatTime
+        expiredTime
+        clusterSize
+        organizations {
+          name
+        }
+      }
       federations
       users {
         name

diff --git a/src/pages/Organization/index.jsx b/src/pages/Organization/index.jsx
@@ -655,7 +655,9 @@ class Organization$$Page extends React.Component {
                           style={{ fontSize: "" }}
                         >
                           {__$$eval(() =>
-                            text?.length > 0 ? text?.join(",") : "-"
+                            text?.length > 0
+                              ? text?.map((item) => item.name)?.join(",")
+                              : "-"
                           )}
                         </Typography.Text>
                       ))(