@atlaskit/teams-public 0.63.4 → 0.65.0

package/dist/es2019/controllers/hooks/use-team-containers/mocks.js

@@ -0,0 +1,119 @@
+// Mock data for tests
+export const MOCK_TEAM_CONTAINERS = {
+  graphStore: {
+    cypherQuery: {
+      edges: [{
+        node: {
+          from: {
+            id: '1'
+          },
+          to: {
+            id: '2',
+            data: {
+              __typename: 'ConfluenceSpace',
+              confluenceSpaceName: 'Confluence Space',
+              type: 'confluence',
+              createdDate: '2021-01-01',
+              links: {
+                webUi: 'web-link'
+              },
+              icon: {
+                path: 'https://avatar-management--avatars.us-west-2.staging.public.atl-paas.net/712020:2981defd-17f1-440e-a377-8c7657b72a6f/4b5b0d55-614b-4e75-858f-9da3d0c7e3f8/128'
+              }
+            }
+          }
+        }
+      }, {
+        node: {
+          from: {
+            id: '1'
+          },
+          to: {
+            id: '3',
+            data: {
+              __typename: 'JiraProject',
+              jiraProjectName: 'Jira Project',
+              webUrl: 'web-link',
+              created: '2021-01-01',
+              avatar: {
+                medium: 'https://avatar-management--avatars.us-west-2.staging.public.atl-paas.net/712020:2981defd-17f1-440e-a377-8c7657b72a6f/4b5b0d55-614b-4e75-858f-9da3d0c7e3f8/128'
+              }
+            }
+          }
+        }
+      }]
+    }
+  }
+};
+export const MOCK_TEAM_CONTAINERSV2 = {
+  graphStore: {
+    cypherQueryV2: {
+      edges: [{
+        node: {
+          columns: [{
+            key: 'container',
+            value: {
+              data: {
+                __typename: 'ConfluenceSpace',
+                id: '2',
+                confluenceSpaceName: 'Confluence Space',
+                type: 'confluence',
+                createdDate: '2021-01-01',
+                links: {
+                  base: 'https://example.com',
+                  webUi: '/wiki/spaces/SPACE'
+                },
+                icon: {
+                  path: '/wiki/download/attachments/123/icon.png'
+                }
+              }
+            }
+          }]
+        }
+      }, {
+        node: {
+          columns: [{
+            key: 'container',
+            value: {
+              data: {
+                __typename: 'JiraProject',
+                id: '3',
+                jiraProjectName: 'Jira Project',
+                webUrl: 'https://example.com/jira/project',
+                created: '2021-01-01',
+                avatar: {
+                  medium: 'https://avatar-management--avatars.us-west-2.staging.public.atl-paas.net/712020:2981defd-17f1-440e-a377-8c7657b72a6f/4b5b0d55-614b-4e75-858f-9da3d0c7e3f8/128'
+                },
+                projectType: 'software',
+                projectTypeName: 'Software Project'
+              }
+            }
+          }]
+        }
+      }]
+    }
+  }
+};
+export const MOCK_CONNECTED_TEAMS_RESULT = [{
+  id: 'ari:cloud:identity::team/8ee37950-7de7-41ec-aee2-2c02c95949f4',
+  displayName: 'THE SUPER TEAM',
+  description: "Super team's super description",
+  state: 'ACTIVE',
+  membershipSettings: 'MEMBER_INVITE',
+  organizationId: 'ari:cloud:platform::org/434kbc65-c30c-1a22-6933-d25085c532ca',
+  creatorId: 'ari:cloud:identity::user/70121:c17bdf1f-39db-4611-a700-2f8c1aff841e',
+  isVerified: false,
+  members: [{
+    id: '70121:c17bdf1f-39db-4611-a700-2f8c1aff841e',
+    fullName: 'Shrutha Kashyap',
+    avatarUrl: 'https://avatar-management--avatars.us-west-2.prod.public.atl-paas.net/70121:c17bdf1f-39db-4611-a700-2f8c1aff841e/cf4058fd-75f2-4824-8041-c8efa4cc0ea8/128',
+    status: 'active'
+  }],
+  includesYou: false,
+  memberCount: 1,
+  smallAvatarImageUrl: 'https://ptc-directory-sited-static.us-east-1.prod.public.atl-paas.net/teams/avatars/0.svg',
+  smallHeaderImageUrl: 'https://ptc-directory-sited-static.us-east-1.prod.public.atl-paas.net/gradients/0.svg',
+  largeAvatarImageUrl: 'https://ptc-directory-sited-static.us-east-1.prod.public.atl-paas.net/teams/avatars/0.svg',
+  largeHeaderImageUrl: 'https://ptc-directory-sited-static.us-east-1.prod.public.atl-paas.net/gradients/0.svg',
+  restriction: 'ORG_MEMBERS'
+}];

