Merge pull request #21 from dayuy/fix-network

fix: modify the field networks of Organization

Dockerfile

@@ -10,7 +10,6 @@ FROM hyperledgerk8s/bc-console:dev-branch as bc-console
 FROM hyperledgerk8s/bc-apis-base-pro:1.0.0
 
 COPY --from=builder /usr/src/app/dist /usr/src/app/dist
-COPY --from=builder /usr/src/app/src/kubernetes/docs /usr/src/app/public/kubernetes/
 COPY --from=bc-console /build-files/dist /usr/src/app/public
 
 EXPOSE 8024

Dockerfile.build

@@ -8,4 +8,3 @@ RUN nr build
 
 FROM busybox
 COPY --from=builder /usr/src/app/dist /build-files/app/dist
-COPY --from=builder /usr/src/app/src/kubernetes/docs /builder-files/app/public/kubernetes/

src/organization/models/organization.model.ts

@@ -1,4 +1,5 @@
 import { Field, HideField, ID, ObjectType } from '@nestjs/graphql';
+import { Network } from 'src/network/models/network.model';
 import { User } from 'src/users/models/user.model';
 import { StatusType } from './status-type.enum';
 
@@ -43,5 +44,5 @@ export class Organization {
   federations?: string[];
 
   /** 所在网络 */
-  networks?: string[];
+  networks?: Network[];
 }

src/organization/organization.gql

@@ -9,7 +9,9 @@ query getOrganizations($admin: String) {
     admin
     status
     reason
-    networks
+    networks {
+      name
+    }
     federations
   }
 }
@@ -25,7 +27,16 @@ query getOrganization($name: String!) {
     admin
     status
     reason
-    networks
+    networks {
+      name
+      creationTimestamp
+      lastHeartbeatTime
+      expiredTime
+      clusterSize
+      organizations {
+        name
+      }
+    }
     federations
     users {
       name

src/schema.gql

@@ -261,7 +261,7 @@ type Organization {
   name: ID!
 
   """所在网络"""
-  networks: [String!]
+  networks: [Network!]
 
   """原因（状态为非Deplyed时）"""
   reason: String