WIP: make it work together

schema.graphql

@@ -586,7 +586,7 @@ input MonthlyCostFilter {
 
 type Mutation {
   """
-  Add opt-out of a reconciler for a team member. Only reconcilers that uses team memberships can be opted out from.
+  Add opt-out of a reconciler for a team member. Only reconcilers that are member aware can be opted out from.
   """
   addReconcilerOptOut(
     """The name of the reconciler to opt the team member out of."""
@@ -1190,14 +1190,11 @@ type Reconciler {
   """Whether or not the reconciler is enabled."""
   enabled: Boolean!
 
+  """Whether or not the reconciler uses team memberships when syncing."""
+  memberAware: Boolean!
+
   """The name of the reconciler."""
   name: String!
-
-  """The run order of the reconciler."""
-  runOrder: Int!
-
-  """Whether or not the reconciler uses team memberships when syncing."""
-  usesTeamMemberships: Boolean!
 }
 
 """Reconciler configuration type."""
@@ -1596,17 +1593,10 @@ type Team {
     offset: Int
   ): DeploymentList!
 
-  """A list of GitHub repositories for the team."""
-  gitHubRepositories(
-    """Filter teams by GitHub repository permissions."""
-    filter: GitHubRepositoriesFilter
-
-    """Limit the number of repositories to return. Default is 20."""
-    limit: Int
-
-    """Offset to start listing repositories from. Default is 0."""
-    offset: Int
-  ): GitHubRepositoryList!
+  """
+  The email address of the Google Group for the team. This value is only available after the initial team synchronization.
+  """
+  googleGroupEmail: String
   id: ID!
 
   """Timestamp of the last successful synchronization of the team."""

src/routes/admin/+page.gql

@@ -1,5 +1,7 @@
 query AdminReconcilers {
-	reconcilers {
-        ...ReconcilerFragment
+	reconcilers(limit: 100) {
+		nodes {
+			...ReconcilerFragment
+		}
 	}
-}
+}

src/routes/admin/+page.svelte

@@ -7,7 +7,7 @@
 	export let data: PageData;
 
 	$: ({ AdminReconcilers } = data);
-	$: reconcilers = $AdminReconcilers.data?.reconcilers;
+	$: reconcilers = $AdminReconcilers.data?.reconcilers.nodes;
 
 	const synchronize = graphql(`
 		mutation Synchronize {
@@ -47,6 +47,8 @@
 
 {#each reconcilers || [] as r}
 	<Reconciler reconciler={r} />
+{:else}
+	<p>No reconcilers registered</p>
 {/each}
 
 <style>

src/routes/admin/Reconciler.svelte

@@ -30,8 +30,7 @@
 				displayName
 				enabled
 				name
-				runOrder
-				usesTeamMemberships
+				memberAware
 				config {
 					configured
 					description

src/routes/deploys/+page.svelte

@@ -4,7 +4,7 @@
 	import DeploymentStatus from '$lib/DeploymentStatus.svelte';
 	import Pagination from '$lib/Pagination.svelte';
 	import Time from '$lib/Time.svelte';
-	import { limitOffset } from '$lib/pagination';
+	import { changeParams, limitOffset } from '$lib/pagination';
 	import { Alert, Skeleton, Table, Tbody, Td, Th, Thead, Tr } from '@nais/ds-svelte-community';
 	import type { PageData } from './$houdini';
 	export let data: PageData;

src/routes/team/[team]/(teamTabs)/members/AddMember.svelte

@@ -33,7 +33,7 @@
 					displayName
 					name
 					description
-					usesTeamMemberships
+					memberAware
 				}
 			}
 		}
@@ -57,7 +57,7 @@
 		return store.subscribe(async (v) => {
 			if (!v.data) return;
 
-			const recs = v.data.reconcilers.filter((r) => r.usesTeamMemberships);
+			const recs = v.data.reconcilers.nodes.filter((r) => r.memberAware);
 			reconcilers =
 				recs.map((r) => ({
 					name: r.displayName,

src/routes/team/[team]/(teamTabs)/repositories/+page.gql

@@ -1,20 +1,31 @@
 query Repositories($team: Slug!) @cache(policy: NetworkOnly) {
 	team(slug: $team) {
-		gitHubRepositories(limit: 20) {
+		reconcilerResources(key: "repo", reconciler: "github:team", limit: 20) {
 			pageInfo {
 				totalCount
 				hasNextPage
 				hasPreviousPage
 			}
 			nodes {
-				name
-				authorizations
-				permissions {
-					name
-					granted
-				}
-				roleName
+				name: value
+				metadata
 			}
 		}
+		# gitHubRepositories(limit: 20) {
+		# 	pageInfo {
+		# 		totalCount
+		# 		hasNextPage
+		# 		hasPreviousPage
+		# 	}
+		# 	nodes {
+		# 		name
+		# 		authorizations
+		# 		permissions {
+		# 			name
+		# 			granted
+		# 		}
+		# 		roleName
+		# 	}
+		# }
 	}
 }

src/routes/team/[team]/(teamTabs)/repositories/+page.svelte

@@ -2,11 +2,8 @@
 	import { page } from '$app/stores';
 	import { PendingValue, RepositoryAuthorization, graphql } from '$houdini';
 	import Card from '$lib/Card.svelte';
-	import Pagination from '$lib/Pagination.svelte';
 	import { sortTable } from '$lib/pagination';
 	import {
-		Button,
-		HelpText,
 		Link,
 		Table,
 		Tbody,
@@ -127,47 +124,47 @@
 				</Tr>
 			</Thead>
 			<Tbody>
-				{#each team.githubRepositories.edges as repo}
+				{#each team.reconcilerResources.nodes as repo}
 					<Tr>
-						<Td><Link href="https://github.com/{repo.node.name}">{repo.node.name}</Link></Td>
-						{#if teamRoles && teamRoles !== PendingValue && teamRoles.viewerIsMember}
-							{#if repo.node.authorizations !== null && repo.node.name !== null}
+						<Td><Link href="https://github.com/{repo.name}">{repo.name}</Link></Td>
+						<!-- {#if teamRoles && teamRoles !== PendingValue && teamRoles.viewerIsMember} -->
+						<!-- {#if repo.authorizations !== null && repo.value !== null}
 								<Td>
-									{#if repo.node.authorizations.includes('DEPLOY')}
+									{#if repo.authorizations.includes('DEPLOY')}
 										<Button
 											size="xsmall"
 											variant="danger"
 											on:click={() => {
-												deauthorizeDeploy(teamName, repo.node.name);
+												deauthorizeDeploy(teamName, repo.value);
 											}}>Deauthorize</Button
 										>
 									{:else}
 										<Button
 											size="xsmall"
 											variant="primary-neutral"
 											on:click={() => {
-												authorizeDeploy(teamName, repo.node.name);
+												authorizeDeploy(teamName, repo.value);
 											}}>Authorize</Button
 										>
 									{/if}
 								</Td>
-							{/if}
-							<Td
+							{/if} -->
+						<!-- <Td
 								><div class="roleHelpText">
-									{repo.node.roleName}<HelpText placement={'left'} title="Role description"
-										>The team's role for the repository.<br />{repo.node.roleName.toUpperCase()}: {roleDesc(
-											repo.node.roleName.toUpperCase()
+									{repo.roleName}<HelpText placement={'left'} title="Role description"
+										>The team's role for the repository.<br />{repo.roleName.toUpperCase()}: {roleDesc(
+											repo.roleName.toUpperCase()
 										)}</HelpText
 									>
 								</div></Td
 							>
-						{/if}
+						{/if} -->
 					</Tr>
 				{/each}
 			</Tbody>
 		</Table>
 
-		<Pagination
+		<!-- <Pagination
 			pageInfo={team.githubRepositories.pageInfo}
 			totalCount={team.githubRepositories.totalCount}
 			on:nextPage={() => {
@@ -178,7 +175,7 @@
 				if (!$Repositories.pageInfo.hasPreviousPage) return;
 				Repositories.loadPreviousPage();
 			}}
-		/>
+		/> -->
 	</Card>
 {/if}
 

vite.config.ts

@@ -14,7 +14,7 @@ export default defineConfig({
 				headers: {
 					'X-User-Email': import.meta.env?.VITE_API_USER_EMAIL
 						? import.meta.env?.VITE_API_USER_EMAIL
-						: 'dev.usersen@example.com'
+						: 'admin.usersen@example.com'
 				}
 			}
 		}