Change: Adds OrganizationDetails & extends projectByNameExtended query

api/lagoon/client/_lgraphql/organizations/allOrganizationsWithProjects.graphql

@@ -0,0 +1,17 @@
+query {
+    allOrganizations {
+        id
+        name
+        description
+        friendlyName
+        quotaProject
+        quotaGroup
+        quotaNotification
+        quotaEnvironment
+        quotaRoute
+        projects {
+            id
+            name
+        }
+    }
+}

api/lagoon/client/_lgraphql/projects/projectByNameExtended.graphql

@@ -20,5 +20,11 @@ query (
     }
     autoIdle
     developmentEnvironmentsLimit
+    organization
+    organizationDetails{
+      id
+      name
+      friendlyName
+    }
   }
 }

api/lagoon/client/organizations.go

@@ -102,3 +102,16 @@ func (c *Client) AllOrganizations(ctx context.Context, organizations *[]schema.O
 		Response: organizations,
 	})
 }
+
+func (c *Client) AllOrganizationsExtended(ctx context.Context, organizations *[]schema.Organization) error {
+	req, err := c.newRequest("_lgraphql/organizations/allOrganizationsWithProjects.graphql", nil)
+	if err != nil {
+		return err
+	}
+
+	return c.client.Run(ctx, req, &struct {
+		Response *[]schema.Organization `json:"allOrganizations"`
+	}{
+		Response: organizations,
+	})
+}

api/lagoon/organizations.go

@@ -15,6 +15,7 @@ type Organizations interface {
 	DeleteOrg(ctx context.Context, id uint, organization *schema.DeleteOrganizationInput) error
 	UpdateOrganization(ctx context.Context, id uint, patch schema.UpdateOrganizationPatchInput, result *schema.Organization) error
 	AllOrganizations(ctx context.Context, organizations *[]schema.Organization) error
+	AllOrganizationsExtended(ctx context.Context, organizations *[]schema.Organization) error
 }
 
 // GetOrganizationByID gets info of an organization in lagoon that matches the provided ID.
@@ -46,3 +47,9 @@ func AllOrganizations(ctx context.Context, o Organizations) (*[]schema.Organizat
 	organization := []schema.Organization{}
 	return &organization, o.AllOrganizations(ctx, &organization)
 }
+
+// AllOrganizationsExtended lists all organizations with associated projects.
+func AllOrganizationsExtended(ctx context.Context, o Organizations) (*[]schema.Organization, error) {
+	organization := []schema.Organization{}
+	return &organization, o.AllOrganizationsExtended(ctx, &organization)
+}

api/schema/project.go

@@ -53,7 +53,8 @@ type Project struct {
 	// Openshift is unmarshalled during export.
 	OpenshiftID *OpenshiftID `json:"openshift,omitempty"`
 	// Groups are unmarshalled during export.
-	Groups []Group `json:"groups,omitempty"`
+	Groups              []Group      `json:"groups,omitempty"`
+	OrganizationDetails Organization `json:"organizationDetails,omitempty"`
 }
 
 // ProjectConfig contains project configuration.