package/dist/es2019/services/agg-client/index.js

@@ -1,4 +1,3 @@
-import { fg } from '@atlaskit/platform-feature-flags';
 import { teamIdToAri } from '../../common/utils/team-id-to-ari';
 import { toUserId } from '../../common/utils/user-ari';
 import { DEFAULT_CONFIG } from '../constants';
@@ -6,7 +5,7 @@ import { BaseGraphQlClient } from '../graphql-client';
 import { UnlinkContainerMutation } from './utils/mutations/unlink-container-mutation';
 import { NumberOfTeamConnectedToContainerQuery } from './utils/queries/number-of-team-connected-to-container-query';
 import { TeamConnectedToContainerQuery } from './utils/queries/team-connected-to-container-query';
-import { TeamContainersQuery, TeamContainersQueryV2 } from './utils/queries/team-containers-query';
+import { TeamContainersQueryV2 } from './utils/queries/team-containers-query';
 export class AGGClient extends BaseGraphQlClient {
   constructor(baseUrl, config) {
     super(`${baseUrl}/graphql`, config);
@@ -17,37 +16,25 @@ export class AGGClient extends BaseGraphQlClient {
   async getTeamContainers(teamId) {
     const teamAri = teamIdToAri(teamId);
     const cypherQuery = `MATCH (team:IdentityTeam {ari: '${teamAri}'})-[:team_connected_to_container]->(container) RETURN container`;
-    if (fg('teams_containers_cypher_query_v2_migration')) {
-      const response = await this.makeGraphQLRequest({
-        query: TeamContainersQueryV2,
-        variables: {
-          cypherQuery,
-          params: {
-            id: teamAri
-          }
-        }
-      }, {
-        operationName: 'TeamContainersQueryV2'
-      });
-      return this.processV2Response(response);
-    } else {
-      const response = await this.makeGraphQLRequest({
-        query: TeamContainersQuery,
-        variables: {
-          cypherQuery
+    const response = await this.makeGraphQLRequest({
+      query: TeamContainersQueryV2,
+      variables: {
+        cypherQuery,
+        params: {
+          id: teamAri
         }
-      }, {
-        operationName: 'TeamContainersQuery'
-      });
-      return this.processV1Response(response);
-    }
+      }
+    }, {
+      operationName: 'TeamContainersQueryV2'
+    });
+    return this.processResponse(response);
   }
-  processV2Response(response) {
+  processResponse(response) {
     const containersResult = response.graphStore.cypherQueryV2.edges.reduce((containers, edge) => {
       edge.node.columns.forEach(column => {
         var _column$value;
         const containerData = (_column$value = column.value) === null || _column$value === void 0 ? void 0 : _column$value.data;
-        if (!containerData && fg('enable_team_containers_null_check')) {
+        if (!containerData) {
           return;
         }
         if ((containerData === null || containerData === void 0 ? void 0 : containerData.__typename) === 'ConfluenceSpace') {
@@ -90,50 +77,6 @@ export class AGGClient extends BaseGraphQlClient {
     }, []);
     return containersResult;
   }
-  processV1Response(response) {
-    const containersResult = response.graphStore.cypherQuery.edges.reduce((containers, edge) => {
-      if (!edge.node.to.data && fg('enable_team_containers_null_check')) {
-        return containers;
-      }
-      if (edge.node.to.data.__typename === 'ConfluenceSpace') {
-        containers.push({
-          id: edge.node.to.id,
-          type: edge.node.to.data.__typename,
-          name: edge.node.to.data.confluenceSpaceName || '',
-          icon: `${edge.node.to.data.links.base}${edge.node.to.data.icon.path}`,
-          createdDate: new Date(edge.node.to.data.createdDate),
-          link: `${edge.node.to.data.links.base}${edge.node.to.data.links.webUi}`,
-          containerTypeProperties: {
-            subType: undefined,
-            name: undefined
-          }
-        });
-      } else if (edge.node.to.data.__typename === 'JiraProject') {
-        containers.push({
-          id: edge.node.to.id,
-          type: edge.node.to.data.__typename,
-          name: edge.node.to.data.jiraProjectName,
-          icon: edge.node.to.data.avatar.medium,
-          createdDate: new Date(edge.node.to.data.created),
-          link: edge.node.to.data.webUrl,
-          containerTypeProperties: {
-            subType: edge.node.to.data.projectType || '',
-            name: edge.node.to.data.projectTypeName || ''
-          }
-        });
-      } else if (edge.node.to.data.__typename === 'LoomSpace') {
-        containers.push({
-          id: edge.node.to.id,
-          type: edge.node.to.data.__typename,
-          name: edge.node.to.data.loomSpaceName,
-          icon: '',
-          link: edge.node.to.data.url
-        });
-      }
-      return containers;
-    }, []);
-    return containersResult;
-  }
   async unlinkTeamContainer(teamId, containerId) {
     const teamAri = teamIdToAri(teamId);
     const response = await this.makeGraphQLRequest({

package/dist/es2019/services/agg-client/mocks/index.js

@@ -14,6 +14,7 @@ export const MOCK_TEAM_CONTAINERS = {
               type: 'confluence',
               createdDate: '2021-01-01',
               links: {
+                base: 'https://example.com',
                 webUi: 'web-link'
               },
               icon: {

package/dist/es2019/services/agg-client/utils/queries/team-containers-query.js

@@ -1,57 +1,5 @@
 import { print } from 'graphql';
 import gql from 'graphql-tag';
-import { fg } from '@atlaskit/platform-feature-flags';
-export const TeamContainersQuery = print(gql`
-	query TeamContainersQuery($cypherQuery: String!) {
-		graphStore @optIn(to: ["GraphStore"]) {
-			cypherQuery(query: $cypherQuery) @optIn(to: ["GraphStoreCypherQuery"]) {
-				edges {
-					__typename
-					node {
-						from {
-							id
-						}
-						to {
-							id
-							data {
-								__typename
-								... on ConfluenceSpace {
-									id
-									confluenceSpaceName: name
-									type
-									createdDate
-									links {
-										base
-										webUi
-									}
-									icon {
-										path
-									}
-								}
-								... on JiraProject {
-									id
-									jiraProjectName: name
-									webUrl
-									created
-									avatar {
-										medium
-									}
-									projectType
-									projectTypeName
-								}
-								... on LoomSpace {
-									id
-									loomSpaceName: name
-									url
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-`);
 export const TeamContainersQueryV2 = print(gql`
 	query TeamContainersQueryV2($cypherQuery: String!, $params: JSON!) {
 		graphStore @optIn(to: ["GraphStore", "GraphStoreCypherQueryV2"]) {
@@ -104,5 +52,5 @@ export const TeamContainersQueryV2 = print(gql`
 	}
 `);
 export const getTeamContainersQuery = () => {
-  return fg('teams_containers_cypher_query_v2_migration') ? TeamContainersQueryV2 : TeamContainersQuery;
+  return TeamContainersQueryV2;
 };

package/dist/es2019/services/agg-client/utils/query-context-headers.js

@@ -0,0 +1,14 @@
+import { fg } from '@atlaskit/platform-feature-flags';
+
+/**
+ * Creates headers object with X-Query-Context header if cloudId is provided and feature flag is enabled.
+ * Use this for AGG client makeGraphQLRequest calls.
+ */
+export function createQueryContextHeaders(cloudId) {
+  if (!cloudId || !fg('enable_x_query_context_header')) {
+    return undefined;
+  }
+  return {
+    'X-Query-Context': `ari:cloud:platform::site/${cloudId}`
+  };
+}

package/dist/es2019/services/graphql-client/main.js

@@ -1,3 +1,4 @@
+import { fg } from '@atlaskit/platform-feature-flags';
 import { DefaultError, GraphQLError } from '../../common/utils/error';
 import { BaseClient } from '../base-client';
 import { handleGraphQLRequest } from './utils';
@@ -9,9 +10,33 @@ export class BaseGraphQlClient extends BaseClient {
   setServiceUrl(serviceUrl) {
     this.serviceUrl = serviceUrl;
   }
+
+  /**
+   * Creates query context headers if cloudId is available and feature flag is enabled.
+   */
+  createQueryContextHeaders(cloudId) {
+    if (!cloudId || !fg('enable_x_query_context_header')) {
+      return undefined;
+    }
+    return {
+      'X-Query-Context': `ari:cloud:platform::site/${cloudId}`
+    };
+  }
   async makeGraphQLRequest(body, options = {}) {
     try {
-      return handleGraphQLRequest(this.serviceUrl, body, options);
+      // Automatically add X-Query-Context header if cloudId is available in context
+      const cloudId = this.getCloudId();
+      const queryContextHeaders = this.createQueryContextHeaders(cloudId);
+
+      // Merge headers: query context headers first, then provided headers (provided headers take precedence)
+      const mergedOptions = {
+        ...options,
+        headers: {
+          ...queryContextHeaders,
+          ...options.headers
+        }
+      };
+      return handleGraphQLRequest(this.serviceUrl, body, mergedOptions);
     } catch (error) {
       if (error instanceof GraphQLError) {
         throw error;

package/dist/es2019/services/graphql-client/utils/index.js

@@ -8,7 +8,8 @@ export async function makeGraphQLRequestWithoutRetries(serviceUrl, body, options
   const request = fetch(url, {
     method: 'POST',
     headers: new Headers({
-      'Content-Type': 'application/json'
+      'Content-Type': 'application/json',
+      ...(options.headers || {})
     }),
     credentials: 'include',
     body: JSON.stringify(body)

package/dist/esm/controllers/hooks/use-team-containers/index.js

@@ -10,6 +10,7 @@ import { createHook, createStore } from 'react-sweet-state';
 import { useAnalyticsEvents } from '@atlaskit/analytics-next';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { useAnalyticsEvents as useAnalyticsEventsNext } from '@atlaskit/teams-app-internal-analytics';
+import { teamsClient as externalTeamsClient } from '@atlaskit/teams-client';
 import { AnalyticsAction, usePeopleAndTeamAnalytics } from '../../../common/utils/analytics';
 import { teamsClient } from '../../../services';
 var initialConnectedTeamsState = {
@@ -60,7 +61,7 @@ var actions = {
               });
               _context.prev = 5;
               _context.next = 8;
-              return teamsClient.getTeamContainers(teamId);
+              return fg('enable_teams_public_migration_using_teams-client') ? externalTeamsClient.getTeamContainers(teamId) : teamsClient.getTeamContainers(teamId);
             case 8:
               containers = _context.sent;
               if (fg('ptc-enable-teams-public-analytics-refactor')) {
@@ -126,7 +127,7 @@ var actions = {
             case 4:
               _context2.prev = 4;
               _context2.next = 7;
-              return teamsClient.getTeamContainers(teamId);
+              return fg('enable_teams_public_migration_using_teams-client') ? externalTeamsClient.getTeamContainers(teamId) : teamsClient.getTeamContainers(teamId);
             case 7:
               containers = _context2.sent;
               if (fg('ptc-enable-teams-public-analytics-refactor')) {
@@ -201,7 +202,7 @@ var actions = {
               });
               _context3.prev = 5;
               _context3.next = 8;
-              return teamsClient.getNumberOfConnectedTeams(containerId);
+              return fg('enable_teams_public_migration_using_teams-client') ? externalTeamsClient.getNumberOfConnectedTeams(containerId) : teamsClient.getNumberOfConnectedTeams(containerId);
             case 8:
               numberOfTeams = _context3.sent;
               if (fg('ptc-enable-teams-public-analytics-refactor')) {
@@ -290,7 +291,7 @@ var actions = {
               });
               _context4.prev = 5;
               _context4.next = 8;
-              return teamsClient.getConnectedTeams(containerId);
+              return fg('enable_teams_public_migration_using_teams-client') ? externalTeamsClient.getConnectedTeams(containerId) : teamsClient.getConnectedTeams(containerId);
             case 8:
               teams = _context4.sent;
               if (fg('ptc-enable-teams-public-analytics-refactor')) {
@@ -373,7 +374,7 @@ var actions = {
               });
               _context5.prev = 2;
               _context5.next = 5;
-              return teamsClient.unlinkTeamContainer(teamId, containerId);
+              return fg('enable_teams_public_migration_using_teams-client') ? externalTeamsClient.unlinkTeamContainer(teamId, containerId) : teamsClient.unlinkTeamContainer(teamId, containerId);
             case 5:
               mutationResult = _context5.sent;
               if (mutationResult.deleteTeamConnectedToContainer.errors.length) {

package/dist/esm/controllers/hooks/use-team-containers/mocks.js

@@ -0,0 +1,119 @@
+// Mock data for tests
+export var MOCK_TEAM_CONTAINERS = {
+  graphStore: {
+    cypherQuery: {
+      edges: [{
+        node: {
+          from: {
+            id: '1'
+          },
+          to: {
+            id: '2',
+            data: {
+              __typename: 'ConfluenceSpace',
+              confluenceSpaceName: 'Confluence Space',
+              type: 'confluence',
+              createdDate: '2021-01-01',
+              links: {
+                webUi: 'web-link'
+              },
+              icon: {
+                path: 'https://avatar-management--avatars.us-west-2.staging.public.atl-paas.net/712020:2981defd-17f1-440e-a377-8c7657b72a6f/4b5b0d55-614b-4e75-858f-9da3d0c7e3f8/128'
+              }
+            }
+          }
+        }
+      }, {
+        node: {
+          from: {
+            id: '1'
+          },
+          to: {
+            id: '3',
+            data: {
+              __typename: 'JiraProject',
+              jiraProjectName: 'Jira Project',
+              webUrl: 'web-link',
+              created: '2021-01-01',
+              avatar: {
+                medium: 'https://avatar-management--avatars.us-west-2.staging.public.atl-paas.net/712020:2981defd-17f1-440e-a377-8c7657b72a6f/4b5b0d55-614b-4e75-858f-9da3d0c7e3f8/128'
+              }
+            }
+          }
+        }
+      }]
+    }
+  }
+};
+export var MOCK_TEAM_CONTAINERSV2 = {
+  graphStore: {
+    cypherQueryV2: {
+      edges: [{
+        node: {
+          columns: [{
+            key: 'container',
+            value: {
+              data: {
+                __typename: 'ConfluenceSpace',
+                id: '2',
+                confluenceSpaceName: 'Confluence Space',
+                type: 'confluence',
+                createdDate: '2021-01-01',
+                links: {
+                  base: 'https://example.com',
+                  webUi: '/wiki/spaces/SPACE'
+                },
+                icon: {
+                  path: '/wiki/download/attachments/123/icon.png'
+                }
+              }
+            }
+          }]
+        }
+      }, {
+        node: {
+          columns: [{
+            key: 'container',
+            value: {
+              data: {
+                __typename: 'JiraProject',
+                id: '3',
+                jiraProjectName: 'Jira Project',
+                webUrl: 'https://example.com/jira/project',
+                created: '2021-01-01',
+                avatar: {
+                  medium: 'https://avatar-management--avatars.us-west-2.staging.public.atl-paas.net/712020:2981defd-17f1-440e-a377-8c7657b72a6f/4b5b0d55-614b-4e75-858f-9da3d0c7e3f8/128'
+                },
+                projectType: 'software',
+                projectTypeName: 'Software Project'
+              }
+            }
+          }]
+        }
+      }]
+    }
+  }
+};
+export var MOCK_CONNECTED_TEAMS_RESULT = [{
+  id: 'ari:cloud:identity::team/8ee37950-7de7-41ec-aee2-2c02c95949f4',
+  displayName: 'THE SUPER TEAM',
+  description: "Super team's super description",
+  state: 'ACTIVE',
+  membershipSettings: 'MEMBER_INVITE',
+  organizationId: 'ari:cloud:platform::org/434kbc65-c30c-1a22-6933-d25085c532ca',
+  creatorId: 'ari:cloud:identity::user/70121:c17bdf1f-39db-4611-a700-2f8c1aff841e',
+  isVerified: false,
+  members: [{
+    id: '70121:c17bdf1f-39db-4611-a700-2f8c1aff841e',
+    fullName: 'Shrutha Kashyap',
+    avatarUrl: 'https://avatar-management--avatars.us-west-2.prod.public.atl-paas.net/70121:c17bdf1f-39db-4611-a700-2f8c1aff841e/cf4058fd-75f2-4824-8041-c8efa4cc0ea8/128',
+    status: 'active'
+  }],
+  includesYou: false,
+  memberCount: 1,
+  smallAvatarImageUrl: 'https://ptc-directory-sited-static.us-east-1.prod.public.atl-paas.net/teams/avatars/0.svg',
+  smallHeaderImageUrl: 'https://ptc-directory-sited-static.us-east-1.prod.public.atl-paas.net/gradients/0.svg',
+  largeAvatarImageUrl: 'https://ptc-directory-sited-static.us-east-1.prod.public.atl-paas.net/teams/avatars/0.svg',
+  largeHeaderImageUrl: 'https://ptc-directory-sited-static.us-east-1.prod.public.atl-paas.net/gradients/0.svg',
+  restriction: 'ORG_MEMBERS'
+}];

package/dist/esm/services/agg-client/index.js

@@ -7,7 +7,6 @@ import _inherits from "@babel/runtime/helpers/inherits";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
-import { fg } from '@atlaskit/platform-feature-flags';
 import { teamIdToAri } from '../../common/utils/team-id-to-ari';
 import { toUserId } from '../../common/utils/user-ari';
 import { DEFAULT_CONFIG } from '../constants';
@@ -15,7 +14,7 @@ import { BaseGraphQlClient } from '../graphql-client';
 import { UnlinkContainerMutation } from './utils/mutations/unlink-container-mutation';
 import { NumberOfTeamConnectedToContainerQuery } from './utils/queries/number-of-team-connected-to-container-query';
 import { TeamConnectedToContainerQuery } from './utils/queries/team-connected-to-container-query';
-import { TeamContainersQuery, TeamContainersQueryV2 } from './utils/queries/team-containers-query';
+import { TeamContainersQueryV2 } from './utils/queries/team-containers-query';
 export var AGGClient = /*#__PURE__*/function (_BaseGraphQlClient) {
   function AGGClient(baseUrl, config) {
     _classCallCheck(this, AGGClient);
@@ -31,17 +30,13 @@ export var AGGClient = /*#__PURE__*/function (_BaseGraphQlClient) {
     key: "getTeamContainers",
     value: function () {
       var _getTeamContainers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(teamId) {
-        var teamAri, cypherQuery, response, _response;
+        var teamAri, cypherQuery, response;
         return _regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               teamAri = teamIdToAri(teamId);
               cypherQuery = "MATCH (team:IdentityTeam {ari: '".concat(teamAri, "'})-[:team_connected_to_container]->(container) RETURN container");
-              if (!fg('teams_containers_cypher_query_v2_migration')) {
-                _context.next = 9;
-                break;
-              }
-              _context.next = 5;
+              _context.next = 4;
               return this.makeGraphQLRequest({
                 query: TeamContainersQueryV2,
                 variables: {
@@ -53,23 +48,10 @@ export var AGGClient = /*#__PURE__*/function (_BaseGraphQlClient) {
               }, {
                 operationName: 'TeamContainersQueryV2'
               });
-            case 5:
+            case 4:
               response = _context.sent;
-              return _context.abrupt("return", this.processV2Response(response));
-            case 9:
-              _context.next = 11;
-              return this.makeGraphQLRequest({
-                query: TeamContainersQuery,
-                variables: {
-                  cypherQuery: cypherQuery
-                }
-              }, {
-                operationName: 'TeamContainersQuery'
-              });
-            case 11:
-              _response = _context.sent;
-              return _context.abrupt("return", this.processV1Response(_response));
-            case 13:
+              return _context.abrupt("return", this.processResponse(response));
+            case 6:
             case "end":
               return _context.stop();
           }
@@ -81,13 +63,13 @@ export var AGGClient = /*#__PURE__*/function (_BaseGraphQlClient) {
       return getTeamContainers;
     }()
   }, {
-    key: "processV2Response",
-    value: function processV2Response(response) {
+    key: "processResponse",
+    value: function processResponse(response) {
       var containersResult = response.graphStore.cypherQueryV2.edges.reduce(function (containers, edge) {
         edge.node.columns.forEach(function (column) {
           var _column$value;
           var containerData = (_column$value = column.value) === null || _column$value === void 0 ? void 0 : _column$value.data;
-          if (!containerData && fg('enable_team_containers_null_check')) {
+          if (!containerData) {
             return;
           }
           if ((containerData === null || containerData === void 0 ? void 0 : containerData.__typename) === 'ConfluenceSpace') {
@@ -130,52 +112,6 @@ export var AGGClient = /*#__PURE__*/function (_BaseGraphQlClient) {
       }, []);
       return containersResult;
     }
-  }, {
-    key: "processV1Response",
-    value: function processV1Response(response) {
-      var containersResult = response.graphStore.cypherQuery.edges.reduce(function (containers, edge) {
-        if (!edge.node.to.data && fg('enable_team_containers_null_check')) {
-          return containers;
-        }
-        if (edge.node.to.data.__typename === 'ConfluenceSpace') {
-          containers.push({
-            id: edge.node.to.id,
-            type: edge.node.to.data.__typename,
-            name: edge.node.to.data.confluenceSpaceName || '',
-            icon: "".concat(edge.node.to.data.links.base).concat(edge.node.to.data.icon.path),
-            createdDate: new Date(edge.node.to.data.createdDate),
-            link: "".concat(edge.node.to.data.links.base).concat(edge.node.to.data.links.webUi),
-            containerTypeProperties: {
-              subType: undefined,
-              name: undefined
-            }
-          });
-        } else if (edge.node.to.data.__typename === 'JiraProject') {
-          containers.push({
-            id: edge.node.to.id,
-            type: edge.node.to.data.__typename,
-            name: edge.node.to.data.jiraProjectName,
-            icon: edge.node.to.data.avatar.medium,
-            createdDate: new Date(edge.node.to.data.created),
-            link: edge.node.to.data.webUrl,
-            containerTypeProperties: {
-              subType: edge.node.to.data.projectType || '',
-              name: edge.node.to.data.projectTypeName || ''
-            }
-          });
-        } else if (edge.node.to.data.__typename === 'LoomSpace') {
-          containers.push({
-            id: edge.node.to.id,
-            type: edge.node.to.data.__typename,
-            name: edge.node.to.data.loomSpaceName,
-            icon: '',
-            link: edge.node.to.data.url
-          });
-        }
-        return containers;
-      }, []);
-      return containersResult;
-    }
   }, {
     key: "unlinkTeamContainer",
     value: function () {