fix: by subgraph query

controlplane/package.json

@@ -43,7 +43,7 @@
     "axios": "^1.4.0",
     "cookie": "^0.5.0",
     "dotenv": "^16.3.1",
-    "drizzle-orm": "^0.28.1",
+    "drizzle-orm": "^0.28.5",
     "fastify": "^4.21.0",
     "fastify-graceful-shutdown": "^3.5.1",
     "fastify-plugin": "^4.5.1",

controlplane/src/core/repositories/FederatedGraphRepository.ts

@@ -258,33 +258,36 @@ export class FederatedGraphRepository {
         name: targets.name,
       })
       .from(targets)
-      .where(and(eq(targets.organizationId, this.organizationId), eq(targets.type, 'federated')))
-      .innerJoin(federatedGraphs, eq(federatedGraphs.targetId, targets.id))
-      .leftJoin(schemaVersion, eq(schemaVersion.id, federatedGraphs.composedSchemaVersionId))
-      // This is a negative lookup. We check if there is a label matchers of a federated graph
-      // that does not match the given subgraph labels. If all label matchers match, then the
-      // federated graph will be part of the result.
       .where(
-        notExists(
-          this.db
-            .select()
-            .from(targetLabelMatchers)
-            .where(
-              and(
-                eq(targetLabelMatchers.targetId, targets.id),
-                not(
-                  // We created a GIN index on the label_matcher column, so we can look up
-                  // very quickly if the label matcher matches the given subgraph labels.
-                  sql.raw(
-                    `${targetLabelMatchers.labelMatcher.name} && ARRAY[${uniqueLabels.map(
-                      (ul) => "'" + joinLabel(ul) + "'",
-                    )}]`,
+        and(
+          eq(targets.organizationId, this.organizationId),
+          eq(targets.type, 'federated'),
+          // This is a negative lookup. We check if there is a label matchers of a federated graph
+          // that does not match the given subgraph labels. If all label matchers match, then the
+          // federated graph will be part of the result.
+          notExists(
+            this.db
+              .select()
+              .from(targetLabelMatchers)
+              .where(
+                and(
+                  eq(targetLabelMatchers.targetId, targets.id),
+                  not(
+                    // We created a GIN index on the label_matcher column, so we can look up
+                    // very quickly if the label matcher matches the given subgraph labels.
+                    sql.raw(
+                      `${targetLabelMatchers.labelMatcher.name} && ARRAY[${uniqueLabels.map(
+                        (ul) => "'" + joinLabel(ul) + "'",
+                      )}]`,
+                    ),
                   ),
                 ),
               ),
-            ),
+          ),
         ),
       )
+      .innerJoin(federatedGraphs, eq(federatedGraphs.targetId, targets.id))
+      .leftJoin(schemaVersion, eq(schemaVersion.id, federatedGraphs.composedSchemaVersionId))
       .orderBy(asc(targets.createdAt), asc(schemaVersion.createdAt))
       .execute();
 

controlplane/src/core/repositories/SubgraphRepository.ts

@@ -408,8 +408,7 @@ export class SubgraphRepository {
     const subgraphs = await this.db
       .select({ id: schema.subgraphs.id, name: schema.targets.name })
       .from(targets)
-      .where(and(eq(schema.targets.organizationId, this.organizationId), eq(targets.type, 'subgraph')))
-      .where(and(...conditions))
+      .where(and(eq(targets.organizationId, this.organizationId), eq(targets.type, 'subgraph'), ...conditions))
       .innerJoin(schema.subgraphs, eq(schema.subgraphs.targetId, targets.id))
       .execute();
 

controlplane/test/authenthication.test.ts

@@ -37,6 +37,7 @@ describe('Authentication', (ctx) => {
         url: databaseConnectionUrl,
       },
       keycloak: {
+        loginRealm: 'test',
         realm: 'test',
         adminUser: 'admin',
         adminPassword: 'changeme',

scripts/create-docker-demo.sh

@@ -14,6 +14,8 @@ pnpm wgc subgraph create family --label team=A env=production --routing-url http
 pnpm wgc subgraph create hobbies --label team=B env=production --routing-url http://hobbies:4003/graphql
 pnpm wgc subgraph create products --label team=B env=production --routing-url http://products:4004/graphql
 
+cd "../scripts"
+
 ./update-docker-demo.sh
 
 pnpm wgc federated-graph create-token production --name mytoken

scripts/create-local-demo.sh

@@ -14,6 +14,8 @@ pnpm wgc subgraph create family --label team=A env=production --routing-url http
 pnpm wgc subgraph create hobbies --label team=B env=production --routing-url http://localhost:4003/graphql
 pnpm wgc subgraph create products --label team=B env=production --routing-url http://localhost:4004/graphql
 
+cd "../scripts"
+
 ./update-local-demo.sh
 
 pnpm wgc federated-graph create-token production --name mytoken